456c456,458
< Addr load_addr = ld_inst->physEffAddr & cacheBlockMask;
---
> Addr load_addr_low = ld_inst->physEffAddrLow & cacheBlockMask;
> Addr load_addr_high = ld_inst->physEffAddrHigh & cacheBlockMask;
>
458,459c460,462
< if (ld_inst->effAddrValid() && load_addr == invalidate_addr &&
< ld_inst->memReqFlags & Request::LLSC)
---
> if (ld_inst->effAddrValid() && (load_addr_low == invalidate_addr
> || load_addr_high == invalidate_addr)
> && ld_inst->memReqFlags & Request::LLSC)
479c482,484
< Addr load_addr = ld_inst->physEffAddr & cacheBlockMask;
---
> Addr load_addr_low = ld_inst->physEffAddrLow & cacheBlockMask;
> Addr load_addr_high = ld_inst->physEffAddrHigh & cacheBlockMask;
>
481c486
< ld_inst->seqNum, load_addr, invalidate_addr);
---
> ld_inst->seqNum, load_addr_low, invalidate_addr);
483c488,489
< if (load_addr == invalidate_addr || force_squash) {
---
> if ((load_addr_low == invalidate_addr
> || load_addr_high == invalidate_addr) || force_squash) {