ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-08 06:48:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

cache for section flags

Browse Source 
modifying the section flags is expensive with COW file mappings, Windows
maps are set to 64k granularity
This commit is contained in:
Nikita Smith
2026-06-12 11:40:02 -07:00
parent 3452f23839
commit 42cf820972
5 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/linker/lnk.c
+48 -46
View File
@@ -2307,9 +2307,9 @@ lnk_link_image(TP_Context *tp, TP_Arena *arena, LNK_Config *config, LNK_Inputer
String8 debug_strings = {0}; String8 debug_strings = {0};
for EachIndex(sect_idx, obj->header.section_count_no_null) { for EachIndex(sect_idx, obj->header.section_count_no_null) {
COFF_SectionHeader *section_header = &section_table[sect_idx]; if (obj->section_flags[sect_idx] & LNK_SECTION_FLAG_DEBUG) { continue; }
if (section_header->flags & LNK_SECTION_FLAG_DEBUG) { continue; }
COFF_SectionHeader *section_header = &section_table[sect_idx];
String8 section_name = coff_name_from_section_header(string_table, section_header); String8 section_name = coff_name_from_section_header(string_table, section_header);
U64 section_number = sect_idx+1; U64 section_number = sect_idx+1;
COFF_RelocArray relocs = lnk_coff_relocs_from_section_header(obj, section_header); COFF_RelocArray relocs = lnk_coff_relocs_from_section_header(obj, section_header);
@@ -2490,17 +2490,15 @@ THREAD_POOL_TASK_FUNC(lnk_walk_relocs_and_mark_ref_sections_task)
active_thread_count = push_array(scratch.arena, U64, 1); active_thread_count = push_array(scratch.arena, U64, 1);
global_batch_list = push_array(scratch.arena, LNK_RelocRefsBatchList, 1); global_batch_list = push_array(scratch.arena, LNK_RelocRefsBatchList, 1);
// alloc live flags for each section // alloc live flags and set live status on every non-COMDAT section
is_live = push_array_no_zero(scratch.arena, U8 *, objs.count); is_live = push_array_no_zero(scratch.arena, U8 *, objs.count);
{ {
U64 obj_idx = 0; U64 obj_idx = 0;
for EachNode(n, LNK_ObjNode, task->objs.first) { for EachNode(n, LNK_ObjNode, task->objs.first) {
is_live[obj_idx] = push_array(scratch.arena, U8, n->data.header.section_count_no_null + 1); is_live[obj_idx] = push_array(scratch.arena, U8, n->data.header.section_count_no_null + 1);
COFF_SectionHeader *section_table = lnk_coff_section_table_from_obj(&n->data);
for EachIndex(sect_idx, n->data.header.section_count_no_null) { for EachIndex(sect_idx, n->data.header.section_count_no_null) {
COFF_SectionHeader *header = &section_table[sect_idx]; is_live[obj_idx][sect_idx + 1] = !(n->data.section_flags[sect_idx] & COFF_SectionFlag_LnkCOMDAT);
is_live[obj_idx][sect_idx + 1] = !(header->flags & COFF_SectionFlag_LnkCOMDAT);
} }
obj_idx += 1; obj_idx += 1;
@@ -2534,13 +2532,13 @@ THREAD_POOL_TASK_FUNC(lnk_walk_relocs_and_mark_ref_sections_task)
LNK_Obj *obj = &obj_n->data; LNK_Obj *obj = &obj_n->data;
for EachIndex(sect_idx, obj->header.section_count_no_null) { for EachIndex(sect_idx, obj->header.section_count_no_null) {
U32 section_number = sect_idx+1; U32 section_number = sect_idx+1;
COFF_SectionHeader *section_header = lnk_coff_section_header_from_section_number(obj, section_number); COFF_SectionFlags section_flags = obj->section_flags[sect_idx];
// is section eligible for walking? // is section eligible for walking?
if (section_header->flags & COFF_SectionFlag_LnkRemove) { continue; } if (section_flags & COFF_SectionFlag_LnkRemove) { continue; }
if (section_header->flags & COFF_SectionFlag_LnkCOMDAT) { continue; } if (section_flags & COFF_SectionFlag_LnkCOMDAT) { continue; }
if (section_header->flags & COFF_SectionFlag_LnkInfo) { continue; } if (section_flags & COFF_SectionFlag_LnkInfo) { continue; }
if (section_header->flags & LNK_SECTION_FLAG_DEBUG) { continue; } if (section_flags & LNK_SECTION_FLAG_DEBUG) { continue; }
// divide relocs and push task for each reloc block // divide relocs and push task for each reloc block
COFF_RelocArray relocs = lnk_coff_reloc_info_from_section_number(obj, section_number); COFF_RelocArray relocs = lnk_coff_reloc_info_from_section_number(obj, section_number);
@@ -2643,16 +2641,16 @@ THREAD_POOL_TASK_FUNC(lnk_walk_relocs_and_mark_ref_sections_task)
SLLStackPush(stack, stack_n); SLLStackPush(stack, stack_n);
} }
COFF_SectionHeader *section_header = lnk_coff_section_header_from_section_number(ref_symbol.obj, section_number); COFF_SectionFlags section_flags = ref_symbol.obj->section_flags[section_number-1];
// on first section visit, set live flag and enqueue section // on first section visit, set live flag and enqueue section
U8 was_visited = ins_atomic_u8_eval_assign(&is_live[ref_symbol.obj->input_idx][section_number], 1); U8 was_visited = ins_atomic_u8_eval_assign(&is_live[ref_symbol.obj->input_idx][section_number], 1);
if (was_visited) { continue; } if (was_visited) { continue; }
// is section eligible for walking? // is section eligible for walking?
if (section_header->flags & COFF_SectionFlag_LnkRemove) { continue; } if (section_flags & COFF_SectionFlag_LnkRemove) { continue; }
if (section_header->flags & COFF_SectionFlag_LnkInfo) { continue; } if (section_flags & COFF_SectionFlag_LnkInfo) { continue; }
if (section_header->flags & LNK_SECTION_FLAG_DEBUG) { continue; } if (section_flags & LNK_SECTION_FLAG_DEBUG) { continue; }
LNK_RelocRefs refs = {0}; LNK_RelocRefs refs = {0};
refs.obj = ref_symbol.obj; refs.obj = ref_symbol.obj;
@@ -2721,14 +2719,15 @@ THREAD_POOL_TASK_FUNC(lnk_walk_relocs_and_mark_ref_sections_task)
if (is_live[obj->input_idx][section_number]) { continue; } if (is_live[obj->input_idx][section_number]) { continue; }
COFF_SectionHeader *section_header = lnk_coff_section_header_from_section_number(obj, section_number); COFF_SectionHeader *section_header = lnk_coff_section_header_from_section_number(obj, section_number);
section_header->flags |= COFF_SectionFlag_LnkRemove; obj->section_flags[sect_idx] |= COFF_SectionFlag_LnkRemove;
COFF_SectionFlags section_flags = obj->section_flags[sect_idx];
U64 stat_kind = Stat_Null; U64 stat_kind = Stat_Null;
if (section_header->flags & LNK_SECTION_FLAG_DEBUG) { stat_kind = Stat_Debug; } if (section_flags & LNK_SECTION_FLAG_DEBUG) { stat_kind = Stat_Debug; }
else if (section_header->flags & COFF_SectionFlag_CntCode) { stat_kind = Stat_Code; } else if (section_flags & COFF_SectionFlag_CntCode) { stat_kind = Stat_Code; }
else { stat_kind = Stat_Data; } else { stat_kind = Stat_Data; }
if (section_header->flags & COFF_SectionFlag_CntUninitializedData) { if (section_flags & COFF_SectionFlag_CntUninitializedData) {
stats[stat_kind].vsize += section_header->vsize; stats[stat_kind].vsize += section_header->vsize;
} else { } else {
stats[stat_kind].fsize += section_header->fsize; stats[stat_kind].fsize += section_header->fsize;
@@ -2788,13 +2787,14 @@ THREAD_POOL_TASK_FUNC(lnk_gather_section_definitions_task)
for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) { for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) {
COFF_SectionHeader *sect_header = &section_table[sect_idx]; COFF_SectionHeader *sect_header = &section_table[sect_idx];
COFF_SectionFlags sect_flags = obj->section_flags[sect_idx];
if (~sect_header->flags & COFF_SectionFlag_LnkRemove && ~sect_header->flags & COFF_SectionFlag_LnkInfo && sect_header->fsize > 0) { if (~sect_flags & COFF_SectionFlag_LnkRemove && ~sect_flags & COFF_SectionFlag_LnkInfo && sect_header->fsize > 0) {
Temp temp = temp_begin(scratch.arena); Temp temp = temp_begin(scratch.arena);
// was section defined? // was section defined?
String8 sect_name = coff_name_from_section_header(string_table, sect_header); String8 sect_name = coff_name_from_section_header(string_table, sect_header);
String8 sect_name_with_flags = lnk_make_name_with_flags(temp.arena, sect_name, sect_header->flags & ~COFF_SectionFlags_LnkFlags); String8 sect_name_with_flags = lnk_make_name_with_flags(temp.arena, sect_name, sect_flags & ~COFF_SectionFlags_LnkFlags);
LNK_SectionDefinition *sect_defn = hash_table_search_string_raw(sect_defn_ht, sect_name_with_flags); LNK_SectionDefinition *sect_defn = hash_table_search_string_raw(sect_defn_ht, sect_name_with_flags);
// push new section definition // push new section definition
@@ -2803,7 +2803,7 @@ THREAD_POOL_TASK_FUNC(lnk_gather_section_definitions_task)
sect_defn->name = sect_name; sect_defn->name = sect_name;
sect_defn->obj = obj; sect_defn->obj = obj;
sect_defn->obj_sect_idx = sect_idx; sect_defn->obj_sect_idx = sect_idx;
sect_defn->flags = sect_header->flags & ~COFF_SectionFlags_LnkFlags; sect_defn->flags = sect_flags & ~COFF_SectionFlags_LnkFlags;
sect_name_with_flags = push_str8_copy(arena, sect_name_with_flags); sect_name_with_flags = push_str8_copy(arena, sect_name_with_flags);
hash_table_push_string_raw(arena, sect_defn_ht, sect_name_with_flags, sect_defn); hash_table_push_string_raw(arena, sect_defn_ht, sect_name_with_flags, sect_defn);
@@ -2835,25 +2835,26 @@ THREAD_POOL_TASK_FUNC(lnk_gather_section_contribs_task)
for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) { for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) {
LNK_SectionContrib *sc = task->null_sc; LNK_SectionContrib *sc = task->null_sc;
COFF_SectionHeader *sect_header = &section_table[sect_idx]; COFF_SectionHeader *sect_header = &section_table[sect_idx];
if (~sect_header->flags & COFF_SectionFlag_LnkRemove && ~sect_header->flags & COFF_SectionFlag_LnkInfo && sect_header->fsize > 0) { COFF_SectionFlags sect_flags = obj->section_flags[sect_idx];
if (~sect_flags & COFF_SectionFlag_LnkRemove && ~sect_flags & COFF_SectionFlag_LnkInfo && sect_header->fsize > 0) {
LNK_SectionContribChunk *sc_chunk = 0; LNK_SectionContribChunk *sc_chunk = 0;
{ {
Temp temp = temp_begin(scratch.arena); Temp temp = temp_begin(scratch.arena);
String8 sect_name = coff_name_from_section_header(string_table, sect_header); String8 sect_name = coff_name_from_section_header(string_table, sect_header);
String8 sect_name_with_flags = lnk_make_name_with_flags(temp.arena, sect_name, sect_header->flags & ~COFF_SectionFlags_LnkFlags); String8 sect_name_with_flags = lnk_make_name_with_flags(temp.arena, sect_name, sect_flags & ~COFF_SectionFlags_LnkFlags);
sc_chunk = hash_table_search_string_raw(task->contribs_ht, sect_name_with_flags); sc_chunk = hash_table_search_string_raw(task->contribs_ht, sect_name_with_flags);
temp_end(temp); temp_end(temp);
} }
if (sc_chunk) { if (sc_chunk) {
String8 data; String8 data;
if (sect_header->flags & COFF_SectionFlag_CntUninitializedData) { if (sect_flags & COFF_SectionFlag_CntUninitializedData) {
data = str8(0, sect_header->fsize); data = str8(0, sect_header->fsize);
} else { } else {
data = str8_substr(obj->data, rng_1u64(sect_header->foff, sect_header->foff + sect_header->fsize)); data = str8_substr(obj->data, rng_1u64(sect_header->foff, sect_header->foff + sect_header->fsize));
} }
U16 sc_align = coff_align_size_from_section_flags(sect_header->flags); U16 sc_align = coff_align_size_from_section_flags(sect_flags);
sc = lnk_section_contrib_chunk_push_atomic(sc_chunk, 1); sc = lnk_section_contrib_chunk_push_atomic(sc_chunk, 1);
sc->first_data_node.next = 0; sc->first_data_node.next = 0;
sc->first_data_node.string = data; sc->first_data_node.string = data;
@@ -2881,8 +2882,7 @@ THREAD_POOL_TASK_FUNC(lnk_set_comdat_leaders_contribs_task)
for EachIndex(sect_idx, obj->header.section_count_no_null) { for EachIndex(sect_idx, obj->header.section_count_no_null) {
U64 section_number = sect_idx+1; U64 section_number = sect_idx+1;
COFF_SectionHeader *section_header = lnk_coff_section_header_from_section_number(obj, section_number); if (~obj->section_flags[sect_idx] & COFF_SectionFlag_LnkCOMDAT) { continue; }
if (~section_header->flags & COFF_SectionFlag_LnkCOMDAT) { continue; }
LNK_Symbol *symlink = lnk_obj_get_comdat_symlink(obj, section_number); LNK_Symbol *symlink = lnk_obj_get_comdat_symlink(obj, section_number);
if (symlink == 0) { continue; } if (symlink == 0) { continue; }
@@ -2906,8 +2906,7 @@ THREAD_POOL_TASK_FUNC(lnk_flag_debug_symbols_task)
symbol = lnk_parsed_symbol_from_coff_symbol_idx(obj, symbol_idx); symbol = lnk_parsed_symbol_from_coff_symbol_idx(obj, symbol_idx);
COFF_SymbolValueInterpType interp = coff_interp_symbol(symbol.section_number, symbol.value, symbol.storage_class); COFF_SymbolValueInterpType interp = coff_interp_symbol(symbol.section_number, symbol.value, symbol.storage_class);
if (interp == COFF_SymbolValueInterp_Regular) { if (interp == COFF_SymbolValueInterp_Regular) {
COFF_SectionHeader *section_header = lnk_coff_section_header_from_section_number(obj, symbol.section_number); if (obj->section_flags[symbol.section_number-1] & LNK_SECTION_FLAG_DEBUG) {
if (section_header->flags & LNK_SECTION_FLAG_DEBUG) {
task->u.patch_symtabs.was_symbol_patched[obj_idx][symbol_idx] = 1; task->u.patch_symtabs.was_symbol_patched[obj_idx][symbol_idx] = 1;
} }
} }
@@ -3248,13 +3247,14 @@ THREAD_POOL_TASK_FUNC(lnk_obj_reloc_patcher)
for EachIndex(sect_idx, obj_header.section_count_no_null) { for EachIndex(sect_idx, obj_header.section_count_no_null) {
COFF_SectionHeader *section_header = &section_table[sect_idx]; COFF_SectionHeader *section_header = &section_table[sect_idx];
COFF_SectionFlags section_flags = obj->section_flags[sect_idx];
if (section_header->flags & COFF_SectionFlag_LnkInfo) { continue; } if (section_flags & COFF_SectionFlag_LnkInfo) { continue; }
if (section_header->flags & COFF_SectionFlag_LnkRemove) { continue; } if (section_flags & COFF_SectionFlag_LnkRemove) { continue; }
if (section_header->flags & COFF_SectionFlag_CntUninitializedData) { continue; } if (section_flags & COFF_SectionFlag_CntUninitializedData) { continue; }
// get section bytes (special case debug info because it is not copied to the image) // get section bytes (special case debug info because it is not copied to the image)
String8 data = section_header->flags & LNK_SECTION_FLAG_DEBUG ? obj->data : task->image_data; String8 data = section_flags & LNK_SECTION_FLAG_DEBUG ? obj->data : task->image_data;
Rng1U64 section_frange = rng_1u64(section_header->foff, section_header->foff + section_header->fsize); Rng1U64 section_frange = rng_1u64(section_header->foff, section_header->foff + section_header->fsize);
String8 section_data = str8_substr(data, section_frange); String8 section_data = str8_substr(data, section_frange);
@@ -3285,7 +3285,7 @@ THREAD_POOL_TASK_FUNC(lnk_obj_reloc_patcher)
COFF_SymbolValueInterpType interp = coff_interp_from_parsed_symbol(symbol); COFF_SymbolValueInterpType interp = coff_interp_from_parsed_symbol(symbol);
if (interp == COFF_SymbolValueInterp_Regular) { if (interp == COFF_SymbolValueInterp_Regular) {
if (symbol.section_number == lnk_obj_get_removed_section_number(obj)) { if (symbol.section_number == lnk_obj_get_removed_section_number(obj)) {
if (~section_header->flags & LNK_SECTION_FLAG_DEBUG) { if (~section_flags & LNK_SECTION_FLAG_DEBUG) {
String8 sect_name = coff_name_from_section_header(string_table, &section_table[sect_idx]); String8 sect_name = coff_name_from_section_header(string_table, &section_table[sect_idx]);
lnk_error_obj(LNK_Error_RelocationAgainstRemovedSection, obj, "relocating against symbol that is in a removed section (symbol: %S, reloc-section: %S 0x%llx, reloc-index: 0x%llx)", symbol.name, sect_name, sect_idx+1, reloc_idx); lnk_error_obj(LNK_Error_RelocationAgainstRemovedSection, obj, "relocating against symbol that is in a removed section (symbol: %S, reloc-section: %S 0x%llx, reloc-index: 0x%llx)", symbol.name, sect_name, sect_idx+1, reloc_idx);
} }
@@ -3399,10 +3399,9 @@ THREAD_POOL_TASK_FUNC(lnk_flag_hotpatch_contribs_task)
symbol = lnk_parsed_symbol_from_coff_symbol_idx(obj, symbol_idx); symbol = lnk_parsed_symbol_from_coff_symbol_idx(obj, symbol_idx);
COFF_SymbolValueInterpType interp = coff_interp_symbol(symbol.section_number, symbol.value, symbol.storage_class); COFF_SymbolValueInterpType interp = coff_interp_symbol(symbol.section_number, symbol.value, symbol.storage_class);
if (interp == COFF_SymbolValueInterp_Regular && COFF_SymbolType_IsFunc(symbol.type)) { if (interp == COFF_SymbolValueInterp_Regular && COFF_SymbolType_IsFunc(symbol.type)) {
COFF_SectionHeader *section_header = lnk_coff_section_header_from_section_number(obj, symbol.section_number);
LNK_SectionContrib *sc = task->sect_map[obj_idx][symbol.section_number-1]; LNK_SectionContrib *sc = task->sect_map[obj_idx][symbol.section_number-1];
if (sc != task->null_sc) { if (sc != task->null_sc) {
sc->hotpatch = !!(section_header->flags & COFF_SectionFlag_CntCode); sc->hotpatch = !!(obj->section_flags[symbol.section_number-1] & COFF_SectionFlag_CntCode);
} }
} }
} }
@@ -3766,7 +3765,7 @@ THREAD_POOL_TASK_FUNC(lnk_patch_virtual_offsets_and_sizes_in_obj_section_headers
COFF_SectionHeader *section_table = (COFF_SectionHeader *)str8_substr(obj->data, obj->header.section_table_range).str; COFF_SectionHeader *section_table = (COFF_SectionHeader *)str8_substr(obj->data, obj->header.section_table_range).str;
for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) { for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) {
COFF_SectionHeader *sect_header = &section_table[sect_idx]; COFF_SectionHeader *sect_header = &section_table[sect_idx];
if (~sect_header->flags & COFF_SectionFlag_LnkRemove) { if (~obj->section_flags[sect_idx] & COFF_SectionFlag_LnkRemove) {
LNK_SectionContrib *sc = task->sect_map[obj_idx][sect_idx]; LNK_SectionContrib *sc = task->sect_map[obj_idx][sect_idx];
LNK_Section *sect = task->image_sects.v[sc->u.sect_idx]; LNK_Section *sect = task->image_sects.v[sc->u.sect_idx];
sect_header->vsize = lnk_size_from_section_contrib(sc); sect_header->vsize = lnk_size_from_section_contrib(sc);
@@ -3787,8 +3786,9 @@ THREAD_POOL_TASK_FUNC(lnk_patch_file_offsets_and_sizes_in_obj_section_headers_ta
COFF_SectionHeader *section_table = (COFF_SectionHeader *)str8_substr(obj->data, obj->header.section_table_range).str; COFF_SectionHeader *section_table = (COFF_SectionHeader *)str8_substr(obj->data, obj->header.section_table_range).str;
for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) { for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) {
COFF_SectionHeader *sect_header = &section_table[sect_idx]; COFF_SectionHeader *sect_header = &section_table[sect_idx];
B32 patch_section_header = (~sect_header->flags & COFF_SectionFlag_LnkRemove) && COFF_SectionFlags sect_flags = obj->section_flags[sect_idx];
(~sect_header->flags & LNK_SECTION_FLAG_DEBUG); B32 patch_section_header = (~sect_flags & COFF_SectionFlag_LnkRemove) &&
(~sect_flags & LNK_SECTION_FLAG_DEBUG);
if (patch_section_header) { if (patch_section_header) {
LNK_SectionContrib *sc = task->sect_map[obj_idx][sect_idx]; LNK_SectionContrib *sc = task->sect_map[obj_idx][sect_idx];
LNK_Section *sect = task->image_sects.v[sc->u.sect_idx]; LNK_Section *sect = task->image_sects.v[sc->u.sect_idx];
@@ -3819,9 +3819,10 @@ THREAD_POOL_TASK_FUNC(lnk_patch_section_symbols_task)
COFF_SectionHeader *section_table = lnk_coff_section_table_from_obj(obj); COFF_SectionHeader *section_table = lnk_coff_section_table_from_obj(obj);
for EachIndex(sect_idx, obj->header.section_count_no_null) { for EachIndex(sect_idx, obj->header.section_count_no_null) {
COFF_SectionHeader *section_header = &section_table[sect_idx]; COFF_SectionHeader *section_header = &section_table[sect_idx];
if (section_header->flags & COFF_SectionFlag_LnkRemove) { continue; } COFF_SectionFlags section_flags = obj->section_flags[sect_idx];
if (section_header->flags & COFF_SectionFlag_LnkInfo) { continue; } if (section_flags & COFF_SectionFlag_LnkRemove) { continue; }
if (section_header->flags & LNK_SECTION_FLAG_DEBUG) { continue; } if (section_flags & COFF_SectionFlag_LnkInfo) { continue; }
if (section_flags & LNK_SECTION_FLAG_DEBUG) { continue; }
COFF_RelocArray relocs = lnk_coff_relocs_from_section_header(obj, section_header); COFF_RelocArray relocs = lnk_coff_relocs_from_section_header(obj, section_header);
for EachIndex(reloc_idx, relocs.count) { for EachIndex(reloc_idx, relocs.count) {
if (relocs.v[reloc_idx].isymbol == symbol_idx) { if (relocs.v[reloc_idx].isymbol == symbol_idx) {
@@ -3897,7 +3898,7 @@ THREAD_POOL_TASK_FUNC(lnk_gather_base_reloc_pages_task)
ProfBeginV("%S", obj->path); ProfBeginV("%S", obj->path);
for EachIndex(sect_idx, obj->header.section_count_no_null) { for EachIndex(sect_idx, obj->header.section_count_no_null) {
COFF_SectionHeader *sect_header = &sect_table[sect_idx]; COFF_SectionHeader *sect_header = &sect_table[sect_idx];
if (sect_header->flags & COFF_SectionFlag_LnkRemove) { continue; } if (obj->section_flags[sect_idx] & COFF_SectionFlag_LnkRemove) { continue; }
COFF_RelocArray relocs = lnk_coff_relocs_from_section_header(obj, sect_header); COFF_RelocArray relocs = lnk_coff_relocs_from_section_header(obj, sect_header);
for EachIndex(reloc_idx, relocs.count) { for EachIndex(reloc_idx, relocs.count) {
@@ -5051,7 +5052,7 @@ lnk_obj_sect_idx_from_section(Arena *arena, U64 objs_count, LNK_Obj **objs, LNK_
String8 section_name, section_postfix; String8 section_name, section_postfix;
coff_parse_section_name(full_section_name, &section_name, &section_postfix); coff_parse_section_name(full_section_name, &section_name, &section_postfix);
if (section_header->flags & COFF_SectionFlag_LnkRemove) { continue; } if (obj->section_flags[sect_idx] & COFF_SectionFlag_LnkRemove) { continue; }
if (section_header->fsize == 0) { continue; } if (section_header->fsize == 0) { continue; }
if (lnk_is_section_removed(config, section_name)) { continue; } if (lnk_is_section_removed(config, section_name)) { continue; }
@@ -5222,7 +5223,8 @@ lnk_build_rad_map(Arena *arena, String8 image_data, LNK_Config *config, U64 objs
COFF_SectionHeader *section_table = str8_deserial_get_raw_ptr(obj->data, obj->header.section_table_range.min, 0); COFF_SectionHeader *section_table = str8_deserial_get_raw_ptr(obj->data, obj->header.section_table_range.min, 0);
for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) { for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) {
COFF_SectionHeader *section_header = &section_table[sect_idx]; COFF_SectionHeader *section_header = &section_table[sect_idx];
if (~section_header->flags & COFF_SectionFlag_LnkRemove && section_header->flags & LNK_SECTION_FLAG_DEBUG) { COFF_SectionFlags section_flags = obj->section_flags[sect_idx];
if (~section_flags & COFF_SectionFlag_LnkRemove && section_flags & LNK_SECTION_FLAG_DEBUG) {
LNK_Lib *lib = lnk_obj_get_lib(obj); LNK_Lib *lib = lnk_obj_get_lib(obj);
if (lib) { if (lib) {
String8 lib_name = str8_chop_last_dot(str8_skip_last_slash(lib->path)); String8 lib_name = str8_chop_last_dot(str8_skip_last_slash(lib->path));
src/linker/lnk_debug_info.c
+6 -5
View File
@@ -3050,10 +3050,11 @@ THREAD_POOL_TASK_FUNC(lnk_push_dbi_sec_contrib_task)
for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) { for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) {
COFF_SectionHeader *obj_sect_header = &obj_section_table[sect_idx]; COFF_SectionHeader *obj_sect_header = &obj_section_table[sect_idx];
COFF_SectionFlags obj_sect_flags = obj->section_flags[sect_idx];
if (obj_sect_header->flags & COFF_SectionFlag_LnkInfo) { continue; } if (obj_sect_flags & COFF_SectionFlag_LnkInfo) { continue; }
if (obj_sect_header->flags & COFF_SectionFlag_LnkRemove) { continue; } if (obj_sect_flags & COFF_SectionFlag_LnkRemove) { continue; }
if (obj_sect_header->flags & LNK_SECTION_FLAG_DEBUG) { continue; } if (obj_sect_flags & LNK_SECTION_FLAG_DEBUG) { continue; }
String8 header_name = str8_cstring_capped(obj_sect_header->name, obj_sect_header->name + sizeof(obj_sect_header->name)); String8 header_name = str8_cstring_capped(obj_sect_header->name, obj_sect_header->name + sizeof(obj_sect_header->name));
if (str8_match(header_name, str8_lit(".pdata"), 0)) { continue; } if (str8_match(header_name, str8_lit(".pdata"), 0)) { continue; }
@@ -3062,7 +3063,7 @@ THREAD_POOL_TASK_FUNC(lnk_push_dbi_sec_contrib_task)
String8 sect_data; String8 sect_data;
U32 sect_off; U32 sect_off;
U32 data_crc; U32 data_crc;
if (obj_sect_header->flags & COFF_SectionFlag_CntUninitializedData) { if (obj_sect_flags & COFF_SectionFlag_CntUninitializedData) {
if (obj_sect_header->vsize == 0) { continue; } if (obj_sect_header->vsize == 0) { continue; }
U64 sect_num = rng1u64_array_num_from_value__binary_search(&task->image_section_virt_ranges, obj_sect_header->voff); U64 sect_num = rng1u64_array_num_from_value__binary_search(&task->image_section_virt_ranges, obj_sect_header->voff);
@@ -3088,7 +3089,7 @@ THREAD_POOL_TASK_FUNC(lnk_push_dbi_sec_contrib_task)
sc->data.base.pad0 = 0; sc->data.base.pad0 = 0;
sc->data.base.sec_off = sect_off; sc->data.base.sec_off = sect_off;
sc->data.base.size = obj_sect_header->vsize; sc->data.base.size = obj_sect_header->vsize;
sc->data.base.flags = obj_sect_header->flags; sc->data.base.flags = obj_sect_flags;
sc->data.base.mod = mod->imod; sc->data.base.mod = mod->imod;
sc->data.base.pad1 = 0; sc->data.base.pad1 = 0;
sc->data.data_crc = 0; sc->data.data_crc = 0;
src/linker/lnk_obj.c
+14 -13
View File
@@ -97,10 +97,12 @@ THREAD_POOL_TASK_FUNC(lnk_obj_initer)
// error check section headers // error check section headers
// //
COFF_SectionHeader *coff_section_table = (COFF_SectionHeader *)raw_coff_section_table.str; COFF_SectionHeader *coff_section_table = (COFF_SectionHeader *)raw_coff_section_table.str;
COFF_SectionFlags *section_flags = push_array_no_zero(arena, COFF_SectionFlags, header.section_count_no_null);
for (U64 sect_idx = 0; sect_idx < header.section_count_no_null; sect_idx += 1) { for (U64 sect_idx = 0; sect_idx < header.section_count_no_null; sect_idx += 1) {
COFF_SectionHeader *coff_sect_header = &coff_section_table[sect_idx]; COFF_SectionHeader *coff_sect_header = &coff_section_table[sect_idx];
section_flags[sect_idx] = coff_sect_header->flags;
String8 sect_name = coff_name_from_section_header(raw_coff_string_table, coff_sect_header); String8 sect_name = coff_name_from_section_header(raw_coff_string_table, coff_sect_header);
if (~coff_sect_header->flags & COFF_SectionFlag_CntUninitializedData) { if (~section_flags[sect_idx] & COFF_SectionFlag_CntUninitializedData) {
if (coff_sect_header->fsize > 0) { if (coff_sect_header->fsize > 0) {
Rng1U64 sect_range = rng_1u64(coff_sect_header->foff, coff_sect_header->foff + coff_sect_header->fsize); Rng1U64 sect_range = rng_1u64(coff_sect_header->foff, coff_sect_header->foff + coff_sect_header->fsize);
if (contains_1u64(header.header_range, coff_sect_header->foff) || if (contains_1u64(header.header_range, coff_sect_header->foff) ||
@@ -166,7 +168,7 @@ THREAD_POOL_TASK_FUNC(lnk_obj_initer)
if (symbol.storage_class == COFF_SymStorageClass_Static) { if (symbol.storage_class == COFF_SymStorageClass_Static) {
if (symbol.section_number > 0 && symbol.section_number <= header.section_count_no_null) { if (symbol.section_number > 0 && symbol.section_number <= header.section_count_no_null) {
COFF_SectionHeader *sect_header = &coff_section_table[symbol.section_number-1]; COFF_SectionHeader *sect_header = &coff_section_table[symbol.section_number-1];
if (sect_header->flags & COFF_SectionFlag_LnkCOMDAT) { if (section_flags[symbol.section_number-1] & COFF_SectionFlag_LnkCOMDAT) {
if (symbol.aux_symbol_count) { if (symbol.aux_symbol_count) {
U32 section_length = 0; U32 section_length = 0;
coff_parse_secdef(symbol, header.is_big_obj, 0, 0, &section_length, 0); coff_parse_secdef(symbol, header.is_big_obj, 0, 0, &section_length, 0);
@@ -270,14 +272,14 @@ THREAD_POOL_TASK_FUNC(lnk_obj_initer)
// debug info // debug info
if (str8_starts_with(sect_name, str8_lit(".debug$"))) { if (str8_starts_with(sect_name, str8_lit(".debug$"))) {
sect_header->flags |= LNK_SECTION_FLAG_DEBUG; section_flags[sect_idx] |= LNK_SECTION_FLAG_DEBUG;
} }
// function overrides // function overrides
if (str8_ends_with(sect_name, str8_lit("$fo$"), 0) || if (str8_ends_with(sect_name, str8_lit("$fo$"), 0) ||
str8_ends_with(sect_name, str8_lit("$fo_rvas$"), 0) || str8_ends_with(sect_name, str8_lit("$fo_rvas$"), 0) ||
str8_ends_with(sect_name, str8_lit("$fo_bdd$"), 0)) { str8_ends_with(sect_name, str8_lit("$fo_bdd$"), 0)) {
sect_header->flags |= COFF_SectionFlag_LnkInfo; section_flags[sect_idx] |= COFF_SectionFlag_LnkInfo;
} }
} }
} }
@@ -295,7 +297,7 @@ THREAD_POOL_TASK_FUNC(lnk_obj_initer)
CV_Symbol comp_symbol = {0}; CV_Symbol comp_symbol = {0};
for EachIndex(sect_idx, header.section_count_no_null) { for EachIndex(sect_idx, header.section_count_no_null) {
COFF_SectionHeader *sect_header = &coff_section_table[sect_idx]; COFF_SectionHeader *sect_header = &coff_section_table[sect_idx];
if (sect_header->flags & LNK_SECTION_FLAG_DEBUG) { if (section_flags[sect_idx] & LNK_SECTION_FLAG_DEBUG) {
String8 name = str8_cstring_capped(sect_header->name, sect_header->name+sizeof(sect_header->name)); String8 name = str8_cstring_capped(sect_header->name, sect_header->name+sizeof(sect_header->name));
if (str8_match(name, str8_lit(".debug$S"), 0)) { if (str8_match(name, str8_lit(".debug$S"), 0)) {
Temp temp = temp_begin(scratch.arena); Temp temp = temp_begin(scratch.arena);
@@ -332,6 +334,7 @@ THREAD_POOL_TASK_FUNC(lnk_obj_initer)
obj->data = input->data; obj->data = input->data;
obj->path = push_str8_copy(arena, input->path); obj->path = push_str8_copy(arena, input->path);
obj->header = header; obj->header = header;
obj->section_flags = section_flags;
obj->comdats = comdats; obj->comdats = comdats;
obj->exclude_from_debug_info = input->exclude_from_debug_info; obj->exclude_from_debug_info = input->exclude_from_debug_info;
obj->hotpatch = hotpatch; obj->hotpatch = hotpatch;
@@ -414,8 +417,7 @@ THREAD_POOL_TASK_FUNC(lnk_input_coff_symbol_table)
switch (interp) { switch (interp) {
case COFF_SymbolValueInterp_Regular: { case COFF_SymbolValueInterp_Regular: {
if (symbol.storage_class == COFF_SymStorageClass_External) { if (symbol.storage_class == COFF_SymStorageClass_External) {
COFF_SectionHeader *sect_header = lnk_coff_section_header_from_section_number(obj, symbol.section_number); if (obj->section_flags[symbol.section_number-1] & COFF_SectionFlag_LnkRemove) {
if (sect_header->flags & COFF_SectionFlag_LnkRemove) {
break; break;
} }
LNK_Symbol *defn = lnk_make_symbol(arena, symbol.name, obj, symbol_idx); LNK_Symbol *defn = lnk_make_symbol(arena, symbol.name, obj, symbol_idx);
@@ -459,8 +461,7 @@ lnk_symlinks_from_obj(Arena *arena, LNK_SymbolTable *symtab, LNK_Obj *obj)
symbol = lnk_parsed_symbol_from_coff_symbol_idx(obj, symbol_idx); symbol = lnk_parsed_symbol_from_coff_symbol_idx(obj, symbol_idx);
COFF_SymbolValueInterpType interp = coff_interp_symbol(symbol.section_number, symbol.value, symbol.storage_class); COFF_SymbolValueInterpType interp = coff_interp_symbol(symbol.section_number, symbol.value, symbol.storage_class);
if (interp == COFF_SymbolValueInterp_Regular && symbol.aux_symbol_count == 0 && symbol.storage_class == COFF_SymStorageClass_External) { if (interp == COFF_SymbolValueInterp_Regular && symbol.aux_symbol_count == 0 && symbol.storage_class == COFF_SymStorageClass_External) {
COFF_SectionHeader *sect_header = lnk_coff_section_header_from_section_number(obj, symbol.section_number); if (obj->section_flags[symbol.section_number-1] & COFF_SectionFlag_LnkCOMDAT) {
if (sect_header->flags & COFF_SectionFlag_LnkCOMDAT) {
if (symlinks[symbol.section_number] == 0 || symbol.value == 0) { if (symlinks[symbol.section_number] == 0 || symbol.value == 0) {
symlinks[symbol.section_number] = lnk_symbol_table_search_(symtab, symbol.name); symlinks[symbol.section_number] = lnk_symbol_table_search_(symtab, symbol.name);
} }
@@ -634,7 +635,7 @@ THREAD_POOL_TASK_FUNC(lnk_collect_obj_chunks_task)
for (U32 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) { for (U32 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) {
COFF_SectionHeader *section_header = &section_table[sect_idx]; COFF_SectionHeader *section_header = &section_table[sect_idx];
if (section_header->flags & COFF_SectionFlag_LnkRemove) { if (obj->section_flags[sect_idx] & COFF_SectionFlag_LnkRemove) {
if (!task->collect_discarded) { if (!task->collect_discarded) {
continue; continue;
} }
@@ -721,10 +722,11 @@ lnk_raw_directives_from_obj(Arena *arena, LNK_Obj *obj)
String8List drectve_data = {0}; String8List drectve_data = {0};
for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) { for (U64 sect_idx = 0; sect_idx < obj->header.section_count_no_null; sect_idx += 1) {
COFF_SectionHeader *sect_header = &section_table[sect_idx]; COFF_SectionHeader *sect_header = &section_table[sect_idx];
if (sect_header->flags & COFF_SectionFlag_LnkInfo) { COFF_SectionFlags sect_flags = obj->section_flags[sect_idx];
if (sect_flags & COFF_SectionFlag_LnkInfo) {
String8 sect_name = str8_cstring_capped(sect_header->name, sect_header->name + sizeof(sect_header->name)); String8 sect_name = str8_cstring_capped(sect_header->name, sect_header->name + sizeof(sect_header->name));
if (str8_match(sect_name, str8_lit(".drectve"), 0)) { if (str8_match(sect_name, str8_lit(".drectve"), 0)) {
if (sect_header->flags & COFF_SectionFlag_CntUninitializedData) { if (sect_flags & COFF_SectionFlag_CntUninitializedData) {
lnk_error_obj(LNK_Error_IllData, obj, ".drectve section header has flag COFF_SectionFlag_CntUninitializedData"); lnk_error_obj(LNK_Error_IllData, obj, ".drectve section header has flag COFF_SectionFlag_CntUninitializedData");
break; break;
} }
@@ -797,4 +799,3 @@ lnk_debug_s_from_obj(Arena *arena, LNK_Obj *obj)
scratch_end(scratch); scratch_end(scratch);
return debug_s; return debug_s;
} }
src/linker/lnk_obj.h
+1 -1
View File
@@ -11,6 +11,7 @@ typedef struct LNK_Obj
String8 data; String8 data;
COFF_FileHeaderInfo header; COFF_FileHeaderInfo header;
COFF_SectionFlags *section_flags;
// flags // flags
B8 hotpatch; B8 hotpatch;
@@ -153,4 +154,3 @@ internal LNK_DirectiveInfo lnk_directive_info_from_raw_directives(Arena *arena,
// --- Debug Info -------------------------------------------------------------- // --- Debug Info --------------------------------------------------------------
internal CV_DebugS lnk_debug_s_from_obj(Arena *arena, LNK_Obj *obj); internal CV_DebugS lnk_debug_s_from_obj(Arena *arena, LNK_Obj *obj);
src/linker/lnk_symbol_table.c
+3 -7
View File
@@ -337,15 +337,13 @@ lnk_on_symbol_replace(LNK_Symbol *dst, LNK_Symbol *src)
if (dst_interp == COFF_SymbolValueInterp_Regular) { if (dst_interp == COFF_SymbolValueInterp_Regular) {
// remove replaced section from the output // remove replaced section from the output
COFF_SectionHeader *dst_sect = lnk_coff_section_header_from_section_number(dst_ref.obj, dst_parsed.section_number); dst_ref.obj->section_flags[dst_parsed.section_number-1] |= COFF_SectionFlag_LnkRemove;
dst_sect->flags |= COFF_SectionFlag_LnkRemove;
// remove associated sections from the output // remove associated sections from the output
for (U32Node *associated_section = dst_ref.obj->associated_sections[dst_parsed.section_number]; for (U32Node *associated_section = dst_ref.obj->associated_sections[dst_parsed.section_number];
associated_section != 0; associated_section != 0;
associated_section = associated_section->next) { associated_section = associated_section->next) {
COFF_SectionHeader *section_header = lnk_coff_section_header_from_section_number(dst_ref.obj, associated_section->data); dst_ref.obj->section_flags[associated_section->data-1] |= COFF_SectionFlag_LnkRemove;
section_header->flags |= COFF_SectionFlag_LnkRemove;
} }
} }
@@ -362,8 +360,7 @@ lnk_on_symbol_replace(LNK_Symbol *dst, LNK_Symbol *src)
LNK_ObjSymbolRef src_ref = lnk_ref_from_symbol(src); LNK_ObjSymbolRef src_ref = lnk_ref_from_symbol(src);
if (src_interp == COFF_SymbolValueInterp_Regular) { if (src_interp == COFF_SymbolValueInterp_Regular) {
COFF_SectionHeader *src_sect = lnk_coff_section_header_from_section_number(src_ref.obj, src_parsed.section_number); AssertAlways(~src_ref.obj->section_flags[src_parsed.section_number-1] & COFF_SectionFlag_LnkRemove);
AssertAlways(~src_sect->flags & COFF_SectionFlag_LnkRemove);
} }
} }
#endif #endif
@@ -804,4 +801,3 @@ lnk_replace_weak_with_default_symbols(TP_Context *tp, LNK_SymbolTable *symtab)
ProfEnd(); ProfEnd();
} }