summaryrefslogtreecommitdiff
path: root/src/cpu/inorder/resources
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2011-06-19 21:43:41 -0400
committerKorey Sewell <ksewell@umich.edu>2011-06-19 21:43:41 -0400
commit8c0def8d0347e9a7b84f21895c5cbd94eba9a09a (patch)
tree4b3e65bde6e55cdf9c1512c247cb52ce8a9adb08 /src/cpu/inorder/resources
parent5ef0b7a9db3c6ec4ca191c2e9381719e1e694873 (diff)
downloadgem5-8c0def8d0347e9a7b84f21895c5cbd94eba9a09a.tar.xz
inorder: use trapPending flag to manage traps
Diffstat (limited to 'src/cpu/inorder/resources')
-rw-r--r--src/cpu/inorder/resources/graduation_unit.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cpu/inorder/resources/graduation_unit.cc b/src/cpu/inorder/resources/graduation_unit.cc
index ebcf40c6a..c69e55512 100644
--- a/src/cpu/inorder/resources/graduation_unit.cc
+++ b/src/cpu/inorder/resources/graduation_unit.cc
@@ -66,7 +66,9 @@ GraduationUnit::execute(int slot_num)
return;
}
- if (lastFaultTick[tid] == cur_tick) {
+ //@todo: use trap Pending
+ if (cpu->trapPending[tid]) {
+ //if (lastFaultTick[tid] == cur_tick) {
DPRINTF(InOrderGraduation, "Unable to graduate [sn:%i]. "
"Only 1 fault can be handled per tick.\n");
grad_req->done(false);