Apple-2-SW/merlin-utils
1
0
Fork 0
mirror of https://github.com/ksherlock/merlin-utils.git synced 2025-01-20 02:31:07 +00:00
Code Issues Projects Releases Wiki Activity

use ENT opcode to print symbol table.

Browse Source
This commit is contained in:
Kelvin Sherlock 2020-06-03 10:57:05 -04:00
parent 26676ede7d
commit ef618dc449
1 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
link.cpp
View File

@ -1,6 +1,7 @@
/* c++17 */ /* c++17 */
#include <algorithm> #include <algorithm>
#include <numeric>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <system_error> #include <system_error>
@ -645,14 +646,15 @@ static void resolve(bool allow_unresolved = false) {
} }
static void print_symbols2(void) { static void print_symbols2(const std::vector<size_t> &ix) {
size_t len = 8; size_t len = 8;
for (const auto &e : symbol_table) { for (const auto &e : symbol_table) {
len = std::max(len, e.name.size()); len = std::max(len, e.name.size());
} }
for (const auto &e : symbol_table) { for (auto i : ix) {
const auto &e = symbol_table[i];
char q = ' '; char q = ' ';
if (!e.count) q = '?'; if (!e.count) q = '?';
if (!e.defined) q = '!'; if (!e.defined) q = '!';
@ -666,18 +668,47 @@ static void print_symbols(void) {
if (symbol_table.empty()) return; if (symbol_table.empty()) return;
std::vector<size_t> ix(symbol_table.size());
std::iota(ix.begin(), ix.end(), 0);
/* alpha */ /* alpha */
fputs("\nSymbol table, alphabetical order:\n", stdout); fputs("\nSymbol table, alphabetical order:\n", stdout);
std::sort(ix.begin(), ix.end(), [&](const size_t a, const size_t b){
const symbol &aa = symbol_table[a];
const symbol &bb = symbol_table[b];
return aa.name < bb.name;
});
#if 0
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.name < b.name; return a.name < b.name;
}); });
#endif
print_symbols2(ix);
print_symbols2(); std::iota(ix.begin(), ix.end(), 0);
fputs("\nSymbol table, numerical order:\n", stdout); fputs("\nSymbol table, numerical order:\n", stdout);
/* numeric, factoring in segment #, absolute first */ /* numeric, factoring in segment #, absolute first */
std::sort(ix.begin(), ix.end(), [&](const size_t a, const size_t b){
const symbol &aa = symbol_table[a];
const symbol &bb = symbol_table[b];
/* absolute have a segment # of 0 so will sort first */
auto aaa = std::make_pair(aa.segment, aa.value);
auto bbb = std::make_pair(bb.segment, bb.value);
return aaa < bbb;
});
#if 0
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){
/* absolute have a segment # of 0 so will sort first */ /* absolute have a segment # of 0 so will sort first */
@ -686,8 +717,8 @@ static void print_symbols(void) {
return aa < bb; return aa < bb;
}); });
#endif
print_symbols2(); print_symbols2(ix);
fputs("\n", stdout); fputs("\n", stdout);
} }
@ -728,9 +759,6 @@ void finish(void) {
check_exd(); check_exd();
/* OP_ENT should print symbols */
print_symbols();
segments.clear(); segments.clear();
relocations.clear(); relocations.clear();
} }
@ -1249,6 +1277,10 @@ void evaluate(label_t label, opcode_t opcode, const char *cursor) {
break; break;
} }
case OP_ENT:
print_symbols();
break;
case OP_KBD: { case OP_KBD: {
char buffer[256]; char buffer[256];