summaryrefslogtreecommitdiff
path: root/src/cpu/inorder/pipeline_stage.cc
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2011-02-04 00:09:20 -0500
committerKorey Sewell <ksewell@umich.edu>2011-02-04 00:09:20 -0500
commite396a34b0155d5054a099c67a91baa66c095d3d8 (patch)
tree9372731b0110d067b4377ab73b1d62bbabf5efe3 /src/cpu/inorder/pipeline_stage.cc
parente57613588b15f25b5b912ae98134b6f1007988fd (diff)
downloadgem5-e396a34b0155d5054a099c67a91baa66c095d3d8.tar.xz
inorder: fault handling
Maintain all information about an instruction's fault in the DynInst object rather than any cpu-request object. Also, if there is a fault during the execution stage then just save the fault inside the instruction and trap once the instruction tries to graduate
Diffstat (limited to 'src/cpu/inorder/pipeline_stage.cc')
-rw-r--r--src/cpu/inorder/pipeline_stage.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/cpu/inorder/pipeline_stage.cc b/src/cpu/inorder/pipeline_stage.cc
index e10ceb326..744ffd4d2 100644
--- a/src/cpu/inorder/pipeline_stage.cc
+++ b/src/cpu/inorder/pipeline_stage.cc
@@ -944,12 +944,7 @@ PipelineStage::processInstSchedule(DynInstPtr inst,int &reqs_processed)
"completed.\n", tid, inst->seqNum,
cpu->resPool->name(res_num));
- if (req->fault == NoFault) {
- inst->popSchedEntry();
- } else {
- panic("%i: encountered %s fault!\n",
- curTick(), req->fault->name());
- }
+ inst->popSchedEntry();
reqs_processed++;