summaryrefslogtreecommitdiff
path: root/src/cpu/o3
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-12-11 23:51:21 -0500
committerKevin Lim <ktlim@umich.edu>2006-12-11 23:51:21 -0500
commit34924ce3b82ec19322990c721369b08ddfd3df8a (patch)
tree71d61a5ff1980562fc36a9fe74e0b722457673d6 /src/cpu/o3
parent1868c9fd7f9805e6f0a9cf3ceab958c8b36259b0 (diff)
downloadgem5-34924ce3b82ec19322990c721369b08ddfd3df8a.tar.xz
Fix up in case a req hasn't yet been generated for this instruction (if there was a fault prior to translation).
--HG-- extra : convert_revision : 43f4ea5e6a234cc6071006eab72135c11b8523c8
Diffstat (limited to 'src/cpu/o3')
-rw-r--r--src/cpu/o3/lsq_unit_impl.hh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh
index 4facea9f9..3b84d3411 100644
--- a/src/cpu/o3/lsq_unit_impl.hh
+++ b/src/cpu/o3/lsq_unit_impl.hh
@@ -418,7 +418,8 @@ LSQUnit<Impl>::executeLoad(DynInstPtr &inst)
// realizes there is activity.
// Mark it as executed unless it is an uncached load that
// needs to hit the head of commit.
- if (!(inst->req->isUncacheable()) || inst->isAtCommit()) {
+ if (!(inst->req && inst->req->isUncacheable()) ||
+ inst->isAtCommit()) {
inst->setExecuted();
}
iewStage->instToCommit(inst);