[mc] Move MC_report() functions as static functions where they're used

[simgrid.git] / src / mc / ChunkedData.cpp

diff --git a/src/mc/ChunkedData.cpp b/src/mc/ChunkedData.cpp
index 00f6e31..8d5a8e0 100644 (file)
--- a/src/mc/ChunkedData.cpp
+++ b/src/mc/ChunkedData.cpp
@@ -4,8 +4,17 @@
 /* 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. */
 
+#include <cstddef>
+#include <cstdint>
 
+#include <vector>
+
+#include <xbt/misc.h> // xbt_pagesize and friends
+#include <xbt/asserts.h>
+
+#include "src/mc/AddressSpace.hpp"
 #include "src/mc/ChunkedData.hpp"
+#include "src/mc/PageStore.hpp"
 
 #define SOFT_DIRTY_BIT_NUMBER 55
 #define SOFT_DIRTY (((uint64_t)1) << SOFT_DIRTY_BIT_NUMBER)
@@ -20,7 +29,7 @@ namespace mc {
  *  @return                Snapshot page numbers of this new snapshot
  */
 ChunkedData::ChunkedData(PageStore& store, AddressSpace& as,
-    remote_ptr<void> addr, std::size_t page_count,
+    RemotePtr<void> addr, std::size_t page_count,
     const std::size_t* ref_page_numbers, const std::uint64_t* pagemap)
 {
   store_ = &store;
@@ -36,8 +45,9 @@ ChunkedData::ChunkedData(PageStore& store, AddressSpace& as,
       continue;
     }
 
-      remote_ptr<void> page = remote(addr.address() + (i << xbt_pagebits));
-      xbt_assert(mc_page_offset((void*)page.address())==0,
+      RemotePtr<void> page = remote((void*)
+        simgrid::mc::mmu::join(i, addr.address()));
+      xbt_assert(simgrid::mc::mmu::split(page.address()).second == 0,
         "Not at the beginning of a page");
 
         /* Adding another copy (and a syscall) will probably slow things a lot.