MEM: Remove the Broadcast destination from the packet

[gem5.git] / src / cpu / inorder / inorder_trace.hh

diff --git a/src/cpu/inorder/inorder_trace.hh b/src/cpu/inorder/inorder_trace.hh
index eb12873700474f1b2f17897d37fe42b89b8dbcdc..5386f641dd25655620a0d52b608ca247491901e5 100644 (file)
--- a/src/cpu/inorder/inorder_trace.hh
+++ b/src/cpu/inorder/inorder_trace.hh
@@ -29,27 +29,26 @@
  * Authors: Korey Sewell
  */
 
-#ifndef __INORDERTRACE_HH__
-#define __INORDERTRACE_HH__
+#ifndef __CPU_INORDER_INORDER_TRACE_HH__
+#define __CPU_INORDER_INORDER_TRACE_HH__
 
 #include "base/trace.hh"
-#include "cpu/static_inst.hh"
 #include "base/types.hh"
-#include "sim/insttracer.hh"
-#include "params/InOrderTrace.hh"
 #include "cpu/exetrace.hh"
+#include "cpu/static_inst.hh"
+#include "params/InOrderTrace.hh"
+#include "sim/insttracer.hh"
 
 class ThreadContext;
 
-
 namespace Trace {
 
 class InOrderTraceRecord : public ExeTracerRecord
 {
   public:
     InOrderTraceRecord(unsigned num_stages, bool _stage_tracing,
-           ThreadContext *_thread, bool spec = false)
-        : ExeTracerRecord(0, _thread, NULL, 0, spec)
+           ThreadContext *_thread, TheISA::PCState _pc, bool spec = false)
+        : ExeTracerRecord(0, _thread, NULL, _pc, spec)
     {
         stageTrace = _stage_tracing;
         stageCycle.resize(num_stages);
@@ -76,7 +75,8 @@ class InOrderTraceRecord : public ExeTracerRecord
     {
         staticInst = _staticInst;
     }
-    void setPC(Addr _pc) { PC = _pc; }
+
+    void setPC(TheISA::PCState _pc) { pc = _pc; }
 };
 
 class InOrderTrace : public InstTracer
@@ -88,11 +88,11 @@ class InOrderTrace : public InstTracer
     InOrderTraceRecord *
     getInstRecord(unsigned num_stages, bool stage_tracing, ThreadContext *tc);
 
-    virtual InOrderTraceRecord *getInstRecord(Tick when, ThreadContext *tc,
-            const StaticInstPtr staticInst, Addr pc,
-            const StaticInstPtr macroStaticInst = NULL, MicroPC upc = 0);
+    InOrderTraceRecord *getInstRecord(Tick when, ThreadContext *tc,
+            const StaticInstPtr staticInst, TheISA::PCState pc,
+            const StaticInstPtr macroStaticInst = NULL);
 };
 
-/* namespace Trace */ }
+} // namespace Trace
 
-#endif // __EXETRACE_HH__
+#endif // __CPU_INORDER_INORDER_TRACE_HH__