X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f6e8576ae0221324ccba0eb542504e2d7bd9f766..859be56ee4794f262b79665d2caa32664e52cbed:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index 9672142970..1e2e0a994b 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -36,8 +36,11 @@ typedef struct s_mc_function_index_item s_mc_function_index_item_t, *mc_function #define NB_REGIONS 3 /* binary data (data + BSS) (type = 2), libsimgrid data (data + BSS) (type = 1), std_heap (type = 0)*/ typedef struct s_mc_mem_region{ + // Real address: void *start_addr; + // Copy of the datra: void *data; + // Size of the data region: size_t size; } s_mc_mem_region_t, *mc_mem_region_t; @@ -91,6 +94,8 @@ mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall); mc_snapshot_t MC_take_snapshot(int num_state); void MC_restore_snapshot(mc_snapshot_t); void MC_free_snapshot(mc_snapshot_t); +void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot); +uintptr_t mc_untranslate_address(void* addr, mc_snapshot_t snapshot); extern xbt_dynar_t mc_checkpoint_ignore; @@ -344,7 +349,7 @@ struct s_mc_object_info { xbt_dynar_t subprograms; // xbt_dynar_t xbt_dynar_t global_variables; // xbt_dynar_t xbt_dict_t types; // xbt_dict_t - xbt_dict_t types_by_name; // xbt_dict_t (full defined type only) + 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. @@ -366,6 +371,8 @@ mc_object_info_t MC_ip_find_object_info(void* ip); extern mc_object_info_t mc_libsimgrid_info; extern mc_object_info_t mc_binary_info; +extern mc_object_info_t mc_object_infos[2]; +extern size_t mc_object_infos_size; void MC_find_object_address(memory_map_t maps, mc_object_info_t result); void MC_post_process_types(mc_object_info_t info); @@ -386,79 +393,39 @@ typedef struct s_mc_location_list { mc_expression_t locations; } s_mc_location_list_t, *mc_location_list_t; -Dwarf_Off mc_dwarf_resolve_location(mc_expression_t expression, unw_cursor_t* c, void* frame_pointer_address); -Dwarf_Off mc_dwarf_resolve_locations(mc_location_list_t locations, unw_cursor_t* c, void* frame_pointer_address); +Dwarf_Off mc_dwarf_resolve_location(mc_expression_t expression, unw_cursor_t* c, void* frame_pointer_address, mc_snapshot_t snapshot); +Dwarf_Off mc_dwarf_resolve_locations(mc_location_list_t locations, unw_cursor_t* c, void* frame_pointer_address, mc_snapshot_t snapshot); + +void mc_dwarf_expression_clear(mc_expression_t expression); +void mc_dwarf_expression_init(mc_expression_t expression, size_t len, Dwarf_Op* ops); void mc_dwarf_location_list_clear(mc_location_list_t list); void mc_dwarf_location_list_init_from_expression(mc_location_list_t target, size_t len, Dwarf_Op* ops); void mc_dwarf_location_list_init(mc_location_list_t target, mc_object_info_t info, Dwarf_Die* die, Dwarf_Attribute* attr); -// ***** Deprecated locations: +// ***** Variables and functions -typedef enum { - e_dw_loclist, - e_dw_register, - e_dw_bregister_op, - e_dw_lit, - e_dw_fbregister_op, - e_dw_piece, - e_dw_arithmetic, - e_dw_plus_uconst, - e_dw_compose, - e_dw_deref, - e_dw_uconstant, - e_dw_sconstant, - e_dw_unsupported -} e_dw_location_type; - -typedef struct s_dw_location{ - e_dw_location_type type; - union{ - - xbt_dynar_t loclist; - - int reg; - - struct{ - unsigned int reg; - int offset; - }breg_op; - - unsigned int lit; - - int fbreg_op; - - int piece; - - unsigned short int deref_size; - - xbt_dynar_t compose; - - char *arithmetic; - - struct{ - int bytes; - long unsigned int value; - }uconstant; - - struct{ - int bytes; - long signed int value; - }sconstant; - - unsigned int plus_uconst; - - }location; -}s_dw_location_t, *dw_location_t; - -typedef struct s_dw_location_entry{ - void* lowpc; - void* highpc; - dw_location_t location; -}s_dw_location_entry_t, *dw_location_entry_t; +struct s_dw_type{ + e_dw_type_type type; + void *id; /* Offset in the section (in hexadecimal form) */ + char *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*/ + int is_pointer_type; + + // Location (for members) is either of: + struct s_mc_expression location; + int offset; + + dw_type_t subtype; // DW_AT_type + dw_type_t full_type; // The same (but more complete) type in the other object. +}; -// ***** Variables and functions +void* mc_member_resolve(const void* base, dw_type_t type, dw_type_t member, mc_snapshot_t snapshot); +void* mc_member_snapshot_resolve(const void* base, dw_type_t type, dw_type_t member, mc_snapshot_t snapshot); typedef struct s_dw_variable{ Dwarf_Off dwarf_offset; /* Global offset of the field. */ @@ -502,8 +469,6 @@ void* MC_object_base_address(mc_object_info_t info); /********************************** DWARF **********************************/ -Dwarf_Off MC_dwarf_resolve_location(unw_cursor_t* c, dw_location_t location, void* frame_pointer_address); - #define MC_EXPRESSION_STACK_SIZE 64 #define MC_EXPRESSION_OK 0 @@ -519,6 +484,7 @@ typedef struct s_mc_expression_state { unw_cursor_t* cursor; void* frame_base; + mc_snapshot_t snapshot; } s_mc_expression_state_t, *mc_expression_state_t; int mc_dwarf_execute_expression(size_t n, const Dwarf_Op* ops, mc_expression_state_t state); @@ -562,7 +528,7 @@ void get_comm_pattern(xbt_dynar_t communications_pattern, smx_simcall_t request, typedef struct s_mc_address_set *mc_address_set_t; mc_address_set_t mc_address_set_new(); -mc_address_set_t mc_address_set_free(mc_address_set_t* p); +void mc_address_set_free(mc_address_set_t* p); void mc_address_add(mc_address_set_t p, const void* value); bool mc_address_test(mc_address_set_t p, const void* value);