Merge in .hgignore from head.

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

diff --git a/src/cpu/exetrace.hh b/src/cpu/exetrace.hh
index be10b4a6a33fdf7df25ece9943210b59f04be178..8c0fa22cb401aa825d6697d04c8245064e5d2c5f 100644 (file)
--- a/src/cpu/exetrace.hh
+++ b/src/cpu/exetrace.hh
@@ -116,6 +116,8 @@ class InstRecord
 
     void setAddr(Addr a) { addr = a; addr_valid = true; }
 
+    void setData(Twin64_t d) { data.as_int = d.a; data_status = DataInt64; }
+    void setData(Twin32_t d) { data.as_int = d.a; data_status = DataInt32; }
     void setData(uint64_t d) { data.as_int = d; data_status = DataInt64; }
     void setData(uint32_t d) { data.as_int = d; data_status = DataInt32; }
     void setData(uint16_t d) { data.as_int = d; data_status = DataInt16; }
@@ -157,6 +159,9 @@ getInstRecord(Tick when, ThreadContext *tc, const StaticInstPtr staticInst,
     if (!IsOn(ExecEnable))
         return NULL;
 
+    if (!Trace::enabled)
+        return NULL;
+
     if (!IsOn(ExecSpeculative) && tc->misspeculating())
         return NULL;