Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-04-25 15:42:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix more broken relocations

Browse Source
This commit is contained in:
hondew 2021-03-21 10:07:09 -04:00
parent e5f25acf1b
commit 1cd32c047c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/asm_processor/asm_processor.py
View File

@ -908,7 +908,6 @@ def parse_source(f, opt, framepointer, input_enc, output_enc, print_source=None)
# same name in fix_objfile().
def convert_func_name(asm_func_name, to_copy):
for sec_name, func_data in to_copy.items():
print(sec_name, func_data)
if func_data and func_data[0][4] == asm_func_name:
return func_data[0][2]
return ''
@ -1193,9 +1192,6 @@ def fixup_objfile(objfile_name, functions, asm_prelude, assembler, output_enc):
for reltab in source.relocated_by:
for rel in reltab.relocations:
rel.sym_index = asm_objfile.symtab.symbol_entries[rel.sym_index].new_index
# I suspect that this is requried for matching. If the after linking the
# binary doesn't match, retry after commenting out the following line:
rel.r_addend = 0
if sectype == '.rodata' and rel.r_offset in moved_late_rodata:
rel.r_offset = moved_late_rodata[rel.r_offset]
new_data = b''.join(rel.to_bin() for rel in reltab.relocations)
@ -1266,6 +1262,7 @@ def run(argv, outfile=sys.stdout.buffer):
try:
run_wrapped(argv, outfile)
except Failure as e:
print("Error:", e, file=sys.stderr)
sys.exit(1)
if __name__ == "__main__":