RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-24 12:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[MC] When using bundle aligment, align sections to bundle size

Browse Source 
Summary:
Bundle aligment requires that the functions always start at an aligned address.
Usually this is ensured by the compiler, but assembly code does not always
begin with a .align directive.

This change ensures that sections get the correct alignment if they contain
any instructions and bundling is enabled. (It also makes LLVM match the
behavior of GNU as).

Differential Revision: http://reviews.llvm.org/D9131

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235365 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Derek Schuff 2015-04-21 00:14:25 +00:00
parent b5750565de
commit a49508cb92
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/MC/MCELFStreamer.cpp
View File

@ -131,6 +131,16 @@ void MCELFStreamer::EmitAssemblerFlag(MCAssemblerFlag Flag) {
llvm_unreachable("invalid assembler flag!");
}
// If bundle aligment is used and there are any instructions in the section, it
// needs to be aligned to at least the bundle size.
static void setSectionAlignmentForBundling(
const MCAssembler &Assembler, MCSectionData *Section) {
if (Assembler.isBundlingEnabled() && Section &&
Section->hasInstructions() &&
Section->getAlignment() < Assembler.getBundleAlignSize())
Section->setAlignment(Assembler.getBundleAlignSize());
}
void MCELFStreamer::ChangeSection(const MCSection *Section,
const MCExpr *Subsection) {
MCSectionData *CurSection = getCurrentSectionData();
@ -138,6 +148,8 @@ void MCELFStreamer::ChangeSection(const MCSection *Section,
report_fatal_error("Unterminated .bundle_lock when changing a section");
MCAssembler &Asm = getAssembler();
// Ensure the previous section gets aligned if necessary.
setSectionAlignmentForBundling(Asm, CurSection);
auto *SectionELF = static_cast<const MCSectionELF *>(Section);
const MCSymbol *Grp = SectionELF->getGroup();
if (Grp)
@ -639,6 +651,9 @@ void MCELFStreamer::Flush() {
}
void MCELFStreamer::FinishImpl() {
// Ensure the last section gets aligned if necessary.
setSectionAlignmentForBundling(getAssembler(), getCurrentSectionData());
EmitFrames(nullptr);
Flush();

21
test/MC/X86/AlignedBundling/section-alignment.s Normal file
View File

@ -0,0 +1,21 @@
# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \
# RUN: | llvm-readobj -sections | FileCheck %s
# Test that bundle-aligned sections with instructions are aligned
.bundle_align_mode 5
# CHECK: Sections
# Check that the empty .text section has the default alignment
# CHECK-LABEL: Name: .text
# CHECK-NOT: Name
# CHECK: AddressAlignment: 4
.section text1, "x"
imull $17, %ebx, %ebp
# CHECK-LABEL: Name: text1
# CHECK: AddressAlignment: 32
.section text2, "x"
imull $17, %ebx, %ebp
# CHECK-LABEL: Name: text2
# CHECK: AddressAlignment: 32