diff options
Diffstat (limited to 'configs/common/FSConfig.py')
| -rw-r--r-- | configs/common/FSConfig.py | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index d17a354af..e86cc05f5 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -29,12 +29,8 @@ import m5 from m5 import makeList from m5.objects import * +from Benchmarks import * from FullO3Config import * -from SysPaths import * -from Util import * - -script.dir = '/z/saidi/work/m5.newmem/configs/boot' -linux_image = env.get('LINUX_IMAGE', disk('linux-latest.img')) class CowIdeDisk(IdeDisk): image = CowDiskImage(child=RawDiskImage(read_only=True), @@ -50,18 +46,22 @@ class BaseTsunami(Tsunami): ide = IdeController(disks=[Parent.disk0, Parent.disk2], pci_func=0, pci_dev=0, pci_bus=0) -def makeLinuxAlphaSystem(cpu, mem_mode, linux_image, icache=None, dcache=None, l2cache=None): +def makeLinuxAlphaSystem(mem_mode, mdesc = None): self = LinuxAlphaSystem() + if not mdesc: + # generic system + mdesc = Machine() + self.readfile = mdesc.script() self.iobus = Bus(bus_id=0) self.membus = Bus(bus_id=1) self.bridge = Bridge() - self.physmem = PhysicalMemory(range = AddrRange('128MB')) + self.physmem = PhysicalMemory(range = AddrRange(mdesc.mem())) self.bridge.side_a = self.iobus.port self.bridge.side_b = self.membus.port self.physmem.port = self.membus.port self.disk0 = CowIdeDisk(driveID='master') self.disk2 = CowIdeDisk(driveID='master') - self.disk0.childImage(linux_image) + self.disk0.childImage(mdesc.disk()) self.disk2.childImage(disk('linux-bigswap2.img')) self.tsunami = BaseTsunami() self.tsunami.attachIO(self.iobus) @@ -71,16 +71,10 @@ def makeLinuxAlphaSystem(cpu, mem_mode, linux_image, icache=None, dcache=None, l self.tsunami.ethernet.pio = self.iobus.port self.tsunami.ethernet.dma = self.iobus.port self.tsunami.ethernet.config = self.iobus.port - self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = linux_image, + self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk(), read_only = True)) self.intrctrl = IntrControl() - self.cpu = cpu self.mem_mode = mem_mode - connectCpu(self.cpu, self.membus, icache, dcache, l2cache) - for each_cpu in makeList(self.cpu): - each_cpu.itb = AlphaITB() - each_cpu.dtb = AlphaDTB() - self.cpu.clock = '2GHz' self.sim_console = SimConsole(listener=ConsoleListener(port=3456)) self.kernel = binary('vmlinux') self.pal = binary('ts_osfpal') @@ -89,14 +83,14 @@ def makeLinuxAlphaSystem(cpu, mem_mode, linux_image, icache=None, dcache=None, l return self -def makeDualRoot(clientSystem, serverSystem): +def makeDualRoot(testSystem, driveSystem): self = Root() - self.client = clientSystem - self.server = serverSystem + self.testsys = testSystem + self.drivesys = driveSystem self.etherdump = EtherDump(file='ethertrace') - self.etherlink = EtherLink(int1 = Parent.client.tsunami.etherint[0], - int2 = Parent.server.tsunami.etherint[0], + self.etherlink = EtherLink(int1 = Parent.testsys.tsunami.etherint[0], + int2 = Parent.drivesys.tsunami.etherint[0], dump = Parent.etherdump) self.clock = '1THz' return self |