/* 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 <cinttypes>
+
#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 <inttypes.h>
#include <simgrid_config.h>
#include <xbt/log.h>
* \param tag tag code (see the DWARF specification)
* \return name of the tag
*/
+XBT_INTERNAL
const char *MC_dwarf_tagname(int tag)
{
switch (tag) {
type->dw_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*);
+
// 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);
// ***** object_info
-
-
-mc_object_info_t MC_new_object_info(void)
+s_mc_object_info::s_mc_object_info()
{
- mc_object_info_t res = xbt_new0(s_mc_object_info_t, 1);
- res->subprograms = xbt_dict_new_homogeneous((void (*)(void *)) mc_frame_free);
- res->global_variables =
+ this->types = xbt_dict_new_homogeneous((void (*)(void *)) dw_type_free);
+ 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);
- res->types = xbt_dict_new_homogeneous((void (*)(void *)) dw_type_free);
- res->full_types_by_name = xbt_dict_new_homogeneous(NULL);
- return res;
+
+ this->full_types_by_name = xbt_dict_new_homogeneous(NULL);
}
-void MC_free_object_info(mc_object_info_t * info)
+s_mc_object_info::~s_mc_object_info()
{
- xbt_free(&(*info)->file_name);
- xbt_dict_free(&(*info)->subprograms);
- xbt_dynar_free(&(*info)->global_variables);
- xbt_dict_free(&(*info)->types);
- xbt_dict_free(&(*info)->full_types_by_name);
- xbt_free(info);
- xbt_dynar_free(&(*info)->functions_index);
- *info = NULL;
+ 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);
}
// ***** Helpers
}
/** \brief Finds informations about a given shared object/executable */
-mc_object_info_t MC_find_object_info(memory_map_t maps, const char *name,
- int executable)
+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 = MC_new_object_info();
+ mc_object_info_t result = new s_mc_object_info_t();
if (executable)
result->flags |= MC_OBJECT_INFO_EXECUTABLE;
result->file_name = xbt_strdup(name);