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

small subtlety with the $4f relocation record

Browse Source 
the low-byte of the address is stored in the relocation record and needs to be accounted for.
This commit is contained in:
Kelvin Sherlock 2019-12-21 23:35:56 -05:00
parent e52e7921ef
commit 5ee80c8b51
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
link.cpp
View File

@ -348,11 +348,13 @@ static void process_reloc(byte_view &data, cookie &cookie) {
} else {
// offset already adjusted by start so below comparisons are wrong.
switch(flag & (0x80 | 0x40 | 0x20)) {
case 0:
switch(flag & 0xf0) {
case 0x00:
case 0x10:
size = 1;
break;
case 0x20:
case 0x30:
size = 3;
break;
case 0x40:
@ -360,6 +362,7 @@ static void process_reloc(byte_view &data, cookie &cookie) {
shift = -8;
break;
case 0x80:
case 0x90:
size = 2;
break;
default: /* bad size */
@ -378,6 +381,7 @@ static void process_reloc(byte_view &data, cookie &cookie) {
if (flag & 0x40) {
/* value is already shifted, so need to adjust back */
value <<= 8;
value += x; /* low-byte of address */
value -= 0x8000;
assert(!external);
}