empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger 2.7.0.35

Browse source 
.35 Added: DW address -- round the length up to even number for convenience. Example: DW 6062 is equivalent to: DW 6062:6063
.34 Fixed: Unified auto-defined name: B_, W_, T_ for byte, word, or text respectively
This commit is contained in:
michaelangel007 2014-09-01 09:49:55 -07:00
parent 346a171310
commit 3a0d2697e4
2 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/Debugger_Changelog.txt
View file

@ -2,6 +2,8 @@
2.8.0.0 Released with AppleWin 1.25 2.8.0.0 Released with AppleWin 1.25
2.7.0.# 2.7.0.#
.35 Added: DW address -- round the length up to even number for convenience. Example: DW 6062 is equivalent to: DW 6062:6063
.34 Fixed: Unified auto-defined name: B_, W_, T_ for byte, word, or text respectively
.33 Fixed: ASC range -- auto-define symbol name: T_#### .33 Fixed: ASC range -- auto-define symbol name: T_####
.32 Fixed: DW range -- auto-define symbol name: W_#### .32 Fixed: DW range -- auto-define symbol name: W_####
.31 Fixed: DB range -- auto-define symbol name B_#### .31 Fixed: DB range -- auto-define symbol name B_####

43
source/Debugger/Debugger_DisassemblerData.cpp
View file

@ -68,6 +68,14 @@ WORD _CmdDefineByteRange(int nArgs,int iArg,DisasmData_t & tData_)
} }
} }
// 2.7.0.35 DW address -- round the length up to even number for convenience.
// Example: 'DW 6062' is equivalent to: 'DW 6062:6063'
if( g_iCommand == CMD_DEFINE_DATA_WORD1 )
{
if( ~nLen & 1 )
nLen++;
}
tData_.nStartAddress = nAddress; tData_.nStartAddress = nAddress;
tData_.nEndAddress = nAddress + nLen; tData_.nEndAddress = nAddress + nLen;
// tData_.nArraySize = 0; // tData_.nArraySize = 0;
@ -75,30 +83,35 @@ WORD _CmdDefineByteRange(int nArgs,int iArg,DisasmData_t & tData_)
char *pSymbolName = ""; char *pSymbolName = "";
char aSymbolName[ 32 ]; char aSymbolName[ 32 ];
SymbolTable_Index_e eSymbolTable = SYMBOLS_ASSEMBLY; SymbolTable_Index_e eSymbolTable = SYMBOLS_ASSEMBLY;
bool bAutoDefineName = false; // 2.7.0.34
if( nArgs > 1 ) if( nArgs > 1 )
{ {
if( g_aArgs[ 2 ].eToken == TOKEN_COLON ) // 2.7.0.31 Bug fix: DB range, i.e. DB 174E:174F if( g_aArgs[ 2 ].eToken == TOKEN_COLON ) // 2.7.0.31 Bug fix: DB range, i.e. DB 174E:174F
{ bAutoDefineName = true;
if( g_iCommand == CMD_DEFINE_DATA_STR )
sprintf( aSymbolName, "T_%04X", tData_.nStartAddress ); // ASC range
else
if( g_iCommand == CMD_DEFINE_DATA_WORD1 )
sprintf( aSymbolName, "W_%04X", tData_.nStartAddress ); // DW range
else
sprintf( aSymbolName, "B_%04X", tData_.nStartAddress ); // DB range
pSymbolName = aSymbolName;
}
else else
pSymbolName = g_aArgs[ 1 ].sArg; pSymbolName = g_aArgs[ 1 ].sArg;
} }
else else
{ {
// 'DB' with 1 arg bAutoDefineName = true;
// DB 801 }
// auto define D_# DB $XX
sprintf( aSymbolName, "D_%04X", tData_.nStartAddress ); // 2.7.0.34 Unified auto-defined name: B_, W_, T_ for byte, word, or text respectively
pSymbolName = aSymbolName; // Old name: auto define D_# DB $XX
// Example 'DB' or 'DW' with 1 arg
// DB 801
if( bAutoDefineName )
{
if( g_iCommand == CMD_DEFINE_DATA_STR )
sprintf( aSymbolName, "T_%04X", tData_.nStartAddress ); // ASC range
else
if( g_iCommand == CMD_DEFINE_DATA_WORD1 )
sprintf( aSymbolName, "W_%04X", tData_.nStartAddress ); // DW range
else
sprintf( aSymbolName, "B_%04X", tData_.nStartAddress ); // DB range
pSymbolName = aSymbolName;
} }
// bRemoveSymbol = false // use arg[2] // bRemoveSymbol = false // use arg[2]