X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1fc042e8bc9c51f9267fa1936deaebe59ae01ee7..b0ac1d5d6e14550c3d3abbe50a9105513aa5a263:/src/mc/mc_mmu.hpp diff --git a/src/mc/mc_mmu.hpp b/src/mc/mc_mmu.hpp index d406e8989e..34e71e4e09 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-2018. 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. */ @@ -28,24 +28,21 @@ static int chunkSize() static XBT_ALWAYS_INLINE std::size_t chunkCount(std::size_t size) { size_t page_count = size >> xbt_pagebits; - if (size & (xbt_pagesize-1)) - page_count ++; + if (size & (xbt_pagesize - 1)) + page_count++; return page_count; } /** @brief Split into chunk number and remaining offset */ static XBT_ALWAYS_INLINE std::pair split(std::uintptr_t offset) { - return { - offset >> xbt_pagebits, - offset & (xbt_pagesize-1) - }; + return {offset >> xbt_pagebits, offset & (xbt_pagesize - 1)}; } /** Merge chunk number and remaining offset info 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; + return ((std::uintptr_t)page << xbt_pagebits) + offset; } static XBT_ALWAYS_INLINE std::uintptr_t join(std::pair value) @@ -57,7 +54,6 @@ static XBT_ALWAYS_INLINE bool sameChunk(std::uintptr_t a, std::uintptr_t b) { return (a >> xbt_pagebits) == (b >> xbt_pagebits); } - } } }