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

Use std::vector for sorted symbols

Browse Source
This commit is contained in:
Rangi42
2024-02-21 15:26:32 -05:00
committed by Sylvie
parent b74b40abd2
commit 2df4fff6c9
1 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/link/output.cpp
View File

@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: MIT */ /* SPDX-License-Identifier: MIT */
#include <algorithm>
#include <assert.h> #include <assert.h>
#include <deque> #include <deque>
#include <inttypes.h> #include <inttypes.h>
@@ -7,6 +8,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <vector>
#include "link/output.hpp" #include "link/output.hpp"
#include "link/main.hpp" #include "link/main.hpp"
@@ -29,7 +31,6 @@ FILE *mapFile;
struct SortedSymbol { struct SortedSymbol {
struct Symbol const *sym; struct Symbol const *sym;
uint32_t idx;
uint16_t addr; uint16_t addr;
}; };
@@ -285,18 +286,15 @@ static void printSymName(char const *name)
} }
} }
// Comparator function for `qsort` to sort symbols // Comparator function for `std::stable_sort` to sort symbols
// Symbols are ordered by address, then by parentage, or else by original index for a stable sort // Symbols are ordered by address, then by parentage
static int compareSymbols(void const *a, void const *b) static int compareSymbols(struct SortedSymbol const &sym1, struct SortedSymbol const &sym2)
{ {
struct SortedSymbol const *sym1 = (struct SortedSymbol const *)a; if (sym1.addr != sym2.addr)
struct SortedSymbol const *sym2 = (struct SortedSymbol const *)b; return sym1.addr < sym2.addr ? -1 : 1;
if (sym1->addr != sym2->addr) char const *sym1_name = sym1.sym->name;
return sym1->addr < sym2->addr ? -1 : 1; char const *sym2_name = sym2.sym->name;
char const *sym1_name = sym1->sym->name;
char const *sym2_name = sym2->sym->name;
bool sym1_local = strchr(sym1_name, '.'); bool sym1_local = strchr(sym1_name, '.');
bool sym2_local = strchr(sym2_name, '.'); bool sym2_local = strchr(sym2_name, '.');
@@ -313,7 +311,7 @@ static int compareSymbols(void const *a, void const *b)
return sym1_local ? -1 : 1; return sym1_local ? -1 : 1;
} }
return sym1->idx < sym2->idx ? -1 : sym1->idx > sym2->idx ? 1 : 0; return 0;
} }
/* /*
@@ -343,40 +341,31 @@ static void writeSymBank(struct SortedSections const &bankSections,
if (!nbSymbols) if (!nbSymbols)
return; return;
struct SortedSymbol *symList = (struct SortedSymbol *)malloc(sizeof(*symList) * nbSymbols); std::vector<struct SortedSymbol> symList;
if (!symList) symList.reserve(nbSymbols);
err("Failed to allocate symbol list");
nbSymbols = 0;
forEachSortedSection(sect, { forEachSortedSection(sect, {
for (uint32_t i = 0; i < sect->nbSymbols; i++) { for (uint32_t i = 0; i < sect->nbSymbols; i++) {
if (!canStartSymName(sect->symbols[i]->name[0])) struct Symbol const *sym = sect->symbols[i];
// Don't output symbols that begin with an illegal character
continue; // Don't output symbols that begin with an illegal character
symList[nbSymbols].idx = nbSymbols; if (canStartSymName(sym->name[0]))
symList[nbSymbols].sym = sect->symbols[i]; symList.push_back({ .sym = sym, .addr = (uint16_t)(sym->offset + sect->org) });
symList[nbSymbols].addr = symList[nbSymbols].sym->offset + sect->org;
nbSymbols++;
} }
}); });
#undef forEachSortedSection #undef forEachSortedSection
qsort(symList, nbSymbols, sizeof(*symList), compareSymbols); std::stable_sort(RANGE(symList), compareSymbols);
uint32_t symBank = bank + sectionTypeInfo[type].firstBank; uint32_t symBank = bank + sectionTypeInfo[type].firstBank;
for (uint32_t i = 0; i < nbSymbols; i++) { for (struct SortedSymbol &sym : symList) {
struct SortedSymbol *sym = &symList[i]; fprintf(symFile, "%02" PRIx32 ":%04" PRIx16 " ", symBank, sym.addr);
printSymName(sym.sym->name);
fprintf(symFile, "%02" PRIx32 ":%04" PRIx16 " ", symBank, sym->addr);
printSymName(sym->sym->name);
putc('\n', symFile); putc('\n', symFile);
} }
free(symList);
} }
static void writeEmptySpace(uint16_t begin, uint16_t end) static void writeEmptySpace(uint16_t begin, uint16_t end)