A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix potential buffer overflows.
[simgrid.git]
/
src
/
mc
/
mc_mmu.h
diff --git
a/src/mc/mc_mmu.h
b/src/mc/mc_mmu.h
index 1438db4d0fd384e7f6a5557bc60390d7e074f587..c7d5b976f1d7cd8494c40b5cce3ec3d7a67864d2 100644
(file)
--- a/
src/mc/mc_mmu.h
+++ b/
src/mc/mc_mmu.h
@@
-1,5
+1,4
@@
-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2014-2017. 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. */
/* 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. */
@@
-7,15
+6,7
@@
#ifndef SIMGRID_MC_MMU_H
#define SIMGRID_MC_MMU_H
#ifndef SIMGRID_MC_MMU_H
#define SIMGRID_MC_MMU_H
-#include <cstdint>
-#include <cstddef>
-
-#include <xbt/asserts.h>
-#include <xbt/base.h> // xbt_pagesize...
-#include <xbt/misc.h>
-
-#include <simgrid_config.h>
-
+#include "xbt/misc.h" // xbt_pagesize...
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-32,8
+23,7
@@
static int chunkSize()
* @param size Byte size
* @return Number of memory pages
*/
* @param size Byte size
* @return Number of memory pages
*/
-static inline __attribute__ ((always_inline))
-std::size_t chunkCount(std::size_t size)
+static XBT_ALWAYS_INLINE std::size_t chunkCount(std::size_t size)
{
size_t page_count = size >> xbt_pagebits;
if (size & (xbt_pagesize-1))
{
size_t page_count = size >> xbt_pagebits;
if (size & (xbt_pagesize-1))
@@
-42,8
+32,7
@@
std::size_t chunkCount(std::size_t size)
}
/** @brief Split into chunk number and remaining offset */
}
/** @brief Split into chunk number and remaining offset */
-static inline __attribute__ ((always_inline))
-std::pair<std::size_t, std::uintptr_t> split(std::uintptr_t offset)
+static XBT_ALWAYS_INLINE std::pair<std::size_t, std::uintptr_t> split(std::uintptr_t offset)
{
return {
offset >> xbt_pagebits,
{
return {
offset >> xbt_pagebits,
@@
-52,20
+41,17
@@
std::pair<std::size_t, std::uintptr_t> split(std::uintptr_t offset)
}
/** Merge chunk number and remaining offset info a global offset */
}
/** Merge chunk number and remaining offset info a global offset */
-static inline __attribute__ ((always_inline))
-std::uintptr_t join(std::size_t page, std::uintptr_t 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 inline __attribute__ ((always_inline))
-std::uintptr_t join(std::pair<std::size_t,std::uintptr_t> value)
+static XBT_ALWAYS_INLINE std::uintptr_t join(std::pair<std::size_t, std::uintptr_t> value)
{
return join(value.first, value.second);
}
{
return join(value.first, value.second);
}
-static inline __attribute__ ((always_inline))
-bool sameChunk(std::uintptr_t a, std::uintptr_t b)
+static XBT_ALWAYS_INLINE bool sameChunk(std::uintptr_t a, std::uintptr_t b)
{
return (a >> xbt_pagebits) == (b >> xbt_pagebits);
}
{
return (a >> xbt_pagebits) == (b >> xbt_pagebits);
}