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

on ambiguous debug info matches, inside primary debug info -> try building a fully qualified name from context, and replacing initial debug info match if it hits

Browse Source
This commit is contained in:
Ryan Fleury
2026-05-19 12:08:26 -07:00
parent 161663016f
commit 17cdf458d3
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eval/eval_ir.c
+20 -3
View File
@@ -1900,6 +1900,26 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, E_I
// rjf: find match
DI_Match match = di_match_from_string(string, match_disambiguating_idx, e_base_ctx->primary_dbg_info->dbgi_key, 0);
// rjf: match -> RDI
RDI_Parsed *rdi = di_rdi_from_key(access, match.key, 0, 0);
// rjf: ambiguous global/thread variable in primary debug info -> try fully qualifying the name implicitly.
if((match.section_kind == RDI_SectionKind_GlobalVariables ||
match.section_kind == RDI_SectionKind_ThreadVariables) &&
match.count != 1 &&
rdi == e_base_ctx->primary_dbg_info->rdi)
{
U64 voff = e_base_ctx->thread_ip_voff;
RDI_Symbol *procedure = rdi_procedure_from_voff(rdi, voff);
String8 procedure_name = fully_qualified_str8_from_rdi_symbol(scratch.arena, rdi, procedure);
String8 fully_qualified_name = str8f(scratch.arena, "%S.%S", procedure_name, string);
DI_Match fully_qualified_match_maybe = di_match_from_string(fully_qualified_name, match_disambiguating_idx, e_base_ctx->primary_dbg_info->dbgi_key, 0);
if(fully_qualified_match_maybe.idx != 0)
{
match = fully_qualified_match_maybe;
}
}
#if 0
//~ TODO(rjf): vvvvv this used to be used for namespaceifying partially-qualified strings.
// now, the debugger just stores partially-qualified strings, so we instead need to do the
@@ -1943,9 +1963,6 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, E_I
}
#endif
// rjf: match -> RDI
RDI_Parsed *rdi = di_rdi_from_key(access, match.key, 0, 0);
// rjf: find dbg info from rdi
E_DbgInfo *dbg_info = &e_dbg_info_nil;
U32 dbg_info_num = 0;