A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
riscv64: Fix `uadd_overflow` for 32-bit integers (#12951)
Alex Crichton7e43211864bf
diff --git a/cranelift/codegen/src/isa/riscv64/lower.isle b/cranelift/codegen/src/isa/riscv64/lower.isleindex efbae20af1..4c5fbb74f1 100644--- a/cranelift/codegen/src/isa/riscv64/lower.isle+++ b/cranelift/codegen/src/isa/riscv64/lower.isle@@ -330,9 +330,10 @@;; i32 case (on RV64 use addw to detect 32-bit overflow correctly)(rule 1 (lower (has_type $I32 (uadd_overflow _ x y)))- (let ((x64 XReg (zext x))- (sum XReg (rv_addw x y))- (overflow XReg (rv_sltu sum x64)))+ (let ((x64 XReg (zext x))+ (y64 XReg (zext y))+ (sum XReg (rv_add x64 y64))+ (overflow XReg (rv_srli sum (imm12_const 32))))(output_pair sum overflow)));; For i128, we need to handle the high and low parts separately@@ -347,7 +348,7 @@(carry XReg (rv_sltu sum_lo x_lo))(sum_hi XReg (rv_add x_hi y_hi))(sum_hi_with_carry XReg (rv_add sum_hi carry))- (overflow XReg (rv_or (rv_sltu sum_hi_with_carry x_hi)+ (overflow XReg (rv_or (rv_sltu sum_hi_with_carry x_hi)(rv_and carry (rv_seqz (rv_xor sum_hi_with_carry x_hi))))))(output_pair (value_regs sum_lo sum_hi_with_carry) overflow)))diff --git a/cranelift/filetests/filetests/runtests/uadd_overflow.clif b/cranelift/filetests/filetests/runtests/uadd_overflow.clifindex 1ab73adf47..7488d6129a 100644--- a/cranelift/filetests/filetests/runtests/uadd_overflow.clif+++ b/cranelift/filetests/filetests/runtests/uadd_overflow.clif@@ -40,3 +40,4 @@ block0(v0: i32, v1: i32):; run: %uaddof_i32(100, 28) == [128, 0]; run: %uaddof_i32(3000000000, 1294967295) == [-1, 0]; run: %uaddof_i32(3000000000, 1294967296) == [0, 1]+; run: %uaddof_i32(0x80000001, -1) == [0x80000000, 1]