summaryrefslogtreecommitdiff
path: root/src/cpu/simple_thread.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2012-05-25 00:53:37 -0700
committerGabe Black <gblack@eecs.umich.edu>2012-05-25 00:53:37 -0700
commit82a228bd4348f2788151630fab0160acc368b4ff (patch)
tree79a685753c6f72eb6b76784d3d2e459b907b5ddb /src/cpu/simple_thread.hh
parent49da0497d3a4695ca613e6e47161f41d74ce9d32 (diff)
downloadgem5-82a228bd4348f2788151630fab0160acc368b4ff.tar.xz
Decode: Make the Decoder class defined per ISA.
--HG-- rename : src/cpu/decode.cc => src/arch/generic/decoder.cc rename : src/cpu/decode.hh => src/arch/generic/decoder.hh
Diffstat (limited to 'src/cpu/simple_thread.hh')
-rw-r--r--src/cpu/simple_thread.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index b1b8a66e4..1595551fb 100644
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -44,6 +44,7 @@
#ifndef __CPU_SIMPLE_THREAD_HH__
#define __CPU_SIMPLE_THREAD_HH__
+#include "arch/decoder.hh"
#include "arch/isa.hh"
#include "arch/isa_traits.hh"
#include "arch/registers.hh"
@@ -51,7 +52,6 @@
#include "arch/types.hh"
#include "base/types.hh"
#include "config/the_isa.hh"
-#include "cpu/decode.hh"
#include "cpu/thread_context.hh"
#include "cpu/thread_state.hh"
#include "debug/FloatRegs.hh"
@@ -128,7 +128,7 @@ class SimpleThread : public ThreadState
TheISA::TLB *itb;
TheISA::TLB *dtb;
- Decoder decoder;
+ TheISA::Decoder decoder;
// constructor: initialize SimpleThread from given process structure
// FS
@@ -199,7 +199,7 @@ class SimpleThread : public ThreadState
CheckerCPU *getCheckerCpuPtr() { return NULL; }
- Decoder *getDecoderPtr() { return &decoder; }
+ TheISA::Decoder *getDecoderPtr() { return &decoder; }
System *getSystemPtr() { return system; }