X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0700b488178346d3cccc454f641a7155c6ff6026..9eb844c3fac1bd3dc35f46bda1134b633378fb2d:/src/mc/mc_mmu.h

diff --git a/src/mc/mc_mmu.h b/src/mc/mc_mmu.h
index 8df82fa306..f097daccdd 100644
--- a/src/mc/mc_mmu.h
+++ b/src/mc/mc_mmu.h
@@ -8,15 +8,22 @@
 #define MC_MMU_H
 
 #include <stdint.h>
+#include <stdbool.h>
 
-#include "mc_private.h"
+#include <xbt/asserts.h>
+#include <xbt/misc.h>
+
+#include <simgrid_config.h>
+
+SG_BEGIN_DECL()
 
 /** @brief How many memory pages are necessary to store size bytes?
  *
  *  @param size Byte size
  *  @return Number of memory pages
  */
-static inline size_t mc_page_count(size_t size)
+static inline __attribute__ ((always_inline))
+size_t mc_page_count(size_t size)
 {
   size_t page_count = size >> xbt_pagebits;
   if (size & (xbt_pagesize-1)) {
@@ -30,9 +37,11 @@ static inline size_t mc_page_count(size_t size)
  *  @param address Address
  *  @return Virtual memory page number of the given address
  */
-static inline size_t mc_page_number(void* address)
+static inline __attribute__ ((always_inline))
+size_t mc_page_number(const void* base, const void* address)
 {
-  return ((uintptr_t) address) >> xbt_pagebits;
+  xbt_assert(address>=base, "The address is not in the range");
+  return ((uintptr_t) address - (uintptr_t) base) >> xbt_pagebits;
 }
 
 /** @brief Get the offset of an address within a memory page
@@ -40,7 +49,8 @@ static inline size_t mc_page_number(void* address)
  *  @param address Address
  *  @return Offset within the memory page
  */
-static inline size_t mc_page_offset(void* address)
+static inline __attribute__ ((always_inline))
+size_t mc_page_offset(const void* address)
 {
   return ((uintptr_t) address) & (xbt_pagesize-1);
 }
@@ -50,9 +60,18 @@ static inline size_t mc_page_offset(void* address)
  *  @param base Address of the first page
  *  @param page Index of the page
  */
-static inline void* mc_page_from_number(void* base, size_t page)
+static inline __attribute__ ((always_inline))
+void* mc_page_from_number(const void* base, size_t page)
 {
   return (void*) ((char*)base + (page << xbt_pagebits));
 }
 
+static inline __attribute__ ((always_inline))
+bool mc_same_page(const void* a, const void* b)
+{
+  return ((uintptr_t) a >> xbt_pagebits) == ((uintptr_t) b >> xbt_pagebits);
+}
+
+SG_END_DECL()
+
 #endif