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

fix duplicate nil local, equip locals with their scopes as symbol containers

Browse Source
This commit is contained in:
Ryan Fleury
2026-04-20 09:57:32 -07:00
parent e281528d57
commit bec7e630ba
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rdi/rdi_local.c
+9 -6
View File
@@ -1134,9 +1134,15 @@ lane_sync(); if(flags & (1ull<<(kind))) ProfScope(rdi_name_title_from_dump_subse
RDI_Symbol *symbol = &v[idx]; RDI_Symbol *symbol = &v[idx];
Temp scratch = scratch_begin(&arena, 1); Temp scratch = scratch_begin(&arena, 1);
dumpf("\n '%S': // %S[%I64u]\n {\n", str8_from_rdi_string_idx(rdi, symbol->name_string_idx), table_name, idx); dumpf("\n '%S': // %S[%I64u]\n {\n", str8_from_rdi_string_idx(rdi, symbol->name_string_idx), table_name, idx);
dumpf(" link_name: '%S'\n", str8_from_rdi_string_idx(rdi, symbol->link_name_string_idx));
dumpf(" type_idx: %u\n", symbol->type_idx); dumpf(" type_idx: %u\n", symbol->type_idx);
if(symbol->link_name_string_idx != 0)
{
dumpf(" link_name: '%S'\n", str8_from_rdi_string_idx(rdi, symbol->link_name_string_idx));
}
if(symbol->root_scope_idx != 0)
{
dumpf(" root_scope_idx: %u\n", symbol->root_scope_idx); dumpf(" root_scope_idx: %u\n", symbol->root_scope_idx);
}
dumpf(" container_idx: %u\n", symbol->container_idx); dumpf(" container_idx: %u\n", symbol->container_idx);
// TODO(rjf): location info // TODO(rjf): location info
dumpf(" }\n"); dumpf(" }\n");
@@ -1185,7 +1191,7 @@ lane_sync(); if(flags & (1ull<<(kind))) ProfScope(rdi_name_title_from_dump_subse
} }
// rjf: scope procedure -> name // rjf: scope procedure -> name
String8 procedure_name = str8_from_rdi_string_idx(rdi, rdi_element_from_name_idx(rdi, Procedures, scope->proc_idx)->name_string_idx); String8 procedure_name = str8_from_rdi_string_idx(rdi, rdi_element_from_name_idx(rdi, ProcedureSymbols, scope->proc_idx)->name_string_idx);
if(procedure_name.size == 0) if(procedure_name.size == 0)
{ {
procedure_name = str8_lit("???"); procedure_name = str8_lit("???");
@@ -1220,10 +1226,7 @@ lane_sync(); if(flags & (1ull<<(kind))) ProfScope(rdi_name_title_from_dump_subse
{ {
Temp scratch = scratch_begin(&arena, 1); Temp scratch = scratch_begin(&arena, 1);
RDI_Symbol *local_ptr = &locals[local_idx]; RDI_Symbol *local_ptr = &locals[local_idx];
dumpf("%.*s '%S': // local[%u]\n", depth*2, indent.str, str8_from_rdi_string_idx(rdi, local_ptr->name_string_idx), local_idx); dumpf("%.*s '%S': {type_idx: %u} // local_variable #%u\n", depth*2, indent.str, str8_from_rdi_string_idx(rdi, local_ptr->name_string_idx), local_ptr->type_idx, local_idx);
dumpf("%.*s {\n", depth*2, indent.str);
dumpf("%.*s type_idx: %u\n", depth*2, indent.str, local_ptr->type_idx);
dumpf("%.*s }\n", depth*2, indent.str);
scratch_end(scratch); scratch_end(scratch);
} }
} }
src/rdi_make/rdi_make_local.c
+3 -5
View File
@@ -3066,7 +3066,7 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params)
} }
if(lane_idx() == lane_from_task_idx(2)) if(lane_idx() == lane_from_task_idx(2))
{ {
baked_scopes->arranged_locals_chunk.count = scope_layout->total_local_count; baked_scopes->arranged_locals_chunk.count = scope_layout->total_local_count - 1;
baked_scopes->arranged_locals_chunk.cap = baked_scopes->arranged_locals_chunk.count; baked_scopes->arranged_locals_chunk.cap = baked_scopes->arranged_locals_chunk.count;
baked_scopes->arranged_locals_chunk.base_idx = 0; baked_scopes->arranged_locals_chunk.base_idx = 0;
baked_scopes->arranged_locals_chunk.v = push_array(scratch.arena, RDIM_Symbol, baked_scopes->arranged_locals_chunk.count); baked_scopes->arranged_locals_chunk.v = push_array(scratch.arena, RDIM_Symbol, baked_scopes->arranged_locals_chunk.count);
@@ -3105,16 +3105,14 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params)
for EachIndex(src_local_idx, src_local_n->count) for EachIndex(src_local_idx, src_local_n->count)
{ {
RDIM_Symbol *src_local = &src_local_n->v[src_local_idx]; RDIM_Symbol *src_local = &src_local_n->v[src_local_idx];
RDIM_Symbol *dst_local = &baked_scopes->arranged_locals_chunk.v[chunk_local_off]; RDIM_Symbol *dst_local = &baked_scopes->arranged_locals_chunk.v[chunk_local_off - 1];
dst_local->chunk = &baked_scopes->arranged_locals_chunk; dst_local->chunk = &baked_scopes->arranged_locals_chunk;
dst_local->is_extern = src_local->is_extern; dst_local->is_extern = src_local->is_extern;
dst_local->is_param = src_local->is_param; dst_local->is_param = src_local->is_param;
dst_local->name = src_local->name; dst_local->name = src_local->name;
dst_local->link_name = src_local->link_name; dst_local->link_name = src_local->link_name;
dst_local->type = src_local->type; dst_local->type = src_local->type;
dst_local->container_scope = src_local->container_scope; dst_local->container_scope = src_scope;
dst_local->container_type = src_local->container_type;
dst_local->container_namespace = src_local->container_namespace;
dst_local->root_scope = src_local->root_scope; dst_local->root_scope = src_local->root_scope;
dst_local->location_cases = src_local->location_cases; dst_local->location_cases = src_local->location_cases;
chunk_local_off += 1; chunk_local_off += 1;