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

Sort .sym files in ascending order, and test for it (#1355)

Browse Source
This commit is contained in:
Sylvie
2024-03-13 18:32:35 -04:00
committed by GitHub
parent 658286c8e4
commit 8ec0d01fc4
7 changed files with 64 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/link/output.cpp
View File

@@ -284,9 +284,9 @@ static void printSymName(char const *name) {
// Comparator function for `std::stable_sort` to sort symbols
// Symbols are ordered by address, then by parentage
static int compareSymbols(SortedSymbol const &sym1, SortedSymbol const &sym2) {
static bool compareSymbols(SortedSymbol const &sym1, SortedSymbol const &sym2) {
if (sym1.addr != sym2.addr)
return sym1.addr < sym2.addr ? -1 : 1;
return sym1.addr < sym2.addr;
std::string const &sym1_name = sym1.sym->name;
std::string const &sym2_name = sym2.sym->name;
@@ -299,14 +299,14 @@ static int compareSymbols(SortedSymbol const &sym1, SortedSymbol const &sym2) {
// Sort parent labels before their child local labels
if (sym2_name.starts_with(sym1_name) && sym2_name[sym1_len] == '.')
return -1;
return true;
if (sym1_name.starts_with(sym2_name) && sym1_name[sym2_len] == '.')
return 1;
return false;
// Sort local labels before unrelated global labels
return sym1_local ? -1 : 1;
return sym1_local;
}
return 0;
return false;
}
/*