From: George Wright <gw@gwright.org.uk>
Date: Tue, 10 Dec 2024 06:59:52 +0000 (-0800)
Subject: Sigh. Fix error with combining the high and low four bits to get the immediate offset
X-Git-Url: http://git.gwright.org.uk/?a=commitdiff_plain;h=41df46b9795e50a4bb7abc80185d8f3432f7ef56;p=WindEmu.git

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 226ae10..877c905 100644
--- 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];