nicolas
/
copapy
mirror of https://github.com/Nonannet/copapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for allowing different jump/call instruction lengths

This commit is contained in:
Nicolas 2025-10-30 14:01:55 +01:00
parent 9fa5c82650
commit 0ff43e62ab
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/copapy/_stencils.py
View File

@ -5,9 +5,6 @@ import pelfy
ByteOrder = Literal['little', 'big'] ByteOrder = Literal['little', 'big']
# on x86_64: call or jmp instruction when tail call optimized
LENGTH_CALL_INSTRUCTION = 5
@dataclass @dataclass
class patch_entry: class patch_entry:
""" """
@ -75,7 +72,17 @@ def get_last_call_in_function(func: elf_symbol) -> int:
# Find last relocation in function # Find last relocation in function
assert func.relocations, f'No call function in stencil function {func.name}.' assert func.relocations, f'No call function in stencil function {func.name}.'
reloc = func.relocations[-1] reloc = func.relocations[-1]
return reloc.fields['r_offset'] - func.fields['st_value'] - reloc.fields['r_addend'] - LENGTH_CALL_INSTRUCTION print(f"reloc.fields['r_addend'] {reloc.fields['r_addend']}")
instruction_lenghs = 4 if reloc.bits < 32 else 5
return reloc.fields['r_offset'] - func.fields['st_value'] - reloc.fields['r_addend'] - instruction_lenghs
def get_op_after_last_call_in_function(func: elf_symbol) -> int:
# Find last relocation in function
assert func.relocations, f'No call function in stencil function {func.name}.'
reloc = func.relocations[-1]
return reloc.fields['r_offset'] - func.fields['st_value'] - reloc.fields['r_addend']
def symbol_is_stencil(sym: elf_symbol) -> bool: def symbol_is_stencil(sym: elf_symbol) -> bool:
@ -152,6 +159,7 @@ class stencil_database():
print('->', symbol_name) print('->', symbol_name)
for reloc in symbol.relocations: for reloc in symbol.relocations:
print(' ', symbol_name, arm_hi_byte_flag, reloc.symbol.info)
patch_offset = reloc.fields['r_offset'] - symbol.fields['st_value'] - start_index patch_offset = reloc.fields['r_offset'] - symbol.fields['st_value'] - start_index
@ -223,7 +231,7 @@ class stencil_database():
index = get_last_call_in_function(func) index = get_last_call_in_function(func)
return func.data[:index] return func.data[:index]
elif part == 'end': elif part == 'end':
index = get_last_call_in_function(func) index = get_op_after_last_call_in_function(func)
return func.data[index + LENGTH_CALL_INSTRUCTION:] return func.data[index:]
else: else:
return func.data return func.data