Assign traceData to be NULL at BaseSimpleCPU constructor.
Initialize a temporary variable for thread->readPC() at setupFetchRequest() to reduce function calls.
exec tracing isn't needed for m5.fast binaries
Moved MISCREG_GL, MISCREG_CWP, and MISCREG_TLB_DATA out of switch statement and use if blocks instead.
src/arch/sparc/miscregfile.cc:
Moved MISCREG_GL, MISCREG_CWP, and MISCREG_TLB_DATA out of switch statement and use if blocks instead.
src/cpu/simple/base.cc:
Assign traceData to be NULL at BaseSimpleCPU constructor.
Initialize a temporary variable for thread->readPC() at setupFetchRequest() to reduce function calls.
exec tracing isn't needed for m5.fast binaries
--HG--
extra : convert_revision : 5dc92fff05c9bde994f1e0f1bb40e11c44eb72c6
This commit is contained in:
@@ -70,7 +70,7 @@ using namespace std;
|
||||
using namespace TheISA;
|
||||
|
||||
BaseSimpleCPU::BaseSimpleCPU(Params *p)
|
||||
: BaseCPU(p), thread(NULL), predecoder(NULL)
|
||||
: BaseCPU(p), traceData(NULL), thread(NULL), predecoder(NULL)
|
||||
{
|
||||
#if FULL_SYSTEM
|
||||
thread = new SimpleThread(this, 0, p->system, p->itb, p->dtb);
|
||||
@@ -326,18 +326,20 @@ BaseSimpleCPU::checkForInterrupts()
|
||||
Fault
|
||||
BaseSimpleCPU::setupFetchRequest(Request *req)
|
||||
{
|
||||
uint64_t threadPC = thread->readPC();
|
||||
|
||||
// set up memory request for instruction fetch
|
||||
#if ISA_HAS_DELAY_SLOT
|
||||
DPRINTF(Fetch,"Fetch: PC:%08p NPC:%08p NNPC:%08p\n",thread->readPC(),
|
||||
DPRINTF(Fetch,"Fetch: PC:%08p NPC:%08p NNPC:%08p\n",threadPC,
|
||||
thread->readNextPC(),thread->readNextNPC());
|
||||
#else
|
||||
DPRINTF(Fetch,"Fetch: PC:%08p NPC:%08p",thread->readPC(),
|
||||
DPRINTF(Fetch,"Fetch: PC:%08p NPC:%08p",threadPC,
|
||||
thread->readNextPC());
|
||||
#endif
|
||||
|
||||
req->setVirt(0, thread->readPC() & ~3, sizeof(MachInst),
|
||||
(FULL_SYSTEM && (thread->readPC() & 1)) ? PHYSICAL : 0,
|
||||
thread->readPC());
|
||||
req->setVirt(0, threadPC & ~3, sizeof(MachInst),
|
||||
(FULL_SYSTEM && (threadPC & 1)) ? PHYSICAL : 0,
|
||||
threadPC);
|
||||
|
||||
Fault fault = thread->translateInstReq(req);
|
||||
|
||||
@@ -396,6 +398,7 @@ BaseSimpleCPU::preExecute()
|
||||
fetchMicroOp(thread->readMicroPC());
|
||||
}
|
||||
|
||||
#if TRACING_ON
|
||||
//If we decoded an instruction this "tick", record information about it.
|
||||
if(curStaticInst)
|
||||
{
|
||||
@@ -409,6 +412,7 @@ BaseSimpleCPU::preExecute()
|
||||
thread->setInst(inst);
|
||||
#endif // FULL_SYSTEM
|
||||
}
|
||||
#endif // TRACING_ON
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Reference in New Issue
Block a user