summaryrefslogtreecommitdiff
path: root/src/cpu/simple
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-11-02 15:20:47 -0500
committerKevin Lim <ktlim@umich.edu>2006-11-02 15:20:47 -0500
commite71ccde66369951c23eb20281c68a8cb66c4a504 (patch)
tree209293eb44ceeee7eb04bc778956f57ae812978b /src/cpu/simple
parent683d8f0831b476a906dc2720265a2334ba0117e3 (diff)
parent45363ea658251df0c31a75d7bd5d0ac3a3809623 (diff)
downloadgem5-e71ccde66369951c23eb20281c68a8cb66c4a504.tar.xz
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix --HG-- extra : convert_revision : a9a41e2c292bd95aa148e1cf4d9a77c0622a462b
Diffstat (limited to 'src/cpu/simple')
-rw-r--r--src/cpu/simple/base.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 47b3b938f..6a2c0bbe9 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -398,7 +398,11 @@ BaseSimpleCPU::preExecute()
inst = gtoh(inst);
//If we're not in the middle of a macro instruction
if (!curMacroStaticInst) {
+#if THE_ISA == ALPHA_ISA
+ StaticInstPtr instPtr = StaticInst::decode(makeExtMI(inst, thread->readPC()));
+#elif THE_ISA == SPARC_ISA
StaticInstPtr instPtr = StaticInst::decode(makeExtMI(inst, thread->getTC()));
+#endif
if (instPtr->isMacroOp()) {
curMacroStaticInst = instPtr;
curStaticInst = curMacroStaticInst->