m5: merge inorder updates

[gem5.git] / src / cpu / exetrace.hh

diff --git a/src/cpu/exetrace.hh b/src/cpu/exetrace.hh
index e5b22c8819efb40f49cf37bf7ad12bc0e6394c65..aa0831dfd48532fe0ab7e413dcd50fc93de08d1b 100644 (file)
--- a/src/cpu/exetrace.hh
+++ b/src/cpu/exetrace.hh
@@ -29,14 +29,14 @@
  *          Nathan Binkert
  */
 
-#ifndef __EXETRACE_HH__
-#define __EXETRACE_HH__
+#ifndef __CPU_EXETRACE_HH__
+#define __CPU_EXETRACE_HH__
 
 #include "base/trace.hh"
+#include "base/types.hh"
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
-#include "sim/insttracer.hh"
 #include "params/ExeTracer.hh"
+#include "sim/insttracer.hh"
 
 class ThreadContext;
 
@@ -57,6 +57,7 @@ class ExeTracerRecord : public InstRecord
     void traceInst(StaticInstPtr inst, bool ran);
 
     void dump();
+    virtual void dumpTicks(std::ostream &outs);
 };
 
 class ExeTracer : public InstTracer
@@ -87,4 +88,4 @@ class ExeTracer : public InstTracer
 
 /* namespace Trace */ }
 
-#endif // __EXETRACE_HH__
+#endif // __CPU_EXETRACE_HH__