X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2f951e38bdf2b8639bf42b78b69c1530510b6f0..2b245114f143e73ccdcd8367149999b59ef2f9e2:/src/mc/mc_dwarf.cpp diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp index c7a785bcaa..580b8f513e 100644 --- a/src/mc/mc_dwarf.cpp +++ b/src/mc/mc_dwarf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2017. The SimGrid Team. +/* Copyright (c) 2008-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -22,11 +22,12 @@ #include "src/simgrid/util.hpp" #include "xbt/log.h" +#include "xbt/string.hpp" #include "xbt/sysdep.h" #include -#include "src/mc/mc_private.h" #include "src/mc/mc_dwarf.hpp" +#include "src/mc/mc_private.hpp" #include "src/mc/ObjectInformation.hpp" #include "src/mc/Variable.hpp" @@ -266,24 +267,6 @@ static const char *MC_dwarf_attr_integrate_string(Dwarf_Die * die, return dwarf_formstring(&attr); } -/** \brief Get the linkage name of a DIE. - * - * Use either DW_AT_linkage_name or DW_AT_MIPS_linkage_name. - * DW_AT_linkage_name is standardized since DWARF 4. - * Before this version of DWARF, the MIPS extensions - * DW_AT_MIPS_linkage_name is used (at least by GCC). - * - * \param the DIE - * \return linkage name of the given DIE (or nullptr) - * */ -static const char *MC_dwarf_at_linkage_name(Dwarf_Die * die) -{ - const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_linkage_name); - if (not name) - name = MC_dwarf_attr_integrate_string(die, DW_AT_MIPS_linkage_name); - return name; -} - static Dwarf_Off MC_dwarf_attr_dieoffset(Dwarf_Die * die, int attribute) { Dwarf_Attribute attr; @@ -311,7 +294,7 @@ static Dwarf_Off MC_dwarf_attr_integrate_dieoffset(Dwarf_Die * die, /** \brief Find the type/subtype (DW_AT_type) for a DIE * - * \param dit the DIE + * \param die the DIE * \return DW_AT_type reference as a global offset in hexadecimal (or nullptr) */ static @@ -420,12 +403,11 @@ static uint64_t MC_dwarf_subrange_element_count(Dwarf_Die * die, // 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 upper_bound = MC_dwarf_attr_integrate_uint(die, DW_AT_upper_bound, static_cast(-1)); uint64_t lower_bound = 0; if (dwarf_hasattr_integrate(die, DW_AT_lower_bound)) - lower_bound = MC_dwarf_attr_integrate_uint(die, DW_AT_lower_bound, -1); + lower_bound = MC_dwarf_attr_integrate_uint(die, DW_AT_lower_bound, static_cast(-1)); else lower_bound = MC_dwarf_default_lower_bound(dwarf_srclang(unit)); return upper_bound - lower_bound + 1; @@ -532,13 +514,10 @@ static void MC_dwarf_fill_member_location( (uint64_t) type->id, type->name.c_str()); break; } - case simgrid::dwarf::FormClass::LocListPtr: - // Reference to a location list: - // TODO - case simgrid::dwarf::FormClass::Reference: - // It's supposed to be possible in DWARF2 but I couldn't find its semantic - // in the spec. + default: + // includes FormClass::LocListPtr (reference to a location list: TODO) and FormClass::Reference (it's supposed to be + // possible in DWARF2 but I couldn't find its semantic in the spec) xbt_die("Can't handle form class (%d) / form 0x%x as DW_AT_member_location", (int)form_class, (unsigned)form); } @@ -623,7 +602,7 @@ static void MC_dwarf_add_members(simgrid::mc::ObjectInformation* info, Dwarf_Die /** \brief Create a MC type object from a DIE * * \param info current object info object - * \param DIE (for a given type) + * \param die DIE (for a given type) * \param unit compilation unit of the current DIE * \return MC representation of the type */ @@ -657,10 +636,10 @@ static simgrid::mc::Type MC_dwarf_die_to_type( const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_name); if (name != nullptr) { - char* full_name = ns ? bprintf("%s%s::%s", prefix, ns, name) : - bprintf("%s%s", prefix, name); - type.name = std::string(full_name); - free(full_name); + if (ns) + type.name = simgrid::xbt::string_printf("%s%s::%s", prefix, ns, name); + else + type.name = simgrid::xbt::string_printf("%s%s", prefix, name); } type.type_id = MC_dwarf_at_type(die); @@ -697,10 +676,12 @@ static simgrid::mc::Type MC_dwarf_die_to_type( case DW_TAG_union_type: case DW_TAG_class_type: MC_dwarf_add_members(info, die, unit, &type); - char *new_ns = ns == nullptr ? xbt_strdup(type.name.c_str()) - : bprintf("%s::%s", ns, name); - MC_dwarf_handle_children(info, die, unit, frame, new_ns); - free(new_ns); + MC_dwarf_handle_children(info, die, unit, frame, + ns ? simgrid::xbt::string_printf("%s::%s", ns, name).c_str() : type.name.c_str()); + break; + + default: + XBT_DEBUG("Unhandled type: %d (%s)", type.type, simgrid::dwarf::tagname(type.type)); break; } @@ -776,7 +757,7 @@ static std::unique_ptr MC_die_to_variable( variable->address = (void *) (base + offset); } else variable->location_list = { - simgrid::dwarf::DwarfExpression(expr, expr + len) }; + simgrid::dwarf::LocationListEntry(simgrid::dwarf::DwarfExpression(expr, expr + len))}; break; } @@ -799,17 +780,11 @@ static std::unique_ptr MC_die_to_variable( dwarf_attr(die, DW_AT_start_scope, &attr); int form = dwarf_whatform(&attr); simgrid::dwarf::FormClass form_class = simgrid::dwarf::classify_form(form); - switch (form_class) { - case simgrid::dwarf::FormClass::Constant: - { - Dwarf_Word value; - variable->start_scope = - dwarf_formudata(&attr, &value) == 0 ? (size_t) value : 0; - break; - } - - case simgrid::dwarf::FormClass::RangeListPtr: // TODO - default: + if (form_class == simgrid::dwarf::FormClass::Constant) { + Dwarf_Word value; + variable->start_scope = dwarf_formudata(&attr, &value) == 0 ? (size_t)value : 0; + } else { + // TODO: FormClass::RangeListPtr xbt_die("Unhandled form 0x%x, class 0x%X for DW_AT_start_scope of variable %s", (unsigned)form, (unsigned)form_class, name == nullptr ? "?" : name); } @@ -821,10 +796,10 @@ static std::unique_ptr MC_die_to_variable( // The current code needs a variable name, // generate a fake one: - if (variable->name.empty()) - variable->name = - "@anonymous#" + std::to_string(mc_anonymous_variable_index++); - + if (variable->name.empty()) { + variable->name = "@anonymous#" + std::to_string(mc_anonymous_variable_index); + mc_anonymous_variable_index++; + } return variable; } @@ -837,7 +812,7 @@ static void MC_dwarf_handle_variable_die(simgrid::mc::ObjectInformation* info, D if (not variable) return; // Those arrays are sorted later: - else if (variable->global) + if (variable->global) info->global_variables.push_back(std::move(*variable)); else if (frame != nullptr) frame->variables.push_back(std::move(*variable)); @@ -1237,17 +1212,6 @@ void MC_load_dwarf(simgrid::mc::ObjectInformation* info) // ***** Functions index -static int MC_compare_frame_index_items(simgrid::mc::FunctionIndexEntry* a, - simgrid::mc::FunctionIndexEntry* b) -{ - if (a->low_pc < b->low_pc) - return -1; - else if (a->low_pc == b->low_pc) - return 0; - else - return 1; -} - static void MC_make_functions_index(simgrid::mc::ObjectInformation* info) { info->functions_index.clear();