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

cast sizeof(MachInst) to Addr before generating a mask

Browse source 
--HG--
extra : convert_revision : 1ae34a069bbd997a8f888f69415fbeaaf4ade0b3
This commit is contained in:
Ali Saidi 2007-06-01 14:16:58 -04:00
parent d8c487c401
commit d8f6769962
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
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,9 +340,9 @@ 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);