gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-09 05:06:17 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix Fast JIT issues reported by instrument test (#1488)

Browse Source 
- Add checks for `pack_argv`
- Fix the checks in creating cc entry/exit basic blocks
This commit is contained in:
Qiang 2022-09-22 19:37:59 +08:00 committed by GitHub
parent ee210d019f
commit 32d2d16908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/iwasm/fast-jit/fe/jit_emit_function.c
View File

@ -262,6 +262,9 @@ pack_argv(JitCompContext *cc)
stack_base = cc->total_frame_size + offsetof(WASMInterpFrame, lp); stack_base = cc->total_frame_size + offsetof(WASMInterpFrame, lp);
argv = jit_cc_new_reg_ptr(cc); argv = jit_cc_new_reg_ptr(cc);
GEN_INSN(ADD, argv, cc->fp_reg, NEW_CONST(PTR, stack_base)); GEN_INSN(ADD, argv, cc->fp_reg, NEW_CONST(PTR, stack_base));
if (jit_get_last_error(cc)) {
return (JitReg)0;
}
return argv; return argv;
} }
@ -341,7 +344,9 @@ jit_compile_op_call_indirect(JitCompContext *cc, uint32 type_idx,
} }
argv = pack_argv(cc); argv = pack_argv(cc);
if (!argv) {
goto fail;
}
native_ret = jit_cc_new_reg_I32(cc); native_ret = jit_cc_new_reg_I32(cc);
arg_regs[0] = cc->exec_env_reg; arg_regs[0] = cc->exec_env_reg;
arg_regs[1] = NEW_CONST(I32, tbl_idx); arg_regs[1] = NEW_CONST(I32, tbl_idx);

21
core/iwasm/fast-jit/jit_ir.c
View File

@ -380,9 +380,19 @@ jit_cc_init(JitCompContext *cc, unsigned htab_size)
/* Create entry and exit blocks. They must be the first two /* Create entry and exit blocks. They must be the first two
blocks respectively. */ blocks respectively. */
if (!(entry_block = jit_cc_new_basic_block(cc, 0)) if (!(entry_block = jit_cc_new_basic_block(cc, 0)))
|| !(exit_block = jit_cc_new_basic_block(cc, 0)))
goto fail; goto fail;
if (!(exit_block = jit_cc_new_basic_block(cc, 0))) {
jit_basic_block_delete(entry_block);
goto fail;
}
/* Record the entry and exit labels, whose indexes must be 0 and 1
respectively. */
cc->entry_label = jit_basic_block_label(entry_block);
cc->exit_label = jit_basic_block_label(exit_block);
bh_assert(jit_reg_no(cc->entry_label) == 0
&& jit_reg_no(cc->exit_label) == 1);
if (!(cc->exce_basic_blocks = if (!(cc->exce_basic_blocks =
jit_calloc(sizeof(JitBasicBlock *) * JIT_EXCE_NUM))) jit_calloc(sizeof(JitBasicBlock *) * JIT_EXCE_NUM)))
@ -392,13 +402,6 @@ jit_cc_init(JitCompContext *cc, unsigned htab_size)
jit_calloc(sizeof(JitIncomingInsnList) * JIT_EXCE_NUM))) jit_calloc(sizeof(JitIncomingInsnList) * JIT_EXCE_NUM)))
goto fail; goto fail;
/* Record the entry and exit labels, whose indexes must be 0 and 1
respectively. */
cc->entry_label = jit_basic_block_label(entry_block);
cc->exit_label = jit_basic_block_label(exit_block);
bh_assert(jit_reg_no(cc->entry_label) == 0
&& jit_reg_no(cc->exit_label) == 1);
cc->hreg_info = jit_codegen_get_hreg_info(); cc->hreg_info = jit_codegen_get_hreg_info();
bh_assert(cc->hreg_info->info[JIT_REG_KIND_I32].num > 3); bh_assert(cc->hreg_info->info[JIT_REG_KIND_I32].num > 3);