ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 23:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup debug info 'name' stuff.

Browse Source
This commit is contained in:
lachsinc
2018-09-27 18:34:59 +10:00
parent 0818a272e2
commit 11bddf270c
2 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ir.cpp
+18 -18
View File
@@ -1648,7 +1648,7 @@ i32 ir_debug_align_bits(Type *type) {
return ir_debug_info_bits(type_align_of(type)); return ir_debug_info_bits(type_align_of(type));
} }
irDebugInfo *ir_add_debug_info_field_internal(irModule *module, String name, Type *type, i32 offset, irDebugInfo *scope) { irDebugInfo *ir_add_debug_info_field_internal(irModule *module, String name, Type *type, i32 offset_bits, irDebugInfo *scope) {
// NOTE(lachsinc): Caller is expected to insert the returned value into map themselves. // NOTE(lachsinc): Caller is expected to insert the returned value into map themselves.
// "scope", if set, should be inserted into map prior to calling to ensure no cyclical dependencies. // "scope", if set, should be inserted into map prior to calling to ensure no cyclical dependencies.
@@ -1656,7 +1656,7 @@ irDebugInfo *ir_add_debug_info_field_internal(irModule *module, String name, Typ
di->DerivedType.name = name; di->DerivedType.name = name;
di->DerivedType.tag = irDebugBasicEncoding_member; di->DerivedType.tag = irDebugBasicEncoding_member;
di->DerivedType.size = ir_debug_size_bits(type); di->DerivedType.size = ir_debug_size_bits(type);
di->DerivedType.offset = offset; di->DerivedType.offset = offset_bits;
di->DerivedType.scope = scope; di->DerivedType.scope = scope;
// NOTE(lachsinc): It is "safe" to overwrite this base_type after a call to this function, // NOTE(lachsinc): It is "safe" to overwrite this base_type after a call to this function,
@@ -1731,8 +1731,8 @@ irDebugInfo *ir_add_debug_info_type_dynamic_array(irModule *module, Type *type,
map_set(&module->debug_info, hash_type(type), di); map_set(&module->debug_info, hash_type(type), di);
// Data pointer type // Data pointer type
// TODO(lachsinc): Perhaps lookup/alloc-a-fake Type_Pointer type and go via ir_add_debug_info_type() with it.
irDebugInfo *data_ptr_di = ir_alloc_debug_info(irDebugInfo_DerivedType); irDebugInfo *data_ptr_di = ir_alloc_debug_info(irDebugInfo_DerivedType);
// data_ptr_di->DerivedType.name = str_lit("ptr_type_name_todo");
data_ptr_di->DerivedType.tag = irDebugBasicEncoding_pointer_type; data_ptr_di->DerivedType.tag = irDebugBasicEncoding_pointer_type;
data_ptr_di->DerivedType.size = ir_debug_size_bits(t_rawptr); data_ptr_di->DerivedType.size = ir_debug_size_bits(t_rawptr);
map_set(&module->debug_info, hash_pointer(data_ptr_di), data_ptr_di); map_set(&module->debug_info, hash_pointer(data_ptr_di), data_ptr_di);
@@ -1857,8 +1857,8 @@ irDebugInfo *ir_add_debug_info_type(irModule *module, Type *type, Entity *e, irD
return *existing; return *existing;
} }
// Reset entity info if applicable for every type we try add. // Reset entity/location info, if applicable, for every type we try add.
// TODO(lachsinc): Confirm this doesn't mess up struct field scope's. // TODO(lachsinc): Confirm this doesn't mess up field's scopes etc.
if (type->kind == Type_Named) { if (type->kind == Type_Named) {
e = type->Named.type_name; e = type->Named.type_name;
if (e) { if (e) {
@@ -1962,10 +1962,8 @@ irDebugInfo *ir_add_debug_info_type(irModule *module, Type *type, Entity *e, irD
map_set(&module->debug_info, hash_type(type), di); map_set(&module->debug_info, hash_type(type), di);
if (is_type_struct(type)) { if (is_type_struct(type)) {
if (type->kind == Type_Named) { if (is_type_named(type)) {
di->CompositeType.name = type->Named.name; di->CompositeType.name = type->kind == Type_Named ? type->Named.name : type->Basic.name;
} else {
di->CompositeType.name = str_lit("struct_name_todo");
} }
di->CompositeType.elements = ir_add_debug_info_array(module, 0, base->Struct.fields.count); di->CompositeType.elements = ir_add_debug_info_array(module, 0, base->Struct.fields.count);
for_array(field_index, base->Struct.fields) { for_array(field_index, base->Struct.fields) {
@@ -1980,8 +1978,9 @@ irDebugInfo *ir_add_debug_info_type(irModule *module, Type *type, Entity *e, irD
// TODO(lachsinc): Add elements for union // TODO(lachsinc): Add elements for union
di->CompositeType.tag = irDebugBasicEncoding_union_type; di->CompositeType.tag = irDebugBasicEncoding_union_type;
} else if (is_type_enum(type)) { } else if (is_type_enum(type)) {
GB_ASSERT(type->kind == Type_Named); if (type->kind == Type_Named) {
di->CompositeType.name = type->Named.name; di->CompositeType.name = type->Named.name;
}
di->CompositeType.base_type = ir_add_debug_info_type(module, type->Named.base->Enum.base_type, e, scope, file); di->CompositeType.base_type = ir_add_debug_info_type(module, type->Named.base->Enum.base_type, e, scope, file);
di->CompositeType.elements = ir_add_debug_info_array(module, 0, base->Enum.fields.count); di->CompositeType.elements = ir_add_debug_info_array(module, 0, base->Enum.fields.count);
for_array(field_index, base->Enum.fields) { for_array(field_index, base->Enum.fields) {
@@ -2029,17 +2028,14 @@ irDebugInfo *ir_add_debug_info_type(irModule *module, Type *type, Entity *e, irD
// Data pointer type // Data pointer type
irDebugInfo *data_ptr_di = ir_alloc_debug_info(irDebugInfo_DerivedType); irDebugInfo *data_ptr_di = ir_alloc_debug_info(irDebugInfo_DerivedType);
if (type->Slice.elem->kind == Type_Named) { Type *elem_type = type->Slice.elem;
data_ptr_di->DerivedType.name = type->Slice.elem->Named.name; // TODO(lachsinc): Ptr?? if (is_type_named(elem_type)) {
} else if (type->Slice.elem->kind == Type_Basic) { data_ptr_di->DerivedType.name = elem_type->kind == Type_Named ? elem_type->Named.name : elem_type->Basic.name;
data_ptr_di->DerivedType.name = type->Slice.elem->Basic.name; // TODO(lachsinc): Ptr??
} else {
data_ptr_di->DerivedType.name = str_lit("slice_ptr_type_todo");
} }
data_ptr_di->DerivedType.tag = irDebugBasicEncoding_pointer_type; data_ptr_di->DerivedType.tag = irDebugBasicEncoding_pointer_type;
data_ptr_di->DerivedType.size = ir_debug_size_bits(t_rawptr); data_ptr_di->DerivedType.size = ir_debug_size_bits(t_rawptr);
map_set(&module->debug_info, hash_pointer(data_ptr_di), data_ptr_di); map_set(&module->debug_info, hash_pointer(data_ptr_di), data_ptr_di);
data_ptr_di->DerivedType.base_type = ir_add_debug_info_type(module, type->Slice.elem, e, scope, file); data_ptr_di->DerivedType.base_type = ir_add_debug_info_type(module, elem_type, e, scope, file);
irDebugInfo *data_di = ir_add_debug_info_field_internal(module, str_lit("data"), t_rawptr, irDebugInfo *data_di = ir_add_debug_info_field_internal(module, str_lit("data"), t_rawptr,
0, 0,
@@ -2062,6 +2058,10 @@ irDebugInfo *ir_add_debug_info_type(irModule *module, Type *type, Entity *e, irD
} }
if (is_type_map(type)) { if (is_type_map(type)) {
// TODO(lachsinc): Looks like "generated_struct_type" map.entries.data is just a u8*, we could
// always look at the map header and create the debug info manually (if we
// want struct members to be interpreted as the correct type).
// Also; are hashes meant to be interpreted as bool*'s ??
return ir_add_debug_info_type(module, type->Map.generated_struct_type, e, scope, file); return ir_add_debug_info_type(module, type->Map.generated_struct_type, e, scope, file);
} }
src/ir_print.cpp
+33 -34
View File
@@ -2082,45 +2082,44 @@ void print_llvm_ir(irGen *ir) {
case irDebugInfo_CompositeType: { case irDebugInfo_CompositeType: {
if (di->CompositeType.tag == irDebugBasicEncoding_array_type) { if (di->CompositeType.tag == irDebugBasicEncoding_array_type) {
GB_ASSERT_NOT_NULL(di->CompositeType.base_type); GB_ASSERT_NOT_NULL(di->CompositeType.base_type);
ir_fprintf(f, "!DICompositeType(" GB_ASSERT(di->CompositeType.array_count > 0);
"tag: DW_TAG_array_type" GB_ASSERT(di->CompositeType.name.len == 0);
", size: %d" GB_ASSERT(di->CompositeType.size > 0);
", align: %d" }
", baseType: !%d"
", elements: !{!DISubrange(count: %d)}" ir_write_str_lit(f, "!DICompositeType(tag: ");
")", ir_print_debug_encoding(f, irDebugInfo_CompositeType, di->CompositeType.tag);
di->CompositeType.size, if (di->CompositeType.name.len > 0) {
di->CompositeType.align, ir_fprintf(f, ", name: \"%.*s\"", LIT(di->CompositeType.name));
di->CompositeType.base_type->id, }
di->CompositeType.array_count); if (di->CompositeType.scope != nullptr) {
ir_fprintf(f, ", scope: !%d", di->CompositeType.scope->id);
}
if (di->CompositeType.file != nullptr) {
ir_fprintf(f, ", file: !%d"
", line: %td",
di->CompositeType.file->id,
di->CompositeType.pos.line);
}
if (di->CompositeType.size > 0) {
ir_fprintf(f, ", size: %d", di->CompositeType.size);
}
if (di->CompositeType.align > 0) {
ir_fprintf(f, ", align: %d", di->CompositeType.align);
}
if (di->CompositeType.base_type != nullptr) {
GB_ASSERT(di->CompositeType.tag != irDebugBasicEncoding_structure_type);
GB_ASSERT(di->CompositeType.tag != irDebugBasicEncoding_union_type);
ir_fprintf(f, ", baseType: !%d", di->CompositeType.base_type->id);
}
if (di->CompositeType.tag == irDebugBasicEncoding_array_type) {
ir_fprintf(f, ", elements: !{!DISubrange(count: %d)}", di->CompositeType.array_count);
} else { } else {
ir_fprintf(f, "!DICompositeType("
"name: \"%.*s\""
", size: %d"
", align: %d"
", tag: ",
LIT(di->CompositeType.name),
di->CompositeType.size,
di->CompositeType.align);
ir_print_debug_encoding(f, irDebugInfo_CompositeType, di->CompositeType.tag);
if (di->CompositeType.scope != nullptr) {
ir_fprintf(f, ", scope: !%d", di->CompositeType.scope->id);
}
if (di->CompositeType.file != nullptr) {
ir_fprintf(f, ", file: !%d"
", line: %td",
di->CompositeType.file->id,
di->CompositeType.pos.line);
}
if (di->CompositeType.base_type != nullptr) {
GB_ASSERT(di->CompositeType.tag == irDebugBasicEncoding_enumeration_type);
ir_fprintf(f, ", baseType: !%d", di->CompositeType.base_type->id);
}
if (di->CompositeType.elements != nullptr) { if (di->CompositeType.elements != nullptr) {
ir_fprintf(f, ", elements: !%d", di->CompositeType.elements->id); ir_fprintf(f, ", elements: !%d", di->CompositeType.elements->id);
} }
ir_write_byte(f, ')');
} }
ir_write_byte(f, ')');
break; break;
} }
case irDebugInfo_Enumerator: { case irDebugInfo_Enumerator: {