diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-05-19 14:27:46 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-05-19 14:27:46 -0400 |
| commit | c7e7d07ec395156015e3baf52048c403d28a6442 (patch) | |
| tree | 962f00eb6a799e3ad0629fffc34d9879af28f007 | |
| parent | 36581a534240c322e1fc28b8bd6e8f13f2b0fefd (diff) | |
| download | gem5-c7e7d07ec395156015e3baf52048c403d28a6442.tar.xz | |
Fixes for regression build errors.
--HG--
extra : convert_revision : 1f59c853cb0e327d7cf586021b5139f1242e4f28
| -rw-r--r-- | cpu/cpu_exec_context.cc | 4 | ||||
| -rw-r--r-- | cpu/o3/alpha_cpu_impl.hh | 4 | ||||
| -rw-r--r-- | cpu/ozone/cpu.hh | 1 | ||||
| -rw-r--r-- | cpu/ozone/cpu_impl.hh | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/cpu/cpu_exec_context.cc b/cpu/cpu_exec_context.cc index 3d047856a..24de6d450 100644 --- a/cpu/cpu_exec_context.cc +++ b/cpu/cpu_exec_context.cc @@ -157,8 +157,7 @@ CPUExecContext::takeOverFrom(ExecContext *oldContext) cpu_id = oldContext->readCpuId(); #if !FULL_SYSTEM func_exe_inst = oldContext->readFuncExeInst(); -#endif - +#else EndQuiesceEvent *quiesce = oldContext->getQuiesceEvent(); if (quiesce) { // Point the quiesce event's XC at this XC so that it wakes up @@ -168,6 +167,7 @@ CPUExecContext::takeOverFrom(ExecContext *oldContext) if (quiesceEvent) { quiesceEvent->xc = proxy; } +#endif storeCondFailures = 0; diff --git a/cpu/o3/alpha_cpu_impl.hh b/cpu/o3/alpha_cpu_impl.hh index 856fcb1c8..58b2b3548 100644 --- a/cpu/o3/alpha_cpu_impl.hh +++ b/cpu/o3/alpha_cpu_impl.hh @@ -171,8 +171,7 @@ AlphaFullCPU<Impl>::AlphaXC::takeOverFrom(ExecContext *old_context) setCpuId(old_context->readCpuId()); #if !FULL_SYSTEM thread->funcExeInst = 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 @@ -184,6 +183,7 @@ AlphaFullCPU<Impl>::AlphaXC::takeOverFrom(ExecContext *old_context) } // storeCondFailures = 0; cpu->lockFlag = false; +#endif old_context->setStatus(ExecContext::Unallocated); 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); } |