Align functions according to their ISA's requirements (#4826)
Add a function_alignment function to the TargetIsa trait, and use it to align functions when generating objects. Additionally, collect the maximum alignment required for pc-relative constants in functions and pass that value out. Use the max of these two values when padding functions for alignment. This fixes a bug on x86_64 where rip-relative loads to sse registers could cause a segfault, as functions weren't always guaranteed to be aligned to 16-byte addresses. Fixes #4812
This commit is contained in:
@@ -95,6 +95,7 @@ impl TargetIsa for AArch64Backend {
|
||||
dynamic_stackslot_offsets,
|
||||
bb_starts: emit_result.bb_offsets,
|
||||
bb_edges: emit_result.bb_edges,
|
||||
alignment: emit_result.alignment,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -179,6 +180,12 @@ impl TargetIsa for AArch64Backend {
|
||||
fn map_regalloc_reg_to_dwarf(&self, reg: Reg) -> Result<u16, systemv::RegisterMappingError> {
|
||||
inst::unwind::systemv::map_reg(reg).map(|reg| reg.0)
|
||||
}
|
||||
|
||||
fn function_alignment(&self) -> u32 {
|
||||
// We use 32-byte alignment for performance reasons, but for correctness we would only need
|
||||
// 4-byte alignment.
|
||||
32
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for AArch64Backend {
|
||||
|
||||
@@ -277,6 +277,9 @@ pub trait TargetIsa: fmt::Display + Send + Sync {
|
||||
/// will be "labeled" or might have calls between them, typically the number
|
||||
/// of defined functions in the object file.
|
||||
fn text_section_builder(&self, num_labeled_funcs: u32) -> Box<dyn TextSectionBuilder>;
|
||||
|
||||
/// The function alignment required by this ISA.
|
||||
fn function_alignment(&self) -> u32;
|
||||
}
|
||||
|
||||
/// Methods implemented for free for target ISA!
|
||||
|
||||
@@ -93,6 +93,7 @@ impl TargetIsa for S390xBackend {
|
||||
dynamic_stackslot_offsets,
|
||||
bb_starts: emit_result.bb_offsets,
|
||||
bb_edges: emit_result.bb_edges,
|
||||
alignment: emit_result.alignment,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -161,6 +162,10 @@ impl TargetIsa for S390xBackend {
|
||||
fn text_section_builder(&self, num_funcs: u32) -> Box<dyn TextSectionBuilder> {
|
||||
Box::new(MachTextSectionBuilder::<inst::Inst>::new(num_funcs))
|
||||
}
|
||||
|
||||
fn function_alignment(&self) -> u32 {
|
||||
4
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for S390xBackend {
|
||||
|
||||
@@ -88,6 +88,7 @@ impl TargetIsa for X64Backend {
|
||||
dynamic_stackslot_offsets,
|
||||
bb_starts: emit_result.bb_offsets,
|
||||
bb_edges: emit_result.bb_edges,
|
||||
alignment: emit_result.alignment,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -158,6 +159,12 @@ impl TargetIsa for X64Backend {
|
||||
fn text_section_builder(&self, num_funcs: u32) -> Box<dyn TextSectionBuilder> {
|
||||
Box::new(MachTextSectionBuilder::<inst::Inst>::new(num_funcs))
|
||||
}
|
||||
|
||||
/// Align functions on x86 to 16 bytes, ensuring that rip-relative loads to SSE registers are
|
||||
/// always from aligned memory.
|
||||
fn function_alignment(&self) -> u32 {
|
||||
16
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for X64Backend {
|
||||
|
||||
Reference in New Issue
Block a user