diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-12 18:16:07 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-12 18:16:07 -0400 |
| commit | 03a00e5d32411f467735b2af890c1ca54930e949 (patch) | |
| tree | 4154e4703c0c3e18bd4d6b4de98fe8650d6f704d /arch | |
| parent | a91ee5abc2275709871b016d43ca2d2440fa5000 (diff) | |
| parent | 7929b9ee19b6fabc7e69b704fa07fdb6daa35c70 (diff) | |
| download | gem5-03a00e5d32411f467735b2af890c1ca54930e949.tar.xz | |
Merge zeep.pool:/z/saidi/work/m5.head
into zeep.pool:/z/saidi/work/m5.nm_m5_pull
SConscript:
dram memory needs to be converted to newmem before we can use it
dev/ide_ctrl.cc:
don't need this printing in newmem
dev/ide_disk.cc:
will read stats in next commit
dev/sinic.cc:
merge sinic from head, still needs work
--HG--
extra : convert_revision : b9aabd8c7814d07d54ce6f971aad3ec349fa24e1
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/isa/decoder.isa | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/isa/decoder.isa b/arch/alpha/isa/decoder.isa index 3d38e91f9..1adcfb948 100644 --- a/arch/alpha/isa/decoder.isa +++ b/arch/alpha/isa/decoder.isa @@ -810,7 +810,7 @@ decode OPCODE default Unknown::unknown() { AlphaPseudo::addsymbol(xc->xcBase(), R16, R17); }}, IsNonSpeculative); 0x54: m5panic({{ - panic("M5 panic instruction called."); + panic("M5 panic instruction called at pc=%#x.", xc->readPC()); }}, IsNonSpeculative); } |