Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-10-31 20:08:02 +00:00
Code Issues Projects Releases Wiki Activity

Debugger cleanup

Browse Source
This commit is contained in:
michaelangel007 2023-03-26 11:13:11 -07:00
parent e5b6a819da
commit 86f71cb3d7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/Debugger/Debugger_Assembler.cpp
View File

@ -430,9 +430,9 @@ Fx BEQ r SBC (d),Y sbc (z) --- --- SBC d,X INC z,X --- SED SBC a,Y
//=========================================================================== //===========================================================================
bool _6502_CalcRelativeOffset( int nOpcode, int nBaseAddress, int nTargetAddress, WORD * pTargetOffset_ ) bool _6502_CalcRelativeOffset ( int nOpcode, int nBaseAddress, int nTargetAddress, WORD * pTargetOffset_ )
{ {
if (_6502_IsOpcodeBranch( nOpcode)) if (_6502_IsOpcodeBranch(nOpcode))
{ {
// Branch is // Branch is
// a) relative to address+2 // a) relative to address+2
@ -450,7 +450,7 @@ bool _6502_CalcRelativeOffset( int nOpcode, int nBaseAddress, int nTargetAddress
// BaseAddress // BaseAddress
int nDistance = nTargetAddress - nBaseAddress; int nDistance = nTargetAddress - nBaseAddress;
if (pTargetOffset_) if (pTargetOffset_)
*pTargetOffset_ = (BYTE)(nDistance - 2); *pTargetOffset_ = (BYTE)(nDistance - 2);
if ((nDistance - 2) > _6502_BRANCH_POS) if ((nDistance - 2) > _6502_BRANCH_POS)
m_iAsmAddressMode = NUM_OPMODES; // signal bad m_iAsmAddressMode = NUM_OPMODES; // signal bad
@ -473,7 +473,7 @@ int _6502_GetOpmodeOpbyte ( const int nBaseAddress, int & iOpmode_, int & nOpby
{ {
GetFrame().FrameMessageBox("Debugger not properly initialized", "ERROR", MB_OK ); GetFrame().FrameMessageBox("Debugger not properly initialized", "ERROR", MB_OK );
g_aOpcodes = & g_aOpcodes65C02[ 0 ]; // Enhanced Apple //e g_aOpcodes = &g_aOpcodes65C02[ 0 ]; // Enhanced Apple //e
g_aOpmodes[ AM_2 ].m_nBytes = 2; g_aOpmodes[ AM_2 ].m_nBytes = 2;
g_aOpmodes[ AM_3 ].m_nBytes = 3; g_aOpmodes[ AM_3 ].m_nBytes = 3;
} }
@ -498,8 +498,8 @@ int _6502_GetOpmodeOpbyte ( const int nBaseAddress, int & iOpmode_, int & nOpby
if ( pData_ ) if ( pData_ )
*pData_ = pData; *pData_ = pData;
const DWORD nEndAddress = pData->nEndAddress; const DWORD nEndAddress = pData->nEndAddress;
const int nDisplayLen = nEndAddress - nBaseAddress + 1; // *inclusive* KEEP IN SYNC: _CmdDefineByteRange() CmdDisasmDataList() _6502_GetOpmodeOpbyte() FormatNopcodeBytes() const int nDisplayLen = nEndAddress - nBaseAddress + 1; // *inclusive* KEEP IN SYNC: _CmdDefineByteRange() CmdDisasmDataList() _6502_GetOpmodeOpbyte() FormatNopcodeBytes()
nSlack = nDisplayLen; nSlack = nDisplayLen;
// Data Disassembler // Data Disassembler
@ -561,13 +561,13 @@ int _6502_GetOpmodeOpbyte ( const int nBaseAddress, int & iOpmode_, int & nOpby
//=========================================================================== //===========================================================================
void _6502_GetOpcodeOpmodeOpbyte ( int & iOpcode_, int & iOpmode_, int & nOpbyte_ ) void _6502_GetOpcodeOpmodeOpbyte (int & iOpcode_, int & iOpmode_, int & nOpbyte_)
{ {
iOpcode_ = _6502_GetOpmodeOpbyte( regs.pc, iOpmode_, nOpbyte_ ); iOpcode_ = _6502_GetOpmodeOpbyte( regs.pc, iOpmode_, nOpbyte_ );
} }
//=========================================================================== //===========================================================================
bool _6502_GetStackReturnAddress ( WORD & nAddress_ ) bool _6502_GetStackReturnAddress (WORD & nAddress_)
{ {
unsigned nStack = regs.sp; unsigned nStack = regs.sp;
nStack++; nStack++;
@ -586,7 +586,7 @@ bool _6502_GetStackReturnAddress ( WORD & nAddress_ )
//=========================================================================== //===========================================================================
bool _6502_GetTargets ( WORD nAddress, int *pTargetPartial_, int *pTargetPartial2_, int *pTargetPointer_, int * pTargetBytes_, bool _6502_GetTargets (WORD nAddress, int *pTargetPartial_, int *pTargetPartial2_, int *pTargetPointer_, int * pTargetBytes_,
bool bIgnoreBranch /*= true*/, bool bIncludeNextOpcodeAddress /*= true*/ ) bool bIgnoreBranch /*= true*/, bool bIncludeNextOpcodeAddress /*= true*/ )
{ {
if (! pTargetPartial_) if (! pTargetPartial_)