#define SIMGRID_MC_OBJECT_INFO_H
#include <stdint.h>
-#include <stdbool.h>
+
+#include <string>
#include <simgrid_config.h>
#include <xbt/dict.h>
#include <xbt/dynar.h>
+#include <elfutils/libdw.h>
+
#include "mc_forward.h"
#include "mc_location.h"
#include "mc_process.h"
// ***** Type
-typedef int e_dw_type_type;
+typedef int e_mc_type_type;
+
+namespace simgrid {
+namespace mc {
-struct s_dw_type {
- s_dw_type();
- ~s_dw_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;
- e_dw_type_type type;
+ e_mc_type_type 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::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;
// Location (for members) is either of:
- struct s_mc_expression location;
- int offset;
+ simgrid::mc::DwarfExpression location_expression;
+
+ mc_type_t subtype; // DW_AT_type
+ mc_type_t full_type; // The same (but more complete) type
- dw_type_t subtype; // DW_AT_type
- dw_type_t 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
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 types; // xbt_dict_t<origin as hexadecimal string, dw_type_t>
- xbt_dict_t full_types_by_name; // xbt_dict_t<name, dw_type_t> (full defined type only)
+ xbt_dict_t subprograms; // xbt_dict_t<origin as hexadecimal string, mc_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)
// 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;
- dw_variable_t find_variable(const char* name) const;
+ mc_frame_t find_function(const void *ip) const;
+ mc_variable_t find_variable(const char* name) const;
};
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);
+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;
-struct s_dw_variable{
Dwarf_Off dwarf_offset; /* Global offset of the field. */
int global;
- char *name;
- char *type_origin;
- dw_type_t type;
+ std::string name;
+ std::string type_id;
+ mc_type_t type;
// Use either of:
- s_mc_location_list_t locations;
+ s_mc_location_list_t location_list;
void* address;
size_t start_scope;
};
-struct s_dw_frame{
+class Frame {
+public:
+ Frame();
+ ~Frame();
+ Frame(Frame const&) = delete;
+ Frame& operator=(Frame&) = delete;
+
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)*/
+ 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;
+ xbt_dynar_t /* <mc_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
