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

Only emit an adjust_sp_imm if the stack_size is non-zero.

Browse Source
This commit is contained in:
Tyler McMullen
2017-11-29 02:32:20 -08:00
committed by Jakob Stoklund Olesen
parent d12587f218
commit e0c8ab49e1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,11 +162,13 @@ impl TargetIsa for Isa {
RU::rbp as RegUnit, RU::rbp as RegUnit,
RU::rsp as RegUnit, RU::rsp as RegUnit,
); );
if local_stack_size > 0 {
pos.ins().adjust_sp_imm(-(local_stack_size as i32)); pos.ins().adjust_sp_imm(-(local_stack_size as i32));
} }
}
// Find all 'return' instructions
let mut return_insts = Vec::new(); let mut return_insts = Vec::new();
for ebb in func.layout.ebbs() { for ebb in func.layout.ebbs() {
for inst in func.layout.ebb_insts(ebb) { for inst in func.layout.ebb_insts(ebb) {
if let InstructionData::MultiAry { opcode, .. } = func.dfg[inst] { if let InstructionData::MultiAry { opcode, .. } = func.dfg[inst] {
@@ -178,6 +180,7 @@ impl TargetIsa for Isa {
} }
} }
// Insert an epilogue directly before every 'return'
for inst in return_insts { for inst in return_insts {
let fp_ret = self.insert_epilogue(inst, local_stack_size as i32, func); let fp_ret = self.insert_epilogue(inst, local_stack_size as i32, func);
func.locations[fp_ret] = ir::ValueLoc::Reg(RU::rbp as RegUnit); func.locations[fp_ret] = ir::ValueLoc::Reg(RU::rbp as RegUnit);
@@ -196,7 +199,9 @@ impl Isa {
func: &mut ir::Function, func: &mut ir::Function,
) -> ir::Value { ) -> ir::Value {
let mut pos = EncCursor::new(func, self).at_inst(inst); let mut pos = EncCursor::new(func, self).at_inst(inst);
if stack_size > 0 {
pos.ins().adjust_sp_imm(stack_size); pos.ins().adjust_sp_imm(stack_size);
}
pos.ins().x86_pop(ir::types::I64) pos.ins().x86_pop(ir::types::I64)
} }
} }