Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-19 07:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Debugger: In _6502_GetTargets() removed the bool bIgnoreJSRJMP parameter.

Browse Source
This commit is contained in:
tomcw
2019-12-09 20:42:16 +00:00
parent f0e840f8e0
commit 87677ed4c3
5 changed files with 41 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Debugger/Debugger_Display.cpp
+14 -1
View File
@@ -1528,6 +1528,13 @@ int GetDisassemblyLine ( WORD nBaseAddress, DisasmLine_t & line_ )
int nTargetBytes;
_6502_GetTargets( nBaseAddress, &nTargetPartial, &nTargetPartial2, &nTargetPointer, &nTargetBytes );
// For *direct* JSR/JMP, don't show 'addr16:byte char'
if (iOpcode == OPCODE_JSR || iOpcode == OPCODE_JMP_A)
{
nTargetPointer = NO_6502_TARGET;
nTargetBytes = 0;
}
if (nTargetPointer != NO_6502_TARGET)
{
bDisasmFormatFlags |= DISASM_FORMAT_TARGET_POINTER;
@@ -1541,7 +1548,7 @@ int GetDisassemblyLine ( WORD nBaseAddress, DisasmLine_t & line_ )
if (g_iConfigDisasmTargets & DISASM_TARGET_ADDR)
sprintf( line_.sTargetPointer, "%04X", nTargetPointer & 0xFFFF );
if (iOpmode != AM_NA ) // Indirect Absolute
if (iOpcode != OPCODE_JMP_NA && iOpcode != OPCODE_JMP_IAX)
{
bDisasmFormatFlags |= DISASM_FORMAT_TARGET_VALUE;
if (g_iConfigDisasmTargets & DISASM_TARGET_VAL)
@@ -3215,6 +3222,12 @@ void DrawTargets ( int line)
int aTarget[3];
_6502_GetTargets( regs.pc, &aTarget[0],&aTarget[1],&aTarget[2], NULL );
const BYTE iOpcode = mem[regs.pc];
if (iOpcode == OPCODE_JSR || iOpcode == OPCODE_JMP_A)
{
aTarget[2] = NO_6502_TARGET;
}
aTarget[1] = aTarget[2]; // Move down as we only have 2 lines
RECT rect;