more

Author: alexcrichton

cranelift/codegen/src/isa/x64/lower.isle

@@ -111,18 +111,18 @@
         (let ((x_regs ValueRegs x))
           (iadd128 (value_regs_get_gpr x 0) (value_regs_get_gpr x 1)
                    y (RegMemImm.Imm 0))))
-(rule 4 (lower (has_type $I128 (iadd (iadd (uextend a) (uextend b)) (uextend c))))
-        (let (
-            (a Gpr (extend_to_gpr a $I64 (ExtendKind.Zero)))
-            (b Gpr (extend_to_gpr b $I64 (ExtendKind.Zero)))
-            (c Gpr (extend_to_gpr c $I64 (ExtendKind.Zero)))
-            (i0 ProducesFlags (x64_alurmi_with_flags_paired (AluRmiROpcode.Add) $I64 a b))
-            (i0_result Gpr (produces_flags_get_reg i0))
-            (i1 ConsumesAndProducesFlags (x64_alurmi_with_flags_chained (AluRmiROpcode.Adc) $I64 i0_result c))
-            (i2 ConsumesFlags (x64_setcc_paired (CC.O)))
-            (result MultiReg (with_flags_chained i0 i1 i2))
-          )
-          (multi_result_to_add3_result result)))
+;;(rule 4 (lower (has_type $I128 (iadd (iadd (uextend a) (uextend b)) (uextend c))))
+;;        (let (
+;;            (a Gpr (extend_to_gpr a $I64 (ExtendKind.Zero)))
+;;            (b Gpr (extend_to_gpr b $I64 (ExtendKind.Zero)))
+;;            (c Gpr (extend_to_gpr c $I64 (ExtendKind.Zero)))
+;;            (i0 ProducesFlags (x64_alurmi_with_flags_paired (AluRmiROpcode.Add) $I64 a b))
+;;            (i0_result Gpr (produces_flags_get_reg i0))
+;;            (i1 ConsumesAndProducesFlags (x64_alurmi_with_flags_chained (AluRmiROpcode.Adc) $I64 i0_result c))
+;;            (i2 ConsumesFlags (x64_setcc_paired (CC.O)))
+;;            (result MultiReg (with_flags_chained i0 i1 i2))
+;;          )
+;;          (multi_result_to_add3_result result)))
 
 (decl multi_result_to_add3_result (MultiReg) InstOutput)
 (rule (multi_result_to_add3_result (MultiReg.Three _add adc setb))

tests/disas/x64-wide-arithmetic.wat

@@ -170,11 +170,14 @@
 ;; wasm[0]::function[9]::add3_wide_u:
 ;;       pushq   %rbp
 ;;       movq    %rsp, %rbp
-;;       addq    %rcx, %rdx
+;;       movq    %rcx, %rsi
+;;       xorq    %rcx, %rcx
+;;       movq    %rsi, %rdi
+;;       addq    %rdi, %rdx
+;;       adcq    $0, %rcx
 ;;       movq    %rdx, %rax
-;;       adcq    %r8, %rax
-;;       seto    %r11b
-;;       movzbq  %r11b, %rcx
+;;       addq    %r8, %rax
+;;       adcq    $0, %rcx
 ;;       movq    %rbp, %rsp
 ;;       popq    %rbp
 ;;       retq

tests/misc_testsuite/wide-arithmetic.wast

@@ -21,6 +21,24 @@
     local.get 0
     local.get 1
     i64.mul_wide_u)
+  (func (export "i64.add_wide_s") (param i64 i64) (result i64 i64)
+    local.get 0
+    local.get 1
+    i64.add_wide_s)
+  (func (export "i64.add_wide_u") (param i64 i64) (result i64 i64)
+    local.get 0
+    local.get 1
+    i64.add_wide_u)
+  (func (export "i64.add3_wide_s") (param i64 i64 i64) (result i64 i64)
+    local.get 0
+    local.get 1
+    local.get 2
+    i64.add3_wide_s)
+  (func (export "i64.add3_wide_u") (param i64 i64 i64) (result i64 i64)
+    local.get 0
+    local.get 1
+    local.get 2
+    i64.add3_wide_u)
 )
 
 ;; simple addition
@@ -75,6 +93,34 @@
 (assert_return (invoke "i64.mul_wide_u" (i64.const -1) (i64.const 1))
                (i64.const -1) (i64.const 0))
 
+;; simple add_wide
+(assert_return (invoke "i64.add_wide_s" (i64.const 0) (i64.const 0))
+               (i64.const 0) (i64.const 0))
+(assert_return (invoke "i64.add_wide_u" (i64.const 0) (i64.const 0))
+               (i64.const 0) (i64.const 0))
+(assert_return (invoke "i64.add_wide_s" (i64.const 1) (i64.const 2))
+               (i64.const 3) (i64.const 0))
+(assert_return (invoke "i64.add_wide_u" (i64.const 1) (i64.const 2))
+               (i64.const 3) (i64.const 0))
+(assert_return (invoke "i64.add_wide_s" (i64.const -1) (i64.const 2))
+               (i64.const 1) (i64.const 0))
+(assert_return (invoke "i64.add_wide_u" (i64.const -1) (i64.const 2))
+               (i64.const 1) (i64.const 1))
+(assert_return (invoke "i64.add_wide_s" (i64.const 0x7fffffff_ffffffff) (i64.const 2))
+               (i64.const 0x80000000_00000001) (i64.const 1))
+(assert_return (invoke "i64.add_wide_u" (i64.const 0x7fffffff_ffffffff) (i64.const 2))
+               (i64.const 0x80000000_00000001) (i64.const 0))
+
+;; simple add3_wide
+(assert_return (invoke "i64.add3_wide_u" (i64.const 0) (i64.const 0) (i64.const 0))
+               (i64.const 0) (i64.const 0))
+(assert_return (invoke "i64.add3_wide_u" (i64.const 1) (i64.const 2) (i64.const 0))
+               (i64.const 3) (i64.const 0))
+(assert_return (invoke "i64.add3_wide_u" (i64.const -1) (i64.const 2) (i64.const 0))
+               (i64.const 1) (i64.const 1))
+(assert_return (invoke "i64.add3_wide_u" (i64.const 0x7fffffff_ffffffff) (i64.const 2) (i64.const 0))
+               (i64.const 0x80000000_00000001) (i64.const 0))
+
 ;; 20 randomly generated test cases for i64.add128
 (assert_return (invoke "i64.add128"
                    (i64.const -2418420703207364752) (i64.const -1)