diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-10-23 14:32:35 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-10-23 14:32:35 -0400 |
| commit | ce4531c0794ee57c0029bc905802a7856832d941 (patch) | |
| tree | 4d6c87eae2b07f350dc7aa26454e9304aec457dd /src/cpu/o3/fetch_impl.hh | |
| parent | ef8b7713ca1b6120ae4e851877f2a9ce71296219 (diff) | |
| parent | 4ccccfef7144d6c36acdb780395141e5d71890c1 (diff) | |
| download | gem5-ce4531c0794ee57c0029bc905802a7856832d941.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem
--HG--
extra : convert_revision : 161c35ade82f2471e605d948dca56cfa216693fd
Diffstat (limited to 'src/cpu/o3/fetch_impl.hh')
| -rw-r--r-- | src/cpu/o3/fetch_impl.hh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh index e7bf83b20..2f7a75129 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> @@ -1276,11 +1276,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]); } } |