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

Refine code when aux stack global isn't found (#862)

Browse Source 
When auxiliary stack global isn't found in wasm app, it must be unused in
the wasm app, we set it to __heap_base global and set its size to 0, so as to
shrink the linear memory to reduce the memory consumption.
This commit is contained in:
Wenyong Huang 2021-12-03 15:30:32 +08:00 committed by GitHub
parent 212810bc2f
commit b73edc8587
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3040,6 +3040,18 @@ load_from_sections(WASMModule *module, WASMSection *sections,
break;
}
}
if (!aux_stack_top_global) {
/* Auxiliary stack global isn't found, it must be unused
in the wasm app, as if it is used, the global must be
defined. Here we set it to __heap_base global and set
its size to 0. */
aux_stack_top_global = aux_heap_base_global;
aux_stack_top = aux_heap_base;
module->aux_stack_top_global_index =
module->aux_heap_base_global_index;
module->aux_stack_bottom = aux_stack_top;
module->aux_stack_size = 0;
}
break;
}
}
@ -3084,7 +3096,7 @@ load_from_sections(WASMModule *module, WASMSection *sections,
export->name, export->index);
/* resolve retain function.
If not find, reset malloc function index */
If not found, reset malloc function index */
export_tmp = module->exports;
for (j = 0; j < module->export_count; j++, export_tmp++) {
if ((export_tmp->kind == EXPORT_KIND_FUNC)

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

@ -1959,6 +1959,18 @@ load_from_sections(WASMModule *module, WASMSection *sections,
break;
}
}
if (!aux_stack_top_global) {
/* Auxiliary stack global isn't found, it must be unused
in the wasm app, as if it is used, the global must be
defined. Here we set it to __heap_base global and set
its size to 0. */
aux_stack_top_global = aux_heap_base_global;
aux_stack_top = aux_heap_base;
module->aux_stack_top_global_index =
module->aux_heap_base_global_index;
module->aux_stack_bottom = aux_stack_top;
module->aux_stack_size = 0;
}
break;
}
}
@ -2002,7 +2014,7 @@ load_from_sections(WASMModule *module, WASMSection *sections,
export->name, export->index);
/* resolve retain function.
If not find, reset malloc function index */
If not found, reset malloc function index */
export_tmp = module->exports;
for (j = 0; j < module->export_count; j++, export_tmp++) {
if ((export_tmp->kind == EXPORT_KIND_FUNC)