christoph/wamr
1
Fork 0
Code Releases Activity

Fix aot issue in 32-bit platform (#297)

Browse Source 
fix aot 32-bit boundary check issue
This commit is contained in:
wenyongh
2020-07-01 12:22:13 +08:00
committed by GitHub
parent 847dccaa34
commit ee3d448eb6
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,13 +215,11 @@ memory_instantiate(AOTModuleInstance *module_inst, AOTModule *module,
module_inst->mem_cur_page_count = module->mem_init_page_count;
module_inst->mem_max_page_count = module->mem_max_page_count;
module_inst->mem_bound_check_heap_base = module_inst->heap_base_offset;
if (module_inst->memory_data_size > 0) {
module_inst->mem_bound_check_1byte = module_inst->memory_data_size - 1;
module_inst->mem_bound_check_2bytes = module_inst->memory_data_size - 2;
module_inst->mem_bound_check_4bytes = module_inst->memory_data_size - 4;
module_inst->mem_bound_check_8bytes = module_inst->memory_data_size - 8;
}
module_inst->mem_bound_check_heap_base = (int64)module_inst->heap_base_offset;
module_inst->mem_bound_check_1byte = (int64)module_inst->memory_data_size - 1;
module_inst->mem_bound_check_2bytes = (int64)module_inst->memory_data_size - 2;
module_inst->mem_bound_check_4bytes = (int64)module_inst->memory_data_size - 4;
module_inst->mem_bound_check_8bytes = (int64)module_inst->memory_data_size - 8;
for (i = 0; i < module->mem_init_data_count; i++) {
data_seg = module->mem_init_data_list[i];

2
core/iwasm/aot/aot_runtime.h
View File

@ -211,7 +211,7 @@ typedef struct AOTModuleInstance {
uint32 default_wasm_stack_size;
/* reserved */
uint32 reserved[12];
uint32 reserved[11];
union {
uint64 _make_it_8_byte_aligned_;