From 5f0c36fef4bc210fdb8ce18caa1ee89015549de4 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Tue, 27 Jan 2026 16:37:27 +0100 Subject: [PATCH] code style and typehints fixed --- src/pelfy/_fields_data.py | 22 +++++++++++----------- src/pelfy/_main.py | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/pelfy/_fields_data.py b/src/pelfy/_fields_data.py index 459f7ea..ce9cb1b 100644 --- a/src/pelfy/_fields_data.py +++ b/src/pelfy/_fields_data.py @@ -389,18 +389,18 @@ relocation_table_types = { 33: ("R_AMD64_SIZE64", 64, "Z + A"), }, "EM_ARM": { - 0: ("R_ARM_NONE", 0, ""), + 0: ("R_ARM_NONE", 0, ""), - 1: ("R_ARM_PC24", 24, "S - P + A"), - 2: ("R_ARM_ABS32", 32, "S + A"), - 3: ("R_ARM_REL32", 32, "S - P + A"), - 4: ("R_ARM_LDR_PC_G0", 12, "S - P + A"), + 1: ("R_ARM_PC24", 24, "S - P + A"), + 2: ("R_ARM_ABS32", 32, "S + A"), + 3: ("R_ARM_REL32", 32, "S - P + A"), + 4: ("R_ARM_LDR_PC_G0", 12, "S - P + A"), - 5: ("R_ARM_ABS16", 16, "S + A"), - 6: ("R_ARM_ABS12", 12, "S + A"), - 7: ("R_ARM_THM_ABS5", 5, "S + A"), - 8: ("R_ARM_ABS8", 8, "S + A"), - 9: ("R_ARM_SBREL32", 32, "S - B + A"), + 5: ("R_ARM_ABS16", 16, "S + A"), + 6: ("R_ARM_ABS12", 12, "S + A"), + 7: ("R_ARM_THM_ABS5", 5, "S + A"), + 8: ("R_ARM_ABS8", 8, "S + A"), + 9: ("R_ARM_SBREL32", 32, "S - B + A"), 10: ("R_ARM_THM_CALL", 22, "S - P + A"), 11: ("R_ARM_THM_PC8", 8, "S - P + A"), @@ -415,7 +415,7 @@ relocation_table_types = { 29: ("R_ARM_JUMP24", 24, "((S + A) - P) >> 2"), 30: ("R_ARM_THM_JUMP24", 24, "((S + A) - P) >> 1"), - 32: ("R_ARM_ALU_PCREL_7_0", 8, "(S - P + A) & 0x000000FF"), + 32: ("R_ARM_ALU_PCREL_7_0", 8, "(S - P + A) & 0x000000FF"), 33: ("R_ARM_ALU_PCREL_15_8", 8, "(S - P + A) & 0x0000FF00"), 34: ("R_ARM_ALU_PCREL_23_15", 9, "(S - P + A) & 0x00FF8000"), diff --git a/src/pelfy/_main.py b/src/pelfy/_main.py index 5b1047b..15a86cd 100644 --- a/src/pelfy/_main.py +++ b/src/pelfy/_main.py @@ -26,7 +26,7 @@ def open_elf_file(file_path: str) -> 'elf_file': return elf_file(f.read()) -def _decode_thumb_branch_imm(field: int, bits: int): +def _decode_thumb_branch_imm(field: int, bits: int) -> int: """ Decode Thumb-2 wide branch immediate. bits: 22 (R_ARM_THM_PC22) or 24 (R_ARM_THM_JUMP24) @@ -35,10 +35,10 @@ def _decode_thumb_branch_imm(field: int, bits: int): h1 = (field >> 16) & 0xFFFF h2 = field & 0xFFFF - S = (h1 >> 10) & 1 + S = (h1 >> 10) & 1 imm10 = h1 & 0x03FF - J1 = (h2 >> 13) & 1 - J2 = (h2 >> 11) & 1 + J1 = (h2 >> 13) & 1 + J2 = (h2 >> 11) & 1 imm11 = h2 & 0x07FF # Decode J1/J2 → I1/I2