X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/859be56ee4794f262b79665d2caa32664e52cbed..19ae8582cb401f7b1b6d2f7e3ca00e79ce78e8bb:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index 1e2e0a994b..01514bb3ff 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -94,7 +94,30 @@ 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); + +/** \brief Translate a pointer from process address space to snapshot address space + * + * The address space contains snapshot of the main/application memory: + * this function finds the address in a given snaphot for a given + * real/application address. + * + * For read only memory regions and other regions which are not int the + * snapshot, the address is not changed. + * + * \param addr Application address + * \param snapshot The snapshot of interest (if NULL no translation is done) + * \return Translated address in the snapshot address space + * */ void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot); + +/** \brief Translate a pointer from the snapshot address space to the application address space + * + * This is the inverse of mc_translate_address. + * + * \param addr Address in the snapshot address space + * \param snapsot Snapshot of interest (if NULL no translation is done) + * \return Translated address in the application address space + */ uintptr_t mc_untranslate_address(void* addr, mc_snapshot_t snapshot); extern xbt_dynar_t mc_checkpoint_ignore; @@ -346,7 +369,7 @@ struct s_mc_object_info { char *start_exec, *end_exec; // Executable segment char *start_rw, *end_rw; // Read-write segment char *start_ro, *end_ro; // read-only segment - xbt_dynar_t subprograms; // xbt_dynar_t + 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) @@ -421,7 +444,7 @@ struct s_dw_type{ int offset; dw_type_t subtype; // DW_AT_type - dw_type_t full_type; // The same (but more complete) type in the other object. + dw_type_t full_type; // The same (but more complete) type }; void* mc_member_resolve(const void* base, dw_type_t type, dw_type_t member, mc_snapshot_t snapshot); @@ -443,13 +466,14 @@ typedef struct s_dw_variable{ }s_dw_variable_t, *dw_variable_t; 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 start; /* DWARF offset of the subprogram */ - unsigned long int end; /* Dwarf offset of the next sibling */ + xbt_dynar_t /* */ scopes; }; struct s_mc_function_index_item { @@ -457,6 +481,8 @@ struct s_mc_function_index_item { dw_frame_t function; }; +void mc_frame_free(dw_frame_t freme); + void dw_type_free(dw_type_t t); void dw_variable_free(dw_variable_t v); void dw_variable_free_voidp(void *t);