Merge vm1.(none):/home/stever/bk/newmem

into  vm1.(none):/home/stever/bk/newmem-py

src/python/m5/__init__.py:
src/sim/syscall_emul.cc:
    Hand merge.

--HG--
extra : convert_revision : e2542735323e648383c89382421d98a7d1d761bf

1 files changed, 36 insertions, 8 deletions

diff --git a/configs/test/test.py b/configs/test/test.py
index 75e832f5e..0c6359148 100644
--- a/configs/test/test.py
+++ b/configs/test/test.py
@@ -1,12 +1,40 @@
-from m5 import *
+import os, optparse, sys
+import m5
+from m5.objects import *
 
-class HelloWorld(AlphaLiveProcess):
-    executable = '../configs/test/hello'
-    cmd = 'hello'
+parser = optparse.OptionParser(option_list=m5.standardOptions)
+
+parser.add_option("-t", "--timing", action="store_true")
+
+(options, args) = parser.parse_args()
+
+if args:
+    print "Error: script doesn't take any positional arguments"
+    sys.exit(1)
+
+this_dir = os.path.dirname(__file__)
+
+process = AlphaLiveProcess()
+process.executable = os.path.join(this_dir, 'hello')
+process.cmd = 'hello'
 
 magicbus = Bus()
 mem = PhysicalMemory()
-cpu = AtomicSimpleCPU(workload=HelloWorld(), mem=magicbus)
-system = System(physmem=mem, cpu=cpu)
-system.c1 =  Connector(side_a=mem, side_b=magicbus)
-root = Root(system=system)
+
+if options.timing:
+    cpu = TimingSimpleCPU()
+else:
+    cpu = AtomicSimpleCPU()
+cpu.workload = process
+cpu.mem = magicbus
+
+system = System(physmem = mem, cpu = cpu)
+system.c1 =  Connector(side_a = mem, side_b = magicbus)
+root = Root(system = system)
+
+m5.instantiate(root)
+
+exit_event = m5.simulate()
+
+print 'Exiting @', m5.curTick(), 'because', exit_event.getCause()
+