From e3d49069bfdf22e81e42af9479752de69381270a Mon Sep 17 00:00:00 2001 From: Nikita Smith Date: Fri, 21 Aug 2026 01:34:50 -0700 Subject: [PATCH] remove helper for patching symbols and update values directly --- src/linker/lnk.c | 51 +++++++++++++++++------------------ src/linker/lnk_obj.c | 15 ----------- src/linker/lnk_obj.h | 10 +------ src/linker/lnk_symbol_table.c | 8 +++--- 4 files changed, 30 insertions(+), 54 deletions(-) diff --git a/src/linker/lnk.c b/src/linker/lnk.c index f6782ec9..e790b1d9 100644 --- a/src/linker/lnk.c +++ b/src/linker/lnk.c @@ -4069,9 +4069,9 @@ THREAD_POOL_TASK_FUNC(lnk_patch_comdat_leaders_task) } if (should_patch) { - symbol.section_number = section_number; - symbol.value = value; - lnk_obj_symbol_patch(obj, symbol_idx, symbol, LNK_ObjSymbolPatch_Section | LNK_ObjSymbolPatch_Value); + U64 primary_idx = lnk_obj_primary_symbol_idx_from_coff_symbol_idx(obj, symbol_idx); + obj->coff.symbols.section_numbers[primary_idx] = section_number; + obj->coff.symbols.values [primary_idx] = value; } } ProfEnd(); @@ -4230,12 +4230,11 @@ THREAD_POOL_TASK_FUNC(lnk_patch_common_block_leaders_task) LNK_CommonBlockContrib *contrib = &task->u.patch_symtabs.common_block_contribs[contrib_idx]; LNK_Symbol *symbol = contrib->symbol; LNK_ObjSymbolRef symbol_ref = lnk_ref_from_symbol(symbol); - COFF_ParsedSymbol parsed_symbol = lnk_parsed_from_symbol(symbol); U64 section_number = task->u.patch_symtabs.common_block_sect->sect_idx + 1; - parsed_symbol.value = contrib->u.offset; - parsed_symbol.section_number = safe_cast_u32(section_number); - lnk_obj_symbol_patch(symbol_ref.obj, symbol_ref.symbol_idx, parsed_symbol, LNK_ObjSymbolPatch_Value | LNK_ObjSymbolPatch_Section); + U64 primary_idx = lnk_obj_primary_symbol_idx_from_coff_symbol_idx(symbol_ref.obj, symbol_ref.symbol_idx); + symbol_ref.obj->coff.symbols.values [primary_idx] = contrib->u.offset; + symbol_ref.obj->coff.symbols.section_numbers[primary_idx] = safe_cast_u32(section_number); task->u.patch_symtabs.was_symbol_patched[symbol_ref.obj->input_idx][symbol_ref.symbol_idx] = 1; } @@ -4260,10 +4259,10 @@ THREAD_POOL_TASK_FUNC(lnk_patch_common_block_symbols_task) COFF_ParsedSymbol defn_parsed = lnk_parsed_from_symbol(defn); Assert(lnk_interp_from_symbol(defn) == COFF_SymbolValueInterp_Regular); if (defn) { - symbol.section_number = defn_parsed.section_number; - symbol.value = safe_cast_u32(defn_parsed.value); - symbol.storage_class = COFF_SymStorageClass_Static; - lnk_obj_symbol_patch(obj, symbol_idx, symbol, LNK_ObjSymbolPatch_Section | LNK_ObjSymbolPatch_Value | LNK_ObjSymbolPatch_StorageClass); + U64 primary_idx = lnk_obj_primary_symbol_idx_from_coff_symbol_idx(obj, symbol_idx); + obj->coff.symbols.section_numbers[primary_idx] = defn_parsed.section_number; + obj->coff.symbols.values [primary_idx] = safe_cast_u32(defn_parsed.value); + obj->coff.symbols.storage_classes[primary_idx] = COFF_SymStorageClass_Static; } } } @@ -4297,9 +4296,9 @@ THREAD_POOL_TASK_FUNC(lnk_patch_regular_symbols_task) value = sc->u.off + symbol.value; } - symbol.section_number = section_number; - symbol.value = value; - lnk_obj_symbol_patch(obj, symbol_idx, symbol, LNK_ObjSymbolPatch_Section | LNK_ObjSymbolPatch_Value); + U64 primary_idx = lnk_obj_primary_symbol_idx_from_coff_symbol_idx(obj, symbol_idx); + obj->coff.symbols.section_numbers[primary_idx] = section_number; + obj->coff.symbols.values [primary_idx] = value; } } ProfEnd(); @@ -4336,10 +4335,10 @@ lnk_patch_obj_symtab(LNK_SymbolTable *symtab, LNK_Obj *obj, B8 *was_symbol_patch value = fixup_src.value; } - fixup_dst.section_number = section_number; - fixup_dst.value = value; - fixup_dst.storage_class = COFF_SymStorageClass_Static; - lnk_obj_symbol_patch(obj, symbol_idx, fixup_dst, LNK_ObjSymbolPatch_Section | LNK_ObjSymbolPatch_Value | LNK_ObjSymbolPatch_StorageClass); + U64 primary_idx = lnk_obj_primary_symbol_idx_from_coff_symbol_idx(obj, symbol_idx); + obj->coff.symbols.section_numbers[primary_idx] = section_number; + obj->coff.symbols.values [primary_idx] = value; + obj->coff.symbols.storage_classes[primary_idx] = COFF_SymStorageClass_Static; was_symbol_patched[symbol_idx] = 1; } @@ -5012,10 +5011,10 @@ THREAD_POOL_TASK_FUNC(lnk_patch_section_symbols_task) if (sect && (~sect->flags & COFF_SectionFlag_LnkRemove)) { if (~sect->flags & COFF_SectionFlag_MemDiscardable) { LNK_SectionContrib *first_sc = lnk_get_first_section_contrib(sect); - symbol.section_number = safe_cast_u32(first_sc->u.sect_idx + 1); - symbol.value = first_sc->u.off; - symbol.storage_class = COFF_SymStorageClass_Static; - lnk_obj_symbol_patch(obj, symbol_idx, symbol, LNK_ObjSymbolPatch_Section | LNK_ObjSymbolPatch_Value | LNK_ObjSymbolPatch_StorageClass); + U64 primary_idx = lnk_obj_primary_symbol_idx_from_coff_symbol_idx(obj, symbol_idx); + obj->coff.symbols.section_numbers[primary_idx] = safe_cast_u32(first_sc->u.sect_idx + 1); + obj->coff.symbols.values [primary_idx] = first_sc->u.off; + obj->coff.symbols.storage_classes[primary_idx] = COFF_SymStorageClass_Static; } else { lnk_error_obj(LNK_Error_SectRefsDiscardedMemory, obj, "symbol %S (No. 0x%llx) references section with discard flag", symbol_name, symbol_idx); } @@ -5033,10 +5032,10 @@ THREAD_POOL_TASK_FUNC(lnk_patch_section_symbols_task) LNK_Section *fallback_sect = task->image_sects.v[task->image_sects.count-1]; U32 fallback_section_number = safe_cast_u32(fallback_sect->sect_idx + 1); U32 fallback_section_offset = safe_cast_u32(fallback_voff - fallback_sect->voff); - symbol.section_number = fallback_section_number; - symbol.value = fallback_section_offset; - symbol.storage_class = COFF_SymStorageClass_Static; - lnk_obj_symbol_patch(obj, symbol_idx, symbol, LNK_ObjSymbolPatch_Section | LNK_ObjSymbolPatch_Value | LNK_ObjSymbolPatch_StorageClass); + U64 primary_idx = lnk_obj_primary_symbol_idx_from_coff_symbol_idx(obj, symbol_idx); + obj->coff.symbols.section_numbers[primary_idx] = fallback_section_number; + obj->coff.symbols.values [primary_idx] = fallback_section_offset; + obj->coff.symbols.storage_classes[primary_idx] = COFF_SymStorageClass_Static; lnk_error_obj(LNK_Warning_UndefinedSectionSymbol, obj, "undefined section symbol %S (No. 0x%llx) refers to an image section that doesn't exist; patching to %#llx", symbol_name, symbol_idx, fallback_voff); } diff --git a/src/linker/lnk_obj.c b/src/linker/lnk_obj.c index 25191e6a..0fcab0b7 100644 --- a/src/linker/lnk_obj.c +++ b/src/linker/lnk_obj.c @@ -857,21 +857,6 @@ lnk_parsed_symbol_from_coff_symbol_idx(LNK_Obj *obj, U64 symbol_idx) return result; } -internal void -lnk_obj_symbol_patch(LNK_Obj *obj, U64 symbol_idx, COFF_ParsedSymbol patch, LNK_ObjSymbolPatchFlags flags) -{ - U64 primary_idx = lnk_obj_primary_symbol_idx_from_coff_symbol_idx(obj, symbol_idx); - if (flags & LNK_ObjSymbolPatch_Value) { - obj->coff.symbols.values[primary_idx] = patch.value; - } - if (flags & LNK_ObjSymbolPatch_Section) { - obj->coff.symbols.section_numbers[primary_idx] = patch.section_number; - } - if (flags & LNK_ObjSymbolPatch_StorageClass) { - obj->coff.symbols.storage_classes[primary_idx] = patch.storage_class; - } -} - internal THREAD_POOL_TASK_FUNC(lnk_collect_obj_chunks_task) { diff --git a/src/linker/lnk_obj.h b/src/linker/lnk_obj.h index 162eb314..321dcea4 100644 --- a/src/linker/lnk_obj.h +++ b/src/linker/lnk_obj.h @@ -5,14 +5,6 @@ // --- Input ------------------------------------------------------------------- -typedef U32 LNK_ObjSymbolPatchFlags; -enum -{ - LNK_ObjSymbolPatch_Value = (1 << 0), - LNK_ObjSymbolPatch_Section = (1 << 1), - LNK_ObjSymbolPatch_StorageClass = (1 << 2), -}; - typedef struct LNK_ObjSymbolArray { U64 count; @@ -245,7 +237,7 @@ internal U32List lnk_obj_collect_associated_sections(Arena *arena, LNK_ internal force_inline COFF_ParsedSymbol lnk_parsed_symbol_from_coff_symbol_idx(LNK_Obj *obj, U64 symbol_idx); internal force_inline COFF_ParsedSymbol lnk_parsed_symbol_from_coff_symbol_idx_no_name(LNK_Obj *obj, U64 symbol_idx); internal force_inline String8 lnk_symbol_name_from_coff_symbol_idx(LNK_Obj *obj, U64 symbol_idx); -internal void lnk_obj_symbol_patch(LNK_Obj *obj, U64 symbol_idx, COFF_ParsedSymbol patch, LNK_ObjSymbolPatchFlags flags); +internal force_inline U64 lnk_obj_primary_symbol_idx_from_coff_symbol_idx(LNK_Obj *obj, U64 symbol_idx); internal COFF_SectionHeader * lnk_coff_section_header_from_section_number(LNK_Obj *obj, U64 section_number); internal String8 lnk_obj_section_data_from_sect_idx(LNK_Obj *obj, U64 sect_idx); diff --git a/src/linker/lnk_symbol_table.c b/src/linker/lnk_symbol_table.c index dc82c8ba..174364d5 100644 --- a/src/linker/lnk_symbol_table.c +++ b/src/linker/lnk_symbol_table.c @@ -826,10 +826,10 @@ THREAD_POOL_TASK_FUNC(lnk_replace_weak_with_default_symbol_task) COFF_ParsedSymbol resolve_parsed = lnk_parsed_symbol_from_coff_symbol_idx_no_name(resolve.obj, resolve.symbol_idx); COFF_SymbolValueInterpType resolve_interp = coff_interp_from_parsed_symbol(resolve_parsed); if (resolve_interp == COFF_SymbolValueInterp_Weak) { - symbol_parsed.section_number = COFF_Symbol_UndefinedSection; - symbol_parsed.value = 0; - symbol_parsed.storage_class = COFF_SymStorageClass_External; - lnk_obj_symbol_patch(symbol_ref.obj, symbol_ref.symbol_idx, symbol_parsed, LNK_ObjSymbolPatch_Section | LNK_ObjSymbolPatch_Value | LNK_ObjSymbolPatch_StorageClass); + U64 primary_idx = lnk_obj_primary_symbol_idx_from_coff_symbol_idx(symbol_ref.obj, symbol_ref.symbol_idx); + symbol_ref.obj->coff.symbols.section_numbers[primary_idx] = COFF_Symbol_UndefinedSection; + symbol_ref.obj->coff.symbols.values [primary_idx] = 0; + symbol_ref.obj->coff.symbols.storage_classes[primary_idx] = COFF_SymStorageClass_External; lnk_symbol_set_search_type(symbol, LNK_SymbolSearch_Undefined); } else { symbol->first_ref->v = resolve;