summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-10-23 14:10:37 -0400
committerKevin Lim <ktlim@umich.edu>2006-10-23 14:10:37 -0400
commit4ccccfef7144d6c36acdb780395141e5d71890c1 (patch)
tree3e7cd8778aaca4eac63a0dd1c50f799106f0d9f7 /src/cpu
parent1926faac067c5ab01c0a925ccd5afc4d2bd6b83a (diff)
downloadgem5-4ccccfef7144d6c36acdb780395141e5d71890c1.tar.xz
Fix fetch to stop fetching upon encountering a fault in SE mode. Also change warning to a DPRINTF.
--HG-- extra : convert_revision : 819bade049d7ffd97d316051c99146ece5e3a651
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/o3/fetch_impl.hh9
1 files changed, 5 insertions, 4 deletions
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]);
}
}