summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2010-06-23 22:09:49 -0400
committerKorey Sewell <ksewell@umich.edu>2010-06-23 22:09:49 -0400
commit1a737644032be8d95a381e3661b740c2b4f78bba (patch)
tree2dc317856fb1ecfe1ac08d91578d58538bbb7500 /src/cpu
parente17c41c17692dd6bc50bc0a564e5655b6fa8b8fa (diff)
downloadgem5-1a737644032be8d95a381e3661b740c2b4f78bba.tar.xz
inorder: squash from memory stall
this applies to multithreading models which would like to squash a thread on memory stall
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/inorder/resources/fetch_seq_unit.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cpu/inorder/resources/fetch_seq_unit.cc b/src/cpu/inorder/resources/fetch_seq_unit.cc
index 03663881c..0d22226a5 100644
--- a/src/cpu/inorder/resources/fetch_seq_unit.cc
+++ b/src/cpu/inorder/resources/fetch_seq_unit.cc
@@ -228,7 +228,11 @@ FetchSeqUnit::squash(DynInstPtr inst, int squash_stage,
tid, squash_stage);
InstSeqNum done_seq_num = inst->bdelaySeqNum;
- Addr new_PC = inst->readPredTarg();
+
+ // Handles the case where we are squashing because of something that is
+ // not a branch...like a memory stall
+ Addr new_PC = (inst->isControl()) ?
+ inst->readPredTarg() : inst->readPC() + instSize;
if (squashSeqNum[tid] <= done_seq_num &&
lastSquashCycle[tid] == curTick) {