gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-08 20:56:13 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Diasble AOT in SGX build by default, as it requires SGX SDKv2.8 or la… (#180)

Browse Source 
* Diasble AOT in SGX build by default, as it requires SGX SDKv2.8 or later.

* Update bh_platform.c

Co-authored-by: daomingq <daomingq@users.noreply.github.com>
Co-authored-by: wenyongh <wenyong.huang@intel.com>
This commit is contained in:
qdaoming-intel 2020-02-25 16:00:37 +08:00 committed by GitHub
parent 76eea80046
commit 7962c47085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/shared/platform/linux-sgx/bh_platform.c
View File

@ -7,7 +7,9 @@
#include "bh_platform.h" #include "bh_platform.h"
#include <unistd.h> #include <unistd.h>
#if WASM_ENABLE_AOT != 0
#include "sgx_rsrv_mem_mngr.h" #include "sgx_rsrv_mem_mngr.h"
#endif
#define FIXED_BUFFER_SIZE (1<<9) #define FIXED_BUFFER_SIZE (1<<9)
static bh_print_function_t print_function = NULL; static bh_print_function_t print_function = NULL;
@ -72,6 +74,7 @@ int bh_vprintf_sgx(const char * format, va_list arg)
void* bh_mmap(void *hint, unsigned int size, int prot, int flags) void* bh_mmap(void *hint, unsigned int size, int prot, int flags)
{ {
#if WASM_ENABLE_AOT != 0
int mprot = 0; int mprot = 0;
unsigned alignedSize = (size+4095) & (unsigned)~4095; //Page aligned unsigned alignedSize = (size+4095) & (unsigned)~4095; //Page aligned
void* ret = NULL; void* ret = NULL;
@ -96,15 +99,21 @@ void* bh_mmap(void *hint, unsigned int size, int prot, int flags)
} }
return ret; return ret;
#else
return NULL;
#endif
} }
void bh_munmap(void *addr, uint32 size) void bh_munmap(void *addr, uint32 size)
{ {
#if WASM_ENABLE_AOT != 0
sgx_free_rsrv_mem(addr, size); sgx_free_rsrv_mem(addr, size);
#endif
} }
int bh_mprotect(void *addr, uint32 size, int prot) int bh_mprotect(void *addr, uint32 size, int prot)
{ {
#if WASM_ENABLE_AOT != 0
int mprot = 0; int mprot = 0;
sgx_status_t st = 0; sgx_status_t st = 0;
@ -118,4 +127,7 @@ int bh_mprotect(void *addr, uint32 size, int prot)
if (st != SGX_SUCCESS) bh_printf_sgx("bh_mprotect(addr=0x%lx,size=%d,prot=0x%x) failed.", addr, size, prot); if (st != SGX_SUCCESS) bh_printf_sgx("bh_mprotect(addr=0x%lx,size=%d,prot=0x%x) failed.", addr, size, prot);
return (st == SGX_SUCCESS? 0:-1); return (st == SGX_SUCCESS? 0:-1);
#else
return -1;
#endif
} }

5
product-mini/platforms/linux-sgx/CMakeLists.txt
View File

@ -32,8 +32,9 @@ if (NOT DEFINED WAMR_BUILD_INTERP)
endif () endif ()
if (NOT DEFINED WAMR_BUILD_AOT) if (NOT DEFINED WAMR_BUILD_AOT)
# Enable AOT by default. # Disable AOT by default.
set (WAMR_BUILD_AOT 1) # If enabling AOT, please install Intel SGX SDKv2.8 or later.
set (WAMR_BUILD_AOT 0)
endif () endif ()
if (NOT DEFINED WAMR_BUILD_JIT) if (NOT DEFINED WAMR_BUILD_JIT)