Sigh. Fix error with combining the high and low four bits to get the immediate offset

diff --git a/WindCore/arm710.cpp b/WindCore/arm710.cpp
index 226ae106bc68724fe710e523bfc8389bc92246b1..877c905017b759a55c1ae5d400a7b6a61e10af99 100644 (file)
--- a/WindCore/arm710.cpp
+++ b/WindCore/arm710.cpp
@@ -504,7 +504,7 @@ uint32_t ARM710::execSingleHalfWordDataTransfer(uint32_t PUIWL, uint32_t Rn, uin
                // No rotation or anything here
                // addrMode1 is the high 4 bits
                // addrMode2 is the low 4 bits
-               calcOffset = (addrMode1 << 4) & addrMode2;
+               calcOffset = (addrMode1 << 4) | addrMode2;
        }
 
        uint32_t base = GPRs[Rn];