diff options
Diffstat (limited to 'src/cpu/ozone')
| -rw-r--r-- | src/cpu/ozone/cpu_impl.hh | 6 | ||||
| -rw-r--r-- | src/cpu/ozone/thread_state.hh | 21 |
2 files changed, 6 insertions, 21 deletions
diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh index 0763a30b3..76e2318aa 100644 --- a/src/cpu/ozone/cpu_impl.hh +++ b/src/cpu/ozone/cpu_impl.hh @@ -36,7 +36,7 @@ #include "base/trace.hh" #include "config/full_system.hh" #include "cpu/base.hh" -#include "cpu/checker/exec_context.hh" +#include "cpu/checker/thread_context.hh" #include "cpu/thread_context.hh" #include "cpu/exetrace.hh" #include "cpu/ozone/cpu.hh" @@ -670,8 +670,8 @@ OzoneCPU<Impl>::processInterrupts() thread.setMiscReg(IPR_INTID, ipl); // @todo: Make this more transparent if (checker) { - checker->cpuXCBase()->setMiscReg(IPR_ISR, summary); - checker->cpuXCBase()->setMiscReg(IPR_INTID, ipl); + checker->threadBase()->setMiscReg(IPR_ISR, summary); + checker->threadBase()->setMiscReg(IPR_INTID, ipl); } Fault fault = new InterruptFault; fault->invoke(thread.getTC()); diff --git a/src/cpu/ozone/thread_state.hh b/src/cpu/ozone/thread_state.hh index c91297e73..e6256e4e3 100644 --- a/src/cpu/ozone/thread_state.hh +++ b/src/cpu/ozone/thread_state.hh @@ -49,7 +49,7 @@ class FunctionalMemory; // Maybe this ozone thread state should only really have committed state? // I need to think about why I'm using this and what it's useful for. Clearly -// has benefits for SMT; basically serves same use as CPUExecContext. +// has benefits for SMT; basically serves same use as SimpleThread. // Makes the ExecContext proxy easier. Gives organization/central access point // to state of a thread that can be accessed normally (i.e. not in-flight // stuff within a OoO processor). Does this need an TC proxy within it? @@ -83,18 +83,11 @@ struct OzoneThreadState : public ThreadState { } #endif - Status _status; - - Status status() const { return _status; } - - void setStatus(Status new_status) { _status = new_status; } - RenameTable<Impl> renameTable; + Addr PC; - Addr nextPC; - // Current instruction - TheISA::MachInst inst; + Addr nextPC; TheISA::RegFile regs; @@ -169,14 +162,6 @@ struct OzoneThreadState : public ThreadState { void setNextPC(uint64_t val) { nextPC = val; } - - bool misspeculating() { return false; } - - void setInst(TheISA::MachInst _inst) { inst = _inst; } - - Counter readFuncExeInst() { return funcExeInst; } - - void setFuncExeInst(Counter new_val) { funcExeInst = new_val; } }; #endif // __CPU_OZONE_THREAD_STATE_HH__ |