diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2007-06-12 17:19:14 +0000 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2007-06-12 17:19:14 +0000 |
commit | 02732929e8a69fcdda523ebc7aa511d4cdbb0f0e (patch) | |
tree | 0c4f8c8327b69c0191da08d8ca8ee24b20f37e19 /src/cpu/simple/base.cc | |
parent | 1a3e668446e4b2d2c61651c9ae58e643c2aa3ad2 (diff) | |
parent | 0d8d3f988f835e58e5e53b6ee2be871e7bff9132 (diff) | |
download | gem5-02732929e8a69fcdda523ebc7aa511d4cdbb0f0e.tar.xz |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : 1d2efac895a1c8328026a079e0b319a436325616
Diffstat (limited to 'src/cpu/simple/base.cc')
-rw-r--r-- | src/cpu/simple/base.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc index 33c5877a5..b4371b2c4 100644 --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -400,17 +400,17 @@ BaseSimpleCPU::preExecute() //If we decoded an instruction and it's microcoded, start pulling //out micro ops - if (instPtr && instPtr->isMacroOp()) { + if (instPtr && instPtr->isMacroop()) { curMacroStaticInst = instPtr; curStaticInst = curMacroStaticInst-> - fetchMicroOp(thread->readMicroPC()); + fetchMicroop(thread->readMicroPC()); } else { curStaticInst = instPtr; } } else { //Read the next micro op from the macro op curStaticInst = curMacroStaticInst-> - fetchMicroOp(thread->readMicroPC()); + fetchMicroop(thread->readMicroPC()); } //If we decoded an instruction this "tick", record information about it. @@ -475,7 +475,7 @@ BaseSimpleCPU::advancePC(Fault fault) thread->setNextMicroPC(1); } else { //If we're at the last micro op for this instruction - if (curStaticInst && curStaticInst->isLastMicroOp()) { + if (curStaticInst && curStaticInst->isLastMicroop()) { //We should be working with a macro op assert(curMacroStaticInst); //Close out this macro op, and clean up the |