diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-01-03 00:52:30 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-01-03 00:52:30 -0500 |
| commit | 8840ebcb00f3988c781063e572b6df5742968f95 (patch) | |
| tree | e9711f561dff45b31489a7fb539ed98660e26d0e /src/cpu/o3/lsq_unit.hh | |
| parent | a0e8aa6737f534a8e51d866728dd6dc59bef263d (diff) | |
| parent | 7d7f3d0e99eca98a5659e73bce56d615f0ed4fc3 (diff) | |
| download | gem5-8840ebcb00f3988c781063e572b6df5742968f95.tar.xz | |
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
--HG--
extra : convert_revision : f4a05accb8fa24d425dd818b1b7f268378180e99
Diffstat (limited to 'src/cpu/o3/lsq_unit.hh')
| -rw-r--r-- | src/cpu/o3/lsq_unit.hh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/cpu/o3/lsq_unit.hh b/src/cpu/o3/lsq_unit.hh index 0318175c3..9c7eb7780 100644 --- a/src/cpu/o3/lsq_unit.hh +++ b/src/cpu/o3/lsq_unit.hh @@ -509,7 +509,6 @@ LSQUnit<Impl>::read(Request *req, T &data, int load_idx) "storeHead: %i addr: %#x\n", load_idx, store_idx, storeHead, req->getPaddr()); -#if FULL_SYSTEM if (req->isLocked()) { // Disable recording the result temporarily. Writing to misc // regs normally updates the result, but this is not the @@ -518,7 +517,6 @@ LSQUnit<Impl>::read(Request *req, T &data, int load_idx) TheISA::handleLockedRead(load_inst.get(), req); load_inst->recordResult = true; } -#endif while (store_idx != -1) { // End once we've reached the top of the LSQ |