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

d2r2: don't descend children for childless subprograms!

Browse Source
This commit is contained in:
Ryan Fleury
2026-05-03 11:24:38 -07:00
parent 4f3d9c96b8
commit e48c23db20
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project.4coder
+1 -1
View File
@@ -49,7 +49,7 @@ commands =
// .f1 = { .win = "raddbg_stable --ipc kill_all && build raddbg meta telemetry", .linux = "", .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, .cursor_at_end = false, }, // .f1 = { .win = "raddbg_stable --ipc kill_all && build raddbg meta telemetry", .linux = "", .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, .cursor_at_end = false, },
// .f1 = { .win = "raddbg_stable --ipc kill_all && build raddbg debug telemetry", .linux = "", .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, .cursor_at_end = false, }, // .f1 = { .win = "raddbg_stable --ipc kill_all && build raddbg debug telemetry", .linux = "", .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, .cursor_at_end = false, },
// .f1 = { .win = "raddbg_stable --ipc kill_all && build radbin", .linux = "", .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, .cursor_at_end = false, }, // .f1 = { .win = "raddbg_stable --ipc kill_all && build radbin", .linux = "", .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, .cursor_at_end = false, },
.f1 = { .win = "build radbin debug telemetry", .linux = "", .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, .cursor_at_end = false, }, .f1 = { .win = "build radbin release telemetry", .linux = "", .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, .cursor_at_end = false, },
//- rjf: [raddbg wsl] //- rjf: [raddbg wsl]
// .f1 = { .win = "wsl ./build.sh raddbg", .linux = "", .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, .cursor_at_end = false, }, // .f1 = { .win = "wsl ./build.sh raddbg", .linux = "", .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, .cursor_at_end = false, },
src/rdi_from_dwarf/rdi_from_dwarf_2.c
+8 -3
View File
@@ -2268,6 +2268,7 @@ d2r2_convert(Arena *arena, D2R2_ConvertParams *params)
DW2_Attrib *bytesize_attrib = &dw2_attrib_nil; DW2_Attrib *bytesize_attrib = &dw2_attrib_nil;
DW2_Attrib *encoding_attrib = &dw2_attrib_nil; DW2_Attrib *encoding_attrib = &dw2_attrib_nil;
DW2_Attrib *decl_attrib = &dw2_attrib_nil; DW2_Attrib *decl_attrib = &dw2_attrib_nil;
DW2_Attrib *prototyped_attrib = &dw2_attrib_nil;
// //
// TODO(rjf): if a DW_AttribKing_GNU_Vector is found on an DW_TagKind_ArrayType, // TODO(rjf): if a DW_AttribKing_GNU_Vector is found on an DW_TagKind_ArrayType,
// then: @native_vector_support extract byte size from the base type tag // then: @native_vector_support extract byte size from the base type tag
@@ -2367,6 +2368,7 @@ d2r2_convert(Arena *arena, D2R2_ConvertParams *params)
}break; }break;
case DW_TagKind_SubProgram: case DW_TagKind_SubProgram:
case DW_TagKind_SubroutineType: case DW_TagKind_SubroutineType:
ProfScope("subprogram / subroutine (%.*s)", str8_varg(name))
{ {
// rjf: build type // rjf: build type
dst_type = rdim_type_chunk_list_push(arena, &lane_types, lane_types_chunk_count); dst_type = rdim_type_chunk_list_push(arena, &lane_types, lane_types_chunk_count);
@@ -2386,25 +2388,27 @@ d2r2_convert(Arena *arena, D2R2_ConvertParams *params)
ParamNode *first_param = 0; ParamNode *first_param = 0;
ParamNode *last_param = 0; ParamNode *last_param = 0;
U64 param_count = 0; U64 param_count = 0;
if(tag.has_children)
{ {
U64 tag_children_off = info_off + tag_info_size; U64 tag_children_off = info_off + tag_info_size;
S64 depth = 1; S64 depth = 1;
for(U64 off = tag_children_off; depth > 0 && contains_1u64(unit_info_tag_range, off);) for(U64 off = tag_children_off; depth > 0 && contains_1u64(unit_info_tag_range, off);)
{ {
Temp scratch3 = scratch_begin(&scratch2.arena, 1);
U64 start_off = off; U64 start_off = off;
// rjf: read child tag // rjf: read child tag
DW2_Tag child_tag = {0}; DW2_Tag child_tag = {0};
off += dw2_read_tag(scratch2.arena, unit_parse_ctx, raw->sec[DW_Section_Info].data, off, &child_tag); off += dw2_read_tag(scratch3.arena, unit_parse_ctx, raw->sec[DW_Section_Info].data, off, &child_tag);
// rjf: gather parameters // rjf: gather parameters
if(depth == 1 && child_tag.kind == DW_TagKind_FormalParameter) if(depth == 1 && child_tag.kind == DW_TagKind_FormalParameter)
{ {
DW2_Attrib *type_attrib = dw2_attrib_from_kind(&child_tag, DW_AttribKind_Type); DW2_Attrib *type_attrib = dw2_attrib_from_kind(&child_tag, DW_AttribKind_Type);
ParamNode *n = push_array(scratch2.arena, ParamNode, 1); ParamNode *n = push_array(scratch2.arena, ParamNode, 1);
n->type_info_off = dw2_reference_info_off_from_form_val(unit_parse_ctx, &direct_type_attrib->val);
n->type_unit_idx = unit_idx;
SLLQueuePush(first_param, last_param, n); SLLQueuePush(first_param, last_param, n);
n->type_info_off = dw2_reference_info_off_from_form_val(unit_parse_ctx, &type_attrib->val);
n->type_unit_idx = unit_idx;
if(!contains_1u64(unit_info_tag_range, n->type_info_off)) if(!contains_1u64(unit_info_tag_range, n->type_info_off))
{ {
U64 new_unit_num = rng1u64_array_num_from_value__binary_search(&unit_info_tag_ranges_array, n->type_info_off); U64 new_unit_num = rng1u64_array_num_from_value__binary_search(&unit_info_tag_ranges_array, n->type_info_off);
@@ -2423,6 +2427,7 @@ d2r2_convert(Arena *arena, D2R2_ConvertParams *params)
depth += 1; depth += 1;
} }
scratch_end(scratch3);
if(off == start_off) if(off == start_off)
{ {
break; break;