X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e86b9249c03f07996e386a45add92857c9853963..719a77db362a51309e90a75253788223936b276c:/src/mc/mc_compare.cpp

diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp
index 5a7c634617..b62dc7ccf7 100644
--- a/src/mc/mc_compare.cpp
+++ b/src/mc/mc_compare.cpp
@@ -4,6 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 #include <boost/unordered_set.hpp>
 
@@ -29,9 +30,10 @@ typedef struct s_pointers_pair {
 namespace boost {
   template<>
   struct hash<s_pointers_pair> {
-    typedef uint64_t result_type;
+    typedef uintptr_t result_type;
     result_type operator()(s_pointers_pair const& x) const {
-      return (result_type) x.p1 ^ (result_type) x.p2 << 8;
+      return (result_type) x.p1 ^
+        ((result_type) x.p2 << 8 | (result_type) x.p2 >> (8*sizeof(uintptr_t) - 8));
     }
   };
 }
@@ -105,7 +107,7 @@ static int compare_areas_with_type(struct mc_compare_state& state,
     void* data1 =
       mc_snapshot_read_region(real_area1, region1, alloca(type->byte_size), type->byte_size);
     void* data2 =
-      mc_snapshot_read_region(real_area2, region1, alloca(type->byte_size), type->byte_size);
+      mc_snapshot_read_region(real_area2, region2, alloca(type->byte_size), type->byte_size);
     return (memcmp(data1, data2, type->byte_size) != 0);
     break;
   }
@@ -245,6 +247,7 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1,
                                     mc_mem_region_t r2, mc_snapshot_t snapshot1,
                                     mc_snapshot_t snapshot2)
 {
+  xbt_assert(r1 && r2, "Missing region.");
   struct mc_compare_state state;
 
   xbt_dynar_t variables;