ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bugs in recent debugger commits: remove some spaces, fix some totally messed up replacements; fix an old bug that would have made the wrong bank' symbol get used for replacing an address

This commit is contained in:
zeromus 2017-12-04 02:15:29 +00:00
parent 7fdba82d67
commit c7df3a0123
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
trunk/src/drivers/win/debuggersp.cpp
View File

@ -525,11 +525,19 @@ void replaceNames(Name* list, char* str, std::vector<uint16>* addressesLog)
char* pos; char* pos;
char* src; char* src;
Name* listRoot = list;
while (list) while (list)
{ {
if (list->name) if (list->name)
{ {
// find and replace substrings //don't do replacements if we're not mapped appropriately
if(listRoot != getNamesPointerForAddress(list->offsetNumeric))
{
list = list->next;
continue;
}
*buff = 0; *buff = 0;
src = str; src = str;
@ -551,6 +559,12 @@ void replaceNames(Name* list, char* str, std::vector<uint16>* addressesLog)
//first, check for the (potentially) shortened zero page address //first, check for the (potentially) shortened zero page address
pos = strstr(src, test); pos = strstr(src, test);
if(pos)
{
//next character must not be another part of a longer hex value
if(pos[3] >= '0' && pos[3] <= '9') pos = NULL;
else if(pos[3] >= 'A' && pos[3] <= 'F') pos = NULL;
}
if(!pos) if(!pos)
{ {
//if we didnt find that, check for the full $ABCD thing //if we didnt find that, check for the full $ABCD thing
@ -581,8 +595,6 @@ void replaceNames(Name* list, char* str, std::vector<uint16>* addressesLog)
strcat(buff, list->name); strcat(buff, list->name);
//begin processing after that offset //begin processing after that offset
src = pos + myAddrlen; src = pos + myAddrlen;
//append a space.. unless what's next is an RParen, I guess
if(*src != ')' && *src != ',' && *src != 0) strcat(buff," ");
if (addressesLog) if (addressesLog)
addressesLog->push_back(list->offsetNumeric); addressesLog->push_back(list->offsetNumeric);