summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-09-25 20:11:41 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-09-25 20:11:41 -0700
commit2dd65dc2546216ef132e30f5c590e11e35b4ff37 (patch)
treed64578bd2dbbc5ba41f40279c9bd762ed765677d /src/cpu
parent25a9b6ea5e232590240a7ffc6ff769ffdfdc1e04 (diff)
parentb3c6f32543f7c7e3a2ef5d70681424fb77e64731 (diff)
downloadgem5-2dd65dc2546216ef132e30f5c590e11e35b4ff37.tar.xz
Merge with head.
--HG-- extra : convert_revision : f331b9cbd82086d63d4f35e18f9e08466c016225
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/simple/base.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index d6b124efc..9fc1d1dd9 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -428,11 +428,10 @@ void
BaseSimpleCPU::postExecute()
{
#if FULL_SYSTEM
- if (thread->profile) {
+ if (thread->profile && curStaticInst) {
bool usermode = TheISA::inUserMode(tc);
thread->profilePC = usermode ? 1 : thread->readPC();
- StaticInstPtr si(inst, thread->readPC());
- ProfileNode *node = thread->profile->consume(tc, si);
+ ProfileNode *node = thread->profile->consume(tc, curStaticInst);
if (node)
thread->profileNode = node;
}