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

inorder: get rid of references to mainEventQueue.

Browse Source 
Events need to be scheduled on the queue assigned
to the SimObject, not on the global queue (which
should be going away).
Also cleaned up a number of redundant expressions
that made the code unnecessarily verbose.
This commit is contained in:
Steve Reinhardt
2011-01-07 21:50:29 -08:00
parent d650f4138e
commit 214cc0fafc
5 changed files with 43 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpu/inorder/cpu.cc
View File

@@ -157,12 +157,12 @@ InOrderCPU::CPUEvent::description()
void
InOrderCPU::CPUEvent::scheduleEvent(int delay)
{
Tick when = cpu->nextCycle(curTick + cpu->ticks(delay));
if (squashed())
mainEventQueue.reschedule(this, cpu->nextCycle(curTick +
cpu->ticks(delay)));
cpu->reschedule(this, when);
else if (!scheduled())
mainEventQueue.schedule(this, cpu->nextCycle(curTick +
cpu->ticks(delay)));
cpu->schedule(this, when);
}
void
@@ -540,7 +540,7 @@ InOrderCPU::tick()
} else {
//Tick next_tick = curTick + cycles(1);
//tickEvent.schedule(next_tick);
mainEventQueue.schedule(&tickEvent, nextCycle(curTick + 1));
schedule(&tickEvent, nextCycle(curTick + 1));
DPRINTF(InOrderCPU, "Scheduled CPU for next tick @ %i.\n",
nextCycle(curTick + 1));
}
@@ -701,7 +701,7 @@ InOrderCPU::scheduleCpuEvent(CPUEventType c_event, Fault fault,
if (delay >= 0) {
DPRINTF(InOrderCPU, "Scheduling CPU Event (%s) for cycle %i, [tid:%i].\n",
eventNames[c_event], curTick + delay, tid);
mainEventQueue.schedule(cpu_event, sked_tick);
schedule(cpu_event, sked_tick);
} else {
cpu_event->process();
cpuEventRemoveList.push(cpu_event);
@@ -1403,7 +1403,7 @@ InOrderCPU::wakeCPU()
numCycles += extra_cycles;
mainEventQueue.schedule(&tickEvent, nextCycle(curTick));
schedule(&tickEvent, nextCycle(curTick));
}
#if FULL_SYSTEM