sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge zizzer:/bk/newmem

Browse source 
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 43dc3a23758e7956572d59464ebddcc56e82728b
This commit is contained in:
Ali Saidi 2007-06-01 14:55:17 -04:00
commit 66ee27078e
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cpu/o3/fetch_impl.hh
View file

@ -1151,10 +1151,14 @@ DefaultFetch<Impl>::fetch(bool &status_change)
DPRINTF(Fetch, "[tid:%i]: Instruction is: %s\n", DPRINTF(Fetch, "[tid:%i]: Instruction is: %s\n",
tid, instruction->staticInst->disassemble(fetch_PC)); tid, instruction->staticInst->disassemble(fetch_PC));
#if TRACING_ON
instruction->traceData = instruction->traceData =
Trace::getInstRecord(curTick, cpu->tcBase(tid), Trace::getInstRecord(curTick, cpu->tcBase(tid),
instruction->staticInst, instruction->staticInst,
instruction->readPC()); instruction->readPC());
#elif
instruction->traceData = NULL;
#endif
///FIXME This needs to be more robust in dealing with delay slots ///FIXME This needs to be more robust in dealing with delay slots
#if !ISA_HAS_DELAY_SLOT #if !ISA_HAS_DELAY_SLOT

8
src/cpu/simple/base.cc
View file

@ -329,7 +329,7 @@ BaseSimpleCPU::checkForInterrupts()
Fault Fault
BaseSimpleCPU::setupFetchRequest(Request *req) BaseSimpleCPU::setupFetchRequest(Request *req)
{ {
uint64_t threadPC = thread->readPC(); Addr threadPC = thread->readPC();
// set up memory request for instruction fetch // set up memory request for instruction fetch
#if ISA_HAS_DELAY_SLOT #if ISA_HAS_DELAY_SLOT
@ -340,8 +340,8 @@ BaseSimpleCPU::setupFetchRequest(Request *req)
thread->readNextPC()); thread->readNextPC());
#endif #endif
const Addr PCMask = ~(sizeof(MachInst) - 1); const Addr PCMask = ~((Addr)sizeof(MachInst) - 1);
Addr fetchPC = thread->readPC() + fetchOffset; Addr fetchPC = threadPC + fetchOffset;
req->setVirt(0, fetchPC & PCMask, sizeof(MachInst), 0, threadPC); req->setVirt(0, fetchPC & PCMask, sizeof(MachInst), 0, threadPC);
Fault fault = thread->translateInstReq(req); Fault fault = thread->translateInstReq(req);
@ -380,7 +380,7 @@ BaseSimpleCPU::preExecute()
//This should go away once the constructor can be set up properly //This should go away once the constructor can be set up properly
predecoder.setTC(thread->getTC()); predecoder.setTC(thread->getTC());
//If more fetch data is needed, pass it in. //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()) if(predecoder.needMoreBytes())
predecoder.moreBytes((thread->readPC() & PCMask) + fetchOffset, predecoder.moreBytes((thread->readPC() & PCMask) + fetchOffset,
0, inst); 0, inst);