162,163c162,165
< def makeLinuxX86System(mem_mode, mdesc = None):
< self = LinuxX86System()
---
> def makeX86System(mem_mode, mdesc = None, self = None):
> if self == None:
> self = X86System()
>
173a176,194
> # North Bridge
> self.iobus = Bus(bus_id=0)
> self.bridge = Bridge(delay='50ns', nack_delay='4ns')
> self.bridge.side_a = self.iobus.port
> self.bridge.side_b = self.membus.port
>
> # Platform
> self.pc = PC()
> self.pc.attachIO(self.iobus)
>
> self.intrctrl = IntrControl()
>
>
> def makeLinuxX86System(mem_mode, mdesc = None):
> self = LinuxX86System()
>
> # Build up a generic x86 system and then specialize it for Linux
> makeX86System(mem_mode, mdesc, self)
>
190,195d210
< # North Bridge
< self.iobus = Bus(bus_id=0)
< self.bridge = Bridge(delay='50ns', nack_delay='4ns')
< self.bridge.side_a = self.iobus.port
< self.bridge.side_b = self.membus.port
<
199,204d213
< # Platform
< self.pc = PC()
< self.pc.attachIO(self.iobus)
<
< self.intrctrl = IntrControl()
<