From 65cfe89e00e83acd19e1668f1fe89331ab6290f2 Mon Sep 17 00:00:00 2001 From: michaelangel007 Date: Thu, 28 Aug 2014 22:23:47 -0700 Subject: [PATCH] Debugger 2.8.0.1 fix: DB range to auto-generate symbol name: B_#### --- source/Debugger/Debugger_DisassemblerData.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/source/Debugger/Debugger_DisassemblerData.cpp b/source/Debugger/Debugger_DisassemblerData.cpp index 82d1edd3..9a29018b 100644 --- a/source/Debugger/Debugger_DisassemblerData.cpp +++ b/source/Debugger/Debugger_DisassemblerData.cpp @@ -86,7 +86,13 @@ WORD _CmdDefineByteRange(int nArgs,int iArg,DisasmData_t & tData_) if( nArgs > 1 ) { - pSymbolName = g_aArgs[ 1 ].sArg; + if( g_aArgs[ 2 ].eToken == TOKEN_COLON ) // // 2.8.0.1 Bug fix: DB range + { + sprintf( aSymbolName, "B_%04X", tData_.nStartAddress ); + pSymbolName = aSymbolName; + } + else + pSymbolName = g_aArgs[ 1 ].sArg; } else { @@ -215,13 +221,20 @@ Update_t _CmdDisasmDataDefByteX (int nArgs) // To "return to code" use ."X" int iCmd = g_aArgs[0].nValue - NOP_BYTE_1; - if (nArgs > 3) // ! ((nArgs < 2) || (nArgs == 4))) + if (nArgs > 4) // 2.8.0.1 Bug fix: DB 174E:175E { return Help_Arg_1( CMD_DEFINE_DATA_BYTE1 + iCmd ); } DisasmData_t tData; int iArg = 2; + + if (nArgs == 3 ) // 2.8.0.1 DB range + { + if ( g_aArgs[ 2 ].eToken == TOKEN_COLON ) + iArg = 1; + } + WORD nAddress = _CmdDefineByteRange( nArgs, iArg, tData ); // TODO: Allow user to select which assembler to use for displaying directives!