diff options
Diffstat (limited to 'src/cpu/o3')
| -rw-r--r-- | src/cpu/o3/fetch.hh | 4 | ||||
| -rwxr-xr-x | src/cpu/o3/thread_context.hh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh index b61ae2c7b..474834889 100644 --- a/src/cpu/o3/fetch.hh +++ b/src/cpu/o3/fetch.hh @@ -44,11 +44,11 @@ #ifndef __CPU_O3_FETCH_HH__ #define __CPU_O3_FETCH_HH__ +#include "arch/decoder.hh" #include "arch/predecoder.hh" #include "arch/utility.hh" #include "base/statistics.hh" #include "config/the_isa.hh" -#include "cpu/decode.hh" #include "cpu/pc_event.hh" #include "cpu/timebuf.hh" #include "cpu/translation.hh" @@ -340,7 +340,7 @@ class DefaultFetch } /** The decoder. */ - Decoder decoder; + TheISA::Decoder decoder; private: DynInstPtr buildInst(ThreadID tid, StaticInstPtr staticInst, diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh index 178a344f9..b4108e25c 100755 --- a/src/cpu/o3/thread_context.hh +++ b/src/cpu/o3/thread_context.hh @@ -85,7 +85,7 @@ class O3ThreadContext : public ThreadContext CheckerCPU *getCheckerCpuPtr() { return NULL; } - Decoder *getDecoderPtr() { return &cpu->fetch.decoder; } + TheISA::Decoder *getDecoderPtr() { return &cpu->fetch.decoder; } /** Returns a pointer to this CPU. */ virtual BaseCPU *getCpuPtr() { return cpu; } |