X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..872cf95ab5a2b08aa1f2c6ebba29b9f86b0ba54e:/src/mc/mc_mmu.hpp

diff --git a/src/mc/mc_mmu.hpp b/src/mc/mc_mmu.hpp
index b220822584..d1c2e02bfd 100644
--- a/src/mc/mc_mmu.hpp
+++ b/src/mc/mc_mmu.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2022. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -6,28 +6,29 @@
 #ifndef SIMGRID_MC_MMU_HPP
 #define SIMGRID_MC_MMU_HPP
 
-#include "xbt/misc.h" // xbt_pagesize...
 #include <cstdint>
 #include <utility>
 
-namespace simgrid {
-namespace mc {
-// TODO, do not depend on xbt_pagesize/xbt_pagebits but our own chunk size
-namespace mmu {
+#ifndef XBT_ALWAYS_INLINE
+#define XBT_ALWAYS_INLINE inline __attribute__((always_inline))
+#endif
 
-static int chunkSize()
-{
-  return xbt_pagesize;
-}
+/** Size of a memory page for the current system. */
+extern "C" int xbt_pagesize;
+/** Number of bits of addresses inside a given page, log2(xbt_pagesize). */
+extern "C" int xbt_pagebits;
+
+namespace simgrid::mc::mmu {
+// TODO, do not depend on xbt_pagesize/xbt_pagebits but our own chunk size
 
 /** @brief How many memory pages are necessary to store size bytes?
  *
  *  @param size Byte size
  *  @return Number of memory pages
  */
-static XBT_ALWAYS_INLINE std::size_t chunkCount(std::size_t size)
+static XBT_ALWAYS_INLINE std::size_t chunk_count(std::size_t size)
 {
-  size_t page_count = size >> xbt_pagebits;
+  std::size_t page_count = size >> xbt_pagebits;
   if (size & (xbt_pagesize - 1))
     page_count++;
   return page_count;
@@ -39,7 +40,7 @@ static XBT_ALWAYS_INLINE std::pair<std::size_t, std::uintptr_t> split(std::uintp
   return {offset >> xbt_pagebits, offset & (xbt_pagesize - 1)};
 }
 
-/** Merge chunk number and remaining offset info a global offset */
+/** Merge chunk number and remaining offset into a global offset */
 static XBT_ALWAYS_INLINE std::uintptr_t join(std::size_t page, std::uintptr_t offset)
 {
   return ((std::uintptr_t)page << xbt_pagebits) + offset;
@@ -50,12 +51,10 @@ static XBT_ALWAYS_INLINE std::uintptr_t join(std::pair<std::size_t, std::uintptr
   return join(value.first, value.second);
 }
 
-static XBT_ALWAYS_INLINE bool sameChunk(std::uintptr_t a, std::uintptr_t b)
+static XBT_ALWAYS_INLINE bool same_chunk(std::uintptr_t a, std::uintptr_t b)
 {
   return (a >> xbt_pagebits) == (b >> xbt_pagebits);
 }
-}
-}
-}
+} // namespace simgrid::mc::mmu
 
 #endif