diff options
Diffstat (limited to 'src/cpu/inorder/resources')
| -rw-r--r-- | src/cpu/inorder/resources/execution_unit.cc | 21 | ||||
| -rw-r--r-- | src/cpu/inorder/resources/use_def.cc | 15 |
2 files changed, 25 insertions, 11 deletions
diff --git a/src/cpu/inorder/resources/execution_unit.cc b/src/cpu/inorder/resources/execution_unit.cc index 77ab21b21..460ec32fe 100644 --- a/src/cpu/inorder/resources/execution_unit.cc +++ b/src/cpu/inorder/resources/execution_unit.cc @@ -142,6 +142,9 @@ ExecutionUnit::execute(int slot_num) // Evaluate Branch fault = inst->execute(); + + // Should unconditional control , pc relative count as an + // execution??? Probably not. executions++; if (fault == NoFault) { @@ -204,11 +207,19 @@ ExecutionUnit::execute(int slot_num) if (fault == NoFault) { inst->setExecuted(); - DPRINTF(InOrderExecute, "[tid:%i]: [sn:%i]: The result " - "of execution is 0x%x.\n", inst->readTid(), - seq_num, - (inst->resultType(0) == InOrderDynInst::Float) ? - inst->readFloatResult(0) : inst->readIntResult(0)); +#if TRACING_ON + for (int didx = 0; didx < inst->numDestRegs(); didx++) + if (inst->resultType(didx) == InOrderDynInst::Float || + inst->resultType(didx) == InOrderDynInst::Double) + DPRINTF(InOrderExecute, "[tid:%i]: [sn:%i]: Dest result %i " + "of FP execution is %08f (%x).\n", inst->readTid(), + seq_num, didx, inst->readFloatResult(didx), + inst->readIntResult(didx)); + else + DPRINTF(InOrderExecute, "[tid:%i]: [sn:%i]: Dest result %i " + "of Int execution is 0x%x.\n", inst->readTid(), + seq_num, didx, inst->readIntResult(didx)); +#endif #if !FULL_SYSTEM // The Syscall might change the PC, so conservatively diff --git a/src/cpu/inorder/resources/use_def.cc b/src/cpu/inorder/resources/use_def.cc index 1adee09db..78497f6e5 100644 --- a/src/cpu/inorder/resources/use_def.cc +++ b/src/cpu/inorder/resources/use_def.cc @@ -181,7 +181,7 @@ UseDefUnit::execute(int slot_idx) RegIndex flat_idx = cpu->flattenRegIdx(reg_idx, reg_type, tid); inst->flattenSrcReg(ud_idx, flat_idx); - if (flat_idx == TheISA::ZeroReg) { + if (flat_idx == TheISA::ZeroReg && reg_type == InOrderCPU::IntType) { DPRINTF(InOrderUseDef, "[tid:%i]: [sn:%i]: Ignoring Reading of ISA-ZeroReg " "(Int. Reg %i).\n", tid, inst->seqNum, flat_idx); ud_req->done(); @@ -226,6 +226,9 @@ UseDefUnit::execute(int slot_idx) inst->setFloatSrc(ud_idx, cpu->readFloatReg(flat_idx, inst->readTid())); + inst->setFloatRegBitsSrc(ud_idx, + cpu->readFloatRegBits(flat_idx, + inst->readTid())); floatRegFileReads++; } break; @@ -238,7 +241,7 @@ UseDefUnit::execute(int slot_idx) tid, seq_num, reg_idx - Ctrl_Base_DepTag, flat_idx, cpu->readMiscReg(flat_idx, - inst->readTid())); + inst->readTid())); inst->setIntSrc(ud_idx, cpu->readMiscReg(flat_idx, inst->readTid())); @@ -331,7 +334,7 @@ UseDefUnit::execute(int slot_idx) RegIndex reg_idx = inst->_destRegIdx[ud_idx]; RegIndex flat_idx = cpu->flattenRegIdx(reg_idx, reg_type, tid); - if (flat_idx == TheISA::ZeroReg) { + if (flat_idx == TheISA::ZeroReg && reg_type == InOrderCPU::IntType) { DPRINTF(IntRegs, "[tid:%i]: Ignoring Writing of ISA-ZeroReg " "(Int. Reg %i)\n", tid, flat_idx); ud_req->done(); @@ -374,7 +377,7 @@ UseDefUnit::execute(int slot_idx) if (inst->resultType(ud_idx) == InOrderDynInst::Integer) { DPRINTF(InOrderUseDef, "[tid:%i]: [sn:%i]: Writing FP-Bits " - "Result 0x%x (bits:0x%x) to register " + "Result %08f (bits:0x%x) to register " "idx %i (%i).\n", tid, seq_num, inst->readFloatResult(ud_idx), @@ -388,7 +391,7 @@ UseDefUnit::execute(int slot_idx) } else if (inst->resultType(ud_idx) == InOrderDynInst::Float) { DPRINTF(InOrderUseDef, "[tid:%i]: [sn:%i]: Writing Float " - "Result 0x%x (bits:0x%x) to register " + "Result %08f (bits:0x%x) to register " "idx %i (%i).\n", tid, seq_num, inst->readFloatResult(ud_idx), inst->readIntResult(ud_idx), @@ -400,7 +403,7 @@ UseDefUnit::execute(int slot_idx) } else if (inst->resultType(ud_idx) == InOrderDynInst::Double) { DPRINTF(InOrderUseDef, "[tid:%i]: [sn:%i]: Writing Double " - "Result 0x%x (bits:0x%x) to register " + "Result %08f (bits:0x%x) to register " "idx %i (%i).\n", tid, seq_num, inst->readFloatResult(ud_idx), |