gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sort symbols by address, then parentage, then index (#1186)

Browse Source
This commit is contained in:
Rangi
2023-11-02 18:58:25 -04:00
committed by GitHub
parent 55f946198b
commit 9e4b9e75e3
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/link/output.c
View File

@@ -11,6 +11,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "link/output.h" #include "link/output.h"
#include "link/main.h" #include "link/main.h"
@@ -325,7 +326,7 @@ static void printSymName(char const *name)
} }
// Comparator function for `qsort` to sort symbols // Comparator function for `qsort` to sort symbols
// Symbols are ordered by address, or else by original index for a stable sort // Symbols are ordered by address, then by parentage, or else by original index for a stable sort
static int compareSymbols(void const *a, void const *b) static int compareSymbols(void const *a, void const *b)
{ {
struct SortedSymbol const *sym1 = (struct SortedSymbol const *)a; struct SortedSymbol const *sym1 = (struct SortedSymbol const *)a;
@@ -334,6 +335,24 @@ static int compareSymbols(void const *a, void const *b)
if (sym1->addr != sym2->addr) if (sym1->addr != sym2->addr)
return sym1->addr < sym2->addr ? -1 : 1; return sym1->addr < sym2->addr ? -1 : 1;
char const *sym1_name = sym1->sym->name;
char const *sym2_name = sym2->sym->name;
bool sym1_local = !!strchr(sym1_name, '.');
bool sym2_local = !!strchr(sym2_name, '.');
if (sym1_local != sym2_local) {
size_t sym1_len = strlen(sym1_name);
size_t sym2_len = strlen(sym2_name);
// Sort parent labels before their child local labels
if (!strncmp(sym1_name, sym2_name, sym1_len) && sym2_name[sym1_len] == '.')
return -1;
if (!strncmp(sym2_name, sym1_name, sym2_len) && sym1_name[sym2_len] == '.')
return 1;
// Sort local labels before unrelated global labels
return sym1_local ? -1 : 1;
}
return sym1->idx < sym2->idx ? -1 : sym1->idx > sym2->idx ? 1 : 0; return sym1->idx < sym2->idx ? -1 : sym1->idx > sym2->idx ? 1 : 0;
} }