diff --git a/docs/Debugger_Changelog.txt b/docs/Debugger_Changelog.txt index b776660a..d0c0c455 100644 --- a/docs/Debugger_Changelog.txt +++ b/docs/Debugger_Changelog.txt @@ -1,4 +1,5 @@ /* +2.9.2.3 Fixed: DB HGR = 2000:3FFF and DB FOO = 300 wasn't parsing correctly from 2.9.1.3. Fix for commit 48e0fe3a. 2.9.2.2 Fixed: DB HGR = 2000:3FFF was displaying help instead of being parsed. 2.9.2.1 Added: Error message when trying to add a symbol > 51 characters. diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp index 6fa18e7e..5a2f21bd 100644 --- a/source/Debugger/Debug.cpp +++ b/source/Debugger/Debug.cpp @@ -53,7 +53,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #define MAKE_VERSION(a,b,c,d) ((a<<24) | (b<<16) | (c<<8) | (d)) // See /docs/Debugger_Changelog.txt for full details - const int DEBUGGER_VERSION = MAKE_VERSION(2,9,2,2); + const int DEBUGGER_VERSION = MAKE_VERSION(2,9,2,3); // Public _________________________________________________________________________________________ diff --git a/source/Debugger/Debugger_DisassemblerData.cpp b/source/Debugger/Debugger_DisassemblerData.cpp index d08a69c4..5761f7e6 100644 --- a/source/Debugger/Debugger_DisassemblerData.cpp +++ b/source/Debugger/Debugger_DisassemblerData.cpp @@ -82,6 +82,9 @@ WORD _GetDataRange (int nArgs, int iArg, DisasmData_t& tData_) else { // DB foo = 300 // nArgs == 3 + // 2.9.2.3: Fixed: DB HGR = 2000:3FFF and DB FOO = 300 wasn't parsing correctly from 2.9.1.3. Fix for commit 48e0fe3a. + if (g_aArgs[iArg].eToken == TOKEN_EQUAL) + iArg++; RangeType_t eRange = Range_Get( nAddress, nAddress2, iArg); if ((eRange == RANGE_HAS_END) || @@ -97,10 +100,7 @@ WORD _GetDataRange (int nArgs, int iArg, DisasmData_t& tData_) // 2.9.1.1 Add: Support for equal sign, also make it optional for command DB // DB FOO 300 // DB FOO = 300 - if (g_aArgs[2].bType == TOKEN_EQUAL) - nAddress = g_aArgs[ 3 ].nValue; - else - nAddress = g_aArgs[ 2 ].nValue; + nAddress = g_aArgs[ iArg ].nValue; } else nAddress = g_aArgs[ 1 ].nValue;