derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for the sampler.

Browse Source 
cpu/simple/cpu.cc:
    Sampler fixes.  The status may be switched out when calling activate or suspend if there is a switchover during a quiesce.

--HG--
extra : convert_revision : da026e75dfb86289484cf01c5b1ecd9b03a72bd3
This commit is contained in:
Kevin Lim
2006-05-03 15:54:36 -04:00
parent 32a5294983
commit 4601230d35
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cpu/simple/cpu.cc
View File

@@ -144,6 +144,7 @@ SimpleCPU::SimpleCPU(Params *p)
cpuXC = new CPUExecContext(this, /* thread_num */ 0, p->process,
/* asid */ 0);
#endif // !FULL_SYSTEM
cpuXC->setStatus(ExecContext::Suspended);
xcProxy = cpuXC->getProxy();
icacheInterface = p->icache_interface;
@@ -212,7 +213,7 @@ SimpleCPU::activateContext(int thread_num, int delay)
assert(thread_num == 0);
assert(cpuXC);
assert(_status == Idle);
assert(_status == Idle || _status == SwitchedOut);
notIdleFraction++;
scheduleTickEvent(delay);
_status = Running;
@@ -225,7 +226,7 @@ SimpleCPU::suspendContext(int thread_num)
assert(thread_num == 0);
assert(cpuXC);
assert(_status == Running);
assert(_status == Running || _status == SwitchedOut);
notIdleFraction--;
unscheduleTickEvent();
_status = Idle;
@@ -418,7 +419,7 @@ SimpleCPU::read(Addr addr, T &data, unsigned flags)
Fault fault = cpuXC->read(memReq,data);
if (traceData) {
traceData->setAddr(addr);
traceData->setAddr(memReq->vaddr);
}
return fault;
}