Apple-2-SW
/
merlin-utils
mirror of https://github.com/ksherlock/merlin-utils.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

sort relocation records 

fix value for external labels.
This commit is contained in:
Kelvin Sherlock 2019-12-11 00:27:04 -05:00
parent e3aa60be6a
commit 515594346f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
link.cpp
View File

@ -221,12 +221,10 @@ void process_reloc(byte_view &data, cookie &cookie) {
if (size > 1) value -= 0x8000;
value += cookie.begin;
}
/* external resolutions are deferred for later */
if (external) {
/* x = local symbol # */
pending_reloc r;
@ -243,7 +241,7 @@ void process_reloc(byte_view &data, cookie &cookie) {
omf::reloc r;
r.size = size;
r.offset = offset;
r.value = value;
r.value = value + cookie.begin;
r.shift = shift;
seg.relocs.emplace_back(r);
@ -362,6 +360,11 @@ void resolve(void) {
seg.relocs.emplace_back(r);
}
relocations.clear();
/* sort them */
std::sort(seg.relocs.begin(), seg.relocs.end(), [](const omf::reloc &a, const omf::reloc &b){
return a.offset < b.offset;
});
}
static void print_symbols2(void) {