diff options
Diffstat (limited to 'src/cpu/inorder')
-rw-r--r-- | src/cpu/inorder/resources/decode_unit.cc | 17 | ||||
-rw-r--r-- | src/cpu/inorder/resources/decode_unit.hh | 3 | ||||
-rw-r--r-- | src/cpu/inorder/resources/execution_unit.cc | 5 |
3 files changed, 6 insertions, 19 deletions
diff --git a/src/cpu/inorder/resources/decode_unit.cc b/src/cpu/inorder/resources/decode_unit.cc index 1ba5c204a..d15428436 100644 --- a/src/cpu/inorder/resources/decode_unit.cc +++ b/src/cpu/inorder/resources/decode_unit.cc @@ -54,7 +54,6 @@ DecodeUnit::execute(int slot_num) { ResourceRequest* decode_req = reqs[slot_num]; DynInstPtr inst = reqs[slot_num]->inst; - ThreadID tid = inst->readTid(); switch (decode_req->cmd) { @@ -71,11 +70,12 @@ DecodeUnit::execute(int slot_num) if (inst->backSked != NULL) { DPRINTF(InOrderDecode, "[tid:%i]: Back End Schedule created for %s [sn:%i].\n", - tid, inst->instName(), inst->seqNum); + inst->readTid(), inst->instName(), inst->seqNum); decode_req->done(); } else { DPRINTF(Resource, - "[tid:%i] Static Inst not available to decode.\n", tid); + "[tid:%i] Static Inst not available to decode.\n", + inst->readTid()); DPRINTF(Resource, "Unable to create schedule for instruction [sn:%i] \n", inst->seqNum); @@ -90,14 +90,3 @@ DecodeUnit::execute(int slot_num) } } - -void -DecodeUnit::squash(DynInstPtr inst, int stage_num, InstSeqNum squash_seq_num, - ThreadID tid) -{ - DPRINTF(InOrderDecode, - "[tid:%i]: Updating due to squash from stage %i after [sn:%i].\n", - tid, stage_num, squash_seq_num); - - //cpu->removeInstsUntil(squash_seq_num, tid); -} diff --git a/src/cpu/inorder/resources/decode_unit.hh b/src/cpu/inorder/resources/decode_unit.hh index 3742af3e2..084c0008f 100644 --- a/src/cpu/inorder/resources/decode_unit.hh +++ b/src/cpu/inorder/resources/decode_unit.hh @@ -56,9 +56,6 @@ class DecodeUnit : public Resource { void execute(int slot_num); - void squash(DynInstPtr inst, int stage_num, InstSeqNum squash_seq_num, - ThreadID tid); - RegDepMap *regDepMap[ThePipeline::MaxThreads]; protected: diff --git a/src/cpu/inorder/resources/execution_unit.cc b/src/cpu/inorder/resources/execution_unit.cc index d7151add1..6b89c8230 100644 --- a/src/cpu/inorder/resources/execution_unit.cc +++ b/src/cpu/inorder/resources/execution_unit.cc @@ -88,9 +88,10 @@ ExecutionUnit::execute(int slot_num) ResourceRequest* exec_req = reqs[slot_num]; DynInstPtr inst = reqs[slot_num]->inst; Fault fault = NoFault; - InstSeqNum seq_num = inst->seqNum; Tick cur_tick = curTick(); - +#if TRACING_ON + InstSeqNum seq_num = inst->seqNum; +#endif if (cur_tick == serializeTick) { DPRINTF(InOrderExecute, "Can not execute [tid:%i][sn:%i][PC:%s] %s. " "All instructions are being serialized this cycle\n", |