diff options
Diffstat (limited to 'cpu/ozone')
| -rw-r--r-- | cpu/ozone/cpu.hh | 1 | ||||
| -rw-r--r-- | cpu/ozone/cpu_impl.hh | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cpu/ozone/cpu.hh b/cpu/ozone/cpu.hh index 1d522b2fa..7e12e75e5 100644 --- a/cpu/ozone/cpu.hh +++ b/cpu/ozone/cpu.hh @@ -89,7 +89,6 @@ class OzoneCPU : public BaseCPU typedef typename Impl::FrontEnd FrontEnd; typedef typename Impl::BackEnd BackEnd; typedef typename Impl::DynInst DynInst; - typedef typename Impl::DynInst DynInst; typedef typename Impl::DynInstPtr DynInstPtr; typedef TheISA::MiscReg MiscReg; diff --git a/cpu/ozone/cpu_impl.hh b/cpu/ozone/cpu_impl.hh index b085f077f..031b4b145 100644 --- a/cpu/ozone/cpu_impl.hh +++ b/cpu/ozone/cpu_impl.hh @@ -934,8 +934,7 @@ OzoneCPU<Impl>::OzoneXC::takeOverFrom(ExecContext *old_context) setCpuId(old_context->readCpuId()); #if !FULL_SYSTEM setFuncExeInst(old_context->readFuncExeInst()); -#endif - +#else EndQuiesceEvent *other_quiesce = old_context->getQuiesceEvent(); if (other_quiesce) { // Point the quiesce event's XC at this XC so that it wakes up @@ -947,6 +946,7 @@ OzoneCPU<Impl>::OzoneXC::takeOverFrom(ExecContext *old_context) } // storeCondFailures = 0; cpu->lockFlag = false; +#endif old_context->setStatus(ExecContext::Unallocated); } |