summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:00 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:00 -0500
commit96be7e16c15deecc167f99b0d6ba9fe81617197f (patch)
tree6551e060c640d456227b64ad028ca895c18730d0 /src/cpu
parentf49cdb4f5d8c9740e5f021ad5704a4586e88f6c3 (diff)
downloadgem5-96be7e16c15deecc167f99b0d6ba9fe81617197f.tar.xz
ARM: Make the predecoder handle Thumb instructions.
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/simple/base.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 17ba6a10b..d15b84bd6 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -410,7 +410,7 @@ BaseSimpleCPU::preExecute()
//If an instruction is ready, decode it. Otherwise, we'll have to
//fetch beyond the MachInst at the current pc.
if (predecoder.extMachInstReady()) {
-#if THE_ISA == X86_ISA
+#if THE_ISA == X86_ISA || THE_ISA == ARM_ISA
thread->setNextPC(thread->readPC() + predecoder.getInstSize());
#endif // X86_ISA
stayAtPC = false;