diff options
Diffstat (limited to 'src/cpu/ozone')
-rw-r--r-- | src/cpu/ozone/cpu.hh | 3 | ||||
-rw-r--r-- | src/cpu/ozone/cpu_impl.hh | 8 | ||||
-rw-r--r-- | src/cpu/ozone/inorder_back_end_impl.hh | 6 | ||||
-rw-r--r-- | src/cpu/ozone/lw_back_end_impl.hh | 3 |
4 files changed, 0 insertions, 20 deletions
diff --git a/src/cpu/ozone/cpu.hh b/src/cpu/ozone/cpu.hh index fba5886f8..ad23b2790 100644 --- a/src/cpu/ozone/cpu.hh +++ b/src/cpu/ozone/cpu.hh @@ -171,9 +171,6 @@ class OzoneCPU : public BaseCPU int threadId(); - // Also somewhat obnoxious. Really only used for the TLB fault. - TheISA::MachInst getInst(); - void copyArchRegs(ThreadContext *tc); void clearArchRegs(); diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh index c09dd9046..08da1724b 100644 --- a/src/cpu/ozone/cpu_impl.hh +++ b/src/cpu/ozone/cpu_impl.hh @@ -771,7 +771,6 @@ OzoneCPU<Impl>::OzoneTC::takeOverFrom(ThreadContext *old_context) setCpuId(old_context->cpuId()); setContextId(old_context->contextId()); - thread->setInst(old_context->getInst()); #if !FULL_SYSTEM setFuncExeInst(old_context->readFuncExeInst()); #else @@ -863,13 +862,6 @@ OzoneCPU<Impl>::OzoneTC::threadId() } template <class Impl> -TheISA::MachInst -OzoneCPU<Impl>::OzoneTC::getInst() -{ - return thread->getInst(); -} - -template <class Impl> void OzoneCPU<Impl>::OzoneTC::copyArchRegs(ThreadContext *tc) { diff --git a/src/cpu/ozone/inorder_back_end_impl.hh b/src/cpu/ozone/inorder_back_end_impl.hh index 2d4d225c7..b48e8f692 100644 --- a/src/cpu/ozone/inorder_back_end_impl.hh +++ b/src/cpu/ozone/inorder_back_end_impl.hh @@ -304,12 +304,6 @@ InorderBackEnd<Impl>::executeInsts() thread->inSyscall = true; - // Hack for now; DTB will sometimes need the machine instruction - // for when faults happen. So we will set it here, prior to the - // DTB possibly needing it for this translation. - thread->setInst( - static_cast<TheISA::MachInst>(inst->staticInst->machInst)); - // Consider holding onto the trap and waiting until the trap event // happens for this to be executed. inst_fault->invoke(xc); diff --git a/src/cpu/ozone/lw_back_end_impl.hh b/src/cpu/ozone/lw_back_end_impl.hh index cbc386cb0..465fccbdb 100644 --- a/src/cpu/ozone/lw_back_end_impl.hh +++ b/src/cpu/ozone/lw_back_end_impl.hh @@ -1171,9 +1171,6 @@ LWBackEnd<Impl>::commitInst(int inst_num) } #endif - thread->setInst( - static_cast<TheISA::MachInst>(inst->staticInst->machInst)); - handleFault(inst_fault); return false; } |