[gem5-dev] changeset in gem5: ARM: Add support for running multiple systems

[Ali Saidi]

changeset 2d791d07c59b in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=2d791d07c59b
description:
        ARM: Add support for running multiple systems

diffstat:

 configs/common/FSConfig.py |  9 +++++++++
 configs/example/fs.py      |  4 ++--
 src/dev/arm/pl111.cc       |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r b68ae43bc806 -r 2d791d07c59b configs/common/FSConfig.py
--- a/configs/common/FSConfig.py        Mon Jan 09 18:08:20 2012 -0600
+++ b/configs/common/FSConfig.py        Mon Jan 09 18:08:20 2012 -0600
@@ -483,6 +483,15 @@
     self.etherlink.int0 = Parent.testsys.tsunami.ethernet.interface
     self.etherlink.int1 = Parent.drivesys.tsunami.ethernet.interface
 
+    if hasattr(testSystem, 'realview'):
+        self.etherlink.int0 = Parent.testsys.realview.ethernet.interface
+        self.etherlink.int1 = Parent.drivesys.realview.ethernet.interface
+    elif hasattr(testSystem, 'tsunami'):
+        self.etherlink.int0 = Parent.testsys.tsunami.ethernet.interface
+        self.etherlink.int1 = Parent.drivesys.tsunami.ethernet.interface
+    else:
+        fatal("Don't know how to connect these system together")
+
     if dumpfile:
         self.etherdump = EtherDump(file=dumpfile)
         self.etherlink.dump = Parent.etherdump
diff -r b68ae43bc806 -r 2d791d07c59b configs/example/fs.py
--- a/configs/example/fs.py     Mon Jan 09 18:08:20 2012 -0600
+++ b/configs/example/fs.py     Mon Jan 09 18:08:20 2012 -0600
@@ -192,8 +192,8 @@
     elif buildEnv['TARGET_ISA'] == 'x86':
         drive_sys = makeX86System(drive_mem_mode, np, bm[1])
     elif buildEnv['TARGET_ISA'] == 'arm':
-        drive_sys = makeArmSystem(drive_mem_mode,
-                machine_options.machine_type, bm[1])
+        drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, bm[1])
+
     drive_sys.cpu = DriveCPUClass(cpu_id=0)
     drive_sys.cpu.connectAllPorts(drive_sys.membus)
     if options.fastmem:
diff -r b68ae43bc806 -r 2d791d07c59b src/dev/arm/pl111.cc
--- a/src/dev/arm/pl111.cc      Mon Jan 09 18:08:20 2012 -0600
+++ b/src/dev/arm/pl111.cc      Mon Jan 09 18:08:20 2012 -0600
@@ -67,7 +67,7 @@
 {
     pioSize = 0xFFFF;
 
-    pic = simout.create("framebuffer.bmp", true);
+    pic = simout.create(csprintf("%s.framebuffer.bmp", sys->name()), true);
 
     dmaBuffer = new uint8_t[LcdMaxWidth * LcdMaxHeight * sizeof(uint32_t)];
 
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev