#include <cinttypes>
+#include <algorithm>
+#include <memory>
+
#include <stdlib.h>
#define DW_LANG_Objc DW_LANG_ObjC /* fix spelling error in older dwarf.h */
#include <dwarf.h>
#include <elfutils/libdw.h>
#include <simgrid_config.h>
+#include <simgrid/util.hpp>
#include <xbt/log.h>
#include <xbt/sysdep.h>
+#include <simgrid/util.hpp>
+
#include "mc_object_info.h"
#include "mc_private.h"
-static void mc_variable_free_voidp(void *t)
-{
- delete *(simgrid::mc::Variable**)t;
-}
-
-static void mc_frame_free(void* frame)
-{
- delete (simgrid::mc::Frame*)frame;
-}
-
-static void MC_dwarf_register_global_variable(mc_object_info_t info, mc_variable_t variable);
-static void MC_register_variable(mc_object_info_t info, mc_frame_t frame, mc_variable_t variable);
-static void MC_dwarf_register_non_global_variable(mc_object_info_t info, mc_frame_t frame, mc_variable_t variable);
-static void MC_dwarf_register_variable(mc_object_info_t info, mc_frame_t frame, mc_variable_t variable);
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dwarf, mc, "DWARF processing");
/** \brief The default DW_TAG_lower_bound for a given DW_AT_language.
* \param die DIE
* \return DW_TAG_type attribute as a new string (NULL if none)
*/
-static std::string MC_dwarf_at_type(Dwarf_Die * die);
+static std::uint64_t MC_dwarf_at_type(Dwarf_Die * die);
/** \brief A class of DWARF tags (DW_TAG_*)
*/
* \return DW_AT_type reference as a global offset in hexadecimal (or NULL)
*/
static
-std::string MC_dwarf_at_type(Dwarf_Die * die)
+std::uint64_t MC_dwarf_at_type(Dwarf_Die * die)
{
- Dwarf_Off offset = MC_dwarf_attr_integrate_dieoffset(die, DW_AT_type);
- if (offset == 0)
- return std::string();
- char* s = bprintf("%" PRIx64, offset);
- std::string res(s);
- free(s);
- return std::move(res);
+ return MC_dwarf_attr_integrate_dieoffset(die, DW_AT_type);
}
static uint64_t MC_dwarf_attr_integrate_addr(Dwarf_Die * die, int attribute)
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)
+{
+ int cmp = strcmp(a.name.c_str(), b.name.c_str());
+ if (cmp < 0)
+ return true;
+ else if (cmp > 0)
+ return false;
+ else
+ return a.address < b.address;
+}
+
// ***** mc_type_t
/** \brief Initialize the location of a member of a type
}
-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
MC_dwarf_fill_member_location(type, &member, &child);
- if (member.type_id.empty()) {
+ 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());
* \param unit compilation unit of the current DIE
* \return MC representation of the type
*/
-static mc_type_t MC_dwarf_die_to_type(mc_object_info_t info, Dwarf_Die * die,
- Dwarf_Die * unit, mc_frame_t frame,
- const char *ns)
+static simgrid::mc::Type MC_dwarf_die_to_type(
+ mc_object_info_t info, Dwarf_Die * die,
+ Dwarf_Die * unit, mc_frame_t frame,
+ const char *ns)
{
- mc_type_t type = new simgrid::mc::Type();
- type->type = -1;
- type->name = std::string();
- type->element_count = -1;
+ simgrid::mc::Type type;
+ type.type = -1;
+ type.name = std::string();
+ type.element_count = -1;
- type->type = dwarf_tag(die);
+ type.type = dwarf_tag(die);
// Global Offset
- type->id = dwarf_dieoffset(die);
+ type.id = dwarf_dieoffset(die);
const char *prefix = "";
- switch (type->type) {
+ switch (type.type) {
case DW_TAG_structure_type:
prefix = "struct ";
break;
if (name != NULL) {
char* full_name = ns ? bprintf("%s%s::%s", prefix, ns, name) :
bprintf("%s%s", prefix, name);
- type->name = std::string(full_name);
+ type.name = std::string(full_name);
free(full_name);
}
- type->type_id = MC_dwarf_at_type(die);
+ type.type_id = MC_dwarf_at_type(die);
// Some compilers do not emit DW_AT_byte_size for pointer_type,
// so we fill this. We currently assume that the model-checked process is in
// the same architecture..
- if (type->type == DW_TAG_pointer_type)
- type->byte_size = sizeof(void*);
+ if (type.type == DW_TAG_pointer_type)
+ type.byte_size = sizeof(void*);
// Computation of the byte_size;
if (dwarf_hasattr_integrate(die, DW_AT_byte_size))
- type->byte_size = MC_dwarf_attr_integrate_uint(die, DW_AT_byte_size, 0);
- else if (type->type == DW_TAG_array_type
- || type->type == DW_TAG_structure_type
- || type->type == DW_TAG_class_type) {
+ type.byte_size = MC_dwarf_attr_integrate_uint(die, DW_AT_byte_size, 0);
+ else if (type.type == DW_TAG_array_type
+ || type.type == DW_TAG_structure_type
+ || type.type == DW_TAG_class_type) {
Dwarf_Word size;
if (dwarf_aggregate_size(die, &size) == 0) {
- type->byte_size = size;
+ type.byte_size = size;
}
}
- switch (type->type) {
+ switch (type.type) {
case DW_TAG_array_type:
- type->element_count = MC_dwarf_array_element_count(die, unit);
+ type.element_count = MC_dwarf_array_element_count(die, unit);
// TODO, handle DW_byte_stride and (not) DW_bit_stride
break;
case DW_TAG_pointer_type:
case DW_TAG_reference_type:
case DW_TAG_rvalue_reference_type:
- type->is_pointer_type = 1;
+ type.is_pointer_type = 1;
break;
case DW_TAG_structure_type:
case DW_TAG_union_type:
case DW_TAG_class_type:
- MC_dwarf_add_members(info, die, unit, type);
- char *new_ns = ns == NULL ? xbt_strdup(type->name.c_str())
+ MC_dwarf_add_members(info, die, unit, &type);
+ char *new_ns = ns == NULL ? xbt_strdup(type.name.c_str())
: bprintf("%s::%s", ns, name);
MC_dwarf_handle_children(info, die, unit, frame, new_ns);
free(new_ns);
break;
}
- return 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,
const char *ns)
{
- mc_type_t type = MC_dwarf_die_to_type(info, die, unit, frame, ns);
-
- char *key = bprintf("%" PRIx64, (uint64_t) type->id);
- xbt_dict_set(info->types, key, type, NULL);
- xbt_free(key);
-
- if (!type->name.empty() && type->byte_size != 0) {
- xbt_dict_set(info->full_types_by_name, type->name.c_str(), type, NULL);
- }
+ simgrid::mc::Type type = MC_dwarf_die_to_type(info, die, unit, frame, ns);
+ auto& t = (info->types[type.id] = std::move(type));
+ if (!t.name.empty() && type.byte_size != 0)
+ info->full_types_by_name[t.name] = &t;
}
static int mc_anonymous_variable_index = 0;
-static mc_variable_t MC_die_to_variable(mc_object_info_t info, Dwarf_Die * die,
- Dwarf_Die * unit, mc_frame_t frame,
- const char *ns)
+static std::unique_ptr<simgrid::mc::Variable> MC_die_to_variable(
+ mc_object_info_t info, Dwarf_Die * die,
+ Dwarf_Die * unit, mc_frame_t frame,
+ const char *ns)
{
// Skip declarations:
if (MC_dwarf_attr_flag(die, DW_AT_declaration, false))
- return NULL;
+ return nullptr;
// Skip compile time constants:
if (dwarf_hasattr(die, DW_AT_const_value))
- return NULL;
+ return nullptr;
Dwarf_Attribute attr_location;
if (dwarf_attr(die, DW_AT_location, &attr_location) == NULL) {
// No location: do not add it ?
- return NULL;
+ return nullptr;
}
- simgrid::mc::Variable* variable = new simgrid::mc::Variable();
+ std::unique_ptr<simgrid::mc::Variable> variable =
+ std::unique_ptr<simgrid::mc::Variable>(new simgrid::mc::Variable());
variable->dwarf_offset = dwarf_dieoffset(die);
variable->global = frame == NULL; // Can be override base on DW_AT_location
variable->object_info = info;
variable->name =
"@anonymous#" + std::to_string(mc_anonymous_variable_index++);
- return 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,
const char *ns)
{
- mc_variable_t variable =
- MC_die_to_variable(info, die, unit, frame, ns);
- if (variable == NULL)
+ std::unique_ptr<simgrid::mc::Variable> variable =
+ MC_die_to_variable(info, die, unit, frame, ns);
+ if (!variable)
return;
- MC_dwarf_register_variable(info, frame, variable);
+ // 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,
if (klass == mc_tag_scope)
xbt_assert(parent_frame, "No parent scope for this scope");
- mc_frame_t frame = new simgrid::mc::Frame();
+ simgrid::mc::Frame frame;
- frame->tag = tag;
- frame->id = dwarf_dieoffset(die);
- frame->object_info = info;
+ frame.tag = tag;
+ frame.id = dwarf_dieoffset(die);
+ frame.object_info = info;
if (klass == mc_tag_subprogram) {
const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_name);
if(ns)
- frame->name = std::string(ns) + "::" + name;
+ frame.name = std::string(ns) + "::" + name;
else
- frame->name = name;
+ frame.name = name;
}
- frame->abstract_origin_id =
- MC_dwarf_attr_dieoffset(die, DW_AT_abstract_origin);
+ frame.abstract_origin_id =
+ MC_dwarf_attr_dieoffset(die, DW_AT_abstract_origin);
// This is the base address for DWARF addresses.
// Relocated addresses are offset from this base address.
// TODO, support DW_AT_ranges
uint64_t low_pc = MC_dwarf_attr_integrate_addr(die, DW_AT_low_pc);
- frame->low_pc = low_pc ? ((char *) base) + low_pc : 0;
+ frame.low_pc = low_pc ? ((char *) base) + low_pc : 0;
if (low_pc) {
// DW_AT_high_pc:
Dwarf_Attribute attr;
if (dwarf_formsdata(&attr, &offset) != 0)
xbt_die("Could not read constant");
- frame->high_pc = (void *) ((char *) frame->low_pc + offset);
+ frame.high_pc = (void *) ((char *) frame.low_pc + offset);
break;
// DW_AT_high_pc is a relocatable address:
case MC_DW_CLASS_ADDRESS:
if (dwarf_formaddr(&attr, &high_pc) != 0)
xbt_die("Could not read address");
- frame->high_pc = ((char *) base) + high_pc;
+ frame.high_pc = ((char *) base) + high_pc;
break;
default:
if (klass == mc_tag_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,
+ mc_dwarf_location_list_init(&frame.frame_base, info, die,
&attr_frame_base);
}
- // Register it:
- if (klass == mc_tag_subprogram) {
- char *key = bprintf("%" PRIx64, (uint64_t) frame->id);
- xbt_dict_set(info->subprograms, key, frame, NULL);
- xbt_free(key);
- } else if (klass == mc_tag_scope) {
- xbt_dynar_push(parent_frame->scopes, &frame);
- }
// Handle children:
- MC_dwarf_handle_children(info, die, unit, frame, ns);
+ MC_dwarf_handle_children(info, die, unit, &frame, ns);
+
+ // Someone needs this to be sorted but who?
+ std::sort(frame.variables.begin(), frame.variables.end(),
+ MC_compare_variable);
+
+ // Register it:
+ if (klass == mc_tag_subprogram)
+ info->subprograms[frame.id] = frame;
+ else if (klass == mc_tag_scope)
+ parent_frame->scopes.push_back(std::move(frame));
}
static void mc_dwarf_handle_namespace_die(mc_object_info_t info,
*/
void MC_dwarf_get_variables(mc_object_info_t info)
{
- int fd = open(info->file_name, O_RDONLY);
- if (fd < 0) {
- xbt_die("Could not open file %s", info->file_name);
- }
+ 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)", info->file_name);
- }
+ if (dwarf == NULL)
+ xbt_die("Your program must be compiled with -g (%s)",
+ info->file_name.c_str());
// For each compilation unit:
Dwarf_Off offset = 0;
Dwarf_Off next_offset = 0;
close(fd);
}
-/************************** Free functions *************************/
-
-static void dw_type_free(mc_type_t t)
-{
- delete t;
-}
-
-// ***** object_info
-
-namespace simgrid {
-namespace mc {
-
-ObjectInformation::ObjectInformation()
-{
- this->flags = 0;
- this->file_name = nullptr;
- this->start = nullptr;
- this->end = nullptr;
- this->start_exec = nullptr;
- this->end_exec = nullptr;
- this->start_rw = nullptr;
- this->end_rw = nullptr;
- this->start_ro = nullptr;
- this->end_ro = nullptr;
- this->subprograms = xbt_dict_new_homogeneous(mc_frame_free);
- this->global_variables =
- xbt_dynar_new(sizeof(mc_variable_t), mc_variable_free_voidp);
- this->types = xbt_dict_new_homogeneous((void (*)(void *)) dw_type_free);
- this->full_types_by_name = xbt_dict_new_homogeneous(NULL);
- this->functions_index = nullptr;
-}
-
-ObjectInformation::~ObjectInformation()
-{
- xbt_free(this->file_name);
- xbt_dict_free(&this->subprograms);
- xbt_dynar_free(&this->global_variables);
- xbt_dict_free(&this->types);
- xbt_dict_free(&this->full_types_by_name);
- xbt_dynar_free(&this->functions_index);
-}
-
-/** Find the DWARF offset for this ELF object
- *
- * An offset is applied to address found in DWARF:
- *
- * <ul>
- * <li>for an executable obejct, addresses are virtual address
- * (there is no offset) i.e. \f$\text{virtual address} = \{dwarf address}\f$;</li>
- * <li>for a shared object, the addreses are offset from the begining
- * of the shared object (the base address of the mapped shared
- * object must be used as offset
- * i.e. \f$\text{virtual address} = \text{shared object base address}
- * + \text{dwarf address}\f$.</li>
- *
- */
-void *ObjectInformation::base_address() const
-{
- if (this->executable())
- return nullptr;
-
- void *result = this->start_exec;
- if (this->start_rw != NULL && result > (void *) this->start_rw)
- result = this->start_rw;
- if (this->start_ro != NULL && result > (void *) this->start_ro)
- result = this->start_ro;
- return result;
-}
-
-}
-}
-
-// ***** Helpers
-
// ***** Functions index
-static int MC_compare_frame_index_items(mc_function_index_item_t a,
- mc_function_index_item_t b)
+static int MC_compare_frame_index_items(simgrid::mc::FunctionIndexEntry* a,
+ simgrid::mc::FunctionIndexEntry* b)
{
if (a->low_pc < b->low_pc)
return -1;
static void MC_make_functions_index(mc_object_info_t info)
{
- xbt_dynar_t index = xbt_dynar_new(sizeof(s_mc_function_index_item_t), NULL);
-
- // Populate the array:
- mc_frame_t frame = NULL;
- xbt_dict_cursor_t cursor;
- char *key;
- xbt_dict_foreach(info->subprograms, cursor, key, frame) {
- if (frame->low_pc == NULL)
+ info->functions_index.clear();
+
+ for (auto& e : info->subprograms) {
+ if (e.second.low_pc == nullptr)
continue;
- s_mc_function_index_item_t entry;
- entry.low_pc = frame->low_pc;
- entry.high_pc = frame->high_pc;
- entry.function = frame;
- xbt_dynar_push(index, &entry);
+ simgrid::mc::FunctionIndexEntry entry;
+ entry.low_pc = e.second.low_pc;
+ entry.function = &e.second;
+ info->functions_index.push_back(entry);
}
- mc_function_index_item_t base =
- (mc_function_index_item_t) xbt_dynar_get_ptr(index, 0);
+ info->functions_index.shrink_to_fit();
// Sort the array by low_pc:
- qsort(base,
- xbt_dynar_length(index),
- sizeof(s_mc_function_index_item_t),
- (int (*)(const void *, const void *)) MC_compare_frame_index_items);
-
- info->functions_index = index;
+ std::sort(info->functions_index.begin(), info->functions_index.end(),
+ [](simgrid::mc::FunctionIndexEntry& a,
+ simgrid::mc::FunctionIndexEntry& b)
+ {
+ return a.low_pc < b.low_pc;
+ });
}
static void MC_post_process_variables(mc_object_info_t info)
{
- unsigned cursor = 0;
- mc_variable_t variable = nullptr;
- xbt_dynar_foreach(info->global_variables, cursor, variable)
- if (!variable->type_id.empty())
- variable->type = (mc_type_t) xbt_dict_get_or_null(
- info->types, variable->type_id.c_str());
+ // 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) {
+ 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)
{
if (scope->tag == DW_TAG_inlined_subroutine) {
-
// Attach correct namespaced name in inlined subroutine:
- char *key = bprintf("%" PRIx64, (uint64_t) scope->abstract_origin_id);
- mc_frame_t abstract_origin = (mc_frame_t) xbt_dict_get_or_null(info->subprograms, key);
- xbt_assert(abstract_origin, "Could not lookup abstract origin %s", key);
- xbt_free(key);
- scope->name = abstract_origin->name;
+ 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);
+ scope->name = i->second.name;
}
// Direct:
- unsigned cursor = 0;
- mc_variable_t variable = nullptr;
- xbt_dynar_foreach(scope->variables, cursor, variable)
- if (!variable->type_id.empty())
- variable->type = (mc_type_t) xbt_dict_get_or_null(
- info->types, variable->type_id.c_str());
+ for (simgrid::mc::Variable& variable : scope->variables)
+ if (variable.type_id) {
+ variable.type = simgrid::util::find_map_ptr(
+ info->types, variable.type_id);
+ }
// Recursive post-processing of nested-scopes:
- mc_frame_t nested_scope = nullptr;
- xbt_dynar_foreach(scope->scopes, cursor, nested_scope)
- mc_post_process_scope(info, nested_scope);
+ for (simgrid::mc::Frame& nested_scope : scope->scopes)
+ mc_post_process_scope(info, &nested_scope);
}
-static void MC_post_process_functions(mc_object_info_t info)
-{
- xbt_dict_cursor_t cursor;
- char *key;
- mc_frame_t subprogram = NULL;
- xbt_dict_foreach(info->subprograms, cursor, key, subprogram) {
- mc_post_process_scope(info, subprogram);
- }
-}
-
-
/** \brief Fill/lookup the "subtype" field.
*/
static void MC_resolve_subtype(mc_object_info_t info, mc_type_t type)
{
-
- if (type->type_id.empty())
+ if (!type->type_id)
return;
- type->subtype = (mc_type_t) xbt_dict_get_or_null(
- info->types, type->type_id.c_str());
- if (type->subtype == NULL)
+ type->subtype = simgrid::util::find_map_ptr(info->types, type->type_id);
+ if (type->subtype == nullptr)
return;
if (type->subtype->byte_size != 0)
return;
return;
// Try to find a more complete description of the type:
// We need to fix in order to support C++.
-
- mc_type_t subtype =
- (mc_type_t) xbt_dict_get_or_null(
- info->full_types_by_name, type->subtype->name.c_str());
- if (subtype != NULL) {
- type->subtype = subtype;
- }
-
+ simgrid::mc::Type** subtype = simgrid::util::find_map_ptr(
+ info->full_types_by_name, type->subtype->name);
+ if (subtype)
+ type->subtype = *subtype;
}
static void MC_post_process_types(mc_object_info_t info)
{
- xbt_dict_cursor_t cursor = NULL;
- char *origin;
- mc_type_t type;
-
// Lookup "subtype" field:
- xbt_dict_foreach(info->types, cursor, origin, type) {
- MC_resolve_subtype(info, type);
- for (simgrid::mc::Type& member : type->members)
+ for(auto& i : info->types) {
+ MC_resolve_subtype(info, &(i.second));
+ for (simgrid::mc::Type& member : i.second.members)
MC_resolve_subtype(info, &member);
}
}
std::make_shared<s_mc_object_info_t>();
if (executable)
result->flags |= MC_OBJECT_INFO_EXECUTABLE;
- result->file_name = xbt_strdup(name);
+ result->file_name = name;
MC_find_object_address(maps, result.get());
MC_dwarf_get_variables(result.get());
- MC_post_process_types(result.get());
MC_post_process_variables(result.get());
- MC_post_process_functions(result.get());
+ MC_post_process_types(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);
}
/*************************************************************************/
-static int MC_dwarf_get_variable_index(xbt_dynar_t variables, const char *var,
- void *address)
-{
-
- if (xbt_dynar_is_empty(variables))
- return 0;
-
- unsigned int cursor = 0;
- int start = 0;
- int end = xbt_dynar_length(variables) - 1;
- mc_variable_t var_test = NULL;
-
- while (start <= end) {
- cursor = (start + end) / 2;
- var_test =
- (mc_variable_t) xbt_dynar_get_as(variables, cursor, mc_variable_t);
- if (strcmp(var_test->name.c_str(), var) < 0) {
- start = cursor + 1;
- } else if (strcmp(var_test->name.c_str(), var) > 0) {
- end = cursor - 1;
- } else {
- if (address) { /* global variable */
- if (var_test->address == address)
- return -1;
- if (var_test->address > address)
- end = cursor - 1;
- else
- start = cursor + 1;
- } else { /* local variable */
- return -1;
- }
- }
- }
-
- if (strcmp(var_test->name.c_str(), var) == 0) {
- if (address && var_test->address < address)
- return cursor + 1;
- else
- return cursor;
- } else if (strcmp(var_test->name.c_str(), var) < 0)
- return cursor + 1;
- else
- return cursor;
-
-}
-
-void MC_dwarf_register_global_variable(mc_object_info_t info,
- mc_variable_t variable)
-{
- int index =
- MC_dwarf_get_variable_index(info->global_variables,
- variable->name.c_str(),
- variable->address);
- if (index != -1)
- xbt_dynar_insert_at(info->global_variables, index, &variable);
- // TODO, else ?
-}
-
-void MC_dwarf_register_non_global_variable(mc_object_info_t info,
- mc_frame_t frame,
- mc_variable_t variable)
-{
- xbt_assert(frame, "Frame is NULL");
- int index =
- MC_dwarf_get_variable_index(
- frame->variables, variable->name.c_str(), NULL);
- if (index != -1)
- xbt_dynar_insert_at(frame->variables, index, &variable);
- // TODO, else ?
-}
-
-void MC_dwarf_register_variable(mc_object_info_t info, mc_frame_t frame,
- mc_variable_t variable)
-{
- if (variable->global)
- MC_dwarf_register_global_variable(info, variable);
- else if (frame == NULL)
- xbt_die("No frame for this local variable");
- else
- MC_dwarf_register_non_global_variable(info, frame, variable);
-}
-
void MC_post_process_object_info(mc_process_t process, mc_object_info_t info)
{
- xbt_dict_cursor_t cursor = NULL;
- char *key = NULL;
- mc_type_t type = NULL;
- xbt_dict_foreach(info->types, cursor, key, type) {
+ 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) {
// Resolve full_type:
if (!subtype->name.empty() && subtype->byte_size == 0) {
for (auto const& object_info : process->object_infos) {
- mc_type_t same_type = (mc_type_t)
- xbt_dict_get_or_null(object_info->full_types_by_name,
- subtype->name.c_str());
- if (same_type && !same_type->name.empty() && same_type->byte_size) {
- type->full_type = same_type;
+ auto i = object_info->full_types_by_name.find(subtype->name);
+ if (i != object_info->full_types_by_name.end()
+ && !i->second->name.empty() && i->second->byte_size) {
+ type->full_type = i->second;
break;
}
}
