mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-13 04:38:24 +00:00
Add support for subsections to the ELF assembler. Fixes PR8717.
Differential Revision: http://llvm-reviews.chandlerc.com/D598 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179725 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -8,6 +8,7 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "llvm/MC/MCObjectStreamer.h"
|
||||
#include "llvm/ADT/STLExtras.h"
|
||||
#include "llvm/MC/MCAsmBackend.h"
|
||||
#include "llvm/MC/MCAsmInfo.h"
|
||||
#include "llvm/MC/MCAssembler.h"
|
||||
@ -45,14 +46,15 @@ void MCObjectStreamer::reset() {
|
||||
if (Assembler)
|
||||
Assembler->reset();
|
||||
CurSectionData = 0;
|
||||
CurInsertionPoint = MCSectionData::iterator();
|
||||
MCStreamer::reset();
|
||||
}
|
||||
|
||||
MCFragment *MCObjectStreamer::getCurrentFragment() const {
|
||||
assert(getCurrentSectionData() && "No current section!");
|
||||
|
||||
if (!getCurrentSectionData()->empty())
|
||||
return &getCurrentSectionData()->getFragmentList().back();
|
||||
if (CurInsertionPoint != getCurrentSectionData()->getFragmentList().begin())
|
||||
return prior(CurInsertionPoint);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -61,8 +63,10 @@ MCDataFragment *MCObjectStreamer::getOrCreateDataFragment() const {
|
||||
MCDataFragment *F = dyn_cast_or_null<MCDataFragment>(getCurrentFragment());
|
||||
// When bundling is enabled, we don't want to add data to a fragment that
|
||||
// already has instructions (see MCELFStreamer::EmitInstToData for details)
|
||||
if (!F || (Assembler->isBundlingEnabled() && F->hasInstructions()))
|
||||
F = new MCDataFragment(getCurrentSectionData());
|
||||
if (!F || (Assembler->isBundlingEnabled() && F->hasInstructions())) {
|
||||
F = new MCDataFragment();
|
||||
insert(F);
|
||||
}
|
||||
return F;
|
||||
}
|
||||
|
||||
@ -145,7 +149,7 @@ void MCObjectStreamer::EmitULEB128Value(const MCExpr *Value) {
|
||||
return;
|
||||
}
|
||||
Value = ForceExpAbs(Value);
|
||||
new MCLEBFragment(*Value, false, getCurrentSectionData());
|
||||
insert(new MCLEBFragment(*Value, false));
|
||||
}
|
||||
|
||||
void MCObjectStreamer::EmitSLEB128Value(const MCExpr *Value) {
|
||||
@ -155,7 +159,7 @@ void MCObjectStreamer::EmitSLEB128Value(const MCExpr *Value) {
|
||||
return;
|
||||
}
|
||||
Value = ForceExpAbs(Value);
|
||||
new MCLEBFragment(*Value, true, getCurrentSectionData());
|
||||
insert(new MCLEBFragment(*Value, true));
|
||||
}
|
||||
|
||||
void MCObjectStreamer::EmitWeakReference(MCSymbol *Alias,
|
||||
@ -163,10 +167,20 @@ void MCObjectStreamer::EmitWeakReference(MCSymbol *Alias,
|
||||
report_fatal_error("This file format doesn't support weak aliases.");
|
||||
}
|
||||
|
||||
void MCObjectStreamer::ChangeSection(const MCSection *Section) {
|
||||
void MCObjectStreamer::ChangeSection(const MCSection *Section,
|
||||
const MCExpr *Subsection) {
|
||||
assert(Section && "Cannot switch to a null section!");
|
||||
|
||||
CurSectionData = &getAssembler().getOrCreateSectionData(*Section);
|
||||
|
||||
int64_t IntSubsection = 0;
|
||||
if (Subsection &&
|
||||
!Subsection->EvaluateAsAbsolute(IntSubsection, getAssembler()))
|
||||
report_fatal_error("Cannot evaluate subsection number");
|
||||
if (IntSubsection < 0 || IntSubsection > 8192)
|
||||
report_fatal_error("Subsection number out of range");
|
||||
CurInsertionPoint =
|
||||
CurSectionData->getSubsectionInsertionPoint(unsigned(IntSubsection));
|
||||
}
|
||||
|
||||
void MCObjectStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) {
|
||||
@ -185,7 +199,7 @@ void MCObjectStreamer::EmitInstruction(const MCInst &Inst) {
|
||||
|
||||
// Now that a machine instruction has been assembled into this section, make
|
||||
// a line entry for any .loc directive that has been seen.
|
||||
MCLineEntry::Make(this, getCurrentSection());
|
||||
MCLineEntry::Make(this, getCurrentSection().first);
|
||||
|
||||
// If this instruction doesn't need relaxation, just emit it as data.
|
||||
MCAssembler &Assembler = getAssembler();
|
||||
@ -216,8 +230,8 @@ void MCObjectStreamer::EmitInstruction(const MCInst &Inst) {
|
||||
void MCObjectStreamer::EmitInstToFragment(const MCInst &Inst) {
|
||||
// Always create a new, separate fragment here, because its size can change
|
||||
// during relaxation.
|
||||
MCRelaxableFragment *IF =
|
||||
new MCRelaxableFragment(Inst, getCurrentSectionData());
|
||||
MCRelaxableFragment *IF = new MCRelaxableFragment(Inst);
|
||||
insert(IF);
|
||||
|
||||
SmallString<128> Code;
|
||||
raw_svector_ostream VecOS(Code);
|
||||
@ -258,7 +272,7 @@ void MCObjectStreamer::EmitDwarfAdvanceLineAddr(int64_t LineDelta,
|
||||
return;
|
||||
}
|
||||
AddrDelta = ForceExpAbs(AddrDelta);
|
||||
new MCDwarfLineAddrFragment(LineDelta, *AddrDelta, getCurrentSectionData());
|
||||
insert(new MCDwarfLineAddrFragment(LineDelta, *AddrDelta));
|
||||
}
|
||||
|
||||
void MCObjectStreamer::EmitDwarfAdvanceFrameAddr(const MCSymbol *LastLabel,
|
||||
@ -270,7 +284,7 @@ void MCObjectStreamer::EmitDwarfAdvanceFrameAddr(const MCSymbol *LastLabel,
|
||||
return;
|
||||
}
|
||||
AddrDelta = ForceExpAbs(AddrDelta);
|
||||
new MCDwarfCallFrameFragment(*AddrDelta, getCurrentSectionData());
|
||||
insert(new MCDwarfCallFrameFragment(*AddrDelta));
|
||||
}
|
||||
|
||||
void MCObjectStreamer::EmitBytes(StringRef Data, unsigned AddrSpace) {
|
||||
@ -284,8 +298,7 @@ void MCObjectStreamer::EmitValueToAlignment(unsigned ByteAlignment,
|
||||
unsigned MaxBytesToEmit) {
|
||||
if (MaxBytesToEmit == 0)
|
||||
MaxBytesToEmit = ByteAlignment;
|
||||
new MCAlignFragment(ByteAlignment, Value, ValueSize, MaxBytesToEmit,
|
||||
getCurrentSectionData());
|
||||
insert(new MCAlignFragment(ByteAlignment, Value, ValueSize, MaxBytesToEmit));
|
||||
|
||||
// Update the maximum alignment on the current section if necessary.
|
||||
if (ByteAlignment > getCurrentSectionData()->getAlignment())
|
||||
@ -302,7 +315,7 @@ bool MCObjectStreamer::EmitValueToOffset(const MCExpr *Offset,
|
||||
unsigned char Value) {
|
||||
int64_t Res;
|
||||
if (Offset->EvaluateAsAbsolute(Res, getAssembler())) {
|
||||
new MCOrgFragment(*Offset, Value, getCurrentSectionData());
|
||||
insert(new MCOrgFragment(*Offset, Value));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user