summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-12-19 02:11:48 -0500
committerSteve Reinhardt <stever@eecs.umich.edu>2006-12-19 02:11:48 -0500
commit6bc1e78d07c938f540c5a662a69ad76a75e2608a (patch)
treed77b02734b262839448c98948c041b0997c51e50 /src/cpu
parent9d7db8bb2bbd5ae6a3653385c896b19da4d33f69 (diff)
parentf27c686eb57b145336c484db2752e11623592ec8 (diff)
downloadgem5-6bc1e78d07c938f540c5a662a69ad76a75e2608a.tar.xz
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head --HG-- extra : convert_revision : 4bd4f8bb8e48e09562a2d9ae6eb7d061be973c5e
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/exetrace.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc
index 3fe40b4c1..dc76ae189 100644
--- a/src/cpu/exetrace.cc
+++ b/src/cpu/exetrace.cc
@@ -401,7 +401,11 @@ Trace::InstRecord::dump(ostream &outs)
diffCcr || diffTl || diffGl || diffAsi || diffPil ||
diffCwp || diffCansave || diffCanrestore ||
diffOtherwin || diffCleanwin)
- && !((staticInst->machInst & 0xC1F80000) == 0x81D00000)) {
+ && !((staticInst->machInst & 0xC1F80000) == 0x81D00000)
+ && !((staticInst->machInst & 0xC1F80000) == 0xC0580000)
+ && !((staticInst->machInst & 0xC1F80000) == 0xC0000000)
+ && !((staticInst->machInst & 0xC1F80000) == 0xC0700000)) {
+
outs << "Differences found between M5 and Legion:";
if (diffPC)
outs << " [PC]";