summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-06-01 14:55:17 -0400
committerAli Saidi <saidi@eecs.umich.edu>2007-06-01 14:55:17 -0400
commit66ee27078eed95843c5994f0457d199c2317d752 (patch)
tree8ad9c0a6ec48aee3bbef22d0604fbbb10ce6fd22 /src
parent6e8a06b237ef77e34cd8b01b2ba80bdd672c6aae (diff)
parentbe0aef981943d123e0f4eb8c5520a74c1eb1002a (diff)
downloadgem5-66ee27078eed95843c5994f0457d199c2317d752.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : 43dc3a23758e7956572d59464ebddcc56e82728b
Diffstat (limited to 'src')
-rw-r--r--src/cpu/o3/fetch_impl.hh4
-rw-r--r--src/cpu/simple/base.cc8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index e16f97558..895b4a46c 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -1151,10 +1151,14 @@ DefaultFetch<Impl>::fetch(bool &status_change)
DPRINTF(Fetch, "[tid:%i]: Instruction is: %s\n",
tid, instruction->staticInst->disassemble(fetch_PC));
+#if TRACING_ON
instruction->traceData =
Trace::getInstRecord(curTick, cpu->tcBase(tid),
instruction->staticInst,
instruction->readPC());
+#elif
+ instruction->traceData = NULL;
+#endif
///FIXME This needs to be more robust in dealing with delay slots
#if !ISA_HAS_DELAY_SLOT
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 6145b13a1..da50a3eb0 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -329,7 +329,7 @@ BaseSimpleCPU::checkForInterrupts()
Fault
BaseSimpleCPU::setupFetchRequest(Request *req)
{
- uint64_t threadPC = thread->readPC();
+ Addr threadPC = thread->readPC();
// set up memory request for instruction fetch
#if ISA_HAS_DELAY_SLOT
@@ -340,8 +340,8 @@ BaseSimpleCPU::setupFetchRequest(Request *req)
thread->readNextPC());
#endif
- const Addr PCMask = ~(sizeof(MachInst) - 1);
- Addr fetchPC = thread->readPC() + fetchOffset;
+ const Addr PCMask = ~((Addr)sizeof(MachInst) - 1);
+ Addr fetchPC = threadPC + fetchOffset;
req->setVirt(0, fetchPC & PCMask, sizeof(MachInst), 0, threadPC);
Fault fault = thread->translateInstReq(req);
@@ -380,7 +380,7 @@ BaseSimpleCPU::preExecute()
//This should go away once the constructor can be set up properly
predecoder.setTC(thread->getTC());
//If more fetch data is needed, pass it in.
- const Addr PCMask = ~(sizeof(MachInst) - 1);
+ const Addr PCMask = ~((Addr)sizeof(MachInst) - 1);
if(predecoder.needMoreBytes())
predecoder.moreBytes((thread->readPC() & PCMask) + fetchOffset,
0, inst);