x64: Migrate call and call_indirect to ISLE (#4542)

https://github.com/bytecodealliance/wasmtime/pull/4542
2022-07-28 13:10:03 -07:00
parent 32979b2714
commit 29d4edc76b
7 changed files with 152 additions and 66 deletions
--- a/cranelift/filetests/filetests/isa/x64/call-conv.clif
+++ b/cranelift/filetests/filetests/isa/x64/call-conv.clif
@@ -292,11 +292,11 @@ block0:
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   movl    $1, %edx
+;   movl    $1, %eax
 ;   subq    %rsp, $16, %rsp
 ;   virtual_sp_offset_adjust 16
 ;   lea     0(%rsp), %rdi
-;   call    *%rdx
+;   call    *%rax
 ;   movq    0(%rsp), %rdx
 ;   addq    %rsp, $16, %rsp
 ;   virtual_sp_offset_adjust -16
@@ -318,8 +318,8 @@ block0:
 ;   movq    %r13, 0(%rsp)
 ; block0:
 ;   movq    %rdi, %r13
-;   movl    $1, %r9d
-;   call    *%r9
+;   movl    $1, %edx
+;   call    *%rdx
 ;   movq    %r13, %rdi
 ;   movl    %edx, 0(%rdi)
 ;   movq    0(%rsp), %r13
@@ -342,17 +342,17 @@ block0:
 ;   movq    %rbx, 0(%rsp)
 ; block0:
 ;   movq    %rdi, %rbx
-;   movl    $1, %r11d
+;   movl    $1, %r8d
 ;   subq    %rsp, $16, %rsp
 ;   virtual_sp_offset_adjust 16
 ;   lea     0(%rsp), %rdi
-;   call    *%r11
-;   movq    0(%rsp), %rcx
+;   call    *%r8
+;   movq    0(%rsp), %r11
 ;   addq    %rsp, $16, %rsp
 ;   virtual_sp_offset_adjust -16
 ;   movq    %rbx, %rdi
 ;   movq    %rdx, 0(%rdi)
-;   movl    %ecx, 8(%rdi)
+;   movl    %r11d, 8(%rdi)
 ;   movq    0(%rsp), %rbx
 ;   addq    %rsp, $16, %rsp
 ;   movq    %rbp, %rsp
@@ -373,8 +373,8 @@ block0:
 ;   movq    %r12, 0(%rsp)
 ; block0:
 ;   movq    %rdi, %r12
-;   movl    $1, %edi
-;   call    *%rdi
+;   movl    $1, %r9d
+;   call    *%r9
 ;   movq    %r12, %rdi
 ;   movq    %rax, 0(%rdi)
 ;   movl    %edx, 8(%rdi)
@@ -399,8 +399,8 @@ block0(v0: f32, v1: i64, v2: i32, v3: f32):
 ;   movq    %rbx, 0(%rsp)
 ; block0:
 ;   movq    %rdx, %rbx
-;   movl    $1, %eax
-;   call    *%rax
+;   movl    $1, %r8d
+;   call    *%r8
 ;   movq    %rbx, %r10
 ;   movq    %rax, 0(%r10)
 ;   movl    %edx, 8(%r10)
--- a/cranelift/filetests/filetests/isa/x64/i128.clif
+++ b/cranelift/filetests/filetests/isa/x64/i128.clif
@@ -785,15 +785,15 @@ block0(v0: i128, v1: i128):
 ;   subq    %rsp, $16, %rsp
 ;   virtual_sp_offset_adjust 16
 ;   lea     0(%rsp), %r8
-;   load_ext_name %g+0, %rax
-;   call    *%rax
-;   movq    0(%rsp), %r8
-;   movq    8(%rsp), %r10
+;   load_ext_name %g+0, %r9
+;   call    *%r9
+;   movq    0(%rsp), %rcx
+;   movq    8(%rsp), %r8
 ;   addq    %rsp, $16, %rsp
 ;   virtual_sp_offset_adjust -16
 ;   movq    %r12, %r9
-;   movq    %r8, 0(%r9)
-;   movq    %r10, 8(%r9)
+;   movq    %rcx, 0(%r9)
+;   movq    %r8, 8(%r9)
 ;   movq    0(%rsp), %r12
 ;   addq    %rsp, $16, %rsp
 ;   movq    %rbp, %rsp