model-checker : conflit

[simgrid.git] / src / mc / mc_compare.c

diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c
index 12390fb..8d71ad4 100644 (file)
--- a/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@ -207,14 +207,16 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x
       // * a pointer lead to a different ELF object.
 
       // The pointers are both in the heap:
-      if(addr_pointed1 > std_heap && (char *)addr_pointed1 < (char*) std_heap + STD_HEAP_SIZE
-        && addr_pointed2 > std_heap && (char *)addr_pointed2 < (char*) std_heap + STD_HEAP_SIZE){
+      if(addr_pointed1 > std_heap && (char *)addr_pointed1 < (char*) std_heap + STD_HEAP_SIZE){
+        if(!(addr_pointed2 > std_heap && (char *)addr_pointed2 < (char*) std_heap + STD_HEAP_SIZE))
+          return 1;
         return compare_heap_area(addr_pointed1, addr_pointed2, NULL, types, other_types, type->dw_type_id, pointer_level); 
       }
 
       // The pointers are both in the current object R/W segment:
-      else if(addr_pointed1 > start_data && (char*)addr_pointed1 <= (char *)start_data + region_size
-        && addr_pointed2 > start_data && (char*)addr_pointed2 <= (char *)start_data + region_size){
+      else if(addr_pointed1 > start_data && (char*)addr_pointed1 <= (char *)start_data + region_size){
+        if(!(addr_pointed2 > start_data && (char*)addr_pointed2 <= (char *)start_data + region_size))
+          return 1;
         if(type->dw_type_id == NULL)
           return  (addr_pointed1 != addr_pointed2);
         else
@@ -283,11 +285,11 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_
     // If the variable is not in this object, skip it:
     // We do not expect to find a pointer to something which is not reachable
     // by the global variables.
-    if((char*) current_var->address.address < (char*) object_info->start_rw
-      || (char*) current_var->address.address > (char*) object_info->end_rw)
+    if((char*) current_var->address < (char*) object_info->start_rw
+      || (char*) current_var->address > (char*) object_info->end_rw)
        continue;
 
-    offset = (char *)current_var->address.address - (char *)object_info->start_rw;
+    offset = (char *)current_var->address - (char *)object_info->start_rw;
 
     res = compare_areas_with_type((char *)r1->data + offset, (char *)r2->data + offset, types, other_types, current_var->type_origin, r1->size, region_type, start_data, 0);
     if(res == 1){