Skip to content

Commit

Permalink
MC: Lift SwitchSection() and Finish() into MCObjectStreamer.
Browse files Browse the repository at this point in the history 
llvm-svn: 106141
  • Loading branch information
@ddunbar
ddunbar committed Jun 16, 2010
1 parent 8a3c9d9 commit b2347fe
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 42 deletions.
13 changes: 13 additions & 0 deletions llvm/include/llvm/MC/MCObjectStreamer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,27 @@ class raw_ostream;
/// implementation.
class MCObjectStreamer : public MCStreamer {
MCAssembler *Assembler;
MCSectionData *CurSectionData;

protected:
MCObjectStreamer(MCContext &Context, TargetAsmBackend &TAB,
raw_ostream &_OS, MCCodeEmitter *_Emitter);
~MCObjectStreamer();

MCSectionData *getCurrentSectionData() const {
return CurSectionData;
}

public:
MCAssembler &getAssembler() { return *Assembler; }

/// @name MCStreamer Interface
/// @{

virtual void SwitchSection(const MCSection *Section);
virtual void Finish();

/// @}
};

} // end namespace llvm
Expand Down
61 changes: 21 additions & 40 deletions llvm/lib/MC/MCMachOStreamer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,16 @@ using namespace llvm;
namespace {

class MCMachOStreamer : public MCObjectStreamer {

private:
MCSectionData *CurSectionData;

/// Track the current atom for each section.
DenseMap<const MCSectionData*, MCSymbolData*> CurrentAtomMap;

private:
MCFragment *getCurrentFragment() const {
assert(CurSectionData && "No current section!");
assert(getCurrentSectionData() && "No current section!");

if (!CurSectionData->empty())
return &CurSectionData->getFragmentList().back();
if (!getCurrentSectionData()->empty())
return &getCurrentSectionData()->getFragmentList().back();

return 0;
}
Expand All @@ -55,8 +52,8 @@ class MCMachOStreamer : public MCObjectStreamer {

/// Create a new data fragment in the current section.
MCDataFragment *createDataFragment() const {
MCDataFragment *DF = new MCDataFragment(CurSectionData);
DF->setAtom(CurrentAtomMap.lookup(CurSectionData));
MCDataFragment *DF = new MCDataFragment(getCurrentSectionData());
DF->setAtom(CurrentAtomMap.lookup(getCurrentSectionData()));
return DF;
}

Expand All @@ -66,7 +63,7 @@ class MCMachOStreamer : public MCObjectStreamer {
public:
MCMachOStreamer(MCContext &Context, TargetAsmBackend &TAB,
raw_ostream &OS, MCCodeEmitter *Emitter)
: MCObjectStreamer(Context, TAB, OS, Emitter), CurSectionData(0) {}
: MCObjectStreamer(Context, TAB, OS, Emitter) {}

const MCExpr *AddValueSymbols(const MCExpr *Value) {
switch (Value->getKind()) {
Expand Down Expand Up @@ -97,7 +94,6 @@ class MCMachOStreamer : public MCObjectStreamer {
/// @name MCStreamer Interface
/// @{

virtual void SwitchSection(const MCSection *Section);
virtual void EmitLabel(MCSymbol *Symbol);
virtual void EmitAssemblerFlag(MCAssemblerFlag Flag);
virtual void EmitAssignment(MCSymbol *Symbol, const MCExpr *Value);
Expand Down Expand Up @@ -148,23 +144,12 @@ class MCMachOStreamer : public MCObjectStreamer {
}

virtual void EmitInstruction(const MCInst &Inst);
virtual void Finish();

/// @}
};

} // end anonymous namespace.

void MCMachOStreamer::SwitchSection(const MCSection *Section) {
assert(Section && "Cannot switch to a null section!");

// If already in this section, then this is a noop.
if (Section == CurSection) return;

CurSection = Section;
CurSectionData = &getAssembler().getOrCreateSectionData(*Section);
}

void MCMachOStreamer::EmitLabel(MCSymbol *Symbol) {
assert(Symbol->isUndefined() && "Cannot define a symbol twice!");
assert(!Symbol->isVariable() && "Cannot emit a variable symbol!");
Expand All @@ -175,7 +160,7 @@ void MCMachOStreamer::EmitLabel(MCSymbol *Symbol) {
// Update the current atom map, if necessary.
bool MustCreateFragment = false;
if (getAssembler().isSymbolLinkerVisible(&SD)) {
CurrentAtomMap[CurSectionData] = &SD;
CurrentAtomMap[getCurrentSectionData()] = &SD;

// We have to create a new fragment, fragments cannot span atoms.
MustCreateFragment = true;
Expand Down Expand Up @@ -228,7 +213,7 @@ void MCMachOStreamer::EmitSymbolAttribute(MCSymbol *Symbol,
// important for matching the string table that 'as' generates.
IndirectSymbolData ISD;
ISD.Symbol = Symbol;
ISD.SectionData = CurSectionData;
ISD.SectionData = getCurrentSectionData();
getAssembler().getIndirectSymbols().push_back(ISD);
return;
}
Expand Down Expand Up @@ -389,37 +374,37 @@ void MCMachOStreamer::EmitValueToAlignment(unsigned ByteAlignment,
if (MaxBytesToEmit == 0)
MaxBytesToEmit = ByteAlignment;
MCFragment *F = new MCAlignFragment(ByteAlignment, Value, ValueSize,
MaxBytesToEmit, CurSectionData);
F->setAtom(CurrentAtomMap.lookup(CurSectionData));
MaxBytesToEmit, getCurrentSectionData());
F->setAtom(CurrentAtomMap.lookup(getCurrentSectionData()));

// Update the maximum alignment on the current section if necessary.
if (ByteAlignment > CurSectionData->getAlignment())
CurSectionData->setAlignment(ByteAlignment);
if (ByteAlignment > getCurrentSectionData()->getAlignment())
getCurrentSectionData()->setAlignment(ByteAlignment);
}

void MCMachOStreamer::EmitCodeAlignment(unsigned ByteAlignment,
unsigned MaxBytesToEmit) {
if (MaxBytesToEmit == 0)
MaxBytesToEmit = ByteAlignment;
MCAlignFragment *F = new MCAlignFragment(ByteAlignment, 0, 1, MaxBytesToEmit,
CurSectionData);
getCurrentSectionData());
F->setEmitNops(true);
F->setAtom(CurrentAtomMap.lookup(CurSectionData));
F->setAtom(CurrentAtomMap.lookup(getCurrentSectionData()));

// Update the maximum alignment on the current section if necessary.
if (ByteAlignment > CurSectionData->getAlignment())
CurSectionData->setAlignment(ByteAlignment);
if (ByteAlignment > getCurrentSectionData()->getAlignment())
getCurrentSectionData()->setAlignment(ByteAlignment);
}

void MCMachOStreamer::EmitValueToOffset(const MCExpr *Offset,
unsigned char Value) {
MCFragment *F = new MCOrgFragment(*Offset, Value, CurSectionData);
F->setAtom(CurrentAtomMap.lookup(CurSectionData));
MCFragment *F = new MCOrgFragment(*Offset, Value, getCurrentSectionData());
F->setAtom(CurrentAtomMap.lookup(getCurrentSectionData()));
}

void MCMachOStreamer::EmitInstToFragment(const MCInst &Inst) {
MCInstFragment *IF = new MCInstFragment(Inst, CurSectionData);
IF->setAtom(CurrentAtomMap.lookup(CurSectionData));
MCInstFragment *IF = new MCInstFragment(Inst, getCurrentSectionData());
IF->setAtom(CurrentAtomMap.lookup(getCurrentSectionData()));

// Add the fixups and data.
//
Expand Down Expand Up @@ -458,7 +443,7 @@ void MCMachOStreamer::EmitInstruction(const MCInst &Inst) {
if (Inst.getOperand(i).isExpr())
AddValueSymbols(Inst.getOperand(i).getExpr());

CurSectionData->setHasInstructions(true);
getCurrentSectionData()->setHasInstructions(true);

// If this instruction doesn't need relaxation, just emit it as data.
if (!getAssembler().getBackend().MayNeedRelaxation(Inst)) {
Expand All @@ -481,10 +466,6 @@ void MCMachOStreamer::EmitInstruction(const MCInst &Inst) {
EmitInstToFragment(Inst);
}

void MCMachOStreamer::Finish() {
getAssembler().Finish();
}

MCStreamer *llvm::createMachOStreamer(MCContext &Context, TargetAsmBackend &TAB,
raw_ostream &OS, MCCodeEmitter *CE,
bool RelaxAll) {
Expand Down
19 changes: 17 additions & 2 deletions llvm/lib/MC/MCObjectStreamer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,26 @@ using namespace llvm;

MCObjectStreamer::MCObjectStreamer(MCContext &Context, TargetAsmBackend &TAB,
raw_ostream &_OS, MCCodeEmitter *_Emitter)
: MCStreamer(Context),
Assembler(new MCAssembler(Context, TAB, *_Emitter, _OS))
: MCStreamer(Context), Assembler(new MCAssembler(Context, TAB,
*_Emitter, _OS)),
CurSectionData(0)
{
}

MCObjectStreamer::~MCObjectStreamer() {
delete Assembler;
}

void MCObjectStreamer::SwitchSection(const MCSection *Section) {
assert(Section && "Cannot switch to a null section!");

// If already in this section, then this is a noop.
if (Section == CurSection) return;

CurSection = Section;
CurSectionData = &getAssembler().getOrCreateSectionData(*Section);
}

void MCObjectStreamer::Finish() {
getAssembler().Finish();
}

0 comments on commit b2347fe

Please sign in to comment.