mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 05:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Emit integer division by zero trap for all div/rem by zero, but not signed division of INT_MIN by -1.

Browse Source
This commit is contained in:
Nick Lewycky
2020-05-13 14:44:03 -07:00
parent 6ed52be637
commit 9d3162f578
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/compiler-llvm/src/translator/code.rs
View File

@@ -780,13 +780,14 @@ fn trap_if_zero_or_overflow<'ctx>(
unreachable!()
};
let divisor_is_zero = builder.build_int_compare(
IntPredicate::EQ,
right,
int_type.const_int(0, false),
"divisor_is_zero",
);
let should_trap = builder.build_or(
builder.build_int_compare(
IntPredicate::EQ,
right,
int_type.const_int(0, false),
"divisor_is_zero",
),
divisor_is_zero,
builder.build_and(
builder.build_int_compare(IntPredicate::EQ, left, min_value, "left_is_min"),
builder.build_int_compare(IntPredicate::EQ, right, neg_one_value, "right_is_neg_one"),
@@ -813,11 +814,13 @@ fn trap_if_zero_or_overflow<'ctx>(
let should_trap_block = context.append_basic_block(*function, "should_trap_block");
builder.build_conditional_branch(should_trap, should_trap_block, shouldnt_trap_block);
builder.position_at_end(should_trap_block);
builder.build_call(
intrinsics.throw_trap,
&[intrinsics.trap_illegal_arithmetic],
"throw",
let trap_code = builder.build_select(
divisor_is_zero,
intrinsics.trap_integer_division_by_zero,
intrinsics.trap_illegal_arithmetic,
"",
);
builder.build_call(intrinsics.throw_trap, &[trap_code], "throw");
builder.build_unreachable();
builder.position_at_end(shouldnt_trap_block);
}
@@ -857,7 +860,7 @@ fn trap_if_zero<'ctx>(
builder.position_at_end(should_trap_block);
builder.build_call(
intrinsics.throw_trap,
&[intrinsics.trap_illegal_arithmetic],
&[intrinsics.trap_integer_division_by_zero],
"throw",
);
builder.build_unreachable();

4
lib/compiler-llvm/src/translator/intrinsics.rs
View File

@@ -146,6 +146,7 @@ pub struct Intrinsics<'ctx> {
pub trap_call_indirect_sig: BasicValueEnum<'ctx>,
pub trap_memory_oob: BasicValueEnum<'ctx>,
pub trap_illegal_arithmetic: BasicValueEnum<'ctx>,
pub trap_integer_division_by_zero: BasicValueEnum<'ctx>,
pub trap_misaligned_atomic: BasicValueEnum<'ctx>,
pub trap_table_access_oob: BasicValueEnum<'ctx>,
@@ -489,6 +490,9 @@ impl<'ctx> Intrinsics<'ctx> {
trap_illegal_arithmetic: i32_ty
.const_int(TrapCode::IntegerOverflow as _, false)
.as_basic_value_enum(),
trap_integer_division_by_zero: i32_ty
.const_int(TrapCode::IntegerDivisionByZero as _, false)
.as_basic_value_enum(),
// TODO: add misaligned atomic traps to wasmer runtime
trap_misaligned_atomic: i32_ty
.const_int(TrapCode::Interrupt as _, false)