summaryrefslogtreecommitdiff
path: root/src/cpu/o3/fetch_impl.hh
diff options
context:
space:
mode:
authorRon Dreslinski <rdreslin@umich.edu>2006-08-16 15:59:26 -0400
committerRon Dreslinski <rdreslin@umich.edu>2006-08-16 15:59:26 -0400
commit27d60c27fa4cdbe471463fbf8224950d36456592 (patch)
tree06ad37f0b10d2a29b27e0bea264a0a05e2be9cd5 /src/cpu/o3/fetch_impl.hh
parentbb6af8eb8ad870138030c617f27a1f4193341e8e (diff)
parentec0a18ffb956bbcf54b8d4d94dac7255f8868a9e (diff)
downloadgem5-27d60c27fa4cdbe471463fbf8224950d36456592.tar.xz
Merge zizzer:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem --HG-- extra : convert_revision : 659f84c883b9992ae48f26c837983b9f8fcf18ab
Diffstat (limited to 'src/cpu/o3/fetch_impl.hh')
-rw-r--r--src/cpu/o3/fetch_impl.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 990db88ac..25be9d455 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -672,9 +672,9 @@ DefaultFetch<Impl>::doSquash(const Addr &new_PC, unsigned tid)
assert(cacheBlocked);
cacheBlocked = false;
retryTid = -1;
- retryPkt = NULL;
delete retryPkt->req;
delete retryPkt;
+ retryPkt = NULL;
}
fetchStatus[tid] = Squashing;