diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2012-05-26 13:44:46 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2012-05-26 13:44:46 -0700 |
| commit | 0cba96ba6a5d7a4dab2a63b14149c49dfbfbb3bc (patch) | |
| tree | 1e4e1372b76ed021060d560c2ee1a474f4b22ef0 /src/cpu/o3/fetch.hh | |
| parent | eae1e97fb002b44a9d8c46df2da1ddc1d0156ce4 (diff) | |
| download | gem5-0cba96ba6a5d7a4dab2a63b14149c49dfbfbb3bc.tar.xz | |
CPU: Merge the predecoder and decoder.
These classes are always used together, and merging them will give the ISAs
more flexibility in how they cache things and manage the process.
--HG--
rename : src/arch/x86/predecoder_tables.cc => src/arch/x86/decoder_tables.cc
Diffstat (limited to 'src/cpu/o3/fetch.hh')
| -rw-r--r-- | src/cpu/o3/fetch.hh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh index 474834889..6bf5f4588 100644 --- a/src/cpu/o3/fetch.hh +++ b/src/cpu/o3/fetch.hh @@ -45,7 +45,6 @@ #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" @@ -340,7 +339,7 @@ class DefaultFetch } /** The decoder. */ - TheISA::Decoder decoder; + TheISA::Decoder *decoder[Impl::MaxThreads]; private: DynInstPtr buildInst(ThreadID tid, StaticInstPtr staticInst, @@ -398,9 +397,6 @@ class DefaultFetch /** BPredUnit. */ BPredUnit branchPred; - /** Predecoder. */ - TheISA::Predecoder predecoder; - TheISA::PCState pc[Impl::MaxThreads]; Addr fetchOffset[Impl::MaxThreads]; |