Debugger: SNES - Fixed effective address display for indirect JMP

Effective address always had the upper 8 bits of the address as 0 instead of using the current value of K
SourMesen · Nov 29, 2023 · 3c94fe6 · 3c94fe6
1 parent 9e1bde6
commit 3c94fe6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Core/SNES/Debugger/SnesDisUtils.cpp b/Core/SNES/Debugger/SnesDisUtils.cpp
@@ -123,7 +123,12 @@ EffectiveAddressInfo SnesDisUtils::GetEffectiveAddress(DisassemblyInfo &info, Sn
 	if(isJump) {
 		if(info.GetOpSize() == 3) {
 			//For 3-byte jumps, return the target address, and show no value
-			return { dummyCpu.GetLastOperand(), 0, true };
+			if(SnesDisUtils::IsUnconditionalJump(info.GetOpCode())) {
+				//Display the dummy cpu's current address - this allows indirect jumps to display the correct address based on K
+				return { (dummyCpu.GetState().K << 16) | dummyCpu.GetState().PC, 0, true };
+			} else {
+				return { dummyCpu.GetLastOperand(), 0, true };
+			}
 		} else {
 			//Relative or long jumps already show the final address in the disassembly, show nothing
 			return {};