diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-12-12 18:10:00 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-12-12 18:10:00 -0500 |
| commit | 90907f6b3cc79ec3e4bac2af7ef506672bab91e1 (patch) | |
| tree | c089d7170e29e6829e420268ece72c0eeab0e820 /src/cpu/o3/lsq_unit_impl.hh | |
| parent | 498e235ae0612d268001f813de6031fcdfc76de7 (diff) | |
| parent | 6c8c86f2f97913788237f763d4810ab12730ca60 (diff) | |
| download | gem5-90907f6b3cc79ec3e4bac2af7ef506672bab91e1.tar.xz | |
Merge zizzer:/bk/newmem/
into zower.eecs.umich.edu:/eecshome/m5/newmem
--HG--
extra : convert_revision : 17d6c49ee15af5d192dedf82871159219d4277cd
Diffstat (limited to 'src/cpu/o3/lsq_unit_impl.hh')
| -rw-r--r-- | src/cpu/o3/lsq_unit_impl.hh | 3 |
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 379724166..7ce3dc9cb 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); |