From: Kevin Lim <ktlim@umich.edu>
Date: Mon, 23 Oct 2006 18:10:37 +0000 (-0400)
Subject: Fix fetch to stop fetching upon encountering a fault in SE mode.  Also change warning... 
X-Git-Tag: m5_2.0_beta2~73^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4ccccfef7144d6c36acdb780395141e5d71890c1;p=gem5.git

Fix fetch to stop fetching upon encountering a fault in SE mode.  Also change warning to a DPRINTF.

--HG--
extra : convert_revision : 819bade049d7ffd97d316051c99146ece5e3a651
---

diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 07d4ebb42..f261a0a3a 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -63,7 +63,7 @@ template<class Impl>
 void
 DefaultFetch<Impl>::IcachePort::recvFunctional(PacketPtr pkt)
 {
-    warn("Default fetch doesn't update it's state from a functional call.");
+    warn("DefaultFetch doesn't update its state from a functional call.");
 }
 
 template<class Impl>
@@ -1273,11 +1273,12 @@ DefaultFetch<Impl>::fetch(bool &status_change)
 
         fetchStatus[tid] = TrapPending;
         status_change = true;
-
-//        warn("%lli fault (%d) detected @ PC %08p", curTick, fault, PC[tid]);
 #else // !FULL_SYSTEM
-        warn("cycle %lli: fault (%s) detected @ PC %08p", curTick, fault->name(), PC[tid]);
+        fetchStatus[tid] = TrapPending;
+        status_change = true;
+
 #endif // FULL_SYSTEM
+        DPRINTF(Fetch, "[tid:%i]: fault (%d) detected @ PC %08p", tid, fault, PC[tid]);
     }
 }