T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up the encodings for new instructions, both expected and actual. Make the test more accurate.

Browse Source
This commit is contained in:
Tyler McMullen
2017-11-30 22:34:13 -08:00
committed by Jakob Stoklund Olesen
parent daa7a21d05
commit 6ec4bfc4ca
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cranelift/filetests/isa/intel/prologue-epilogue.cton
View File

@@ -3,23 +3,23 @@ test binemit
set is_64bit=1
isa intel haswell
function %foo(f64 [%xmm0], i64 fp [%rbp], i64 csr [%rbx], i64 csr [%r12]) -> i64 csr [%r12] {
function %foo(f64 [%xmm0], i64 fp [%rbp], i64 csr [%rbx], i64 csr [%r12]) -> i64 csr [%r12], i64 csr [%rbx], i64 fp [%rbp] {
ss0 = local 168, offset 0
ss1 = incoming_arg 32, offset -32
ebb0(v0: f64 [%xmm0], v1: i64 [%rbp], v2: i64 [%rbx], v3: i64 [%r12]):
x86_push v1 ; bin: 40 55
x86_push v1 ; bin: 48 55
copy_special %rsp -> %rbp ; bin: 48 89 e5
x86_push v2 ; bin: 40 53
x86_push v3 ; bin: 41 54
x86_push v2 ; bin: 48 53
x86_push v3 ; bin: 49 54
adjust_sp_imm -168 ; bin: 48 81 c4 ffffff58
; ... function body ...
adjust_sp_imm +168 ; bin: 48 81 c4 000000a8
[-,%r12] v100 = x86_pop.i64 ; bin: 41 5c
[-,%rbx] v101 = x86_pop.i64 ; bin: 40 5b
[-,%rbp] v102 = x86_pop.i64 ; bin: 40 5d
return v102
[-,%r12] v100 = x86_pop.i64 ; bin: 49 5c
[-,%rbx] v101 = x86_pop.i64 ; bin: 48 5b
[-,%rbp] v102 = x86_pop.i64 ; bin: 48 5d
return v100, v101, v102
}

2
lib/cretonne/meta/isa/intel/encodings.py
View File

@@ -232,7 +232,7 @@ enc_i32_i64(x86.push, r.pushq, 0x50)
enc_i32_i64(x86.pop, r.popq, 0x58)
# Copy Special
enc_i64(base.copy_special, r.copysp, 0x89)
enc_i64(base.copy_special, r.copysp, 0x89, w=1)
I32.enc(base.copy_special, *r.copysp(0x89))
# Adjust SP Imm