CPU: Print out traces for faluting inst when the flag ExecFaulting is set

diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 8ee91758f175ac19f2031ecec7eb7f6a422286ee..1726db1937e09590baa85e0118fb97e08c95df3e 100644 (file)
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -687,8 +687,7 @@ AtomicSimpleCPU::tick()
                 // keep an instruction count
                 if (fault == NoFault)
                     countInst();
-                else if (traceData) {
-                    // If there was a fault, we should trace this instruction.
+                else if (traceData && !DTRACE(ExecFaulting)) {
                     delete traceData;
                     traceData = NULL;
                 }

diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index b04288ca69089909ae3349f0d8970cba4a2a84c6..4b093e115aeed621fd7ac869176e287bf005f948 100644 (file)
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -817,8 +817,7 @@ TimingSimpleCPU::completeIfetch(PacketPtr pkt)
         // keep an instruction count
         if (fault == NoFault)
             countInst();
-        else if (traceData) {
-            // If there was a fault, we shouldn't trace this instruction.
+        else if (traceData && !DTRACE(ExecFaulting)) {
             delete traceData;
             traceData = NULL;
         }