Compile fixes for SPARC_FS.

src/arch/alpha/predecoder.hh:
src/arch/sparc/predecoder.hh:
    Put in a missing include
src/cpu/exetrace.cc:
    Convert the legion lockstep stuff from makeExtMI to the predecoder object.

--HG--
extra : convert_revision : 91bad4466f8db1447fff8608fa46a5f236dc3a89
This commit is contained in:
Gabe Black 2007-03-18 23:09:51 -04:00
parent b54fa0edda
commit 7c0825ccf9
3 changed files with 10 additions and 2 deletions

View file

@ -33,6 +33,7 @@
#include "arch/alpha/types.hh" #include "arch/alpha/types.hh"
#include "base/misc.hh" #include "base/misc.hh"
#include "config/full_system.hh"
#include "sim/host.hh" #include "sim/host.hh"
class ThreadContext; class ThreadContext;

View file

@ -33,6 +33,7 @@
#include "arch/sparc/types.hh" #include "arch/sparc/types.hh"
#include "base/misc.hh" #include "base/misc.hh"
#include "cpu/thread_context.hh"
#include "sim/host.hh" #include "sim/host.hh"
class ThreadContext; class ThreadContext;

View file

@ -36,6 +36,7 @@
#include <sys/ipc.h> #include <sys/ipc.h>
#include <sys/shm.h> #include <sys/shm.h>
#include "arch/predecoder.hh"
#include "arch/regfile.hh" #include "arch/regfile.hh"
#include "arch/utility.hh" #include "arch/utility.hh"
#include "base/loader/symtab.hh" #include "base/loader/symtab.hh"
@ -302,6 +303,7 @@ Trace::InstRecord::dump()
outs << endl; outs << endl;
} }
#if THE_ISA == SPARC_ISA && FULL_SYSTEM #if THE_ISA == SPARC_ISA && FULL_SYSTEM
static TheISA::Predecoder predecoder(NULL);
// Compare // Compare
if (IsOn(ExecLegion)) if (IsOn(ExecLegion))
{ {
@ -556,9 +558,13 @@ Trace::InstRecord::dump()
<< staticInst->disassemble(m5Pc, debugSymbolTable) << staticInst->disassemble(m5Pc, debugSymbolTable)
<< endl; << endl;
predecoder.setTC(thread);
predecoder.moreBytes(m5Pc, 0, shared_data->instruction);
assert(predecoder.extMachInstRead());
StaticInstPtr legionInst = StaticInstPtr legionInst =
StaticInst::decode(makeExtMI(shared_data->instruction, StaticInst::decode(predecoder.getExtMachInst());
thread));
outs << setfill(' ') << setw(15) outs << setfill(' ') << setw(15)
<< " Legion Inst: " << " Legion Inst: "
<< "0x" << setw(8) << setfill('0') << hex << "0x" << setw(8) << setfill('0') << hex