From f0137c2618812666b5495ed20d1bb24b0397485b Mon Sep 17 00:00:00 2001
From: Trevor Elliott <telliott@fastly.com>
Date: Wed, 15 Feb 2023 11:16:59 -0800
Subject: [PATCH] x64: Fix the formatting for `andn` (#5789)

* Print AluRmRVex instructions with the destination last
* Update andn tests
---
 cranelift/codegen/src/isa/x64/inst/mod.rs                | 4 ++--
 cranelift/filetests/filetests/isa/x64/band_not_bmi1.clif | 5 ++---
 cranelift/filetests/filetests/wasm/i32-not-x64.wat       | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cranelift/codegen/src/isa/x64/inst/mod.rs b/cranelift/codegen/src/isa/x64/inst/mod.rs
index 518b544cf7..6716ec21bf 100644
--- a/cranelift/codegen/src/isa/x64/inst/mod.rs
+++ b/cranelift/codegen/src/isa/x64/inst/mod.rs
@@ -762,9 +762,9 @@ impl PrettyPrint for Inst {
                 format!(
                     "{} {}, {}, {}",
                     ljustify2(op.to_string(), String::new()),
-                    dst,
-                    src1,
                     src2,
+                    src1,
+                    dst,
                 )
             }
             Inst::UnaryRmR { src, dst, op, size } => {
diff --git a/cranelift/filetests/filetests/isa/x64/band_not_bmi1.clif b/cranelift/filetests/filetests/isa/x64/band_not_bmi1.clif
index 29101eaff3..96dc33ef33 100644
--- a/cranelift/filetests/filetests/isa/x64/band_not_bmi1.clif
+++ b/cranelift/filetests/filetests/isa/x64/band_not_bmi1.clif
@@ -11,12 +11,11 @@ block0(v0: i8, v1: i8):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andn    %eax, %esi, %edi
+;   andn    %edi, %esi, %eax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
 
-
 function %reversed_operands(i8, i8) -> i8 {
 block0(v0: i8, v1: i8):
     v2 = bnot v0
@@ -27,7 +26,7 @@ block0(v0: i8, v1: i8):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andn    %eax, %edi, %esi
+;   andn    %esi, %edi, %eax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
diff --git a/cranelift/filetests/filetests/wasm/i32-not-x64.wat b/cranelift/filetests/filetests/wasm/i32-not-x64.wat
index 45d3798e74..e4eb54957a 100644
--- a/cranelift/filetests/filetests/wasm/i32-not-x64.wat
+++ b/cranelift/filetests/filetests/wasm/i32-not-x64.wat
@@ -40,7 +40,7 @@
 ;; block0:
 ;;   jmp     label1
 ;; block1:
-;;   andn    %eax, %esi, %edi
+;;   andn    %edi, %esi, %eax
 ;;   movq    %rbp, %rsp
 ;;   popq    %rbp
 ;;   ret