X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a63448829151bb5a1815542f34b5233778ba52a4..cdd47facb2c8c0762b06830fa27789b21d3326e9:/src/mc/mc_dwarf.cpp diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp index e242a7f1e5..1ee412ef33 100644 --- a/src/mc/mc_dwarf.cpp +++ b/src/mc/mc_dwarf.cpp @@ -1,31 +1,33 @@ -/* Copyright (c) 2008-2014. The SimGrid Team. +/* Copyright (c) 2008-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include +#include #include #include -#include +#include #define DW_LANG_Objc DW_LANG_ObjC /* fix spelling error in older dwarf.h */ #include #include #include +#include #include #include +#include + #include "mc_object_info.h" #include "mc_private.h" -static void MC_register_variable( - mc_object_info_t info, mc_frame_t frame, std::unique_ptr variable); -static void MC_dwarf_register_variable( - mc_object_info_t info, mc_frame_t frame, - std::unique_ptr variable); +#include "mc/Process.hpp" +#include "mc/ObjectInformation.hpp" +#include "mc/Variable.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dwarf, mc, "DWARF processing"); @@ -64,14 +66,14 @@ static uint64_t MC_dwarf_array_element_count(Dwarf_Die * die, Dwarf_Die * unit); * \param unit the DIE of the compile unit of the current DIE * \param frame containg frame if any */ -static void MC_dwarf_handle_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns); /** \brief Process a type DIE */ -static void MC_dwarf_handle_type_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_type_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns); /** \brief Calls MC_dwarf_handle_die on all childrend of the given die @@ -81,8 +83,8 @@ static void MC_dwarf_handle_type_die(mc_object_info_t info, Dwarf_Die * die, * \param unit the DIE of the compile unit of the current DIE * \param frame containg frame if any */ -static void MC_dwarf_handle_children(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_children(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns); /** \brief Handle a variable (DW_TAG_variable or other) @@ -92,8 +94,8 @@ static void MC_dwarf_handle_children(mc_object_info_t info, Dwarf_Die * die, * \param unit the DIE of the compile unit of the current DIE * \param frame containg frame if any */ -static void MC_dwarf_handle_variable_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_variable_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns); /** \brief Get the DW_TAG_type of the DIE @@ -103,18 +105,21 @@ static void MC_dwarf_handle_variable_die(mc_object_info_t info, Dwarf_Die * die, */ static std::uint64_t MC_dwarf_at_type(Dwarf_Die * die); -/** \brief A class of DWARF tags (DW_TAG_*) - */ -typedef enum mc_tag_class { - mc_tag_unknown, - mc_tag_type, - mc_tag_subprogram, - mc_tag_variable, - mc_tag_scope, - mc_tag_namespace -} mc_tag_class; - -static mc_tag_class MC_dwarf_tag_classify(int tag) +namespace simgrid { +namespace dwarf { + +enum class TagClass { + Unknown, + Type, + Subprogram, + Variable, + Scope, + Namespace +}; + +namespace { + +TagClass classify_tag(int tag) { switch (tag) { @@ -141,31 +146,34 @@ static mc_tag_class MC_dwarf_tag_classify(int tag) case DW_TAG_interface_type: case DW_TAG_unspecified_type: case DW_TAG_shared_type: - return mc_tag_type; + return TagClass::Type; case DW_TAG_subprogram: - return mc_tag_subprogram; + return TagClass::Subprogram; case DW_TAG_variable: case DW_TAG_formal_parameter: - return mc_tag_variable; + return TagClass::Variable; case DW_TAG_lexical_block: case DW_TAG_try_block: case DW_TAG_catch_block: case DW_TAG_inlined_subroutine: case DW_TAG_with_stmt: - return mc_tag_scope; + return TagClass::Scope; case DW_TAG_namespace: - return mc_tag_namespace; + return TagClass::Namespace; default: - return mc_tag_unknown; - + return TagClass::Unknown; } } +} +} +} + #define MC_DW_CLASS_UNKNOWN 0 #define MC_DW_CLASS_ADDRESS 1 // Location in the address space of the program #define MC_DW_CLASS_BLOCK 2 // Arbitrary block of bytes @@ -275,30 +283,26 @@ static const char *MC_dwarf_at_linkage_name(Dwarf_Die * die) static Dwarf_Off MC_dwarf_attr_dieoffset(Dwarf_Die * die, int attribute) { Dwarf_Attribute attr; - if (dwarf_hasattr_integrate(die, attribute)) { - dwarf_attr_integrate(die, attribute, &attr); - Dwarf_Die subtype_die; - if (dwarf_formref_die(&attr, &subtype_die) == NULL) { - xbt_die("Could not find DIE"); - } - return dwarf_dieoffset(&subtype_die); - } else + if (dwarf_hasattr_integrate(die, attribute) == 0) return 0; + dwarf_attr_integrate(die, attribute, &attr); + Dwarf_Die subtype_die; + if (dwarf_formref_die(&attr, &subtype_die) == NULL) + xbt_die("Could not find DIE"); + return dwarf_dieoffset(&subtype_die); } static Dwarf_Off MC_dwarf_attr_integrate_dieoffset(Dwarf_Die * die, int attribute) { Dwarf_Attribute attr; - if (dwarf_hasattr_integrate(die, attribute)) { - dwarf_attr_integrate(die, DW_AT_type, &attr); - Dwarf_Die subtype_die; - if (dwarf_formref_die(&attr, &subtype_die) == NULL) { - xbt_die("Could not find DIE"); - } - return dwarf_dieoffset(&subtype_die); - } else + if (dwarf_hasattr_integrate(die, attribute) == 0) return 0; + dwarf_attr_integrate(die, DW_AT_type, &attr); + Dwarf_Die subtype_die; + if (dwarf_formref_die(&attr, &subtype_die) == NULL) + xbt_die("Could not find DIE"); + return dwarf_dieoffset(&subtype_die); } /** \brief Find the type/subtype (DW_AT_type) for a DIE @@ -403,24 +407,22 @@ static uint64_t MC_dwarf_subrange_element_count(Dwarf_Die * die, MC_dwarf_die_tagname(die)); // Use DW_TAG_count if present: - if (dwarf_hasattr_integrate(die, DW_AT_count)) { + if (dwarf_hasattr_integrate(die, DW_AT_count)) return MC_dwarf_attr_integrate_uint(die, DW_AT_count, 0); - } // Otherwise compute DW_TAG_upper_bound-DW_TAG_lower_bound + 1: - if (!dwarf_hasattr_integrate(die, DW_AT_upper_bound)) { + if (!dwarf_hasattr_integrate(die, DW_AT_upper_bound)) // This is not really 0, but the code expects this (we do not know): return 0; - } + uint64_t upper_bound = MC_dwarf_attr_integrate_uint(die, DW_AT_upper_bound, -1); uint64_t lower_bound = 0; - if (dwarf_hasattr_integrate(die, DW_AT_lower_bound)) { + if (dwarf_hasattr_integrate(die, DW_AT_lower_bound)) lower_bound = MC_dwarf_attr_integrate_uint(die, DW_AT_lower_bound, -1); - } else { + else lower_bound = MC_dwarf_default_lower_bound(dwarf_srclang(unit)); - } return upper_bound - lower_bound + 1; } @@ -446,15 +448,18 @@ static uint64_t MC_dwarf_array_element_count(Dwarf_Die * die, Dwarf_Die * unit) res = dwarf_siblingof(&child, &child)) { int child_tag = dwarf_tag(&child); if (child_tag == DW_TAG_subrange_type - || child_tag == DW_TAG_enumeration_type) { + || child_tag == DW_TAG_enumeration_type) result *= MC_dwarf_subrange_element_count(&child, unit); - } } return result; } // ***** Variable +/** Sort the variable by name and address. + * + * We could use boost::container::flat_set instead. + */ static bool MC_compare_variable( simgrid::mc::Variable const& a, simgrid::mc::Variable const& b) { @@ -467,7 +472,7 @@ static bool MC_compare_variable( return a.address < b.address; } -// ***** mc_type_t +// ***** simgrid::mc::Type* /** \brief Initialize the location of a member of a type * (DW_AT_data_member_location of a DW_TAG_member). @@ -476,22 +481,19 @@ static bool MC_compare_variable( * \param member the member of the type * \param child DIE of the member (DW_TAG_member) */ -static void MC_dwarf_fill_member_location(mc_type_t type, mc_type_t member, - Dwarf_Die * child) +static void MC_dwarf_fill_member_location( + simgrid::mc::Type* type, simgrid::mc::Member* member, Dwarf_Die * child) { - if (dwarf_hasattr(child, DW_AT_data_bit_offset)) { + if (dwarf_hasattr(child, DW_AT_data_bit_offset)) xbt_die("Can't groke DW_AT_data_bit_offset."); - } if (!dwarf_hasattr_integrate(child, DW_AT_data_member_location)) { - if (type->type != DW_TAG_union_type) { - xbt_die - ("Missing DW_AT_data_member_location field in DW_TAG_member %s of type <%" - PRIx64 ">%s", member->name.c_str(), - (uint64_t) type->id, type->name.c_str()); - } else { + if (type->type == DW_TAG_union_type) return; - } + xbt_die + ("Missing DW_AT_data_member_location field in DW_TAG_member %s of type <%" + PRIx64 ">%s", member->name.c_str(), + (uint64_t) type->id, type->name.c_str()); } Dwarf_Attribute attr; @@ -505,13 +507,12 @@ static void MC_dwarf_fill_member_location(mc_type_t type, mc_type_t member, { Dwarf_Op *expr; size_t len; - if (dwarf_getlocation(&attr, &expr, &len)) { + if (dwarf_getlocation(&attr, &expr, &len)) xbt_die ("Could not read location expression DW_AT_data_member_location in DW_TAG_member %s of type <%" PRIx64 ">%s", MC_dwarf_attr_integrate_string(child, DW_AT_name), (uint64_t) type->id, type->name.c_str()); - } - simgrid::mc::DwarfExpression(expr, expr+len); + member->location_expression = simgrid::mc::DwarfExpression(expr, expr+len); break; } case MC_DW_CLASS_CONSTANT: @@ -539,11 +540,6 @@ static void MC_dwarf_fill_member_location(mc_type_t type, mc_type_t member, } -static void dw_type_free_voidp(void *t) -{ - delete *(mc_type_t*)t; -} - /** \brief Populate the list of members of a type * * \param info ELF object containing the type DIE @@ -551,8 +547,8 @@ static void dw_type_free_voidp(void *t) * \param unit DIE of the compilation unit containing the type DIE * \param type the type */ -static void MC_dwarf_add_members(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_type_t type) +static void MC_dwarf_add_members(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Type* type) { int res; Dwarf_Die child; @@ -571,31 +567,25 @@ static void MC_dwarf_add_members(mc_object_info_t info, Dwarf_Die * die, continue; // TODO, we should use another type (because is is not a type but a member) - simgrid::mc::Type member; - member.type = tag; - - // Global Offset: - member.id = dwarf_dieoffset(&child); + simgrid::mc::Member member; + member.inheritance = tag == DW_TAG_inheritance; const char *name = MC_dwarf_attr_integrate_string(&child, DW_AT_name); if (name) member.name = name; member.byte_size = MC_dwarf_attr_integrate_uint(&child, DW_AT_byte_size, 0); - member.element_count = -1; member.type_id = MC_dwarf_at_type(&child); - if (dwarf_hasattr(&child, DW_AT_data_bit_offset)) { + if (dwarf_hasattr(&child, DW_AT_data_bit_offset)) xbt_die("Can't groke DW_AT_data_bit_offset."); - } MC_dwarf_fill_member_location(type, &member, &child); - if (!member.type_id) { + if (!member.type_id) xbt_die("Missing type for member %s of <%" PRIx64 ">%s", member.name.c_str(), (uint64_t) type->id, type->name.c_str()); - } type->members.push_back(std::move(member)); } @@ -610,18 +600,15 @@ static void MC_dwarf_add_members(mc_object_info_t info, Dwarf_Die * die, * \return MC representation of the type */ static simgrid::mc::Type MC_dwarf_die_to_type( - mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, + simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { - simgrid::mc::Type type; - type.type = -1; + type.type = dwarf_tag(die); type.name = std::string(); type.element_count = -1; - type.type = dwarf_tag(die); - // Global Offset type.id = dwarf_dieoffset(die); @@ -663,9 +650,8 @@ static simgrid::mc::Type MC_dwarf_die_to_type( || type.type == DW_TAG_structure_type || type.type == DW_TAG_class_type) { Dwarf_Word size; - if (dwarf_aggregate_size(die, &size) == 0) { + if (dwarf_aggregate_size(die, &size) == 0) type.byte_size = size; - } } switch (type.type) { @@ -694,8 +680,8 @@ static simgrid::mc::Type MC_dwarf_die_to_type( return std::move(type); } -static void MC_dwarf_handle_type_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_type_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { simgrid::mc::Type type = MC_dwarf_die_to_type(info, die, unit, frame, ns); @@ -707,8 +693,8 @@ static void MC_dwarf_handle_type_die(mc_object_info_t info, Dwarf_Die * die, static int mc_anonymous_variable_index = 0; static std::unique_ptr MC_die_to_variable( - mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, + simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { // Skip declarations: @@ -720,10 +706,9 @@ static std::unique_ptr MC_die_to_variable( return nullptr; Dwarf_Attribute attr_location; - if (dwarf_attr(die, DW_AT_location, &attr_location) == NULL) { + if (dwarf_attr(die, DW_AT_location, &attr_location) == NULL) // No location: do not add it ? return nullptr; - } std::unique_ptr variable = std::unique_ptr(new simgrid::mc::Variable()); @@ -818,28 +803,37 @@ static std::unique_ptr MC_die_to_variable( return std::move(variable); } -static void MC_dwarf_handle_variable_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_variable_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { - MC_dwarf_register_variable(info, frame, - MC_die_to_variable(info, die, unit, frame, ns)); + std::unique_ptr variable = + MC_die_to_variable(info, die, unit, frame, ns); + if (!variable) + return; + // Those arrays are sorted later: + else if (variable->global) + info->global_variables.push_back(std::move(*variable)); + else if (frame != nullptr) + frame->variables.push_back(std::move(*variable)); + else + xbt_die("No frame for this local variable"); } -static void MC_dwarf_handle_scope_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t parent_frame, +static void MC_dwarf_handle_scope_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* parent_frame, const char *ns) { // TODO, handle DW_TAG_type/DW_TAG_location for DW_TAG_with_stmt int tag = dwarf_tag(die); - mc_tag_class klass = MC_dwarf_tag_classify(tag); + simgrid::dwarf::TagClass klass = simgrid::dwarf::classify_tag(tag); // (Template) Subprogram declaration: - if (klass == mc_tag_subprogram + if (klass == simgrid::dwarf::TagClass::Subprogram && MC_dwarf_attr_flag(die, DW_AT_declaration, false)) return; - if (klass == mc_tag_scope) + if (klass == simgrid::dwarf::TagClass::Scope) xbt_assert(parent_frame, "No parent scope for this scope"); simgrid::mc::Frame frame; @@ -848,12 +842,14 @@ static void MC_dwarf_handle_scope_die(mc_object_info_t info, Dwarf_Die * die, frame.id = dwarf_dieoffset(die); frame.object_info = info; - if (klass == mc_tag_subprogram) { + if (klass == simgrid::dwarf::TagClass::Subprogram) { const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_name); if(ns) frame.name = std::string(ns) + "::" + name; - else + else if (name) frame.name = name; + else + frame.name.clear(); } frame.abstract_origin_id = @@ -900,7 +896,7 @@ static void MC_dwarf_handle_scope_die(mc_object_info_t info, Dwarf_Die * die, } } - if (klass == mc_tag_subprogram) { + if (klass == simgrid::dwarf::TagClass::Subprogram) { Dwarf_Attribute attr_frame_base; if (dwarf_attr_integrate(die, DW_AT_frame_base, &attr_frame_base)) mc_dwarf_location_list_init(&frame.frame_base, info, die, @@ -915,15 +911,15 @@ static void MC_dwarf_handle_scope_die(mc_object_info_t info, Dwarf_Die * die, MC_compare_variable); // Register it: - if (klass == mc_tag_subprogram) + if (klass == simgrid::dwarf::TagClass::Subprogram) info->subprograms[frame.id] = frame; - else if (klass == mc_tag_scope) + else if (klass == simgrid::dwarf::TagClass::Scope) parent_frame->scopes.push_back(std::move(frame)); } -static void mc_dwarf_handle_namespace_die(mc_object_info_t info, +static void mc_dwarf_handle_namespace_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, Dwarf_Die * unit, - mc_frame_t frame, + simgrid::mc::Frame* frame, const char *ns) { const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_name); @@ -935,8 +931,8 @@ static void mc_dwarf_handle_namespace_die(mc_object_info_t info, xbt_free(new_ns); } -static void MC_dwarf_handle_children(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_children(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { // For each child DIE: @@ -948,31 +944,31 @@ static void MC_dwarf_handle_children(mc_object_info_t info, Dwarf_Die * die, } } -static void MC_dwarf_handle_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { int tag = dwarf_tag(die); - mc_tag_class klass = MC_dwarf_tag_classify(tag); + simgrid::dwarf::TagClass klass = simgrid::dwarf::classify_tag(tag); switch (klass) { // Type: - case mc_tag_type: + case simgrid::dwarf::TagClass::Type: MC_dwarf_handle_type_die(info, die, unit, frame, ns); break; // Subprogram or scope: - case mc_tag_subprogram: - case mc_tag_scope: + case simgrid::dwarf::TagClass::Subprogram: + case simgrid::dwarf::TagClass::Scope: MC_dwarf_handle_scope_die(info, die, unit, frame, ns); return; // Variable: - case mc_tag_variable: + case simgrid::dwarf::TagClass::Variable: MC_dwarf_handle_variable_die(info, die, unit, frame, ns); break; - case mc_tag_namespace: + case simgrid::dwarf::TagClass::Namespace: mc_dwarf_handle_namespace_die(info, die, unit, frame, ns); break; @@ -987,33 +983,27 @@ static void MC_dwarf_handle_die(mc_object_info_t info, Dwarf_Die * die, * Read the DWARf information of the EFFL object and populate the * lists of types, variables, functions. */ -void MC_dwarf_get_variables(mc_object_info_t info) +void MC_dwarf_get_variables(simgrid::mc::ObjectInformation* info) { int fd = open(info->file_name.c_str(), O_RDONLY); if (fd < 0) xbt_die("Could not open file %s", info->file_name.c_str()); Dwarf *dwarf = dwarf_begin(fd, DWARF_C_READ); if (dwarf == NULL) - xbt_die("Your program must be compiled with -g (%s)", + xbt_die("Missing debugging information in %s\n" + "Your program and its dependencies must have debugging information.\n" + "You might want to recompile with -g or install the suitable debugging package.\n", info->file_name.c_str()); // For each compilation unit: Dwarf_Off offset = 0; Dwarf_Off next_offset = 0; size_t length; + while (dwarf_nextcu(dwarf, offset, &next_offset, &length, NULL, NULL, NULL) == 0) { Dwarf_Die unit_die; - if (dwarf_offdie(dwarf, offset + length, &unit_die) != NULL) { - - // For each child DIE: - Dwarf_Die child; - int res; - for (res = dwarf_child(&unit_die, &child); res == 0; - res = dwarf_siblingof(&child, &child)) { - MC_dwarf_handle_die(info, &child, &unit_die, NULL, NULL); - } - - } + if (dwarf_offdie(dwarf, offset + length, &unit_die) != NULL) + MC_dwarf_handle_children(info, &unit_die, &unit_die, NULL, NULL); offset = next_offset; } @@ -1034,7 +1024,7 @@ static int MC_compare_frame_index_items(simgrid::mc::FunctionIndexEntry* a, return 1; } -static void MC_make_functions_index(mc_object_info_t info) +static void MC_make_functions_index(simgrid::mc::ObjectInformation* info) { info->functions_index.clear(); @@ -1051,30 +1041,26 @@ static void MC_make_functions_index(mc_object_info_t info) // Sort the array by low_pc: std::sort(info->functions_index.begin(), info->functions_index.end(), - [](simgrid::mc::FunctionIndexEntry& a, - simgrid::mc::FunctionIndexEntry& b) + [](simgrid::mc::FunctionIndexEntry const& a, + simgrid::mc::FunctionIndexEntry const& b) { return a.low_pc < b.low_pc; }); } -static void MC_post_process_variables(mc_object_info_t info) +static void MC_post_process_variables(simgrid::mc::ObjectInformation* info) { // Someone needs this to be sorted but who? std::sort(info->global_variables.begin(), info->global_variables.end(), MC_compare_variable); for(simgrid::mc::Variable& variable : info->global_variables) - if (variable.type_id) { - auto i = info->types.find(variable.type_id); - if (i != info->types.end()) - variable.type = &(i->second); - else - variable.type = nullptr; - } + if (variable.type_id) + variable.type = simgrid::util::find_map_ptr( + info->types, variable.type_id); } -static void mc_post_process_scope(mc_object_info_t info, mc_frame_t scope) +static void mc_post_process_scope(simgrid::mc::ObjectInformation* info, simgrid::mc::Frame* scope) { if (scope->tag == DW_TAG_inlined_subroutine) { @@ -1082,19 +1068,15 @@ static void mc_post_process_scope(mc_object_info_t info, mc_frame_t scope) auto i = info->subprograms.find(scope->abstract_origin_id); xbt_assert(i != info->subprograms.end(), "Could not lookup abstract origin %" PRIx64, - (uint64_t) scope->abstract_origin_id); + (std::uint64_t) scope->abstract_origin_id); scope->name = i->second.name; } // Direct: for (simgrid::mc::Variable& variable : scope->variables) - if (variable.type_id) { - auto i = info->types.find(variable.type_id); - if (i != info->types.end()) - variable.type = &(i->second); - else - variable.type = nullptr; - } + if (variable.type_id) + variable.type = simgrid::util::find_map_ptr( + info->types, variable.type_id); // Recursive post-processing of nested-scopes: for (simgrid::mc::Frame& nested_scope : scope->scopes) @@ -1102,96 +1084,77 @@ static void mc_post_process_scope(mc_object_info_t info, mc_frame_t scope) } -static void MC_post_process_functions(mc_object_info_t info) +static +simgrid::mc::Type* MC_resolve_type( + simgrid::mc::ObjectInformation* info, unsigned type_id) { - for (auto& entry : info->subprograms) - mc_post_process_scope(info, &entry.second); -} + if (!type_id) + return nullptr; + simgrid::mc::Type* type = simgrid::util::find_map_ptr(info->types, type_id); + if (type == nullptr) + return nullptr; + // We already have the information on the type: + if (type->byte_size != 0) + return type; + + // Don't have a name, we can't find a more complete version: + if (type->name.empty()) + return type; -/** \brief Fill/lookup the "subtype" field. - */ -static void MC_resolve_subtype(mc_object_info_t info, mc_type_t type) -{ - if (!type->type_id) - return; - auto i = info->types.find(type->type_id); - if (i != info->types.end()) - type->subtype = &(i->second); - else { - type->subtype = nullptr; - return; - } - if (type->subtype->byte_size != 0) - return; - if (type->subtype->name.empty()) - return; // Try to find a more complete description of the type: // We need to fix in order to support C++. - - auto j = info->full_types_by_name.find(type->subtype->name); - if (j != info->full_types_by_name.end()) - type->subtype = j->second; + simgrid::mc::Type** subtype = simgrid::util::find_map_ptr( + info->full_types_by_name, type->name); + if (subtype) + type = *subtype; + return type; } -static void MC_post_process_types(mc_object_info_t info) +static void MC_post_process_types(simgrid::mc::ObjectInformation* info) { // Lookup "subtype" field: for(auto& i : info->types) { - MC_resolve_subtype(info, &(i.second)); - for (simgrid::mc::Type& member : i.second.members) - MC_resolve_subtype(info, &member); + i.second.subtype = MC_resolve_type(info, i.second.type_id); + for (simgrid::mc::Member& member : i.second.members) + member.type = MC_resolve_type(info, member.type_id); } } /** \brief Finds informations about a given shared object/executable */ -std::shared_ptr MC_find_object_info( +std::shared_ptr MC_find_object_info( std::vector const& maps, const char *name, int executable) { - std::shared_ptr result = - std::make_shared(); + std::shared_ptr result = + std::make_shared(); if (executable) - result->flags |= MC_OBJECT_INFO_EXECUTABLE; + result->flags |= simgrid::mc::ObjectInformation::Executable; result->file_name = name; MC_find_object_address(maps, result.get()); MC_dwarf_get_variables(result.get()); MC_post_process_variables(result.get()); MC_post_process_types(result.get()); - MC_post_process_functions(result.get()); + for (auto& entry : result.get()->subprograms) + mc_post_process_scope(result.get(), &entry.second); MC_make_functions_index(result.get()); return std::move(result); } /*************************************************************************/ -void MC_dwarf_register_variable( - mc_object_info_t info, mc_frame_t frame, - std::unique_ptr variable) -{ - if (!variable) - return; - // Those arrays are sorted later: - else if (variable->global) - info->global_variables.push_back(std::move(*variable)); - else if (frame != nullptr) - frame->variables.push_back(std::move(*variable)); - else - xbt_die("No frame for this local variable"); -} - -void MC_post_process_object_info(mc_process_t process, mc_object_info_t info) +void MC_post_process_object_info(simgrid::mc::Process* process, simgrid::mc::ObjectInformation* info) { for (auto& i : info->types) { - mc_type_t type = &(i.second); - mc_type_t subtype = type; - while (subtype->type == DW_TAG_typedef || subtype->type == DW_TAG_volatile_type - || subtype->type == DW_TAG_const_type) { + simgrid::mc::Type* type = &(i.second); + simgrid::mc::Type* subtype = type; + while (subtype->type == DW_TAG_typedef + || subtype->type == DW_TAG_volatile_type + || subtype->type == DW_TAG_const_type) if (subtype->subtype) subtype = subtype->subtype; else break; - } // Resolve full_type: if (!subtype->name.empty() && subtype->byte_size == 0) {