diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-10-30 00:33:02 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-10-30 00:33:02 -0700 |
| commit | facb40f3ffce30cd9bc3b904eed5761d2d8b91c9 (patch) | |
| tree | a8db1326da23d56c23058c95cf5bf707fc3208b4 /src/cpu/ozone | |
| parent | 5b433568f05c6f1b093628c2a90f8383abfc1168 (diff) | |
| download | gem5-facb40f3ffce30cd9bc3b904eed5761d2d8b91c9.tar.xz | |
SE/FS: Make getProcessPtr available in both modes, and get rid of FULL_SYSTEMs.
Diffstat (limited to 'src/cpu/ozone')
| -rw-r--r-- | src/cpu/ozone/cpu.hh | 3 | ||||
| -rw-r--r-- | src/cpu/ozone/cpu_impl.hh | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/cpu/ozone/cpu.hh b/src/cpu/ozone/cpu.hh index 4860dd271..70b46ec5f 100644 --- a/src/cpu/ozone/cpu.hh +++ b/src/cpu/ozone/cpu.hh @@ -123,9 +123,8 @@ class OzoneCPU : public BaseCPU TheISA::Kernel::Statistics *getKernelStats() { return thread->getKernelStats(); } -#else - Process *getProcessPtr() { return thread->getProcessPtr(); } #endif + Process *getProcessPtr() { return thread->getProcessPtr(); } TranslatingPort *getMemPort() { return thread->getMemPort(); } diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh index bb6e96ecc..724bd99a4 100644 --- a/src/cpu/ozone/cpu_impl.hh +++ b/src/cpu/ozone/cpu_impl.hh @@ -671,9 +671,8 @@ OzoneCPU<Impl>::OzoneTC::takeOverFrom(ThreadContext *old_context) // some things should already be set up #if FULL_SYSTEM assert(getSystemPtr() == old_context->getSystemPtr()); -#else - assert(getProcessPtr() == old_context->getProcessPtr()); #endif + assert(getProcessPtr() == old_context->getProcessPtr()); // copy over functional state setStatus(old_context->status()); |