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

Stack alignment is 16 bytes on x86_64.

Browse Source 
Make sure that the stack frame size is always a multiple of 16 as
specified by the x86_64 ABI.

Heads up @pchickey
This commit is contained in:
Jakob Stoklund Olesen
2018-01-31 16:17:53 -08:00
parent ff16583c59
commit 429027e2f2
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/cretonne/src/isa/intel/abi.rs
View File

@@ -180,20 +180,28 @@ pub fn spiderwasm_prologue_epilogue(
func: &mut ir::Function, func: &mut ir::Function,
isa: &TargetIsa, isa: &TargetIsa,
) -> result::CtonResult { ) -> result::CtonResult {
let word_size = if isa.flags().is_64bit() { 8 } else { 4 }; let (word_size, stack_align) = if isa.flags().is_64bit() {
(8, 16)
} else {
(4, 4)
};
let bytes = StackSize::from(isa.flags().spiderwasm_prologue_words()) * word_size; let bytes = StackSize::from(isa.flags().spiderwasm_prologue_words()) * word_size;
let mut ss = ir::StackSlotData::new(ir::StackSlotKind::IncomingArg, bytes); let mut ss = ir::StackSlotData::new(ir::StackSlotKind::IncomingArg, bytes);
ss.offset = -(bytes as StackOffset); ss.offset = -(bytes as StackOffset);
func.stack_slots.push(ss); func.stack_slots.push(ss);
layout_stack(&mut func.stack_slots, word_size)?; layout_stack(&mut func.stack_slots, stack_align)?;
Ok(()) Ok(())
} }
/// Insert a System V-compatible prologue and epilogue. /// Insert a System V-compatible prologue and epilogue.
pub fn native_prologue_epilogue(func: &mut ir::Function, isa: &TargetIsa) -> result::CtonResult { pub fn native_prologue_epilogue(func: &mut ir::Function, isa: &TargetIsa) -> result::CtonResult {
let word_size = if isa.flags().is_64bit() { 8 } else { 4 }; let (word_size, stack_align) = if isa.flags().is_64bit() {
(8, 16)
} else {
(4, 4)
};
let csr_type = if isa.flags().is_64bit() { let csr_type = if isa.flags().is_64bit() {
ir::types::I64 ir::types::I64
} else { } else {
@@ -215,7 +223,7 @@ pub fn native_prologue_epilogue(func: &mut ir::Function, isa: &TargetIsa) -> res
offset: -csr_stack_size, offset: -csr_stack_size,
}); });
let total_stack_size = layout_stack(&mut func.stack_slots, word_size)? as i32; let total_stack_size = layout_stack(&mut func.stack_slots, stack_align)? as i32;
let local_stack_size = (total_stack_size - csr_stack_size) as i64; let local_stack_size = (total_stack_size - csr_stack_size) as i64;
// Add CSRs to function signature // Add CSRs to function signature