From c368ff0bd8d36ba001f523bd03f56f99d9ecd452 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Thu, 13 Jul 2006 15:48:17 -0400
Subject: add system.mem_mode = ['timing', 'atomic'] update scripts acordingly

configs/test/SysPaths.py:
    new syspaths from nate, this one allows you to set script, binary, and disk paths like
    system.dir = 'aouaou' in your script
configs/test/fs.py:
    update for system mem_mode
    Put small checkpoint example
    Make clock 1THz
configs/test/test.py:
src/arch/alpha/freebsd/system.cc:
src/arch/alpha/linux/system.cc:
src/arch/alpha/system.cc:
src/arch/alpha/tru64/system.cc:
src/arch/sparc/system.cc:
src/python/m5/objects/System.py:
src/sim/system.cc:
src/sim/system.hh:
    update for system mem_mode
src/dev/io_device.cc:
    Use time returned from sendAtomic to delay

--HG--
extra : convert_revision : 67eedb3c84ab2584613faf88a534e793926fc92f
---
 src/python/m5/objects/System.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/python')

diff --git a/src/python/m5/objects/System.py b/src/python/m5/objects/System.py
index 9a1e1d690..386f39277 100644
--- a/src/python/m5/objects/System.py
+++ b/src/python/m5/objects/System.py
@@ -1,9 +1,12 @@
 from m5 import build_env
 from m5.config import *
 
+class MemoryMode(Enum): vals = ['invalid', 'atomic', 'timing']
+
 class System(SimObject):
     type = 'System'
     physmem = Param.PhysicalMemory(Parent.any, "phsyical memory")
+    mem_mode = Param.MemoryMode('atomic', "The mode the memory system is in")
     if build_env['FULL_SYSTEM']:
         boot_cpu_frequency = Param.Frequency(Self.cpu[0].clock.frequency,
                                              "boot processor frequency")
-- 
cgit v1.2.3


From e1b8e71500b7b66b115345eeaef7216617487456 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Thu, 13 Jul 2006 15:48:41 -0400
Subject: fix help when no arguments are passed to m5

--HG--
extra : convert_revision : ee6614166fd5814654309298abe5a706ff02c4c2
---
 src/python/m5/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/python')

diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index 54c54c1d5..afe73d94c 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -182,7 +182,7 @@ options = attrdict()
 arguments = []
 
 def usage(exitcode=None):
-    print parser.help
+    parser.print_help()
     if exitcode is not None:
         sys.exit(exitcode)
 
-- 
cgit v1.2.3