From 75801b0cc72518ac9b0d43a949bb3f581ce50ff0 Mon Sep 17 00:00:00 2001 From: Simon Gaiser Date: Mon, 11 Mar 2019 10:43:38 +0100 Subject: [PATCH] [Pal/*] Remove misleading/old comments in _DkVirtualMemoryAlloc The comment said "The memory should have MAP_PRIVATE and MAP_ANONYMOUS" but depending on the alloc_type parameter the mapping won't be private. That the mapping will be anonymous is obvious so remove the comment completely. Also remove a leftover comment from the initial port to SGX. --- Pal/src/host/FreeBSD/db_memory.c | 1 - Pal/src/host/Linux-SGX/db_memory.c | 6 ------ Pal/src/host/Linux/db_memory.c | 1 - 3 files changed, 8 deletions(-) diff --git a/Pal/src/host/FreeBSD/db_memory.c b/Pal/src/host/FreeBSD/db_memory.c index 988194b3..fb867598 100644 --- a/Pal/src/host/FreeBSD/db_memory.c +++ b/Pal/src/host/FreeBSD/db_memory.c @@ -48,7 +48,6 @@ int _DkVirtualMemoryAlloc (void ** paddr, uint64_t size, int alloc_type, int flags = HOST_FLAGS(alloc_type, prot|PAL_PROT_WRITECOPY); prot = HOST_PROT(prot); - /* The memory should have MAP_PRIVATE and MAP_ANONYMOUS */ flags |= MAP_ANONYMOUS|(addr ? MAP_FIXED : 0); mem = (void *) ARCH_MMAP(addr, size, prot, flags, -1, 0); diff --git a/Pal/src/host/Linux-SGX/db_memory.c b/Pal/src/host/Linux-SGX/db_memory.c index 8f6030fe..7487c7e0 100644 --- a/Pal/src/host/Linux-SGX/db_memory.c +++ b/Pal/src/host/Linux-SGX/db_memory.c @@ -70,12 +70,6 @@ int _DkVirtualMemoryAlloc (void ** paddr, uint64_t size, int alloc_type, int pro { void * addr = *paddr, * mem; - //int flags = HOST_FLAGS(alloc_type, prot|PAL_PROT_WRITECOPY); - //prot = HOST_PROT(prot); - /* The memory should have MAP_PRIVATE and MAP_ANONYMOUS */ - //flags |= MAP_ANONYMOUS|(addr ? MAP_FIXED : 0); - //mem = (void *) ARCH_MMAP(addr, size, prot, flags, -1, 0); - if ((alloc_type & PAL_ALLOC_INTERNAL) && addr) return -PAL_ERROR_INVAL; diff --git a/Pal/src/host/Linux/db_memory.c b/Pal/src/host/Linux/db_memory.c index 1ed37289..cca0a580 100644 --- a/Pal/src/host/Linux/db_memory.c +++ b/Pal/src/host/Linux/db_memory.c @@ -48,7 +48,6 @@ int _DkVirtualMemoryAlloc (void ** paddr, uint64_t size, int alloc_type, int flags = HOST_FLAGS(alloc_type, prot|PAL_PROT_WRITECOPY); prot = HOST_PROT(prot); - /* The memory should have MAP_PRIVATE and MAP_ANONYMOUS */ flags |= MAP_ANONYMOUS|(addr ? MAP_FIXED : 0); mem = (void *) ARCH_MMAP(addr, size, prot, flags, -1, 0);