Apple-2-SW/merlin-utils
1
0
Fork 0
mirror of https://github.com/ksherlock/merlin-utils.git synced 2025-01-27 17:30:56 +00:00
Code Issues Projects Releases Wiki Activity

merlin uses the same loadname for all segments.

Browse Source
This commit is contained in:
Kelvin Sherlock 2019-12-22 14:43:12 -05:00
parent 5ee80c8b51
commit 30d26b7828
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
link.cpp
View File

@ -175,6 +175,7 @@ namespace {
std::unordered_map<std::string, uint32_t> local_symbol_table; std::unordered_map<std::string, uint32_t> local_symbol_table;
std::string loadname;
} }
@ -917,6 +918,7 @@ void evaluate(label_t label, opcode_t opcode, const char *cursor) {
/* use 1st SAV as the path */ /* use 1st SAV as the path */
if (save_file.empty()) save_file = path; if (save_file.empty()) save_file = path;
if (loadname.empty()) loadname = base;
/* /*
lkv 0 = binary linker (unsupported) lkv 0 = binary linker (unsupported)
@ -929,7 +931,7 @@ void evaluate(label_t label, opcode_t opcode, const char *cursor) {
/* merlin link uses a 10-char fixed label */ /* merlin link uses a 10-char fixed label */
//base.resize(10, ' '); //base.resize(10, ' ');
seg.segname = base; seg.segname = base;
seg.loadname = base; seg.loadname = loadname;
// seg.kind = kind; // seg.kind = kind;
} }