X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13388755930c20f4c3785153b8952cf30c23183a..00c3794fcf27d9c7733b5f0c1624a3120b35a72f:/src/mc/mc_object_info.h diff --git a/src/mc/mc_object_info.h b/src/mc/mc_object_info.h index f7ab5b5dae..2ec4e56fef 100644 --- a/src/mc/mc_object_info.h +++ b/src/mc/mc_object_info.h @@ -11,65 +11,160 @@ #ifndef SIMGRID_MC_OBJECT_INFO_H #define SIMGRID_MC_OBJECT_INFO_H -#include -#include +#include + +#include +#include +#include #include #include #include -#include "mc_forward.h" +#include + +#include "mc_forward.hpp" #include "mc_location.h" #include "mc_process.h" #include "../smpi/private.h" // ***** Type -typedef int e_dw_type_type; - -struct s_dw_type { - s_dw_type(); - ~s_dw_type(); +namespace simgrid { +namespace mc { - e_dw_type_type type; +/** Represents a type in the program + * + * It is currently used to represent members of structs and unions as well. + */ +class Type { +public: + Type(); + Type(Type const& type) = default; + Type& operator=(Type const&) = default; + Type(Type&& type) = default; + Type& operator=(Type&&) = default; + + /** The DWARF TAG of the type (e.g. DW_TAG_array_type) */ + int type; Dwarf_Off id; /* Offset in the section (in hexadecimal form) */ - char *name; /* Name of the type */ + std::string name; /* Name of the type */ int byte_size; /* Size in bytes */ int element_count; /* Number of elements for array type */ - char *dw_type_id; /* DW_AT_type id */ - xbt_dynar_t members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/ + std::uint64_t type_id; /* DW_AT_type id */ + std::vector members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/ int is_pointer_type; // Location (for members) is either of: - struct s_mc_expression location; - int offset; + simgrid::mc::DwarfExpression location_expression; - dw_type_t subtype; // DW_AT_type - dw_type_t full_type; // The same (but more complete) type + simgrid::mc::Type* subtype; // DW_AT_type + simgrid::mc::Type* full_type; // The same (but more complete) type + + bool has_offset_location() const + { + return location_expression.size() == 1 && + location_expression[0].atom == DW_OP_plus_uconst; + } + + // TODO, check if this shortcut is really necessary + int offset() const + { + xbt_assert(this->has_offset_location()); + return this->location_expression[0].number; + } + + void offset(int new_offset) + { + Dwarf_Op op; + op.atom = DW_OP_plus_uconst; + op.number = new_offset; + this->location_expression = { op }; + } }; -XBT_INTERNAL void dw_variable_free(dw_variable_t v); -XBT_INTERNAL void dw_variable_free_voidp(void *t); +} +} // ***** Object info -/** Bit field of options */ -typedef int mc_object_info_flags; -#define MC_OBJECT_INFO_NONE 0 -#define MC_OBJECT_INFO_EXECUTABLE 1 - namespace simgrid { namespace mc { +class Variable { +public: + Variable(); + + Dwarf_Off dwarf_offset; /* Global offset of the field. */ + int global; + std::string name; + std::uint64_t type_id; + simgrid::mc::Type* type; + + // Use either of: + simgrid::mc::LocationList location_list; + void* address; + + size_t start_scope; + simgrid::mc::ObjectInformation* object_info; +}; + +class Frame { +public: + Frame(); + + int tag; + std::string name; + void *low_pc; + void *high_pc; + simgrid::mc::LocationList frame_base; + std::vector variables; + unsigned long int id; /* DWARF offset of the subprogram */ + std::vector scopes; + Dwarf_Off abstract_origin_id; + simgrid::mc::ObjectInformation* object_info; +}; + +/** An entry in the functions index + * + * See the code of ObjectInformation::find_function. + */ +struct FunctionIndexEntry { + void* low_pc; + simgrid::mc::Frame* function; +}; + +/** Information about an (ELF) executable/sharedobject + * + * This contain sall the information we have at runtime about an + * executable/shared object in the target (modelchecked) process: + * - where it is located in the virtual address space; + * - where are located it's different memory mapping in the the + * virtual address space ; + * - all the debugging (DWARF) information, + * - location of the functions, + * - types + * - etc. + * + * It is not copyable because we are taking pointers to Types/Frames. + * We'd have to update/rebuild some data structures in order to copy + * successfully. + */ + class ObjectInformation { public: ObjectInformation(); - ~ObjectInformation(); + + // Not copyable: ObjectInformation(ObjectInformation const&) = delete; ObjectInformation& operator=(ObjectInformation const&) = delete; - mc_object_info_flags flags; - char* file_name; + // Flag: + static const int Executable = 1; + + /** Bitfield of flags */ + int flags; + std::string file_name; const void* start; const void *end; char *start_exec; @@ -78,19 +173,22 @@ public: char *end_rw; // Read-write segment char *start_ro; char *end_ro; // read-only segment - xbt_dict_t subprograms; // xbt_dict_t - xbt_dynar_t global_variables; // xbt_dynar_t - xbt_dict_t types; // xbt_dict_t - xbt_dict_t full_types_by_name; // xbt_dict_t (full defined type only) - - // Here we sort the minimal information for an efficient (and cache-efficient) - // lookup of a function given an instruction pointer. - // The entries are sorted by low_pc and a binary search can be used to look them up. - xbt_dynar_t functions_index; + std::unordered_map subprograms; + // TODO, remove the mutable (to remove it we'll have to add a lot of const everywhere) + mutable std::vector global_variables; + std::unordered_map types; + std::unordered_map full_types_by_name; + + /** Index of functions by IP + * + * The entries are sorted by low_pc and a binary search can be used to look + * them up. Should we used a binary tree instead? + */ + std::vector functions_index; bool executable() const { - return this->flags & MC_OBJECT_INFO_EXECUTABLE; + return this->flags & simgrid::mc::ObjectInformation::Executable; } bool privatized() const @@ -100,59 +198,26 @@ public: void* base_address() const; - dw_frame_t find_function(const void *ip) const; - dw_variable_t find_variable(const char* name) const; + simgrid::mc::Frame* find_function(const void *ip) const; + simgrid::mc::Variable* find_variable(const char* name) const; }; } } -XBT_INTERNAL std::shared_ptr MC_find_object_info( + +XBT_INTERNAL std::shared_ptr MC_find_object_info( std::vector const& maps, const char* name, int executable); -XBT_INTERNAL void MC_post_process_object_info(mc_process_t process, mc_object_info_t info); +XBT_INTERNAL void MC_post_process_object_info(simgrid::mc::Process* process, simgrid::mc::ObjectInformation* info); -XBT_INTERNAL void MC_dwarf_get_variables(mc_object_info_t info); -XBT_INTERNAL void MC_dwarf_get_variables_libdw(mc_object_info_t info); +XBT_INTERNAL void MC_dwarf_get_variables(simgrid::mc::ObjectInformation* info); +XBT_INTERNAL void MC_dwarf_get_variables_libdw(simgrid::mc::ObjectInformation* info); XBT_INTERNAL const char* MC_dwarf_attrname(int attr); XBT_INTERNAL const char* MC_dwarf_tagname(int tag); -XBT_INTERNAL void* mc_member_resolve(const void* base, dw_type_t type, dw_type_t member, mc_address_space_t snapshot, int process_index); - -struct s_dw_variable{ - Dwarf_Off dwarf_offset; /* Global offset of the field. */ - int global; - char *name; - char *type_origin; - dw_type_t type; - - // Use either of: - s_mc_location_list_t locations; - void* address; - - size_t start_scope; - mc_object_info_t object_info; - -}; - -struct s_dw_frame{ - int tag; - char *name; - void *low_pc; - void *high_pc; - s_mc_location_list_t frame_base; - xbt_dynar_t /* */ variables; /* Cannot use dict, there may be several variables with the same name (in different lexical blocks)*/ - unsigned long int id; /* DWARF offset of the subprogram */ - xbt_dynar_t /* */ scopes; - Dwarf_Off abstract_origin_id; - mc_object_info_t object_info; -}; - -struct s_mc_function_index_item { - void* low_pc, *high_pc; - dw_frame_t function; -}; - -XBT_INTERNAL void mc_frame_free(dw_frame_t freme); +XBT_INTERNAL void* mc_member_resolve( + const void* base, simgrid::mc::Type* type, simgrid::mc::Type* member, + simgrid::mc::AddressSpace* snapshot, int process_index); #endif