Apple-2-SW/merlin-utils
1
0
Fork 0
mirror of https://github.com/ksherlock/merlin-utils.git synced 2024-12-26 21:30:47 +00:00
Code Issues Projects Releases Wiki Activity

improved sorting for symbol table printing.

Browse Source 
numerical order now prints absolute values first and factors in the segment number (starting at 1) when sorting others.
This commit is contained in:
Kelvin Sherlock 2019-12-21 17:35:01 -05:00
parent 5e6829e9ae
commit 3b95cbb475
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
link.cpp
View File

@ -573,11 +573,18 @@ static void resolve(void) {
static void print_symbols2(void) { static void print_symbols2(void) {
size_t len = 8;
for (const auto &e : symbol_table) {
len = std::max(len, e.name.size());
}
for (const auto &e : symbol_table) { for (const auto &e : symbol_table) {
char q = ' '; char q = ' ';
if (!e.count) q = '?'; if (!e.count) q = '?';
if (!e.defined) q = '!'; if (!e.defined) q = '!';
fprintf(stdout, "%c %-20s=$%06x\n", q, e.name.c_str(), e.value); uint32_t value = e.value;
if (!e.absolute) value += (e.segment << 16);
fprintf(stdout, "%c %-*s=$%06x\n", q, (int)len, e.name.c_str(), value);
} }
} }
@ -596,10 +603,14 @@ static void print_symbols(void) {
fputs("\nSymbol table, numerical order:\n", stdout); fputs("\nSymbol table, numerical order:\n", stdout);
/* numeric */ /* numeric, factoring in segment #, absolute first */
std::sort(symbol_table.begin(), symbol_table.end(), std::sort(symbol_table.begin(), symbol_table.end(),
[](const symbol &a, const symbol &b){ [](const symbol &a, const symbol &b){
return a.value < b.value; /* absolute have a segment # of 0 so will sort first */
auto aa = std::make_pair(a.segment, a.value);
auto bb = std::make_pair(b.segment, b.value);
return aa < bb;
}); });
print_symbols2(); print_symbols2();