maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[MC] Split the layout part of MCAssembler::finish() into its own method. NFC. 

Split a MCAssembler::layout() method out of MCAssembler::finish(). This allows
running the MCSections layout separately from the streaming of the output
file. This way if a client wants to use MC to generate section contents, but
emit something different than the standard relocatable object files it is
possible (llvm-dsymutil is such a client).

llvm-svn: 246008
This commit is contained in:
Frederic Riss 2015-08-26 05:09:49 +00:00
parent 75c0c7050a
commit 74b9882ec3
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/include/llvm/MC/MCAssembler.h
View File

@ -747,6 +747,9 @@ public:
/// if not specified it is automatically created from backend.
void Finish();
// Layout all section and prepare them for emission.
void layout(MCAsmLayout &Layout);
// FIXME: This does not belong here.
bool getSubsectionsViaSymbols() const { return SubsectionsViaSymbols; }
void setSubsectionsViaSymbols(bool Value) { SubsectionsViaSymbols = Value; }

15
llvm/lib/MC/MCAssembler.cpp
View File

@ -852,14 +852,11 @@ std::pair<uint64_t, bool> MCAssembler::handleFixup(const MCAsmLayout &Layout,
return std::make_pair(FixedValue, IsPCRel);
}
void MCAssembler::Finish() {
void MCAssembler::layout(MCAsmLayout &Layout) {
DEBUG_WITH_TYPE("mc-dump", {
llvm::errs() << "assembler backend - pre-layout\n--\n";
dump(); });
// Create the layout object.
MCAsmLayout Layout(*this);
// Create dummy fragments and assign section ordinals.
unsigned SectionIndex = 0;
for (MCSection &Sec : *this) {
@ -896,8 +893,6 @@ void MCAssembler::Finish() {
llvm::errs() << "assembler backend - final-layout\n--\n";
dump(); });
uint64_t StartOffset = OS.tell();
// Allow the object writer a chance to perform post-layout binding (for
// example, to set the index fields in the symbol data).
getWriter().executePostLayoutBinding(*this, Layout);
@ -931,6 +926,14 @@ void MCAssembler::Finish() {
}
}
}
}
void MCAssembler::Finish() {
// Create the layout object.
MCAsmLayout Layout(*this);
layout(Layout);
uint64_t StartOffset = OS.tell();
// Write the object file.
getWriter().writeObject(*this, Layout);