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/legiontrace.cc | |
| 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/legiontrace.cc')
| -rw-r--r-- | src/cpu/legiontrace.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/cpu/legiontrace.cc b/src/cpu/legiontrace.cc index 34c732c54..c000f57fc 100644 --- a/src/cpu/legiontrace.cc +++ b/src/cpu/legiontrace.cc @@ -43,7 +43,6 @@ #include <iomanip> #include "arch/sparc/decoder.hh" -#include "arch/sparc/predecoder.hh" #include "arch/sparc/registers.hh" #include "arch/sparc/utility.hh" #include "arch/tlb.hh" @@ -146,7 +145,6 @@ Trace::LegionTraceRecord::dump() { ostream &outs = Trace::output(); - static TheISA::Predecoder predecoder(NULL); // Compare bool compared = false; bool diffPC = false; @@ -423,15 +421,14 @@ Trace::LegionTraceRecord::dump() << staticInst->disassemble(m5Pc, debugSymbolTable) << endl; - predecoder.setTC(thread); - predecoder.moreBytes(m5Pc, m5Pc, shared_data->instruction); + TheISA::Decoder *decoder = thread->getDecoderPtr(); + decoder->setTC(thread); + decoder->moreBytes(m5Pc, m5Pc, shared_data->instruction); - assert(predecoder.extMachInstReady()); + assert(decoder->instReady()); PCState tempPC = pc; - StaticInstPtr legionInst = - thread->getDecoderPtr()->decode( - predecoder.getExtMachInst(tempPC), lgnPc); + StaticInstPtr legionInst = decoder->decode(tempPC); outs << setfill(' ') << setw(15) << " Legion Inst: " << "0x" << setw(8) << setfill('0') << hex |