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

21
core/iwasm/compilation/aot_emit_control.c
View File

@ -144,10 +144,23 @@ handle_next_reachable_block(AOTCompContext *comp_ctx,
block_prev = block->prev;
block = aot_block_stack_pop(&func_ctx->block_stack);
if (block->block_type == BLOCK_TYPE_IF
&& block->llvm_end_block) {
LLVMDeleteBasicBlock(block->llvm_end_block);
block->llvm_end_block = NULL;
if (block->block_type == BLOCK_TYPE_IF) {
if (block->llvm_else_block
&& !block->skip_wasm_code_else
&& *p_frame_ip <= block->wasm_code_else) {
/* Clear value stack and start to translate else branch */
aot_value_stack_destroy(&block->value_stack);
SET_BUILDER_POS(block->llvm_else_block);
*p_frame_ip = block->wasm_code_else + 1;
/* Push back the block */
aot_block_stack_push(&func_ctx->block_stack, block);
return true;
}
else if (block->llvm_end_block) {
/* Remove unreachable basic block */
LLVMDeleteBasicBlock(block->llvm_end_block);
block->llvm_end_block = NULL;
}
}
frame_ip = block->wasm_code_end;

2
core/iwasm/compilation/aot_emit_memory.c
View File

@ -111,7 +111,7 @@ check_memory_overflow(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
&& mem_offset <= mem_data_size - bytes) {
/* inside memory space */
offset1 = I32_CONST((uint32)mem_offset);
CHECK_LLVM_CONST(offset_const);
CHECK_LLVM_CONST(offset1);
if (!(maddr = LLVMBuildInBoundsGEP(comp_ctx->builder, mem_base_addr,
&offset1, 1, "maddr"))) {
aot_set_last_error("llvm build add failed.");