Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

[gem5.git] / cpu / exetrace.cc

diff --git a/cpu/exetrace.cc b/cpu/exetrace.cc
index 4c5d148938dfcd6baa16094a3708831ec57a956e..3e8877e933db062f75d31a6bb5cb4fe99ecdc4ab 100644 (file)
--- a/cpu/exetrace.cc
+++ b/cpu/exetrace.cc
@@ -29,14 +29,15 @@
 #include <fstream>
 #include <iomanip>
 
-#include "dyn_inst.hh"
-#include "spec_state.hh"
-#include "issue.hh"
-#include "exetrace.hh"
-#include "exec_context.hh"
-#include "symtab.hh"
-#include "base_cpu.hh"
-#include "static_inst.hh"
+#include "sim/param.hh"
+#include "cpu/full_cpu/dyn_inst.hh"
+#include "cpu/full_cpu/spec_state.hh"
+#include "cpu/full_cpu/issue.hh"
+#include "cpu/exetrace.hh"
+#include "cpu/exec_context.hh"
+#include "base/loader/symtab.hh"
+#include "cpu/base_cpu.hh"
+#include "cpu/static_inst.hh"
 
 using namespace std;
 
@@ -73,11 +74,11 @@ Trace::InstRecord::dump(ostream &outs)
     // There's a bug in gcc 2.x library that prevents setw()
     // from working properly on strings
     string mc(staticInst->disassemble(PC, debugSymbolTable));
-    while (mc.length() < 25)
+    while (mc.length() < 26)
         mc += " ";
     outs << mc;
 #else
-    outs << setw(25) << staticInst->disassemble(PC, debugSymbolTable);
+    outs << setw(26) << left << staticInst->disassemble(PC, debugSymbolTable);
 #endif
 
     outs << " : ";
@@ -119,7 +120,6 @@ Trace::InstRecord::dump(ostream &outs)
     //  End of line...
     //
     outs << endl;
-    outs.flush();
 }