summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-03-10 10:01:29 -0500
committerSteve Reinhardt <stever@eecs.umich.edu>2006-03-10 10:01:29 -0500
commite3d96aa889680469be44bb9cd59d3db837cb4dc4 (patch)
tree5dbb9b1342e4e9cc0a86b36687e17e41b15f8a9a /configs
parentf102365bfe14d25e40fb6d5cbd184138c0593c55 (diff)
downloadgem5-e3d96aa889680469be44bb9cd59d3db837cb4dc4.tar.xz
Compiles now (with CPU_MODELS=SimpleCPU), but hangs
on execution. configs/test/test.py: Move test binary out of m5-test, don't depend on m5-test/Benchmarks. python/m5/objects/System.py: Split out full-system-only parameters (lost in merge). sim/system.cc: Need to be able to instantiate System directly in SE mode (lost in merge). sim/system.hh: A few more functions here are FS-only. configs/test/hello: Add in binary. --HG-- rename : configs/test.py => configs/test/test.py extra : convert_revision : 4051b18772e0a0dcb97eb591d4373683be9f4395
Diffstat (limited to 'configs')
-rw-r--r--configs/test.py8
-rwxr-xr-xconfigs/test/hellobin0 -> 312176 bytes
-rw-r--r--configs/test/test.py10
3 files changed, 10 insertions, 8 deletions
diff --git a/configs/test.py b/configs/test.py
deleted file mode 100644
index ea0e63a61..000000000
--- a/configs/test.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from m5 import *
-AddToPath('/z/stever/bk/m5-test')
-import Benchmarks
-
-mem = PhysicalMemory()
-cpu = SimpleCPU(workload=Benchmarks.HelloWorld(), mem=mem)
-system = System(physmem=mem, cpu=cpu)
-root = Root(system=system)
diff --git a/configs/test/hello b/configs/test/hello
new file mode 100755
index 000000000..59c0d195c
--- /dev/null
+++ b/configs/test/hello
Binary files differ
diff --git a/configs/test/test.py b/configs/test/test.py
new file mode 100644
index 000000000..0982ba4f2
--- /dev/null
+++ b/configs/test/test.py
@@ -0,0 +1,10 @@
+from m5 import *
+
+class HelloWorld(LiveProcess):
+ executable = '../configs/test/hello'
+ cmd = 'hello'
+
+mem = PhysicalMemory()
+cpu = SimpleCPU(workload=HelloWorld(), mem=mem)
+system = System(physmem=mem, cpu=cpu)
+root = Root(system=system)