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

machinst x64: fix gen_store_base_offset for multi-value returns;

Browse Source 
The previous method assumed that this could be used only for I64 values,
but this is actually used for multi-value returns, which can have any
type.
This commit is contained in:
Benjamin Bouvier
2020-09-10 11:17:41 +02:00
parent bd3ba0a774
commit a1bdf11602
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cranelift/codegen/src/isa/x64/abi.rs
View File

@@ -328,17 +328,17 @@ impl ABIMachineSpec for X64ABIMachineSpec {
} }
fn gen_load_base_offset(into_reg: Writable<Reg>, base: Reg, offset: i32, ty: Type) -> Self::I { fn gen_load_base_offset(into_reg: Writable<Reg>, base: Reg, offset: i32, ty: Type) -> Self::I {
assert_eq!(ty, I64); // only ever used for I64s. // Only ever used for I64s; if that changes, see if the ExtKind below needs to be changed.
assert_eq!(ty, I64);
let simm32 = offset as u32; let simm32 = offset as u32;
let mem = Amode::imm_reg(simm32, base); let mem = Amode::imm_reg(simm32, base);
Inst::mov64_m_r(mem, into_reg, None) Inst::load(ty, mem, into_reg, ExtKind::None, None)
} }
fn gen_store_base_offset(base: Reg, offset: i32, from_reg: Reg, ty: Type) -> Self::I { fn gen_store_base_offset(base: Reg, offset: i32, from_reg: Reg, ty: Type) -> Self::I {
assert_eq!(ty, I64); // only ever used for I64s.
let simm32 = offset as u32; let simm32 = offset as u32;
let mem = Amode::imm_reg(simm32, base); let mem = Amode::imm_reg(simm32, base);
Inst::mov_r_m(/* bytes = */ 8, from_reg, mem, None) Inst::store(ty, from_reg, mem, None)
} }
fn gen_sp_reg_adjust(amount: i32) -> SmallVec<[Self::I; 2]> { fn gen_sp_reg_adjust(amount: i32) -> SmallVec<[Self::I; 2]> {