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

always create RDI builtins

Browse Source
This commit is contained in:
Nikita Smith
2025-05-05 15:03:53 -07:00
parent ced9c7a3f5
commit cbe2783e0d
2 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_rdi_make/rdi_make.c
+3 -8
View File
@@ -1305,7 +1305,7 @@ rdim_builtin_type_from_kind(RDIM_TypeChunkList list, RDI_TypeKind type_kind)
RDI_U64 type_idx = 0; RDI_U64 type_idx = 0;
if (type_kind != RDI_TypeKind_NULL) { if (type_kind != RDI_TypeKind_NULL) {
type_idx = (type_kind - RDI_TypeKind_FirstBuiltIn) + 1; type_idx = (type_kind - RDI_TypeKind_FirstBuiltIn) + 1;
} }
RDIM_Type *builtin = &list.first->v[type_idx]; RDIM_Type *builtin = &list.first->v[type_idx];
return builtin; return builtin;
} }
@@ -1315,17 +1315,12 @@ rdim_init_type_chunk_list(RDIM_Arena *arena, RDI_Arch arch)
{ {
RDIM_TypeChunkList list = {0}; RDIM_TypeChunkList list = {0};
RDI_U64 type_cap = (RDI_TypeKind_LastBuiltIn - RDI_TypeKind_FirstBuiltIn) + 2; RDI_U64 type_cap = (RDI_TypeKind_LastBuiltIn - RDI_TypeKind_FirstBuiltIn) + 1;
RDIM_Type *null_type = rdim_type_chunk_list_push(arena, &list, type_cap);
for(RDI_TypeKind type_kind = RDI_TypeKind_FirstBuiltIn; type_kind <= RDI_TypeKind_LastBuiltIn; type_kind += 1) for(RDI_TypeKind type_kind = RDI_TypeKind_FirstBuiltIn; type_kind <= RDI_TypeKind_LastBuiltIn; type_kind += 1)
{ {
RDIM_String8 name = {0};
name.str = rdi_string_from_type_kind(type_kind, &name.size);
RDIM_Type *type = rdim_type_chunk_list_push(arena, &list, type_cap); RDIM_Type *type = rdim_type_chunk_list_push(arena, &list, type_cap);
type->name = name; type->name.str = rdi_string_from_type_kind(type_kind, &type->name.size);
type->kind = type_kind; type->kind = type_kind;
type->byte_size = rdi_size_from_basic_type_kind(type_kind); type->byte_size = rdi_size_from_basic_type_kind(type_kind);
} }
src/rdi_from_pdb/rdi_from_pdb.c
+12 -21
View File
@@ -3397,7 +3397,7 @@ p2r_convert(Arena *arena, P2R_User2Convert *in)
// from regular type info. // from regular type info.
// //
RDIM_Type **itype_type_ptrs = 0; RDIM_Type **itype_type_ptrs = 0;
RDIM_TypeChunkList all_types = {0}; RDIM_TypeChunkList all_types = rdim_init_type_chunk_list(arena, top_level_info.arch);
#define p2r_type_ptr_from_itype(itype) ((itype_type_ptrs && (itype) < itype_opl) ? (itype_type_ptrs[(itype_fwd_map[(itype)] ? itype_fwd_map[(itype)] : (itype))]) : 0) #define p2r_type_ptr_from_itype(itype) ((itype_type_ptrs && (itype) < itype_opl) ? (itype_type_ptrs[(itype_fwd_map[(itype)] ? itype_fwd_map[(itype)] : (itype))]) : 0)
if(in->flags & P2R_ConvertFlag_Types) ProfScope("types pass 3: construct all root/stub types from TPI") if(in->flags & P2R_ConvertFlag_Types) ProfScope("types pass 3: construct all root/stub types from TPI")
{ {
@@ -3408,7 +3408,6 @@ p2r_convert(Arena *arena, P2R_User2Convert *in)
// //
{ {
RDIM_DataModel data_model = rdim_infer_data_model(OperatingSystem_Windows, top_level_info.arch); RDIM_DataModel data_model = rdim_infer_data_model(OperatingSystem_Windows, top_level_info.arch);
RDI_TypeKind short_type = rdim_short_type_from_data_model(data_model); RDI_TypeKind short_type = rdim_short_type_from_data_model(data_model);
RDI_TypeKind ushort_type = rdim_unsigned_short_type_from_data_model(data_model); RDI_TypeKind ushort_type = rdim_unsigned_short_type_from_data_model(data_model);
RDI_TypeKind int_type = rdim_int_type_from_data_model(data_model); RDI_TypeKind int_type = rdim_int_type_from_data_model(data_model);
@@ -3430,7 +3429,6 @@ p2r_convert(Arena *arena, P2R_User2Convert *in)
} }
table[] = table[] =
{ {
{ "" , RDI_TypeKind_NULL , CV_BasicType_NOTYPE , 0, 0, 0 },
{ "void" , RDI_TypeKind_Void , CV_BasicType_VOID , 1, 1, 1 }, { "void" , RDI_TypeKind_Void , CV_BasicType_VOID , 1, 1, 1 },
{ "HRESULT" , RDI_TypeKind_Handle , CV_BasicType_HRESULT , 0, 1, 1 }, { "HRESULT" , RDI_TypeKind_Handle , CV_BasicType_HRESULT , 0, 1, 1 },
{ "signed char" , RDI_TypeKind_Char8 , CV_BasicType_CHAR , 1, 1, 1 }, { "signed char" , RDI_TypeKind_Char8 , CV_BasicType_CHAR , 1, 1, 1 },
@@ -3474,24 +3472,17 @@ p2r_convert(Arena *arena, P2R_User2Convert *in)
{ "__pointer" , ptr_type , CV_BasicType_PTR , 0, 0, 0 } { "__pointer" , ptr_type , CV_BasicType_PTR , 0, 0, 0 }
}; };
// special case for null type
itype_type_ptrs[CV_BasicType_NOTYPE] = rdim_builtin_type_from_kind(all_types, RDI_TypeKind_NULL);
for(U64 i = 0; i < ArrayCount(table); i += 1) for(U64 i = 0; i < ArrayCount(table); i += 1)
{ {
U64 builtin_size; RDIM_Type *builtin_alias = rdim_type_chunk_list_push(arena, &all_types, tpi_leaf->itype_opl);
if(table[i].kind_rdi == RDI_TypeKind_Void || table[i].kind_rdi == RDI_TypeKind_Handle) builtin_alias->kind = RDI_TypeKind_Alias;
{ builtin_alias->name = str8_cstring(table[i].name);
builtin_size = arch_addr_size; builtin_alias->direct_type = rdim_builtin_type_from_kind(all_types, table[i].kind_rdi);
}
else
{
builtin_size = rdi_size_from_basic_type_kind(table[i].kind_rdi);
}
RDIM_Type *builtin = rdim_type_chunk_list_push(arena, &all_types, tpi_leaf->itype_opl); itype_type_ptrs[table[i].kind_cv] = builtin_alias;
builtin->kind = table[i].kind_rdi;
builtin->name = str8_cstring(table[i].name);
builtin->byte_size = builtin_size;
itype_type_ptrs[table[i].kind_cv] = builtin;
if(table[i].make_pointer_near) if(table[i].make_pointer_near)
{ {
@@ -3499,7 +3490,7 @@ p2r_convert(Arena *arena, P2R_User2Convert *in)
RDIM_Type *ptr_near = rdim_type_chunk_list_push(arena, &all_types, tpi_leaf->itype_opl); RDIM_Type *ptr_near = rdim_type_chunk_list_push(arena, &all_types, tpi_leaf->itype_opl);
ptr_near->kind = RDI_TypeKind_Ptr; ptr_near->kind = RDI_TypeKind_Ptr;
ptr_near->byte_size = 2; ptr_near->byte_size = 2;
ptr_near->direct_type = builtin; ptr_near->direct_type = builtin_alias;
itype_type_ptrs[near_ptr_itype] = ptr_near; itype_type_ptrs[near_ptr_itype] = ptr_near;
} }
@@ -3509,7 +3500,7 @@ p2r_convert(Arena *arena, P2R_User2Convert *in)
RDIM_Type *ptr_32 = rdim_type_chunk_list_push(arena, &all_types, tpi_leaf->itype_opl); RDIM_Type *ptr_32 = rdim_type_chunk_list_push(arena, &all_types, tpi_leaf->itype_opl);
ptr_32->kind = RDI_TypeKind_Ptr; ptr_32->kind = RDI_TypeKind_Ptr;
ptr_32->byte_size = 4; ptr_32->byte_size = 4;
ptr_32->direct_type = builtin; ptr_32->direct_type = builtin_alias;
itype_type_ptrs[ptr_32_itype] = ptr_32; itype_type_ptrs[ptr_32_itype] = ptr_32;
} }
@@ -3519,7 +3510,7 @@ p2r_convert(Arena *arena, P2R_User2Convert *in)
RDIM_Type *ptr_64 = rdim_type_chunk_list_push(arena, &all_types, tpi_leaf->itype_opl); RDIM_Type *ptr_64 = rdim_type_chunk_list_push(arena, &all_types, tpi_leaf->itype_opl);
ptr_64->kind = RDI_TypeKind_Ptr; ptr_64->kind = RDI_TypeKind_Ptr;
ptr_64->byte_size = 8; ptr_64->byte_size = 8;
ptr_64->direct_type = builtin; ptr_64->direct_type = builtin_alias;
itype_type_ptrs[ptr_64_itype] = ptr_64; itype_type_ptrs[ptr_64_itype] = ptr_64;
} }