std::string name; /* Name of the type */
int byte_size; /* Size in bytes */
int element_count; /* Number of elements for array type */
- std::string dw_type_id; /* DW_AT_type id */
+ std::string 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;
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<dw_variable_t>
+ xbt_dict_t subprograms; // xbt_dict_t<origin as hexadecimal string, mc_frame_t>
+ // 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;
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)
void* base_address() const;
- dw_frame_t find_function(const void *ip) const;
- dw_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 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 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);
+class Variable {
+public:
+ Variable();
-struct s_dw_variable{
Dwarf_Off dwarf_offset; /* Global offset of the field. */
int global;
- char *name;
- char *type_origin;
+ std::string name;
+ std::string type_id;
mc_type_t type;
// Use either of:
- s_mc_location_list_t locations;
+ simgrid::mc::LocationList location_list;
void* address;
size_t start_scope;
};
-struct s_dw_frame{
+class Frame {
+public:
+ Frame();
+
int tag;
- char *name;
+ std::string name;
void *low_pc;
void *high_pc;
- s_mc_location_list_t frame_base;
- xbt_dynar_t /* <dw_variable_t> */ variables; /* Cannot use dict, there may be several variables with the same name (in different lexical blocks)*/
+ simgrid::mc::LocationList frame_base;
+ std::vector<Variable> variables;
unsigned long int id; /* DWARF offset of the subprogram */
- xbt_dynar_t /* <dw_frame_t> */ scopes;
+ std::vector<Frame> scopes;
Dwarf_Off abstract_origin_id;
mc_object_info_t object_info;
};
+}
+}
+
+
+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 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 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);
+
+
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