summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2005-03-02 00:53:23 -0500
committerAli Saidi <saidi@eecs.umich.edu>2005-03-02 00:53:23 -0500
commit761d104f7b5771ad7c854a6e6474c30ce55e217e (patch)
treeee271c45cf5d0e1af39ec32e90b19560c11c0639
parent0aa624b3f1f75bfc1e29ae25fdc5be372dab4389 (diff)
parent50a4ed87d0dc548e55d607381d0aecc35b02caf6 (diff)
downloadgem5-761d104f7b5771ad7c854a6e6474c30ce55e217e.tar.xz
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG-- extra : convert_revision : cc69c3009fe34de4b4a658a383ce1d2750f227f6
-rw-r--r--arch/alpha/isa_desc2
-rw-r--r--sim/pyconfig/m5config.py6
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]: