Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

--HG--
extra : convert_revision : cc69c3009fe34de4b4a658a383ce1d2750f227f6

2 files changed, 7 insertions, 1 deletions

diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc
index 6a6bca4fe..0e07400d3 100644
--- a/arch/alpha/isa_desc
+++ b/arch/alpha/isa_desc
@@ -2566,7 +2566,7 @@ decode OPCODE default Unknown::unknown() {
     }
 
     format BasicOperate {
-	0x1e: hw_rei({{ xc->hwrei(); }});
+	0x1e: hw_rei({{ xc->hwrei(); }}, IsSerializing);
 
 	// M5 special opcodes use the reserved 0x01 opcode space
 	0x01: decode M5FUNC {
diff --git a/sim/pyconfig/m5config.py b/sim/pyconfig/m5config.py
index 50032476c..c413fef71 100644
--- a/sim/pyconfig/m5config.py
+++ b/sim/pyconfig/m5config.py
@@ -234,6 +234,9 @@ class MetaConfigNode(type):
         for key,val in dict.items():
             del dict[key]
 
+            # See description of decorators in the importer.py file
+            # We just strip off the expr_decorator now since we don't
+            # need from this point on.
             if key.startswith(expr_decorator):
                 key = key[len(expr_decorator):]
 
@@ -285,6 +288,9 @@ class MetaConfigNode(type):
 
         # initialize attributes with values from class definition
         for key,value in dict.iteritems():
+            # turn an expression that was munged in the importer
+            # because it had dots into a list so that we can find the
+            # proper variable to modify.
             key = key.split(dot_decorator)
             c = cls
             for item in key[:-1]: