#include "mc_object_info.h"
#include "mc_private.h"
-extern "C" {
-
static void MC_dwarf_register_global_variable(mc_object_info_t info, dw_variable_t variable);
static void MC_register_variable(mc_object_info_t info, dw_frame_t frame, dw_variable_t variable);
static void MC_dwarf_register_non_global_variable(mc_object_info_t info, dw_frame_t frame, dw_variable_t variable);
*/
static char *MC_dwarf_at_type(Dwarf_Die * die);
-/** \brief Get the name of an attribute (DW_AT_*) from its code
- *
- * \param attr attribute code (see the DWARF specification)
- * \return name of the attribute
- */
-const char *MC_dwarf_attrname(int attr)
-{
- switch (attr) {
-#include "mc_dwarf_attrnames.h"
- default:
- return "DW_AT_unknown";
- }
-}
-
-/** \brief Get the name of a dwarf tag (DW_TAG_*) from its code
- *
- * \param tag tag code (see the DWARF specification)
- * \return name of the tag
- */
-XBT_INTERNAL
-const char *MC_dwarf_tagname(int tag)
-{
- switch (tag) {
-#include "mc_dwarf_tagnames.h"
- case DW_TAG_invalid:
- return "DW_TAG_invalid";
- default:
- return "DW_TAG_unknown";
- }
-}
-
/** \brief A class of DWARF tags (DW_TAG_*)
*/
typedef enum mc_tag_class {
static void dw_type_free_voidp(void *t)
{
- dw_type_free((dw_type_t) * (void **) t);
+ delete *(dw_type_t*)t;
}
/** \brief Populate the list of members of a type
const char *ns)
{
- dw_type_t type = xbt_new0(s_dw_type_t, 1);
+ dw_type_t type = new s_dw_type();
type->type = -1;
type->id = 0;
type->name = NULL;
xbt_free(frame);
}
-void dw_type_free(dw_type_t t)
+s_dw_type::s_dw_type()
+{
+ this->type = 0;
+ this->id = 0;
+ this->name = nullptr;
+ this->byte_size = 0;
+ this->element_count = 0;
+ this->dw_type_id = nullptr;
+ this->members = nullptr;
+ this->is_pointer_type = 0;
+ this->location = { 0, 0, 0, 0};
+ this->offset = 0;
+ this->subtype = nullptr;
+ this->full_type = nullptr;
+}
+
+s_dw_type::~s_dw_type()
+{
+ xbt_free(this->name);
+ xbt_free(this->dw_type_id);
+ xbt_dynar_free(&this->members);
+ mc_dwarf_expression_clear(&this->location);
+}
+
+static void dw_type_free(dw_type_t t)
{
- xbt_free(t->name);
- xbt_free(t->dw_type_id);
- xbt_dynar_free(&(t->members));
- mc_dwarf_expression_clear(&t->location);
- xbt_free(t);
+ delete t;
}
void dw_variable_free(dw_variable_t v)
s_mc_object_info::s_mc_object_info()
{
- this->types = xbt_dict_new_homogeneous((void (*)(void *)) dw_type_free);
+ 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((void (*)(void *)) mc_frame_free);
this->global_variables =
xbt_dynar_new(sizeof(dw_variable_t), dw_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;
}
s_mc_object_info::~s_mc_object_info()
}
/** \brief Finds informations about a given shared object/executable */
-mc_object_info_t MC_find_object_info(
+std::shared_ptr<s_mc_object_info_t> MC_find_object_info(
std::vector<simgrid::mc::VmMap> const& maps, const char *name, int executable)
{
- mc_object_info_t result = new s_mc_object_info_t();
+ std::shared_ptr<s_mc_object_info_t> result =
+ std::make_shared<s_mc_object_info_t>();
if (executable)
result->flags |= MC_OBJECT_INFO_EXECUTABLE;
result->file_name = xbt_strdup(name);
- MC_find_object_address(maps, result);
- MC_dwarf_get_variables(result);
- MC_post_process_types(result);
- MC_post_process_variables(result);
- MC_post_process_functions(result);
- MC_make_functions_index(result);
- return result;
+ 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_make_functions_index(result.get());
+ return std::move(result);
}
/*************************************************************************/
// Resolve full_type:
if (subtype->name && subtype->byte_size == 0) {
- for (size_t i = 0; i != process->object_infos_size; ++i) {
+ for (auto const& object_info : process->object_infos) {
dw_type_t same_type = (dw_type_t)
- xbt_dict_get_or_null(process->object_infos[i]->full_types_by_name,
+ xbt_dict_get_or_null(object_info->full_types_by_name,
subtype->name);
if (same_type && same_type->name && same_type->byte_size) {
type->full_type = same_type;
}
}
-
-}
