CloudEdge/wasm-micro-runtime
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Windows/MSVC build issues (#1498)

Browse Source 
Fix two issues of building WAMR on Windows:
- The build_llvm.py script calls itself, spawning instances faster than they expire,
   which makes Python3 eat up the entire RAM in a pretty short time.
- The MSVC compiler doesn't support preprocessor statements inside macro expressions.
  Two places inside bh_assert() were found.
This commit is contained in:
Daniel Ludwig 2022-09-17 15:16:38 +02:00 committed by GitHub
parent 12bbb9189c
commit 046f5f2212
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/iwasm/aot/aot_runtime.c
View File

@ -244,14 +244,18 @@ table_instantiate(AOTModuleInstance *module_inst, AOTModule *module,
tbl_inst = aot_get_table_inst(module_inst, table_seg->table_index); tbl_inst = aot_get_table_inst(module_inst, table_seg->table_index);
bh_assert(tbl_inst); bh_assert(tbl_inst);
#if WASM_ENABLE_REF_TYPES != 0
bh_assert( bh_assert(
table_seg->offset.init_expr_type == INIT_EXPR_TYPE_I32_CONST table_seg->offset.init_expr_type == INIT_EXPR_TYPE_I32_CONST
|| table_seg->offset.init_expr_type == INIT_EXPR_TYPE_GET_GLOBAL || table_seg->offset.init_expr_type == INIT_EXPR_TYPE_GET_GLOBAL
#if WASM_ENABLE_REF_TYPES != 0
|| table_seg->offset.init_expr_type == INIT_EXPR_TYPE_FUNCREF_CONST || table_seg->offset.init_expr_type == INIT_EXPR_TYPE_FUNCREF_CONST
|| table_seg->offset.init_expr_type == INIT_EXPR_TYPE_REFNULL_CONST || table_seg->offset.init_expr_type
== INIT_EXPR_TYPE_REFNULL_CONST);
#else
bh_assert(table_seg->offset.init_expr_type == INIT_EXPR_TYPE_I32_CONST
|| table_seg->offset.init_expr_type
== INIT_EXPR_TYPE_GET_GLOBAL);
#endif #endif
);
/* Resolve table data base offset */ /* Resolve table data base offset */
if (table_seg->offset.init_expr_type == INIT_EXPR_TYPE_GET_GLOBAL) { if (table_seg->offset.init_expr_type == INIT_EXPR_TYPE_GET_GLOBAL) {

14
core/iwasm/interpreter/wasm_runtime.c
View File

@ -1587,17 +1587,21 @@ wasm_instantiate(WASMModule *module, bool is_sub_inst, uint32 stack_size,
#endif #endif
/* init vec(funcidx) or vec(expr) */ /* init vec(funcidx) or vec(expr) */
bh_assert( #if WASM_ENABLE_REF_TYPES != 0
table_seg->base_offset.init_expr_type == INIT_EXPR_TYPE_I32_CONST bh_assert(table_seg->base_offset.init_expr_type
== INIT_EXPR_TYPE_I32_CONST
|| table_seg->base_offset.init_expr_type || table_seg->base_offset.init_expr_type
== INIT_EXPR_TYPE_GET_GLOBAL == INIT_EXPR_TYPE_GET_GLOBAL
#if WASM_ENABLE_REF_TYPES != 0
|| table_seg->base_offset.init_expr_type || table_seg->base_offset.init_expr_type
== INIT_EXPR_TYPE_FUNCREF_CONST == INIT_EXPR_TYPE_FUNCREF_CONST
|| table_seg->base_offset.init_expr_type || table_seg->base_offset.init_expr_type
== INIT_EXPR_TYPE_REFNULL_CONST == INIT_EXPR_TYPE_REFNULL_CONST);
#else
bh_assert(table_seg->base_offset.init_expr_type
== INIT_EXPR_TYPE_I32_CONST
|| table_seg->base_offset.init_expr_type
== INIT_EXPR_TYPE_GET_GLOBAL);
#endif #endif
);
if (table_seg->base_offset.init_expr_type if (table_seg->base_offset.init_expr_type
== INIT_EXPR_TYPE_GET_GLOBAL) { == INIT_EXPR_TYPE_GET_GLOBAL) {

2
wamr-compiler/build_llvm.py
View File

@ -11,4 +11,4 @@ import sys
script = ( script = (
pathlib.Path(__file__).parent.joinpath("../build-scripts/build_llvm.py").resolve() pathlib.Path(__file__).parent.joinpath("../build-scripts/build_llvm.py").resolve()
) )
subprocess.check_call([sys.executable, script.name]) subprocess.check_call([sys.executable, script])