diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2014-12-02 06:08:00 -0500 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2014-12-02 06:08:00 -0500 |
| commit | 74bbe20141aec3bd7639000fb6ad8ff5fe1a7237 (patch) | |
| tree | 0f4c07d5ebe3810b9be06bd5db87e698f623b9c3 /src | |
| parent | 810349a8a789b0a99d6268fe725eca2e00cb9558 (diff) | |
| download | gem5-74bbe20141aec3bd7639000fb6ad8ff5fe1a7237.tar.xz | |
cpu: Always mask the snoop address when performing lock check
Ensure the snoop address check is always using a cache-block aligned
address. This patch updates Alpha and Mips to match the other ISAs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/alpha/locked_mem.hh | 4 | ||||
| -rw-r--r-- | src/arch/mips/locked_mem.hh | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/arch/alpha/locked_mem.hh b/src/arch/alpha/locked_mem.hh index 253b94be4..7998cbdf1 100644 --- a/src/arch/alpha/locked_mem.hh +++ b/src/arch/alpha/locked_mem.hh @@ -76,9 +76,7 @@ handleLockedSnoop(XC *xc, PacketPtr pkt, Addr cacheBlockMask) return; Addr locked_addr = xc->readMiscReg(MISCREG_LOCKADDR) & cacheBlockMask; - Addr snoop_addr = pkt->getAddr(); - - assert((cacheBlockMask & snoop_addr) == snoop_addr); + Addr snoop_addr = pkt->getAddr() & cacheBlockMask; if (locked_addr == snoop_addr) xc->setMiscReg(MISCREG_LOCKFLAG, false); diff --git a/src/arch/mips/locked_mem.hh b/src/arch/mips/locked_mem.hh index 5b0f8a1b8..a5ff467b3 100644 --- a/src/arch/mips/locked_mem.hh +++ b/src/arch/mips/locked_mem.hh @@ -66,9 +66,7 @@ handleLockedSnoop(XC *xc, PacketPtr pkt, Addr cacheBlockMask) return; Addr locked_addr = xc->readMiscReg(MISCREG_LLADDR) & cacheBlockMask; - Addr snoop_addr = pkt->getAddr(); - - assert((cacheBlockMask & snoop_addr) == snoop_addr); + Addr snoop_addr = pkt->getAddr() & cacheBlockMask; if (locked_addr == snoop_addr) xc->setMiscReg(MISCREG_LLFLAG, false); |