X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d47e21d93998034c0f8fa4a9a6c750002f7642fa..1d95145df4657e19b9a02db53de4c9f758a0c6f5:/src/mc/mc_mmu.h

diff --git a/src/mc/mc_mmu.h b/src/mc/mc_mmu.h
index dd6f2da6cf..e0236e56dd 100644
--- a/src/mc/mc_mmu.h
+++ b/src/mc/mc_mmu.h
@@ -1,23 +1,28 @@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. 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. */
 
-#ifndef MC_MMU_H
-#define MC_MMU_H
+#ifndef SIMGRID_MC_MMU_H
+#define SIMGRID_MC_MMU_H
 
-#include <stdint.h>
-#include <stdbool.h>
+#include <cstdint>
 
-#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)) {
@@ -31,9 +36,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* base, void* address)
+static inline __attribute__ ((always_inline))
+size_t mc_page_number(const void* base, const void* address)
 {
-  return ((uintptr_t) address - (uintptr_t) base) >> xbt_pagebits;
+  xbt_assert(address>=base, "The address is not in the range");
+  return ((std::uintptr_t) address - (std::uintptr_t) base) >> xbt_pagebits;
 }
 
 /** @brief Get the offset of an address within a memory page
@@ -41,9 +48,10 @@ static inline size_t mc_page_number(void* base, 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);
+  return ((std::uintptr_t) address) & (xbt_pagesize-1);
 }
 
 /** @brief Get the virtual address of a virtual memory page
@@ -51,14 +59,19 @@ 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 bool mc_same_page(void* a, void* b)
+static inline __attribute__ ((always_inline))
+bool mc_same_page(const void* a, const void* b)
 {
-  return mc_page_number(NULL, a) == mc_page_number(NULL, b);
+  return ((std::uintptr_t) a >> xbt_pagebits)
+    == ((std::uintptr_t) b >> xbt_pagebits);
 }
 
+SG_END_DECL()
+
 #endif