Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-08-15 02:27:45 +00:00
Code Issues Projects Releases Wiki Activity

Debugger: fixes to wrap 16-bit addr (was resulting in AppleWin debugger crashes)

Browse Source
This commit is contained in:
tomcw
2021-02-07 16:58:11 +00:00
parent c492004e8d
commit f3b6b8665f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/Debugger/Debugger_Assembler.cpp
View File

@@ -705,13 +705,13 @@ bool _6502_GetTargets ( WORD nAddress, int *pTargetPartial_, int *pTargetPartial
*pTargetPartial_ = nTarget16; *pTargetPartial_ = nTarget16;
*pTargetPartial2_ = nTarget16+1; *pTargetPartial2_ = nTarget16+1;
if (bIncludeNextOpcodeAddress) if (bIncludeNextOpcodeAddress)
*pTargetPointer_ = *(LPWORD)(mem + nTarget16); *pTargetPointer_ = mem[nTarget16] | (mem[(nTarget16+1)&0xFFFF]<<8);
if (pTargetBytes_) if (pTargetBytes_)
*pTargetBytes_ = 2; *pTargetBytes_ = 2;
break; break;
case AM_IZX: // Indexed (Zeropage Indirect, X) case AM_IZX: // Indexed (Zeropage Indirect, X)
nTarget8 += regs.x; nTarget8 = (nTarget8 + regs.x) & 0xFF;
*pTargetPartial_ = nTarget8; *pTargetPartial_ = nTarget8;
*pTargetPointer_ = *(LPWORD)(mem + nTarget8); *pTargetPointer_ = *(LPWORD)(mem + nTarget8);
if (pTargetBytes_) if (pTargetBytes_)

4
source/Debugger/Debugger_Display.cpp
View File

@@ -1502,7 +1502,7 @@ int GetDisassemblyLine ( WORD nBaseAddress, DisasmLine_t & line_ )
{ {
nTarget = pData->nTargetAddress; nTarget = pData->nTargetAddress;
} else { } else {
nTarget = *(LPWORD)(mem+nBaseAddress+1); nTarget = mem[(nBaseAddress+1)&0xFFFF] | (mem[(nBaseAddress+2)&0xFFFF]<<8);
if (nOpbyte == 2) if (nOpbyte == 2)
nTarget &= 0xFF; nTarget &= 0xFF;
} }
@@ -1742,7 +1742,7 @@ void FormatOpcodeBytes ( WORD nBaseAddress, DisasmLine_t & line_ )
for( int iByte = 0; iByte < nMaxOpBytes; iByte++ ) for( int iByte = 0; iByte < nMaxOpBytes; iByte++ )
{ {
BYTE nMem = (unsigned)*(mem+nBaseAddress + iByte); BYTE nMem = mem[(nBaseAddress+iByte)&0xFFFF];
sprintf( pDst, "%02X", nMem ); // sBytes+strlen(sBytes) sprintf( pDst, "%02X", nMem ); // sBytes+strlen(sBytes)
pDst += 2; pDst += 2;