[mc] Fix mc_snapshot_read_fragmented

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

diff --git a/src/mc/mc_snapshot.c b/src/mc/mc_snapshot.c
index 2d59319..20d7642 100644 (file)
--- a/src/mc/mc_snapshot.c
+++ b/src/mc/mc_snapshot.c
@@ -7,7 +7,7 @@
 #include "mc_private.h"
 #include "mc_mmu.h"
 
-static mc_mem_region_t mc_get_snapshot_region(void* addr, mc_snapshot_t snapshot)
+mc_mem_region_t mc_get_snapshot_region(void* addr, mc_snapshot_t snapshot)
 {
   for (size_t i = 0; i != NB_REGIONS; ++i) {
     mc_mem_region_t region = snapshot->regions[i];
@@ -36,8 +36,10 @@ void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region)
 
   // Per-page snapshot:
   else if (region->page_numbers) {
-    size_t pageno = mc_page_number(region->data, (void*) addr);
-    return (char*) region->page_numbers[pageno] + mc_page_offset((void*) addr);
+    size_t pageno = mc_page_number(region->start_addr, (void*) addr);
+    size_t snapshot_pageno = region->page_numbers[pageno];
+    const void* snapshot_page = mc_page_store_get_page(mc_model_checker->pages, snapshot_pageno);
+    return (char*) snapshot_page + mc_page_offset((void*) addr);
   }
 
   else {
@@ -55,28 +57,6 @@ void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot)
 
   mc_mem_region_t region = mc_get_snapshot_region((void*) addr, snapshot);
   return mc_translate_address_region(addr, region);
-
-}
-
-uintptr_t mc_untranslate_address(void *addr, mc_snapshot_t snapshot)
-{
-  if (!snapshot) {
-    return (uintptr_t) addr;
-  }
-
-  for (size_t i = 0; i != NB_REGIONS; ++i) {
-    mc_mem_region_t region = snapshot->regions[i];
-    if (region->page_numbers) {
-      xbt_die("Does not work for per-page snapshot.");
-    }
-    if (addr >= region->data
-        && addr <= (void *) (((char *) region->data) + region->size)) {
-      size_t offset = (size_t) ((char *) addr - (char *) region->data);
-      return ((uintptr_t) region->start_addr) + offset;
-    }
-  }
-
-  return (uintptr_t) addr;
 }
 
 /** @brief Read memory from a snapshot region broken across fragmented pages
@@ -98,6 +78,7 @@ static void* mc_snapshot_read_fragmented(void* addr, mc_mem_region_t region, voi
     void* next_page = mc_page_from_number(NULL, mc_page_number(NULL, addr) + 1);
     size_t readable = (char*) next_page - (char*) addr;
     memcpy(target, snapshot_addr, readable);
+    addr = (char*) addr + readable;
     target = (char*) target + readable;
     size -= readable;
   }
@@ -121,7 +102,7 @@ void* mc_snapshot_read_region(void* addr, mc_mem_region_t region, void* target,
 {
   uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start_addr;
 
-  if (addr < region->start_addr || offset+size > region->size) {
+  if (addr < region->start_addr || (char*) addr+size >= (char*)region->start_addr+region->size) {
     xbt_die("Trying to read out of the region boundary.");
   }
 
@@ -161,6 +142,18 @@ void* mc_snapshot_read(void* addr, mc_snapshot_t snapshot, void* target, size_t
     mc_mem_region_t region = mc_get_snapshot_region(addr, snapshot);
     return mc_snapshot_read_region(addr, region, target, size);
   } else {
-    return target;
+    return addr;
+  }
+}
+
+int mc_snapshot_memcp(
+  void* addr1, mc_snapshot_t snapshot1,
+  void* addr2, mc_snapshot_t snapshot2, size_t size)
+{
+  void* buffer1 = mc_snapshot_read(addr1, snapshot1, alloca(size), size);
+  void* buffer2 = mc_snapshot_read(addr2, snapshot2, alloca(size), size);
+  if (buffer1 == buffer2) {
+    return 0;
   }
+  return memcmp(buffer1, buffer2, size);
 }