From: Ali Saidi <ali.saidi@arm.com>
Date: Thu, 26 Aug 2010 00:10:43 +0000 (-0500)
Subject: CPU: Print out traces for faluting inst when the flag ExecFaulting is set
X-Git-Tag: stable_2012_02_02~840
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=546eaa6109849879c248822efe89eb4db7126b7d;p=gem5.git

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 8ee91758f..1726db193 100644
--- 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 b04288ca6..4b093e115 100644
--- 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;
         }