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

Fix the ordering of return values.

Browse Source
This commit is contained in:
Tyler McMullen
2017-12-03 23:40:26 -08:00
committed by Jakob Stoklund Olesen
parent c156eb9ff7
commit 0fb59dc589
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/cretonne/src/isa/intel/mod.rs
View File

@@ -221,16 +221,19 @@ impl Isa {
pos.ins().adjust_sp_imm(Imm64::new(stack_size)); pos.ins().adjust_sp_imm(Imm64::new(stack_size));
} }
let csrs = abi::callee_saved_registers(&self.shared_flags);
for reg in csrs.iter().rev() {
let csr_ret = pos.ins().x86_pop(csr_type);
pos.func.locations[csr_ret] = ir::ValueLoc::Reg(*reg as RegUnit);
pos.func.dfg.append_inst_arg(inst, csr_ret);
}
let fp_ret = pos.ins().x86_pop(csr_type); let fp_ret = pos.ins().x86_pop(csr_type);
pos.prev_inst();
pos.func.locations[fp_ret] = ir::ValueLoc::Reg(RU::rbp as RegUnit); pos.func.locations[fp_ret] = ir::ValueLoc::Reg(RU::rbp as RegUnit);
pos.func.dfg.append_inst_arg(inst, fp_ret); pos.func.dfg.append_inst_arg(inst, fp_ret);
let csrs = abi::callee_saved_registers(&self.shared_flags);
for reg in csrs.iter() {
let csr_ret = pos.ins().x86_pop(csr_type);
pos.prev_inst();
pos.func.locations[csr_ret] = ir::ValueLoc::Reg(*reg as RegUnit);
pos.func.dfg.append_inst_arg(inst, csr_ret);
}
} }
} }