#ifndef SIMGRID_MC_OBJECT_INFO_H
#define SIMGRID_MC_OBJECT_INFO_H
-#include <stdint.h>
+#include <cstdint>
#include <string>
+#include <vector>
+#include <unordered_map>
#include <simgrid_config.h>
#include <xbt/dict.h>
std::string name; /* Name of the type */
int byte_size; /* Size in bytes */
int element_count; /* Number of elements for array type */
- std::string type_id; /* DW_AT_type id */
+ std::uint64_t type_id; /* DW_AT_type id */
std::vector<Type> members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/
int is_pointer_type;
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;
+ mc_type_t type;
+
+ // Use either of:
+ simgrid::mc::LocationList location_list;
+ void* address;
+
+ size_t start_scope;
+ mc_object_info_t object_info;
+
+};
+
+class Frame {
+public:
+ Frame();
+
+ int tag;
+ std::string name;
+ void *low_pc;
+ void *high_pc;
+ simgrid::mc::LocationList frame_base;
+ std::vector<Variable> variables;
+ unsigned long int id; /* DWARF offset of the subprogram */
+ std::vector<Frame> scopes;
+ Dwarf_Off abstract_origin_id;
+ mc_object_info_t object_info;
+};
+
class ObjectInformation {
public:
ObjectInformation();
char *end_rw; // Read-write segment
char *start_ro;
char *end_ro; // read-only segment
- xbt_dict_t subprograms; // xbt_dict_t<origin as hexadecimal string, dw_frame_t>
- xbt_dynar_t global_variables; // xbt_dynar_t<mc_variable_t>
- xbt_dict_t types; // xbt_dict_t<origin as hexadecimal string, mc_type_t>
- xbt_dict_t full_types_by_name; // xbt_dict_t<name, mc_type_t> (full defined type only)
+ std::unordered_map<std::uint64_t, simgrid::mc::Frame> subprograms;
+ // TODO, remove the mutable (to remove it we'll have to add a lot of const everywhere)
+ mutable std::vector<simgrid::mc::Variable> global_variables;
+ std::unordered_map<std::uint64_t, simgrid::mc::Type> types;
+ std::unordered_map<std::string, simgrid::mc::Type*> full_types_by_name;
// Here we sort the minimal information for an efficient (and cache-efficient)
// lookup of a function given an instruction pointer.
void* base_address() const;
- dw_frame_t find_function(const void *ip) const;
- mc_variable_t find_variable(const char* name) const;
+ mc_frame_t find_function(const void *ip) const;
+ // TODO, should be simgrid::mc::Variable*
+ simgrid::mc::Variable* find_variable(const char* name) const;
};
}
}
+
XBT_INTERNAL std::shared_ptr<s_mc_object_info_t> MC_find_object_info(
std::vector<simgrid::mc::VmMap> 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 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, mc_type_t type, mc_type_t member, mc_address_space_t snapshot, int process_index);
-
-namespace simgrid {
-namespace mc {
-
-class Variable {
-public:
- Variable();
- ~Variable();
- Variable(Variable const&) = delete;
- Variable& operator=(Variable const&) = delete;
-
- Dwarf_Off dwarf_offset; /* Global offset of the field. */
- int global;
- std::string name;
- std::string type_id;
- mc_type_t type;
-
- // Use either of:
- s_mc_location_list_t location_list;
- void* address;
-
- size_t start_scope;
- mc_object_info_t object_info;
-
-};
+XBT_INTERNAL void* mc_member_resolve(
+ const void* base, mc_type_t type, mc_type_t member,
+ mc_address_space_t snapshot, int process_index);
-}
-}
-
-struct s_dw_frame{
- int tag;
- char *name;
- void *low_pc;
- void *high_pc;
- s_mc_location_list_t frame_base;
- xbt_dynar_t /* <mc_variable_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 /* <dw_frame_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;
+ mc_frame_t function;
};
-XBT_INTERNAL void mc_frame_free(dw_frame_t freme);
-
#endif
