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

shift to slice-granularity of string map gathering, rather than chunk-granularity - gives a bit more flexibility. set up pdb converter type name gathering tasks for slice subdivision. before going forward with this plan it's imperative that we start sparsely allocating these name maps...

Browse Source
This commit is contained in:
Ryan Fleury
2024-02-28 16:48:25 -08:00
parent a38742d80b
commit 1ea3a14a50
5 changed files with 343 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project.4coder
+1 -1
View File
@@ -47,7 +47,7 @@ commands =
{ {
.rjf_f1 = .rjf_f1 =
{ {
.win = "build raddbgi_from_pdb telemetry debug", .win = "build raddbgi_from_pdb telemetry release",
.linux = "", .linux = "",
.out = "*compilation*", .out = "*compilation*",
.footer_panel = true, .footer_panel = true,
src/lib_raddbgi_make/raddbgi_make.c
+31 -31
View File
@@ -1861,47 +1861,47 @@ rdim_bake_string_chunk_list_map_push_path_tree(RDIM_Arena *arena, RDIM_BakeStrin
//- rjf: chunk-granularity bake string gathering passes //- rjf: chunk-granularity bake string gathering passes
RDI_PROC void RDI_PROC void
rdim_bake_string_chunk_list_map_push_src_file_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_SrcFileChunkNode *chunk) rdim_bake_string_chunk_list_map_push_src_file_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_SrcFile *v, RDI_U64 count)
{ {
for(RDI_U64 idx = 0; idx < chunk->count; idx += 1) for(RDI_U64 idx = 0; idx < count; idx += 1)
{ {
rdim_bake_string_chunk_list_map_insert(arena, top, map, 1, chunk->v[idx].normal_full_path); rdim_bake_string_chunk_list_map_insert(arena, top, map, 1, v[idx].normal_full_path);
} }
} }
RDI_PROC void RDI_PROC void
rdim_bake_string_chunk_list_map_push_unit_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_UnitChunkNode *chunk) rdim_bake_string_chunk_list_map_push_unit_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_Unit *v, RDI_U64 count)
{ {
for(RDI_U64 idx = 0; idx < chunk->count; idx += 1) for(RDI_U64 idx = 0; idx < count; idx += 1)
{ {
rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, chunk->v[idx].unit_name); rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, v[idx].unit_name);
rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, chunk->v[idx].compiler_name); rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, v[idx].compiler_name);
rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, chunk->v[idx].source_file); rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, v[idx].source_file);
rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, chunk->v[idx].object_file); rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, v[idx].object_file);
rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, chunk->v[idx].archive_file); rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, v[idx].archive_file);
rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, chunk->v[idx].build_path); rdim_bake_string_chunk_list_map_insert(arena, top, map, 4, v[idx].build_path);
} }
} }
RDI_PROC void RDI_PROC void
rdim_bake_string_chunk_list_map_push_type_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_TypeChunkNode *chunk) rdim_bake_string_chunk_list_map_push_type_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_Type *v, RDI_U64 count)
{ {
for(RDI_U64 idx = 0; idx < chunk->count; idx += 1) for(RDI_U64 idx = 0; idx < count; idx += 1)
{ {
rdim_bake_string_chunk_list_map_insert(arena, top, map, 64, chunk->v[idx].name); rdim_bake_string_chunk_list_map_insert(arena, top, map, 64, v[idx].name);
} }
} }
RDI_PROC void RDI_PROC void
rdim_bake_string_chunk_list_map_push_udt_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_UDTChunkNode *chunk) rdim_bake_string_chunk_list_map_push_udt_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_UDT *v, RDI_U64 count)
{ {
for(RDI_U64 idx = 0; idx < chunk->count; idx += 1) for(RDI_U64 idx = 0; idx < count; idx += 1)
{ {
for(RDIM_UDTMember *mem = chunk->v[idx].first_member; mem != 0; mem = mem->next) for(RDIM_UDTMember *mem = v[idx].first_member; mem != 0; mem = mem->next)
{ {
rdim_bake_string_chunk_list_map_insert(arena, top, map, 64, mem->name); rdim_bake_string_chunk_list_map_insert(arena, top, map, 64, mem->name);
} }
for(RDIM_UDTEnumVal *mem = chunk->v[idx].first_enum_val; mem != 0; mem = mem->next) for(RDIM_UDTEnumVal *mem = v[idx].first_enum_val; mem != 0; mem = mem->next)
{ {
rdim_bake_string_chunk_list_map_insert(arena, top, map, 64, mem->name); rdim_bake_string_chunk_list_map_insert(arena, top, map, 64, mem->name);
} }
@@ -1909,21 +1909,21 @@ rdim_bake_string_chunk_list_map_push_udt_chunk(RDIM_Arena *arena, RDIM_BakeStrin
} }
RDI_PROC void RDI_PROC void
rdim_bake_string_chunk_list_map_push_symbol_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_SymbolChunkNode *chunk) rdim_bake_string_chunk_list_map_push_symbol_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_Symbol *v, RDI_U64 count)
{ {
for(RDI_U64 idx = 0; idx < chunk->count; idx += 1) for(RDI_U64 idx = 0; idx < count; idx += 1)
{ {
rdim_bake_string_chunk_list_map_insert(arena, top, map, 1, chunk->v[idx].name); rdim_bake_string_chunk_list_map_insert(arena, top, map, 1, v[idx].name);
rdim_bake_string_chunk_list_map_insert(arena, top, map, 1, chunk->v[idx].link_name); rdim_bake_string_chunk_list_map_insert(arena, top, map, 1, v[idx].link_name);
} }
} }
RDI_PROC void RDI_PROC void
rdim_bake_string_chunk_list_map_push_scope_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_ScopeChunkNode *chunk) rdim_bake_string_chunk_list_map_push_scope_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_Scope *v, RDI_U64 count)
{ {
for(RDI_U64 idx = 0; idx < chunk->count; idx += 1) for(RDI_U64 idx = 0; idx < count; idx += 1)
{ {
for(RDIM_Local *local = chunk->v[idx].first_local; local != 0; local = local->next) for(RDIM_Local *local = v[idx].first_local; local != 0; local = local->next)
{ {
rdim_bake_string_chunk_list_map_insert(arena, top, map, 1, local->name); rdim_bake_string_chunk_list_map_insert(arena, top, map, 1, local->name);
} }
@@ -1937,7 +1937,7 @@ rdim_bake_string_chunk_list_map_push_src_files(RDIM_Arena *arena, RDIM_BakeStrin
{ {
for(RDIM_SrcFileChunkNode *n = list->first; n != 0; n = n->next) for(RDIM_SrcFileChunkNode *n = list->first; n != 0; n = n->next)
{ {
rdim_bake_string_chunk_list_map_push_src_file_chunk(arena, top, map, n); rdim_bake_string_chunk_list_map_push_src_file_slice(arena, top, map, n->v, n->count);
} }
} }
@@ -1946,7 +1946,7 @@ rdim_bake_string_chunk_list_map_push_units(RDIM_Arena *arena, RDIM_BakeStringChu
{ {
for(RDIM_UnitChunkNode *n = list->first; n != 0; n = n->next) for(RDIM_UnitChunkNode *n = list->first; n != 0; n = n->next)
{ {
rdim_bake_string_chunk_list_map_push_unit_chunk(arena, top, map, n); rdim_bake_string_chunk_list_map_push_unit_slice(arena, top, map, n->v, n->count);
} }
} }
@@ -1955,7 +1955,7 @@ rdim_bake_string_chunk_list_map_push_types(RDIM_Arena *arena, RDIM_BakeStringChu
{ {
for(RDIM_TypeChunkNode *n = list->first; n != 0; n = n->next) for(RDIM_TypeChunkNode *n = list->first; n != 0; n = n->next)
{ {
rdim_bake_string_chunk_list_map_push_type_chunk(arena, top, map, n); rdim_bake_string_chunk_list_map_push_type_slice(arena, top, map, n->v, n->count);
} }
} }
@@ -1964,7 +1964,7 @@ rdim_bake_string_chunk_list_map_push_udts(RDIM_Arena *arena, RDIM_BakeStringChun
{ {
for(RDIM_UDTChunkNode *n = list->first; n != 0; n = n->next) for(RDIM_UDTChunkNode *n = list->first; n != 0; n = n->next)
{ {
rdim_bake_string_chunk_list_map_push_udt_chunk(arena, top, map, n); rdim_bake_string_chunk_list_map_push_udt_slice(arena, top, map, n->v, n->count);
} }
} }
@@ -1973,7 +1973,7 @@ rdim_bake_string_chunk_list_map_push_symbols(RDIM_Arena *arena, RDIM_BakeStringC
{ {
for(RDIM_SymbolChunkNode *n = list->first; n != 0; n = n->next) for(RDIM_SymbolChunkNode *n = list->first; n != 0; n = n->next)
{ {
rdim_bake_string_chunk_list_map_push_symbol_chunk(arena, top, map, n); rdim_bake_string_chunk_list_map_push_symbol_slice(arena, top, map, n->v, n->count);
} }
} }
@@ -1982,7 +1982,7 @@ rdim_bake_string_chunk_list_map_push_scopes(RDIM_Arena *arena, RDIM_BakeStringCh
{ {
for(RDIM_ScopeChunkNode *n = list->first; n != 0; n = n->next) for(RDIM_ScopeChunkNode *n = list->first; n != 0; n = n->next)
{ {
rdim_bake_string_chunk_list_map_push_scope_chunk(arena, top, map, n); rdim_bake_string_chunk_list_map_push_scope_slice(arena, top, map, n->v, n->count);
} }
} }
src/lib_raddbgi_make/raddbgi_make.h
+7 -14
View File
@@ -585,13 +585,6 @@ struct RDIM_TypeChunkList
RDI_U64 total_count; RDI_U64 total_count;
}; };
typedef struct RDIM_TypeArray RDIM_TypeArray;
struct RDIM_TypeArray
{
RDIM_Type *v;
RDI_U64 count;
};
//////////////////////////////// ////////////////////////////////
//~ rjf: User-Defined-Type Info Types //~ rjf: User-Defined-Type Info Types
@@ -1195,13 +1188,13 @@ RDI_PROC void rdim_bake_string_chunk_list_map_push_top_level_info(RDIM_Arena *ar
RDI_PROC void rdim_bake_string_chunk_list_map_push_binary_sections(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_BinarySectionList *secs); RDI_PROC void rdim_bake_string_chunk_list_map_push_binary_sections(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_BinarySectionList *secs);
RDI_PROC void rdim_bake_string_chunk_list_map_push_path_tree(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_BakePathTree *path_tree); RDI_PROC void rdim_bake_string_chunk_list_map_push_path_tree(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_BakePathTree *path_tree);
//- rjf: chunk-granularity bake string gathering passes //- rjf: slice-granularity bake string gathering passes
RDI_PROC void rdim_bake_string_chunk_list_map_push_src_file_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_SrcFileChunkNode *chunk); RDI_PROC void rdim_bake_string_chunk_list_map_push_src_file_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_SrcFile *v, RDI_U64 count);
RDI_PROC void rdim_bake_string_chunk_list_map_push_unit_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_UnitChunkNode *chunk); RDI_PROC void rdim_bake_string_chunk_list_map_push_unit_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_Unit *v, RDI_U64 count);
RDI_PROC void rdim_bake_string_chunk_list_map_push_type_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_TypeChunkNode *chunk); RDI_PROC void rdim_bake_string_chunk_list_map_push_type_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_Type *v, RDI_U64 count);
RDI_PROC void rdim_bake_string_chunk_list_map_push_udt_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_UDTChunkNode *chunk); RDI_PROC void rdim_bake_string_chunk_list_map_push_udt_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_UDT *v, RDI_U64 count);
RDI_PROC void rdim_bake_string_chunk_list_map_push_symbol_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_SymbolChunkNode *chunk); RDI_PROC void rdim_bake_string_chunk_list_map_push_symbol_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_Symbol *v, RDI_U64 count);
RDI_PROC void rdim_bake_string_chunk_list_map_push_scope_chunk(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_ScopeChunkNode *chunk); RDI_PROC void rdim_bake_string_chunk_list_map_push_scope_slice(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_Scope *v, RDI_U64 count);
//- rjf: list-granularity bake string gathering passes //- rjf: list-granularity bake string gathering passes
RDI_PROC void rdim_bake_string_chunk_list_map_push_src_files(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_SrcFileChunkList *list); RDI_PROC void rdim_bake_string_chunk_list_map_push_src_files(RDIM_Arena *arena, RDIM_BakeStringChunkListMapTopology *top, RDIM_BakeStringChunkListMap *map, RDIM_SrcFileChunkList *list);
src/raddbgi_from_pdb/raddbgi_from_pdb.c
+277 -249
View File
@@ -839,288 +839,291 @@ p2r_itype_chain_build_task__entry_point(Arena *arena, void *p)
{ {
Temp scratch = scratch_begin(&arena, 1); Temp scratch = scratch_begin(&arena, 1);
P2R_ITypeChainBuildIn *in = (P2R_ITypeChainBuildIn *)p; P2R_ITypeChainBuildIn *in = (P2R_ITypeChainBuildIn *)p;
for(CV_TypeId itype = in->itype_first; itype < in->itype_opl; itype += 1) ProfScope("dependency itype chain build")
{ {
//- rjf: push initial itype - should be final-visited-itype for this itype for(CV_TypeId itype = in->itype_first; itype < in->itype_opl; itype += 1)
{ {
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1); //- rjf: push initial itype - should be final-visited-itype for this itype
c->itype = itype; {
SLLStackPush(in->itype_chains[itype], c); P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
} c->itype = itype;
SLLStackPush(in->itype_chains[itype], c);
}
//- rjf: skip basic types for dependency walk //- rjf: skip basic types for dependency walk
if(itype < in->tpi_leaf->itype_first) if(itype < in->tpi_leaf->itype_first)
{
continue;
}
//- rjf: walk dependent types, push to chain
P2R_TypeIdChain start_walk_task = {0, itype};
P2R_TypeIdChain *first_walk_task = &start_walk_task;
P2R_TypeIdChain *last_walk_task = &start_walk_task;
for(P2R_TypeIdChain *walk_task = first_walk_task;
walk_task != 0;
walk_task = walk_task->next)
{
CV_TypeId walk_itype = in->itype_fwd_map[walk_task->itype] ? in->itype_fwd_map[walk_task->itype] : walk_task->itype;
if(walk_itype < in->tpi_leaf->itype_first)
{ {
continue; continue;
} }
CV_RecRange *range = &in->tpi_leaf->leaf_ranges.ranges[walk_itype-in->tpi_leaf->itype_first];
CV_LeafKind kind = range->hdr.kind; //- rjf: walk dependent types, push to chain
U64 header_struct_size = cv_header_struct_size_from_leaf_kind(kind); P2R_TypeIdChain start_walk_task = {0, itype};
if(range->off+range->hdr.size <= in->tpi_leaf->data.size && P2R_TypeIdChain *first_walk_task = &start_walk_task;
range->off+2+header_struct_size <= in->tpi_leaf->data.size && P2R_TypeIdChain *last_walk_task = &start_walk_task;
range->hdr.size >= 2) for(P2R_TypeIdChain *walk_task = first_walk_task;
walk_task != 0;
walk_task = walk_task->next)
{ {
U8 *itype_leaf_first = in->tpi_leaf->data.str + range->off+2; CV_TypeId walk_itype = in->itype_fwd_map[walk_task->itype] ? in->itype_fwd_map[walk_task->itype] : walk_task->itype;
U8 *itype_leaf_opl = itype_leaf_first + range->hdr.size-2; if(walk_itype < in->tpi_leaf->itype_first)
switch(kind)
{ {
default:{}break; continue;
}
//- rjf: MODIFIER CV_RecRange *range = &in->tpi_leaf->leaf_ranges.ranges[walk_itype-in->tpi_leaf->itype_first];
case CV_LeafKind_MODIFIER: CV_LeafKind kind = range->hdr.kind;
U64 header_struct_size = cv_header_struct_size_from_leaf_kind(kind);
if(range->off+range->hdr.size <= in->tpi_leaf->data.size &&
range->off+2+header_struct_size <= in->tpi_leaf->data.size &&
range->hdr.size >= 2)
{
U8 *itype_leaf_first = in->tpi_leaf->data.str + range->off+2;
U8 *itype_leaf_opl = itype_leaf_first + range->hdr.size-2;
switch(kind)
{ {
CV_LeafModifier *lf = (CV_LeafModifier *)itype_leaf_first; default:{}break;
// rjf: push dependent itype to chain //- rjf: MODIFIER
case CV_LeafKind_MODIFIER:
{ {
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1); CV_LeafModifier *lf = (CV_LeafModifier *)itype_leaf_first;
c->itype = lf->itype;
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk dependency itype // rjf: push dependent itype to chain
{ {
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1); P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->itype; c->itype = lf->itype;
SLLQueuePush(first_walk_task, last_walk_task, c); SLLStackPush(in->itype_chains[itype], c);
} }
}break;
//- rjf: POINTER // rjf: push task to walk dependency itype
case CV_LeafKind_POINTER: {
{ P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
CV_LeafModifier *lf = (CV_LeafModifier *)itype_leaf_first; c->itype = lf->itype;
SLLQueuePush(first_walk_task, last_walk_task, c);
}
}break;
// rjf: push dependent itype to chain //- rjf: POINTER
case CV_LeafKind_POINTER:
{ {
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1); CV_LeafModifier *lf = (CV_LeafModifier *)itype_leaf_first;
c->itype = lf->itype;
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk dependency itype // rjf: push dependent itype to chain
{ {
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1); P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->itype; c->itype = lf->itype;
SLLQueuePush(first_walk_task, last_walk_task, c); SLLStackPush(in->itype_chains[itype], c);
} }
}break;
//- rjf: PROCEDURE // rjf: push task to walk dependency itype
case CV_LeafKind_PROCEDURE: {
{ P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
CV_LeafProcedure *lf = (CV_LeafProcedure *)itype_leaf_first; c->itype = lf->itype;
SLLQueuePush(first_walk_task, last_walk_task, c);
}
}break;
// rjf: push return itypes to chain //- rjf: PROCEDURE
case CV_LeafKind_PROCEDURE:
{ {
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1); CV_LeafProcedure *lf = (CV_LeafProcedure *)itype_leaf_first;
c->itype = lf->ret_itype;
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk return itype // rjf: push return itypes to chain
{ {
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1); P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->ret_itype; c->itype = lf->ret_itype;
SLLQueuePush(first_walk_task, last_walk_task, c); SLLStackPush(in->itype_chains[itype], c);
} }
// rjf: unpack arglist range // rjf: push task to walk return itype
CV_RecRange *arglist_range = &in->tpi_leaf->leaf_ranges.ranges[lf->arg_itype-in->tpi_leaf->itype_first]; {
if(arglist_range->hdr.kind != CV_LeafKind_ARGLIST || P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
arglist_range->hdr.size<2 || c->itype = lf->ret_itype;
arglist_range->off + arglist_range->hdr.size > in->tpi_leaf->data.size) SLLQueuePush(first_walk_task, last_walk_task, c);
{ }
break;
}
U8 *arglist_first = in->tpi_leaf->data.str + arglist_range->off + 2;
U8 *arglist_opl = arglist_first+arglist_range->hdr.size-2;
if(arglist_first + sizeof(CV_LeafArgList) > arglist_opl)
{
break;
}
// rjf: unpack arglist info // rjf: unpack arglist range
CV_LeafArgList *arglist = (CV_LeafArgList*)arglist_first; CV_RecRange *arglist_range = &in->tpi_leaf->leaf_ranges.ranges[lf->arg_itype-in->tpi_leaf->itype_first];
CV_TypeId *arglist_itypes_base = (CV_TypeId *)(arglist+1); if(arglist_range->hdr.kind != CV_LeafKind_ARGLIST ||
U32 arglist_itypes_count = arglist->count; arglist_range->hdr.size<2 ||
arglist_range->off + arglist_range->hdr.size > in->tpi_leaf->data.size)
{
break;
}
U8 *arglist_first = in->tpi_leaf->data.str + arglist_range->off + 2;
U8 *arglist_opl = arglist_first+arglist_range->hdr.size-2;
if(arglist_first + sizeof(CV_LeafArgList) > arglist_opl)
{
break;
}
// rjf: push arg types to chain // rjf: unpack arglist info
for(U32 idx = 0; idx < arglist_itypes_count; idx += 1) CV_LeafArgList *arglist = (CV_LeafArgList*)arglist_first;
{ CV_TypeId *arglist_itypes_base = (CV_TypeId *)(arglist+1);
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1); U32 arglist_itypes_count = arglist->count;
c->itype = arglist_itypes_base[idx];
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk arg types // rjf: push arg types to chain
for(U32 idx = 0; idx < arglist_itypes_count; idx += 1) for(U32 idx = 0; idx < arglist_itypes_count; idx += 1)
{ {
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1); P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = arglist_itypes_base[idx]; c->itype = arglist_itypes_base[idx];
SLLQueuePush(first_walk_task, last_walk_task, c); SLLStackPush(in->itype_chains[itype], c);
} }
}break;
//- rjf: MFUNCTION // rjf: push task to walk arg types
case CV_LeafKind_MFUNCTION: for(U32 idx = 0; idx < arglist_itypes_count; idx += 1)
{ {
CV_LeafMFunction *lf = (CV_LeafMFunction *)itype_leaf_first; P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
c->itype = arglist_itypes_base[idx];
SLLQueuePush(first_walk_task, last_walk_task, c);
}
}break;
// rjf: push dependent itypes to chain //- rjf: MFUNCTION
case CV_LeafKind_MFUNCTION:
{ {
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1); CV_LeafMFunction *lf = (CV_LeafMFunction *)itype_leaf_first;
c->itype = lf->ret_itype;
SLLStackPush(in->itype_chains[itype], c);
}
{
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->arg_itype;
SLLStackPush(in->itype_chains[itype], c);
}
{
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->this_itype;
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk dependency itypes // rjf: push dependent itypes to chain
{ {
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1); P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->ret_itype; c->itype = lf->ret_itype;
SLLQueuePush(first_walk_task, last_walk_task, c); SLLStackPush(in->itype_chains[itype], c);
} }
{ {
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1); P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->arg_itype; c->itype = lf->arg_itype;
SLLQueuePush(first_walk_task, last_walk_task, c); SLLStackPush(in->itype_chains[itype], c);
} }
{ {
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1); P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->this_itype; c->itype = lf->this_itype;
SLLQueuePush(first_walk_task, last_walk_task, c); SLLStackPush(in->itype_chains[itype], c);
} }
// rjf: unpack arglist range // rjf: push task to walk dependency itypes
CV_RecRange *arglist_range = &in->tpi_leaf->leaf_ranges.ranges[lf->arg_itype-in->tpi_leaf->itype_first]; {
if(arglist_range->hdr.kind != CV_LeafKind_ARGLIST || P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
arglist_range->hdr.size<2 || c->itype = lf->ret_itype;
arglist_range->off + arglist_range->hdr.size > in->tpi_leaf->data.size) SLLQueuePush(first_walk_task, last_walk_task, c);
{ }
break; {
} P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
U8 *arglist_first = in->tpi_leaf->data.str + arglist_range->off + 2; c->itype = lf->arg_itype;
U8 *arglist_opl = arglist_first+arglist_range->hdr.size-2; SLLQueuePush(first_walk_task, last_walk_task, c);
if(arglist_first + sizeof(CV_LeafArgList) > arglist_opl) }
{ {
break; P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
} c->itype = lf->this_itype;
SLLQueuePush(first_walk_task, last_walk_task, c);
}
// rjf: unpack arglist info // rjf: unpack arglist range
CV_LeafArgList *arglist = (CV_LeafArgList*)arglist_first; CV_RecRange *arglist_range = &in->tpi_leaf->leaf_ranges.ranges[lf->arg_itype-in->tpi_leaf->itype_first];
CV_TypeId *arglist_itypes_base = (CV_TypeId *)(arglist+1); if(arglist_range->hdr.kind != CV_LeafKind_ARGLIST ||
U32 arglist_itypes_count = arglist->count; arglist_range->hdr.size<2 ||
arglist_range->off + arglist_range->hdr.size > in->tpi_leaf->data.size)
{
break;
}
U8 *arglist_first = in->tpi_leaf->data.str + arglist_range->off + 2;
U8 *arglist_opl = arglist_first+arglist_range->hdr.size-2;
if(arglist_first + sizeof(CV_LeafArgList) > arglist_opl)
{
break;
}
// rjf: push arg types to chain // rjf: unpack arglist info
for(U32 idx = 0; idx < arglist_itypes_count; idx += 1) CV_LeafArgList *arglist = (CV_LeafArgList*)arglist_first;
CV_TypeId *arglist_itypes_base = (CV_TypeId *)(arglist+1);
U32 arglist_itypes_count = arglist->count;
// rjf: push arg types to chain
for(U32 idx = 0; idx < arglist_itypes_count; idx += 1)
{
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = arglist_itypes_base[idx];
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk arg types
for(U32 idx = 0; idx < arglist_itypes_count; idx += 1)
{
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
c->itype = arglist_itypes_base[idx];
SLLQueuePush(first_walk_task, last_walk_task, c);
}
}break;
//- rjf: BITFIELD
case CV_LeafKind_BITFIELD:
{ {
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1); CV_LeafBitField *lf = (CV_LeafBitField *)itype_leaf_first;
c->itype = arglist_itypes_base[idx];
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk arg types // rjf: push dependent itype to chain
for(U32 idx = 0; idx < arglist_itypes_count; idx += 1) {
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->itype;
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk dependency itype
{
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
c->itype = lf->itype;
SLLQueuePush(first_walk_task, last_walk_task, c);
}
}break;
//- rjf: ARRAY
case CV_LeafKind_ARRAY:
{ {
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1); CV_LeafArray *lf = (CV_LeafArray *)itype_leaf_first;
c->itype = arglist_itypes_base[idx];
SLLQueuePush(first_walk_task, last_walk_task, c);
}
}break;
//- rjf: BITFIELD // rjf: push dependent itypes to chain
case CV_LeafKind_BITFIELD: {
{ P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
CV_LeafBitField *lf = (CV_LeafBitField *)itype_leaf_first; c->itype = lf->entry_itype;
SLLStackPush(in->itype_chains[itype], c);
}
{
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->index_itype;
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push dependent itype to chain // rjf: push task to walk dependency itypes
{
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
c->itype = lf->entry_itype;
SLLQueuePush(first_walk_task, last_walk_task, c);
}
{
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
c->itype = lf->index_itype;
SLLQueuePush(first_walk_task, last_walk_task, c);
}
}break;
//- rjf: ENUM
case CV_LeafKind_ENUM:
{ {
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1); CV_LeafEnum *lf = (CV_LeafEnum *)itype_leaf_first;
c->itype = lf->itype;
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk dependency itype // rjf: push dependent itypes to chain
{ {
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1); P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->itype; c->itype = lf->base_itype;
SLLQueuePush(first_walk_task, last_walk_task, c); SLLStackPush(in->itype_chains[itype], c);
} }
}break;
//- rjf: ARRAY // rjf: push task to walk dependency itypes
case CV_LeafKind_ARRAY: {
{ P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
CV_LeafArray *lf = (CV_LeafArray *)itype_leaf_first; c->itype = lf->base_itype;
SLLQueuePush(first_walk_task, last_walk_task, c);
// rjf: push dependent itypes to chain }
{ }break;
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1); }
c->itype = lf->entry_itype;
SLLStackPush(in->itype_chains[itype], c);
}
{
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->index_itype;
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk dependency itypes
{
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
c->itype = lf->entry_itype;
SLLQueuePush(first_walk_task, last_walk_task, c);
}
{
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
c->itype = lf->index_itype;
SLLQueuePush(first_walk_task, last_walk_task, c);
}
}break;
//- rjf: ENUM
case CV_LeafKind_ENUM:
{
CV_LeafEnum *lf = (CV_LeafEnum *)itype_leaf_first;
// rjf: push dependent itypes to chain
{
P2R_TypeIdChain *c = push_array(arena, P2R_TypeIdChain, 1);
c->itype = lf->base_itype;
SLLStackPush(in->itype_chains[itype], c);
}
// rjf: push task to walk dependency itypes
{
P2R_TypeIdChain *c = push_array(scratch.arena, P2R_TypeIdChain, 1);
c->itype = lf->base_itype;
SLLQueuePush(first_walk_task, last_walk_task, c);
}
}break;
} }
} }
} }
@@ -3506,7 +3509,13 @@ p2r_bake_types_strings_task__entry_point(Arena *arena, void *p)
{ {
P2R_BakeTypesStringsIn *in = (P2R_BakeTypesStringsIn *)p; P2R_BakeTypesStringsIn *in = (P2R_BakeTypesStringsIn *)p;
RDIM_BakeStringChunkListMap *map = rdim_bake_string_chunk_list_map_make(arena, in->top); RDIM_BakeStringChunkListMap *map = rdim_bake_string_chunk_list_map_make(arena, in->top);
ProfScope("bake type strings") rdim_bake_string_chunk_list_map_push_types(arena, in->top, map, in->list); ProfScope("bake type strings")
{
for(P2R_BakeTypesStringsInNode *n = in->first; n != 0; n = n->next)
{
rdim_bake_string_chunk_list_map_push_type_slice(arena, in->top, map, n->v, n->count);
}
}
return map; return map;
} }
@@ -3791,10 +3800,21 @@ p2r_bake(Arena *arena, P2R_Convert2Bake *in)
// rjf: types // rjf: types
{ {
P2R_BakeTypesStringsIn *in = push_array(scratch.arena, P2R_BakeTypesStringsIn, 1); for(RDIM_TypeChunkNode *chunk = params->types.first; chunk != 0; chunk = chunk->next)
in->top = &bake_string_chunk_list_map_topology; {
in->list = &params->types; U64 types_per_task = chunk->count;
ts_ticket_list_push(scratch.arena, &bake_string_map_build_tickets, ts_kickoff(p2r_bake_types_strings_task__entry_point, 0, in)); U64 tasks_per_this_chunk = (chunk->count+types_per_task-1)/types_per_task;
for(U64 task_idx = 0; task_idx < tasks_per_this_chunk; task_idx += 1)
{
P2R_BakeTypesStringsIn *in = push_array(scratch.arena, P2R_BakeTypesStringsIn, 1);
in->top = &bake_string_chunk_list_map_topology;
P2R_BakeTypesStringsInNode *n = push_array(scratch.arena, P2R_BakeTypesStringsInNode, 1);
SLLQueuePush(in->first, in->last, n);
n->v = chunk->v + task_idx*types_per_task;
n->count = types_per_task;
ts_ticket_list_push(scratch.arena, &bake_string_map_build_tickets, ts_kickoff(p2r_bake_types_strings_task__entry_point, 0, in));
}
}
} }
// rjf: UDTs // rjf: UDTs
@@ -3838,7 +3858,7 @@ p2r_bake(Arena *arena, P2R_Convert2Bake *in)
} }
} }
//- rjf: kick off pass 1 tasks //- rjf: kick off name map building tasks
P2R_BuildBakeNameMapIn build_bake_name_map_in[RDI_NameMapKind_COUNT] = {0}; P2R_BuildBakeNameMapIn build_bake_name_map_in[RDI_NameMapKind_COUNT] = {0};
TS_Ticket build_bake_name_map_ticket[RDI_NameMapKind_COUNT] = {0}; TS_Ticket build_bake_name_map_ticket[RDI_NameMapKind_COUNT] = {0};
for(RDI_NameMapKind k = (RDI_NameMapKind)(RDI_NameMapKind_NULL+1); for(RDI_NameMapKind k = (RDI_NameMapKind)(RDI_NameMapKind_NULL+1);
@@ -3856,8 +3876,12 @@ p2r_bake(Arena *arena, P2R_Convert2Bake *in)
{ {
for(TS_TicketNode *n = bake_string_map_build_tickets.first; n != 0; n = n->next) for(TS_TicketNode *n = bake_string_map_build_tickets.first; n != 0; n = n->next)
{ {
ProfBegin("waiting...");
RDIM_BakeStringChunkListMap *map = ts_join_struct(n->v, max_U64, RDIM_BakeStringChunkListMap); RDIM_BakeStringChunkListMap *map = ts_join_struct(n->v, max_U64, RDIM_BakeStringChunkListMap);
ProfEnd();
ProfBegin("joining map...");
rdim_bake_string_chunk_list_map_join_in_place(&bake_string_chunk_list_map_topology, unsorted_bake_string_chunk_list_map, map); rdim_bake_string_chunk_list_map_join_in_place(&bake_string_chunk_list_map_topology, unsorted_bake_string_chunk_list_map, map);
ProfEnd();
} }
} }
@@ -3893,8 +3917,12 @@ p2r_bake(Arena *arena, P2R_Convert2Bake *in)
RDIM_BakeStringChunkListMap *sorted_bake_string_chunk_list_map = sorted_bake_string_chunk_list_map__in_progress; RDIM_BakeStringChunkListMap *sorted_bake_string_chunk_list_map = sorted_bake_string_chunk_list_map__in_progress;
//- rjf: build finalized string map //- rjf: build finalized string map
ProfBegin("build finalized string map base indices");
RDIM_BakeStringChunkListMapBaseIndices bake_string_chunk_list_map_base_idxes = rdim_bake_string_chunk_list_base_indices_from_map(arena, &bake_string_chunk_list_map_topology, sorted_bake_string_chunk_list_map); RDIM_BakeStringChunkListMapBaseIndices bake_string_chunk_list_map_base_idxes = rdim_bake_string_chunk_list_base_indices_from_map(arena, &bake_string_chunk_list_map_topology, sorted_bake_string_chunk_list_map);
ProfEnd();
ProfBegin("build finalized string map");
RDIM_BakeStringMapFinal bake_strings = rdim_bake_string_map_final_from_chunk_list_map(arena, &bake_string_chunk_list_map_topology, &bake_string_chunk_list_map_base_idxes, sorted_bake_string_chunk_list_map); RDIM_BakeStringMapFinal bake_strings = rdim_bake_string_map_final_from_chunk_list_map(arena, &bake_string_chunk_list_map_topology, &bake_string_chunk_list_map_base_idxes, sorted_bake_string_chunk_list_map);
ProfEnd();
//- rjf: kick off pass 2 tasks //- rjf: kick off pass 2 tasks
P2R_BakeUnitsTopLevelIn bake_units_top_level_in = {&bake_strings, path_tree, params}; P2R_BakeUnitsTopLevelIn bake_units_top_level_in = {&bake_strings, path_tree, params};
src/raddbgi_from_pdb/raddbgi_from_pdb.h
+10 -1
View File
@@ -259,11 +259,20 @@ struct P2R_BakeUnitsStringsIn
RDIM_UnitChunkList *list; RDIM_UnitChunkList *list;
}; };
typedef struct P2R_BakeTypesStringsInNode P2R_BakeTypesStringsInNode;
struct P2R_BakeTypesStringsInNode
{
P2R_BakeTypesStringsInNode *next;
RDIM_Type *v;
RDI_U64 count;
};
typedef struct P2R_BakeTypesStringsIn P2R_BakeTypesStringsIn; typedef struct P2R_BakeTypesStringsIn P2R_BakeTypesStringsIn;
struct P2R_BakeTypesStringsIn struct P2R_BakeTypesStringsIn
{ {
RDIM_BakeStringChunkListMapTopology *top; RDIM_BakeStringChunkListMapTopology *top;
RDIM_TypeChunkList *list; P2R_BakeTypesStringsInNode *first;
P2R_BakeTypesStringsInNode *last;
}; };
typedef struct P2R_BakeUDTsStringsIn P2R_BakeUDTsStringsIn; typedef struct P2R_BakeUDTsStringsIn P2R_BakeUDTsStringsIn;