X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aeecccef59f268281e3c0423a535ccc4e001e491..ff673c35e3a4c59f37040d6ae02ae49458301839:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index e79c1d33e9..e4f4f50234 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -794,14 +794,12 @@ void MC_ignore_heap(void *address, size_t size){ MC_SET_RAW_MEM; } - - void MC_remove_ignore_heap(void *address, size_t size){ - + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; - + unsigned int cursor = 0; int start = 0; int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1; @@ -832,9 +830,10 @@ void MC_remove_ignore_heap(void *address, size_t size){ } MC_UNSET_RAW_MEM; - + if(raw_mem_set) MC_SET_RAW_MEM; + } void MC_ignore_data_bss(void *address, size_t size){ @@ -1522,7 +1521,7 @@ static dw_location_t get_location(xbt_dict_t location_list, char *expr){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); new_element->type = e_dw_bregister_op; new_element->location.breg_op.reg = atoi(strtok(tok2, "DW_OP_breg")); - new_element->location.breg_op.offset = atoi(xbt_dynar_get_as(tokens2, 1, char*)); + new_element->location.breg_op.offset = atoi(xbt_dynar_get_as(tokens2, 2, char*)); xbt_dynar_push(loc->location.compose, &new_element); }else if(strncmp(tok2, "DW_OP_lit", 9) == 0){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1);