From 7a59548d5bb50b5409a91c7a5301b028a39c71a4 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Sat, 18 Apr 2026 11:44:11 -0700 Subject: [PATCH] remove 'Symbols' from section titles, now that old sections are gone --- src/ctrl/ctrl_core.c | 14 +++--- src/dbg_info/dbg_info.c | 14 +++--- src/disasm/disasm.c | 2 +- src/eval/eval_core.c | 4 +- src/eval/eval_ir.c | 12 ++--- .../eval_visualization_core.c | 2 +- src/lib_rdi/rdi.h | 50 +++++++++---------- src/lib_rdi/rdi_parse.c | 6 +-- src/radbin/radbin.c | 2 +- src/raddbg/raddbg_core.c | 10 ++-- src/raddbg/raddbg_eval.c | 16 +++--- src/rdi/rdi.mdesk | 10 ++-- src/rdi/rdi_local.c | 14 +++--- src/rdi_make/rdi_make_local.c | 10 ++-- 14 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/ctrl/ctrl_core.c b/src/ctrl/ctrl_core.c index 61170bc7..2ecfd9ad 100644 --- a/src/ctrl/ctrl_core.c +++ b/src/ctrl/ctrl_core.c @@ -4329,7 +4329,7 @@ ctrl_thread__next_dmn_event(Arena *arena, DMN_CtrlCtx *ctrl_ctx, CTRL_Msg *msg, U32 *ids = rdi_matches_from_map_node(rdi, node, &id_count); if(id_count > 0) { - RDI_Symbol *global_var = rdi_element_from_name_idx(rdi, GlobalVariableSymbols, ids[0]); + RDI_Symbol *global_var = rdi_element_from_name_idx(rdi, GlobalVariables, ids[0]); U64 global_var_voff = rdi_voff_from_location(global_var->location); U64 global_var_vaddr = global_var_voff + module->vaddr_range.min; Arch arch = process->arch; @@ -5709,7 +5709,7 @@ ctrl_thread__run(DMN_CtrlCtx *ctrl_ctx, CTRL_Msg *msg) procedure_id = ids[0]; } } - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, procedure_id); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, procedure_id); U64 voff = rdi_first_voff_from_procedure(rdi, procedure); if(voff != 0) { @@ -5743,7 +5743,7 @@ ctrl_thread__run(DMN_CtrlCtx *ctrl_ctx, CTRL_Msg *msg) procedure_id = ids[0]; } } - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, procedure_id); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, procedure_id); U64 voff = rdi_first_voff_from_procedure(rdi, procedure); if(voff != 0) { @@ -5773,7 +5773,7 @@ ctrl_thread__run(DMN_CtrlCtx *ctrl_ctx, CTRL_Msg *msg) procedure_id = ids[0]; } } - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, procedure_id); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, procedure_id); U64 voff = rdi_first_voff_from_procedure(rdi, procedure); if(voff != 0) { @@ -5801,7 +5801,7 @@ ctrl_thread__run(DMN_CtrlCtx *ctrl_ctx, CTRL_Msg *msg) procedure_id = ids[0]; } } - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, procedure_id); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, procedure_id); U64 voff = rdi_first_voff_from_procedure(rdi, procedure); if(voff != 0) { @@ -5835,7 +5835,7 @@ ctrl_thread__run(DMN_CtrlCtx *ctrl_ctx, CTRL_Msg *msg) procedure_id = ids[0]; } } - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, procedure_id); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, procedure_id); U64 voff = rdi_first_voff_from_procedure(rdi, procedure); if(voff != 0) { @@ -5880,7 +5880,7 @@ ctrl_thread__run(DMN_CtrlCtx *ctrl_ctx, CTRL_Msg *msg) procedure_id = ids[0]; } } - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, procedure_id); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, procedure_id); U64 voff = rdi_first_voff_from_procedure(rdi, procedure); if(voff != 0) { diff --git a/src/dbg_info/dbg_info.c b/src/dbg_info/dbg_info.c index fb7ade6e..a558e5f8 100644 --- a/src/dbg_info/dbg_info.c +++ b/src/dbg_info/dbg_info.c @@ -1157,9 +1157,9 @@ di_search_artifact_create(String8 key, B32 *cancel_signal, B32 *retry_out, U64 * switch(section_kind) { default:{}break; - case RDI_SectionKind_ProcedureSymbols: - case RDI_SectionKind_GlobalVariableSymbols: - case RDI_SectionKind_ThreadVariableSymbols: + case RDI_SectionKind_Procedures: + case RDI_SectionKind_GlobalVariables: + case RDI_SectionKind_ThreadVariables: { element_name_idx_off = OffsetOf(RDI_Symbol, name_string_idx); }break; @@ -1562,10 +1562,10 @@ di_match_artifact_create(String8 key, B32 *cancel_signal, B32 *retry_out, U64 *g }; read_only local_persist RDI_SectionKind name_map_section_kinds[] = { - RDI_SectionKind_GlobalVariableSymbols, - RDI_SectionKind_ThreadVariableSymbols, - RDI_SectionKind_ConstantSymbols, - RDI_SectionKind_ProcedureSymbols, + RDI_SectionKind_GlobalVariables, + RDI_SectionKind_ThreadVariables, + RDI_SectionKind_Constants, + RDI_SectionKind_Procedures, RDI_SectionKind_TypeNodes, }; Rng1U64 range = lane_range(dbgi_keys.count); diff --git a/src/disasm/disasm.c b/src/disasm/disasm.c index 1b201b81..5de6a860 100644 --- a/src/disasm/disasm.c +++ b/src/disasm/disasm.c @@ -419,7 +419,7 @@ dasm_artifact_create(String8 key, B32 *cancel_signal, B32 *retry_out, U64 *gen_o { RDI_Scope *scope = rdi_element_from_name_idx(rdi, Scopes, scope_idx); RDI_U32 procedure_idx = scope->proc_idx; - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, procedure_idx); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, procedure_idx); String8 procedure_name = {0}; procedure_name.str = rdi_string_from_idx(rdi, procedure->name_string_idx, &procedure_name.size); if(procedure_name.size != 0) diff --git a/src/eval/eval_core.c b/src/eval/eval_core.c index ba562364..0164b02a 100644 --- a/src/eval/eval_core.c +++ b/src/eval/eval_core.c @@ -590,7 +590,7 @@ e_push_locals_map_from_rdi_voff(Arena *arena, RDI_Parsed *rdi, U64 voff) U32 local_opl_idx = scope->local_first + scope->local_count; for(U32 local_idx = scope->local_first; local_idx < local_opl_idx; local_idx += 1) { - RDI_Symbol *local_var = rdi_element_from_name_idx(rdi, LocalVariableSymbols, local_idx); + RDI_Symbol *local_var = rdi_element_from_name_idx(rdi, LocalVariables, local_idx); U64 local_name_size = 0; U8 *local_name_str = rdi_string_from_idx(rdi, local_var->name_string_idx, &local_name_size); String8 name = push_str8_copy(arena, str8(local_name_str, local_name_size)); @@ -612,7 +612,7 @@ e_push_member_map_from_rdi_voff(Arena *arena, RDI_Parsed *rdi, U64 voff) //- rjf: tightest scope -> procedure U32 proc_idx = tightest_scope->proc_idx; - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, proc_idx); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, proc_idx); //- rjf: procedure -> udt U32 udt_idx = procedure->container_flags & RDI_ContainerFlag_KindMask == RDI_ContainerKind_Type ? procedure->container_idx : 0; diff --git a/src/eval/eval_ir.c b/src/eval/eval_ir.c index 16585e97..eba59fca 100644 --- a/src/eval/eval_ir.c +++ b/src/eval/eval_ir.c @@ -1810,7 +1810,7 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, E_I U64 local_num = e_num_from_string(e_ir_ctx->locals_map, string__redirected); if(local_num != 0) { - RDI_Symbol *local = rdi_element_from_name_idx(rdi, LocalVariableSymbols, local_num-1); + RDI_Symbol *local = rdi_element_from_name_idx(rdi, LocalVariables, local_num-1); // rjf: extract local's type key RDI_TypeNode *type_node = rdi_element_from_name_idx(rdi, TypeNodes, local->type_idx); @@ -1958,9 +1958,9 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, E_I switch(match.section_kind) { default:{}break; - case RDI_SectionKind_GlobalVariableSymbols: - case RDI_SectionKind_ThreadVariableSymbols: - case RDI_SectionKind_ConstantSymbols: + case RDI_SectionKind_GlobalVariables: + case RDI_SectionKind_ThreadVariables: + case RDI_SectionKind_Constants: { RDI_Symbol *symbol = (RDI_Symbol *)rdi_section_raw_element_from_kind_idx(rdi, match.section_kind, match.idx); U64 ip_voff = e_base_ctx->thread_ip_voff; @@ -1973,7 +1973,7 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, E_I mapped_location_module = module; mapped_bytecode_mode = E_Mode_Offset; }break; - case RDI_SectionKind_ProcedureSymbols: + case RDI_SectionKind_Procedures: { RDI_Symbol *procedure = (RDI_Symbol *)rdi_section_raw_element_from_kind_idx(rdi, match.section_kind, match.idx); RDI_TypeNode *type_node = rdi_element_from_name_idx(rdi, TypeNodes, procedure->type_idx); @@ -2479,7 +2479,7 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, E_I { U64 vtable_voff = vtable_vaddr - module_base; U64 global_idx = rdi_vmap_idx_from_section_kind_voff(rdi, RDI_SectionKind_GlobalVMap, vtable_voff); - RDI_Symbol *global_var = rdi_element_from_name_idx(rdi, GlobalVariableSymbols, global_idx); + RDI_Symbol *global_var = rdi_element_from_name_idx(rdi, GlobalVariables, global_idx); if(global_var->container_flags & RDI_ContainerFlag_KindMask == RDI_ContainerKind_Type) { RDI_UDT *udt = rdi_element_from_name_idx(rdi, UDTs, global_var->container_idx); diff --git a/src/eval_visualization/eval_visualization_core.c b/src/eval_visualization/eval_visualization_core.c index 49524205..f41df3a5 100644 --- a/src/eval_visualization/eval_visualization_core.c +++ b/src/eval_visualization/eval_visualization_core.c @@ -2026,7 +2026,7 @@ ev_string_iter_next(Arena *arena, EV_StringIter *it, String8 *out_string) Temp scratch = scratch_begin(&arena, 1); RDI_Scope *scope = rdi_element_from_name_idx(rdi, Scopes, scope_idx); U64 proc_idx = scope->proc_idx; - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, proc_idx); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, proc_idx); RDI_TypeNode *type_node = rdi_element_from_name_idx(rdi, TypeNodes, procedure->type_idx); E_TypeKey type = e_type_key_ext(e_type_kind_from_rdi(type_node->kind), procedure->type_idx, dbg_info_num); String8 name = {0}; diff --git a/src/lib_rdi/rdi.h b/src/lib_rdi/rdi.h index b354a04f..31aee8c7 100644 --- a/src/lib_rdi/rdi.h +++ b/src/lib_rdi/rdi.h @@ -102,12 +102,12 @@ RDI_SectionKind_Scopes = 0x0017, RDI_SectionKind_ScopeVOffData = 0x0018, RDI_SectionKind_ScopeVMap = 0x0019, RDI_SectionKind_InlineSites = 0x001A, -RDI_SectionKind_GlobalVariableSymbols = 0x001B, +RDI_SectionKind_GlobalVariables = 0x001B, RDI_SectionKind_GlobalVMap = 0x001C, -RDI_SectionKind_ThreadVariableSymbols = 0x001D, -RDI_SectionKind_ConstantSymbols = 0x001E, -RDI_SectionKind_ProcedureSymbols = 0x001F, -RDI_SectionKind_LocalVariableSymbols = 0x0020, +RDI_SectionKind_ThreadVariables = 0x001D, +RDI_SectionKind_Constants = 0x001E, +RDI_SectionKind_Procedures = 0x001F, +RDI_SectionKind_LocalVariables = 0x0020, RDI_SectionKind_LocationsBytecodeData = 0x0021, RDI_SectionKind_LocationsConstantData = 0x0022, RDI_SectionKind_LocationsSetElements = 0x0023, @@ -543,12 +543,12 @@ X(Scopes, scopes, RDI_Scope)\ X(ScopeVOffData, scope_voff_data, RDI_U64)\ X(ScopeVMap, scope_vmap, RDI_VMapEntry)\ X(InlineSites, inline_sites, RDI_InlineSite)\ -X(GlobalVariableSymbols, global_variable_symbols, RDI_Symbol)\ +X(GlobalVariables, global_variables, RDI_Symbol)\ X(GlobalVMap, global_vmap, RDI_VMapEntry)\ -X(ThreadVariableSymbols, thread_variable_symbols, RDI_Symbol)\ -X(ConstantSymbols, constant_symbols, RDI_Symbol)\ -X(ProcedureSymbols, procedure_symbols, RDI_Symbol)\ -X(LocalVariableSymbols, local_variable_symbols, RDI_Symbol)\ +X(ThreadVariables, thread_variables, RDI_Symbol)\ +X(Constants, constants, RDI_Symbol)\ +X(Procedures, procedures, RDI_Symbol)\ +X(LocalVariables, local_variables, RDI_Symbol)\ X(LocationsBytecodeData, locations_bytecode_data, RDI_U8)\ X(LocationsConstantData, locations_constant_data, RDI_U8)\ X(LocationsSetElements, locations_set_elements, RDI_LocationSetElement)\ @@ -1045,11 +1045,11 @@ typedef struct RDI_U32_EnumMembers { RDI_U32 v; } RDI_U32_EnumMe typedef struct RDI_U32_Scopes { RDI_U32 v; } RDI_U32_Scopes; typedef struct RDI_U32_ScopeVOffData { RDI_U32 v; } RDI_U32_ScopeVOffData; typedef struct RDI_U32_InlineSites { RDI_U32 v; } RDI_U32_InlineSites; -typedef struct RDI_U32_GlobalVariableSymbols { RDI_U32 v; } RDI_U32_GlobalVariableSymbols; -typedef struct RDI_U32_ThreadVariableSymbols { RDI_U32 v; } RDI_U32_ThreadVariableSymbols; -typedef struct RDI_U32_ConstantSymbols { RDI_U32 v; } RDI_U32_ConstantSymbols; -typedef struct RDI_U32_ProcedureSymbols { RDI_U32 v; } RDI_U32_ProcedureSymbols; -typedef struct RDI_U32_LocalVariableSymbols { RDI_U32 v; } RDI_U32_LocalVariableSymbols; +typedef struct RDI_U32_GlobalVariables { RDI_U32 v; } RDI_U32_GlobalVariables; +typedef struct RDI_U32_ThreadVariables { RDI_U32 v; } RDI_U32_ThreadVariables; +typedef struct RDI_U32_Constants { RDI_U32 v; } RDI_U32_Constants; +typedef struct RDI_U32_Procedures { RDI_U32 v; } RDI_U32_Procedures; +typedef struct RDI_U32_LocalVariables { RDI_U32 v; } RDI_U32_LocalVariables; typedef struct RDI_U32_LocationsBytecodeData { RDI_U32 v; } RDI_U32_LocationsBytecodeData; typedef struct RDI_U32_LocationsConstantData { RDI_U32 v; } RDI_U32_LocationsConstantData; typedef struct RDI_U32_LocationsSetElements { RDI_U32 v; } RDI_U32_LocationsSetElements; @@ -1085,11 +1085,11 @@ typedef RDI_U32_Table RDI_U32_EnumMembers; typedef RDI_U32_Table RDI_U32_Scopes; typedef RDI_U32_Table RDI_U32_ScopeVOffData; typedef RDI_U32_Table RDI_U32_InlineSites; -typedef RDI_U32_Table RDI_U32_GlobalVariableSymbols; -typedef RDI_U32_Table RDI_U32_ThreadVariableSymbols; -typedef RDI_U32_Table RDI_U32_ConstantSymbols; -typedef RDI_U32_Table RDI_U32_ProcedureSymbols; -typedef RDI_U32_Table RDI_U32_LocalVariableSymbols; +typedef RDI_U32_Table RDI_U32_GlobalVariables; +typedef RDI_U32_Table RDI_U32_ThreadVariables; +typedef RDI_U32_Table RDI_U32_Constants; +typedef RDI_U32_Table RDI_U32_Procedures; +typedef RDI_U32_Table RDI_U32_LocalVariables; typedef RDI_U32_Table RDI_U32_LocationsBytecodeData; typedef RDI_U32_Table RDI_U32_LocationsConstantData; typedef RDI_U32_Table RDI_U32_LocationsSetElements; @@ -1445,12 +1445,12 @@ typedef RDI_Scope RDI_SectionElementType_Scopes; typedef RDI_U64 RDI_SectionElementType_ScopeVOffData; typedef RDI_VMapEntry RDI_SectionElementType_ScopeVMap; typedef RDI_InlineSite RDI_SectionElementType_InlineSites; -typedef RDI_Symbol RDI_SectionElementType_GlobalVariableSymbols; +typedef RDI_Symbol RDI_SectionElementType_GlobalVariables; typedef RDI_VMapEntry RDI_SectionElementType_GlobalVMap; -typedef RDI_Symbol RDI_SectionElementType_ThreadVariableSymbols; -typedef RDI_Symbol RDI_SectionElementType_ConstantSymbols; -typedef RDI_Symbol RDI_SectionElementType_ProcedureSymbols; -typedef RDI_Symbol RDI_SectionElementType_LocalVariableSymbols; +typedef RDI_Symbol RDI_SectionElementType_ThreadVariables; +typedef RDI_Symbol RDI_SectionElementType_Constants; +typedef RDI_Symbol RDI_SectionElementType_Procedures; +typedef RDI_Symbol RDI_SectionElementType_LocalVariables; typedef RDI_U8 RDI_SectionElementType_LocationsBytecodeData; typedef RDI_U8 RDI_SectionElementType_LocationsConstantData; typedef RDI_LocationSetElement RDI_SectionElementType_LocationsSetElements; diff --git a/src/lib_rdi/rdi_parse.c b/src/lib_rdi/rdi_parse.c index 0b0204a9..bb977fbf 100644 --- a/src/lib_rdi/rdi_parse.c +++ b/src/lib_rdi/rdi_parse.c @@ -742,7 +742,7 @@ rdi_procedure_from_name(RDI_Parsed *rdi, RDI_U8 *name, RDI_U64 name_size) { procedure_idx = ids[0]; } - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, procedure_idx); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, procedure_idx); return procedure; } @@ -854,7 +854,7 @@ rdi_parent_from_scope(RDI_Parsed *rdi, RDI_Scope *scope) RDI_PROC RDI_Symbol * rdi_procedure_from_scope(RDI_Parsed *rdi, RDI_Scope *scope) { - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, scope->proc_idx); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, scope->proc_idx); return procedure; } @@ -871,7 +871,7 @@ RDI_PROC RDI_Symbol * rdi_global_variable_from_voff(RDI_Parsed *rdi, RDI_U64 voff) { RDI_U32 idx = rdi_vmap_idx_from_section_kind_voff(rdi, RDI_SectionKind_GlobalVMap, voff); - RDI_Symbol *gvar = rdi_element_from_name_idx(rdi, GlobalVariableSymbols, idx); + RDI_Symbol *gvar = rdi_element_from_name_idx(rdi, GlobalVariables, idx); return gvar; } diff --git a/src/radbin/radbin.c b/src/radbin/radbin.c index 91fbde6a..a9034803 100644 --- a/src/radbin/radbin.c +++ b/src/radbin/radbin.c @@ -1029,7 +1029,7 @@ rb_thread_entry_point(void *p) ProfScope("dump FUNC records") { U64 count = 0; - RDI_Symbol *v = rdi_table_from_name(rdi, ProcedureSymbols, &count); + RDI_Symbol *v = rdi_table_from_name(rdi, Procedures, &count); Rng1U64 range = lane_range(count); for EachInRange(idx, range) { diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c index 7934fbd2..b6c9b6d0 100644 --- a/src/raddbg/raddbg_core.c +++ b/src/raddbg/raddbg_core.c @@ -9508,9 +9508,9 @@ rd_code_color_slot_from_txt_token_kind_lookup_string(TXT_TokenKind kind, String8 switch(section_kind) { default:{mapped = 0;}break; - case RDI_SectionKind_ProcedureSymbols: - case RDI_SectionKind_GlobalVariableSymbols: - case RDI_SectionKind_ThreadVariableSymbols: + case RDI_SectionKind_Procedures: + case RDI_SectionKind_GlobalVariables: + case RDI_SectionKind_ThreadVariables: { color = RD_CodeColorSlot_CodeSymbol; }break; @@ -14060,13 +14060,13 @@ rd_frame(void) { match = di_match_from_string(name, 0, di_key_zero(), rd_state->frame_eval_memread_endt_us); } - if(match.section_kind == RDI_SectionKind_ProcedureSymbols) + if(match.section_kind == RDI_SectionKind_Procedures) { Access *access = access_open(); { name_resolved = 1; RDI_Parsed *rdi = di_rdi_from_key(access, match.key, 0, 0); - RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, ProcedureSymbols, match.idx); + RDI_Symbol *procedure = rdi_element_from_name_idx(rdi, Procedures, match.idx); voff = rdi_first_voff_from_procedure(rdi, procedure); voff_dbgi_key = match.key; } diff --git a/src/raddbg/raddbg_eval.c b/src/raddbg/raddbg_eval.c index 11bbf9ec..bc82c903 100644 --- a/src/raddbg/raddbg_eval.c +++ b/src/raddbg/raddbg_eval.c @@ -1751,10 +1751,10 @@ E_TYPE_EXPAND_INFO_FUNCTION_DEF(debug_info_table) E_TypeKey lhs_type_key = eval.irtree.type_key; E_Type *lhs_type = e_type_from_key(lhs_type_key); if(0){} - else if(str8_match(lhs_type->name, str8_lit("procedures"), 0)) {section = RDI_SectionKind_ProcedureSymbols;} - else if(str8_match(lhs_type->name, str8_lit("globals"), 0)) {section = RDI_SectionKind_GlobalVariableSymbols;} - else if(str8_match(lhs_type->name, str8_lit("thread_locals"), 0)) {section = RDI_SectionKind_ThreadVariableSymbols;} - else if(str8_match(lhs_type->name, str8_lit("constants"), 0)) {section = RDI_SectionKind_ConstantSymbols;} + else if(str8_match(lhs_type->name, str8_lit("procedures"), 0)) {section = RDI_SectionKind_Procedures;} + else if(str8_match(lhs_type->name, str8_lit("globals"), 0)) {section = RDI_SectionKind_GlobalVariables;} + else if(str8_match(lhs_type->name, str8_lit("thread_locals"), 0)) {section = RDI_SectionKind_ThreadVariables;} + else if(str8_match(lhs_type->name, str8_lit("constants"), 0)) {section = RDI_SectionKind_Constants;} else if(str8_match(lhs_type->name, str8_lit("types"), 0)) {section = RDI_SectionKind_UDTs;} else if(str8_match(lhs_type->name, str8_lit("source_files"), 0)) {section = RDI_SectionKind_SourceFiles;} } @@ -1806,10 +1806,10 @@ E_TYPE_EXPAND_RANGE_FUNCTION_DEF(debug_info_table) switch(accel->section) { default:{}break; - case RDI_SectionKind_ProcedureSymbols: - case RDI_SectionKind_GlobalVariableSymbols: - case RDI_SectionKind_ThreadVariableSymbols: - case RDI_SectionKind_ConstantSymbols: + case RDI_SectionKind_Procedures: + case RDI_SectionKind_GlobalVariables: + case RDI_SectionKind_ThreadVariables: + case RDI_SectionKind_Constants: { RDI_Symbol *symbol = (RDI_Symbol *)rdi_section_raw_element_from_kind_idx(rdi, accel->section, element_idx); String8 symbol_name = {0}; diff --git a/src/rdi/rdi.mdesk b/src/rdi/rdi.mdesk index b19941ec..443e82bd 100644 --- a/src/rdi/rdi.mdesk +++ b/src/rdi/rdi.mdesk @@ -186,12 +186,12 @@ RDI_SectionTable: {InlineSites inline_sites RDI_InlineSite 0x001A U32 ""} //- rjf: symbols - {GlobalVariableSymbols global_variable_symbols RDI_Symbol 0x001B U32 ""} + {GlobalVariables global_variables RDI_Symbol 0x001B U32 ""} {GlobalVMap global_vmap RDI_VMapEntry 0x001C - ""} - {ThreadVariableSymbols thread_variable_symbols RDI_Symbol 0x001D U32 ""} - {ConstantSymbols constant_symbols RDI_Symbol 0x001E U32 ""} - {ProcedureSymbols procedure_symbols RDI_Symbol 0x001F U32 ""} - {LocalVariableSymbols local_variable_symbols RDI_Symbol 0x0020 U32 ""} + {ThreadVariables thread_variables RDI_Symbol 0x001D U32 ""} + {Constants constants RDI_Symbol 0x001E U32 ""} + {Procedures procedures RDI_Symbol 0x001F U32 ""} + {LocalVariables local_variables RDI_Symbol 0x0020 U32 ""} //- rjf: locations {LocationsBytecodeData locations_bytecode_data RDI_U8 0x0021 U32 ""} diff --git a/src/rdi/rdi_local.c b/src/rdi/rdi_local.c index f9971972..2e1343f1 100644 --- a/src/rdi/rdi_local.c +++ b/src/rdi/rdi_local.c @@ -896,11 +896,11 @@ lane_sync(); if(flags & (1ull<<(kind))) ProfScope(rdi_name_title_from_dump_subse } symbol_tables[] = { - {RDI_DumpSubset_Procedures, RDI_SectionKind_ProcedureSymbols}, - {RDI_DumpSubset_GlobalVariables, RDI_SectionKind_GlobalVariableSymbols}, - {RDI_DumpSubset_ThreadVariables, RDI_SectionKind_ThreadVariableSymbols}, - {RDI_DumpSubset_LocalVariables, RDI_SectionKind_LocalVariableSymbols}, - {RDI_DumpSubset_Constants, RDI_SectionKind_ConstantSymbols}, + {RDI_DumpSubset_Procedures, RDI_SectionKind_Procedures}, + {RDI_DumpSubset_GlobalVariables, RDI_SectionKind_GlobalVariables}, + {RDI_DumpSubset_ThreadVariables, RDI_SectionKind_ThreadVariables}, + {RDI_DumpSubset_LocalVariables, RDI_SectionKind_LocalVariables}, + {RDI_DumpSubset_Constants, RDI_SectionKind_Constants}, }; for EachElement(symbol_table_idx, symbol_tables) { @@ -1047,7 +1047,7 @@ lane_sync(); if(flags & (1ull<<(kind))) ProfScope(rdi_name_title_from_dump_subse U64 scope_voffs_count = 0; U64 *scope_voffs = rdi_table_from_name(rdi, ScopeVOffData, &scope_voffs_count); U64 locals_count = 0; - RDI_Symbol *locals = rdi_table_from_name(rdi, LocalVariableSymbols, &locals_count); + RDI_Symbol *locals = rdi_table_from_name(rdi, LocalVariables, &locals_count); U64 count = 0; RDI_Scope *v = rdi_table_from_name(rdi, Scopes, &count); RDI_Scope *nil = &v[0]; @@ -1077,7 +1077,7 @@ lane_sync(); if(flags & (1ull<<(kind))) ProfScope(rdi_name_title_from_dump_subse } // rjf: scope procedure -> name - String8 procedure_name = str8_from_rdi_string_idx(rdi, rdi_element_from_name_idx(rdi, ProcedureSymbols, scope->proc_idx)->name_string_idx); + String8 procedure_name = str8_from_rdi_string_idx(rdi, rdi_element_from_name_idx(rdi, Procedures, scope->proc_idx)->name_string_idx); if(procedure_name.size == 0) { procedure_name = str8_lit("???"); diff --git a/src/rdi_make/rdi_make_local.c b/src/rdi_make/rdi_make_local.c index a0f69ce8..c60e6fa8 100644 --- a/src/rdi_make/rdi_make_local.c +++ b/src/rdi_make/rdi_make_local.c @@ -3541,12 +3541,12 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params) Map(ScopeVOffData, baked_scopes->scope_voffs, baked_scopes->scope_voffs_count); Map(ScopeVMap, baked_scope_vmap->vmap, baked_scope_vmap->count); Map(InlineSites, baked_inline_sites, baked_inline_sites_count); - Map(GlobalVariableSymbols, baked_global_variables, baked_global_variables_count); + Map(GlobalVariables, baked_global_variables, baked_global_variables_count); Map(GlobalVMap, baked_global_vmap->vmap, baked_global_vmap->count); - Map(ThreadVariableSymbols, baked_thread_variables, baked_thread_variables_count); - Map(ConstantSymbols, baked_constants, baked_constants_count); - Map(ProcedureSymbols, baked_procedures, baked_procedures_count); - Map(LocalVariableSymbols, baked_locals, baked_locals_count); + Map(ThreadVariables, baked_thread_variables, baked_thread_variables_count); + Map(Constants, baked_constants, baked_constants_count); + Map(Procedures, baked_procedures, baked_procedures_count); + Map(LocalVariables, baked_locals, baked_locals_count); Map(LocationsBytecodeData, baked_location_bytecode_data, baked_location_bytecode_data_size); Map(LocationsConstantData, baked_location_constant_data, baked_location_constant_data_size); Map(LocationsSetElements, baked_location_set_elements, baked_location_set_elements_count);