From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Thu, 5 May 2011 01:38:26 +0000 (-0500)
Subject: O3: Fix a small corner case with the lsq hazard detection logic.
X-Git-Tag: stable_2012_02_02~352
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=09a2be0c391d603bb4d56d6abf1b6d7868778879;p=gem5.git

O3: Fix a small corner case with the lsq hazard detection logic.
---

diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh
index 1e7910387..2c2b30b8a 100644
--- a/src/cpu/o3/lsq_unit_impl.hh
+++ b/src/cpu/o3/lsq_unit_impl.hh
@@ -465,8 +465,7 @@ LSQUnit<Impl>::checkViolations(int load_idx, DynInstPtr &inst)
         Addr ld_eff_addr2 =
             (ld_inst->effAddr + ld_inst->effSize - 1) >> depCheckShift;
 
-        if ((inst_eff_addr2 > ld_eff_addr1 && inst_eff_addr1 < ld_eff_addr2) ||
-               inst_eff_addr1 == ld_eff_addr1) {
+        if (inst_eff_addr2 >= ld_eff_addr1 && inst_eff_addr1 <= ld_eff_addr2) {
             // A load/store incorrectly passed this load/store.
             // Check if we already have a violator, or if it's newer
             // squash and refetch.