6502/x65
1
0
Fork 0
mirror of https://github.com/ksherlock/x65.git synced 2024-06-08 11:32:33 +00:00
Code Issues Projects Releases Wiki Activity

Disassembler calling graph skips fallthrough labels

Browse Source 
- significantly cleaner calling graph in complex projects.
This commit is contained in:
Carl-Henrik Skårstedt 2016-01-14 22:08:38 -08:00
parent 1f50f07c24
commit 5b9e5f6d46
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
disassembler/x65dsasm.cpp
View File

@ -2037,19 +2037,22 @@ static const char *aRefStr[] = {
static void printCalls(const int curr_ref, const call_ref *pCalls, const int num_calls, const seg_call *pLookup, const int num_lookup, char *visited, char *included, char *prefix, RefType rtype, FILE *f)
{
RefAddr &ra = refs[curr_ref];
if (ra.label)
_lblName.copy(ra.label);
else
_lblName.sprintf("%s_%d", ra.local ? ".l" : (ra.data==DT_CODE ? "Code" :
(ra.address>=0 && ra.address<0x100 ? "zp" : "Data")), ra.number);
if (rtype != RT_FALLTHROUGH) {
RefAddr &ra = refs[curr_ref];
if (ra.label)
_lblName.copy(ra.label);
else
_lblName.sprintf("%s_%d", ra.local ? ".l" : (ra.data==DT_CODE ? "Code" :
(ra.address>=0 && ra.address<0x100 ? "zp" : "Data")), ra.number);
fprintf(f, "%s" STRREF_FMT " ($%x) [%s]%s\n", prefix, STRREF_ARG(_lblName), pLookup[curr_ref].address, aRefStr[rtype], (visited[curr_ref>>3] & 1<<(curr_ref&7)) ? " ...":"");
if (visited[curr_ref>>3] & 1<<(curr_ref&7))
return;
fprintf(f, "%s" STRREF_FMT " ($%x) [%s]%s\n", prefix, STRREF_ARG(_lblName), pLookup[curr_ref].address, aRefStr[rtype], (visited[curr_ref>>3] & 1<<(curr_ref&7)) ? " ...":"");
if (visited[curr_ref>>3] & 1<<(curr_ref&7))
return;
strcpy(prefix+strlen(prefix), " ");
}
visited[curr_ref>>3] |= 1<<(curr_ref&7);
included[curr_ref>>3] |= 1<<(curr_ref&7);
strcpy(prefix+strlen(prefix), " ");
for (int j = 0; j<pLookup[curr_ref].num_calls_in_seg; j++) {
int next_ref = pCalls[pLookup[curr_ref].first_call_in_seg + j].seg_trg;
if ((visited[next_ref>>3] & 1<<(next_ref&7)) == 0) {
@ -2057,7 +2060,8 @@ static void printCalls(const int curr_ref, const call_ref *pCalls, const int num
printCalls(next_ref, pCalls, num_calls, pLookup, num_lookup, visited, included, prefix, next_type, f);
}
}
prefix[strlen(prefix)-2] = 0;
if (rtype != RT_FALLTHROUGH)
prefix[strlen(prefix)-2] = 0;
}