Merge zizzer.eecs.umich.edu:/bk/newmem

into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : a6ae6ce183aaa4d1a9434f9ddd64cc30878d2147
This commit is contained in:
Gabe Black 2007-03-19 17:13:23 +00:00
commit 4df9411e59
3 changed files with 10 additions and 2 deletions

View file

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

View file

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

View file

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