Skip to content

Remove heap size check when creating wasi ctx #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Mar 10, 2021
Merged

Remove heap size check when creating wasi ctx #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ecfee97
Merge pull request #222 from bytecodealliance/main
wenyongh Feb 4, 2021
a3dacea
Sync up with internal/feature
wenyongh Feb 7, 2021
d9a23bf
Merge pull request #223 from bytecodealliance/main
wenyongh Feb 7, 2021
621d338
Merge pull request #224 from bytecodealliance/main
wenyongh Feb 9, 2021
3302dcb
Fix auxiliary stack size not 16-byte aligned issue
wenyongh Feb 10, 2021
64930e3
Merge pull request #225 from bytecodealliance/main
wenyongh Feb 10, 2021
876db03
Merge pull request #226 from bytecodealliance/main
wenyongh Feb 19, 2021
de5cea5
Merge pull request #228 from bytecodealliance/main
wenyongh Feb 22, 2021
f8d20ea
Merge pull request #229 from bytecodealliance/main
wenyongh Feb 23, 2021
0285eef
Merge pull request #230 from bytecodealliance/main
wenyongh Feb 24, 2021
5c1bb51
Fix ems allocator issue which might cause heap verify fail
wenyongh Feb 25, 2021
078bbee
Merge pull request #231 from bytecodealliance/main
wenyongh Feb 25, 2021
2041caa
Fix global init process issue for latest spec cases
wenyongh Mar 2, 2021
4f43026
Add some globals to list to fix windows compile error
wenyongh Mar 2, 2021
de794b7
Merge pull request #232 from bytecodealliance/main
wenyongh Mar 2, 2021
f861eae
Fix app manager fail to install large file issue
wenyongh Mar 3, 2021
a60a254
Merge pull request #233 from bytecodealliance/main
wenyongh Mar 3, 2021
1073239
Enable SIMD by default for wamrc and iwasm
wenyongh Mar 6, 2021
08e1849
Merge pull request #234 from bytecodealliance/main
wenyongh Mar 6, 2021
4c28637
Enable to use BH_VPRINTF macro to redirect stdout output
wenyongh Mar 6, 2021
3f9ba25
Merge pull request #235 from bytecodealliance/main
wenyongh Mar 6, 2021
a758b1b
Fix interpreter issue, fix littlevgl zephyr sample compilation issue,…
wenyongh Mar 10, 2021
21765d5
Merge pull request #236 from bytecodealliance/main
wenyongh Mar 10, 2021
bd71d09
Upgrade llvm version from 10.x to 11.x
wenyongh Mar 10, 2021
2ae4427
Merge pull request #237 from bytecodealliance/main
wenyongh Mar 10, 2021
2006ba8
Add v128 type for windows platform, remove heap size check when creat…
wenyongh Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions core/iwasm/aot/aot_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,17 +879,16 @@ aot_instantiate(AOTModule *module, bool is_sub_inst,

#if WASM_ENABLE_LIBC_WASI != 0
if (!is_sub_inst) {
if (heap_size > 0
&& !wasm_runtime_init_wasi((WASMModuleInstanceCommon*)module_inst,
module->wasi_args.dir_list,
module->wasi_args.dir_count,
module->wasi_args.map_dir_list,
module->wasi_args.map_dir_count,
module->wasi_args.env,
module->wasi_args.env_count,
module->wasi_args.argv,
module->wasi_args.argc,
error_buf, error_buf_size))
if (!wasm_runtime_init_wasi((WASMModuleInstanceCommon*)module_inst,
module->wasi_args.dir_list,
module->wasi_args.dir_count,
module->wasi_args.map_dir_list,
module->wasi_args.map_dir_count,
module->wasi_args.env,
module->wasi_args.env_count,
module->wasi_args.argv,
module->wasi_args.argc,
error_buf, error_buf_size))
goto fail;
}
#endif
Expand Down
13 changes: 13 additions & 0 deletions core/iwasm/common/wasm_runtime_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3400,8 +3400,21 @@ wasm_runtime_invoke_native(WASMExecEnv *exec_env, void *func_ptr,
#undef v128
#endif

#if defined(_WIN32) || defined(_WIN32_)
typedef union __declspec(intrin_type) __declspec(align(1)) v128 {
__int8 m128i_i8[16];
__int16 m128i_i16[8];
__int32 m128i_i32[4];
__int64 m128i_i64[2];
unsigned __int8 m128i_u8[16];
unsigned __int16 m128i_u16[8];
unsigned __int32 m128i_u32[4];
unsigned __int64 m128i_u64[2];
} v128;
#else
typedef long long v128 __attribute__ ((__vector_size__ (16),
__may_alias__, __aligned__ (1)));
#endif /* end of defined(_WIN32) || defined(_WIN32_) */

#endif /* end of WASM_ENABLE_SIMD != 0 */

Expand Down
3 changes: 1 addition & 2 deletions core/iwasm/include/wasm_export.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,7 @@ wasm_runtime_set_wasi_args(wasm_module_t module,
* specified here is ignored.
* @param heap_size the default heap size of the module instance, a heap will
* be created besides the app memory space. Both wasm app and native
* function can allocate memory from the heap. If heap_size is 0, the
* default heap size will be used.
* function can allocate memory from the heap.
* @param error_buf buffer to output the error info if failed
* @param error_buf_size the size of the error buffer
*
Expand Down
21 changes: 10 additions & 11 deletions core/iwasm/interpreter/wasm_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,17 +1411,16 @@ wasm_instantiate(WASMModule *module, bool is_sub_inst,
#if WASM_ENABLE_LIBC_WASI != 0
/* The sub-instance will get the wasi_ctx from main-instance */
if (!is_sub_inst) {
if (heap_size > 0
&& !wasm_runtime_init_wasi((WASMModuleInstanceCommon*)module_inst,
module->wasi_args.dir_list,
module->wasi_args.dir_count,
module->wasi_args.map_dir_list,
module->wasi_args.map_dir_count,
module->wasi_args.env,
module->wasi_args.env_count,
module->wasi_args.argv,
module->wasi_args.argc,
error_buf, error_buf_size)) {
if (!wasm_runtime_init_wasi((WASMModuleInstanceCommon*)module_inst,
module->wasi_args.dir_list,
module->wasi_args.dir_count,
module->wasi_args.map_dir_list,
module->wasi_args.map_dir_count,
module->wasi_args.env,
module->wasi_args.env_count,
module->wasi_args.argv,
module->wasi_args.argc,
error_buf, error_buf_size)) {
goto fail;
}
}
Expand Down