summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-12-19 02:11:47 -0500
committerAli Saidi <saidi@eecs.umich.edu>2006-12-19 02:11:47 -0500
commitf27c686eb57b145336c484db2752e11623592ec8 (patch)
tree7b29cd04a16d5b31e06aae39523342d5b0ec1460 /src/cpu
parent0e78386874f15ad28ebc1a0928256e3cf4301008 (diff)
parent5e9d8795f2a2642843cbb73b2637adb97935521d (diff)
downloadgem5-f27c686eb57b145336c484db2752e11623592ec8.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : fa8ce7149973245a73bb562b9378db13be647a14
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]";