Merge zizzer:/bk/m5

into  zed.eecs.umich.edu:/z/hsul/work/m5/clean

--HG--
extra : convert_revision : 42c38ea59c6787fdcf25bf8e1737f71ac253cf8a

2 files changed, 9 insertions, 5 deletions

diff --git a/README b/README
index b07c6fda7..af1057577 100644
--- a/README
+++ b/README
@@ -22,9 +22,9 @@ in obtaining disk images, contact us at m5-dev@eecs.umich.edu.
 
 WHAT'S NEEDED
 -------------
-- GCC (version 3.3 or 3.4 recommended)
+- GCC version 3.3 or newer
 - Python 2.3 or newer
-- SCons 0.96.1 (see http://www.scons.org)
+- SCons 0.96.1 or newer (see http://www.scons.org)
 
 WHAT'S RECOMMENDED
 ------------------
@@ -66,9 +66,11 @@ To build and test the syscall-emulation simulator:
 
 To build and test the full-system simualator:
 
-1. Download the full-system binary package from
-   http://m5.eecs.umich.edu/dist/m5_system_1.1.tar.bz2.  This package includes
-   disk images and kernel, palcode, and console binaries for Linux and FreeBSD.
+1. Unpack the full-system binaries from m5_system_1.1.tar.bz2.  This file
+   is included on the CD release, or you can download it from
+   http://m5.eecs.umich.edu/dist/ m5_system_1.1.tar.bz2.)  This package
+   includes disk images and kernel, palcode, and console binaries
+   for Linux and FreeBSD.
 2. Edit SYSTEMDIR in $top/m5-test/SysPaths.py to point to your local copy
    of the binaries.
 3. In $top/m5/build, run "scons ALPHA_FS/opt/test/quick".
diff --git a/python/m5/objects/Root.py b/python/m5/objects/Root.py
index df8fc4bf8..23b13fc67 100644
--- a/python/m5/objects/Root.py
+++ b/python/m5/objects/Root.py
@@ -3,6 +3,7 @@ from HierParams import HierParams
 from Serialize import Serialize
 from Statistics import Statistics
 from Trace import Trace
+from ExeTrace import ExecutionTrace
 
 class Root(SimObject):
     type = 'Root'
@@ -20,4 +21,5 @@ class Root(SimObject):
     hier = HierParams(do_data = False, do_events = True)
     stats = Statistics()
     trace = Trace()
+    exetrace = ExecutionTrace()
     serialize = Serialize()