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

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

--HG--
extra : convert_revision : 247fc298ba8ea1ea38ee2e906aa84bb5bc3f4592

src/cpu/exetrace.cc

@@ -652,7 +652,7 @@ Trace::InstRecord::dump()
                         predecoder.setTC(thread);
                         predecoder.moreBytes(m5Pc, 0, shared_data->instruction);
 
-                        assert(predecoder.extMachInstRead());
+                        assert(predecoder.extMachInstReady());
 
                         StaticInstPtr legionInst =
                             StaticInst::decode(predecoder.getExtMachInst());