From 555bd4d8423bcc4edd77acd3226bcd2af0cbcdac Mon Sep 17 00:00:00 2001 From: Korey Sewell Date: Sun, 19 Jun 2011 21:43:36 -0400 Subject: inorder: update event priorities dont use offset to calculate this but rather an enum that can be updated --- src/cpu/inorder/cpu.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/cpu/inorder/cpu.cc') diff --git a/src/cpu/inorder/cpu.cc b/src/cpu/inorder/cpu.cc index e0e4d9a15..dbee7f46c 100644 --- a/src/cpu/inorder/cpu.cc +++ b/src/cpu/inorder/cpu.cc @@ -90,9 +90,8 @@ InOrderCPU::TickEvent::description() InOrderCPU::CPUEvent::CPUEvent(InOrderCPU *_cpu, CPUEventType e_type, Fault fault, ThreadID _tid, DynInstPtr inst, - unsigned event_pri_offset) - : Event(Event::Priority((unsigned int)CPU_Tick_Pri + event_pri_offset)), - cpu(_cpu) + CPUEventPri event_pri) + : Event(event_pri), cpu(_cpu) { setEvent(e_type, fault, _tid, inst); } @@ -836,10 +835,10 @@ InOrderCPU::squashDueToMemStall(int stage_num, InstSeqNum seq_num, void InOrderCPU::scheduleCpuEvent(CPUEventType c_event, Fault fault, ThreadID tid, DynInstPtr inst, - unsigned delay, unsigned event_pri_offset) + unsigned delay, CPUEventPri event_pri) { CPUEvent *cpu_event = new CPUEvent(this, c_event, fault, tid, inst, - event_pri_offset); + event_pri); Tick sked_tick = nextCycle(curTick() + ticks(delay)); if (delay >= 0) { @@ -1064,7 +1063,7 @@ InOrderCPU::activateNextReadyContext(int delay) // threads after we've finished deactivating, squashing,etc. // other threads scheduleCpuEvent(ActivateNextReadyThread, NoFault, 0/*tid*/, dummyInst[0], - delay, 5); + delay, ActivateNextReadyThread_Pri); // Be sure to signal that there's some activity so the CPU doesn't // deschedule itself. -- cgit v1.2.3