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

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

--HG--
extra : convert_revision : a6ae6ce183aaa4d1a9434f9ddd64cc30878d2147

src/arch/alpha/predecoder.hh

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

src/arch/sparc/predecoder.hh

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

src/cpu/exetrace.cc

@@ -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,
+                            StaticInst::decode(predecoder.getExtMachInst());
-                                        thread));
                         outs << setfill(' ') << setw(15)
                              << " Legion Inst: "
                              << "0x" << setw(8) << setfill('0') << hex