Debugger: WS - Fixed effective address calculation for LES/LDS

Show first word's address instead of the second's
SourMesen · Nov 13, 2024 · 2e6a2e5 · 2e6a2e5
1 parent 54b8973
commit 2e6a2e5
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Core/WS/Debugger/WsDisUtils.cpp b/Core/WS/Debugger/WsDisUtils.cpp
@@ -399,9 +399,14 @@ EffectiveAddressInfo WsDisUtils::GetEffectiveAddress(DisassemblyInfo& info, WsCo
 			result.ShowAddress = true;
 
 			if(dummyCpu.IsWordAccess(i)) {
-				result.Address = opInfo.Address;
-				result.Type = opInfo.MemType;
 				result.ValueSize = 2;
+				if(dummyCpu.IsWordAccess(i - 1) && prevOpInfo.Type == opInfo.Type && prevOpInfo.Address == opInfo.Address - 2) {
+					result.Address = prevOpInfo.Address;
+					result.Type = prevOpInfo.MemType;
+				} else {
+					result.Address = opInfo.Address;
+					result.Type = opInfo.MemType;
+				}
 			} else {
 				if(prevOpInfo.Type == opInfo.Type && prevOpInfo.Address == opInfo.Address - 1) {
 					//For 16-bit read/writes that were split into 2 8-bit accesses, return the first address