summaryrefslogtreecommitdiff
path: root/src/cpu/inorder/cpu.cc
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2011-06-19 21:43:39 -0400
committerKorey Sewell <ksewell@umich.edu>2011-06-19 21:43:39 -0400
commit5f608dd2e9a760b4280fb03ce82a11a62c6f3af9 (patch)
tree725a942e67f2efeffaa84c4385afc81424e142ee /src/cpu/inorder/cpu.cc
parente0e387c2a926dcdb53f85d8189e6d7158765b4ac (diff)
downloadgem5-5f608dd2e9a760b4280fb03ce82a11a62c6f3af9.tar.xz
inorder: squash and trap behind a tlb fault
Diffstat (limited to 'src/cpu/inorder/cpu.cc')
-rw-r--r--src/cpu/inorder/cpu.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cpu/inorder/cpu.cc b/src/cpu/inorder/cpu.cc
index cc2b72e4e..834e591f8 100644
--- a/src/cpu/inorder/cpu.cc
+++ b/src/cpu/inorder/cpu.cc
@@ -847,6 +847,7 @@ void
InOrderCPU::trap(Fault fault, ThreadID tid, DynInstPtr inst)
{
fault->invoke(tcBase(tid), inst->staticInst);
+ removePipelineStalls(tid);
}
void
@@ -1650,6 +1651,7 @@ InOrderCPU::wakeup()
void
InOrderCPU::syscallContext(Fault fault, ThreadID tid, DynInstPtr inst, int delay)
{
+ //@todo: squash behind syscall
scheduleCpuEvent(Syscall, fault, tid, inst, delay, Syscall_Pri);
}