diff options
| author | Sverker Eriksson <[email protected]> | 2016-04-12 20:41:58 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-04-15 19:02:49 +0200 |
| commit | 85a6623152988c267cea008d20616b61ea9c223c (patch) | |
| tree | c83b93cb1ca5e3f396c62bd4cb7f723d97c9221e /erts/emulator/sys/common/erl_mmap.h | |
| parent | 90641d82a4b07e6b0be142d07ac85107b8ebee9d (diff) | |
| download | otp-85a6623152988c267cea008d20616b61ea9c223c.tar.gz otp-85a6623152988c267cea008d20616b61ea9c223c.tar.bz2 otp-85a6623152988c267cea008d20616b61ea9c223c.zip | |
erts: Add 'exec_alloc' for hipe code
that uses its own super carrier (erts_exec_mmapper)
to guarantee low addressed and executable memory (PROT_EXEC).
Currently only used on x86_64 that needs low memory
for HiPE/AMD64's small code model.
By initializing erts_exec_mapper early we secure
its low memory area before erts_literal_mmapper might
steal it.
Diffstat (limited to 'erts/emulator/sys/common/erl_mmap.h')
| -rw-r--r-- | erts/emulator/sys/common/erl_mmap.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/erts/emulator/sys/common/erl_mmap.h b/erts/emulator/sys/common/erl_mmap.h index 30548bd0b0..8a7530d943 100644 --- a/erts/emulator/sys/common/erl_mmap.h +++ b/erts/emulator/sys/common/erl_mmap.h @@ -55,6 +55,11 @@ typedef struct { #define ERTS_MMAP_INIT_LITERAL_INITER \ {{NULL, NULL}, {NULL, NULL}, ERTS_LITERAL_VIRTUAL_AREA_SIZE, 1, (1 << 10), 0} +#define ERTS_HIPE_EXEC_VIRTUAL_AREA_SIZE (UWORD_CONSTANT(512)*1024*1024) + +#define ERTS_MMAP_INIT_HIPE_EXEC_INITER \ + {{NULL, NULL}, {NULL, NULL}, ERTS_HIPE_EXEC_VIRTUAL_AREA_SIZE, 1, (1 << 10), 0} + typedef struct ErtsMemMapper_ ErtsMemMapper; void *erts_mmap(ErtsMemMapper*, Uint32 flags, UWord *sizep); @@ -126,10 +131,17 @@ Eterm erts_mmap_debug_info(ErtsMemMapper*, struct process*); # define ERTS_HAVE_OS_MMAP 1 #endif +#ifdef ERTS_WANT_MEM_MAPPERS +# include "erl_alloc_types.h" + extern ErtsMemMapper erts_dflt_mmapper; -#if defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION) +# if defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION) extern ErtsMemMapper erts_literal_mmapper; -#endif +# endif +# ifdef ERTS_ALC_A_EXEC +extern ErtsMemMapper erts_exec_mmapper; +# endif +#endif /* ERTS_WANT_MEM_MAPPERS */ /*#define HARD_DEBUG_MSEG*/ #ifdef HARD_DEBUG_MSEG |