RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-04-04 09:11:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MC: Lift SwitchSection() and Finish() into MCObjectStreamer.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@106141 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-06-16 20:04:25 +00:00
parent 8dc68ab931
commit 83b467178a
3 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/llvm/MC/MCObjectStreamer.h
View File

@ -28,14 +28,27 @@ class raw_ostream;
/// implementation. /// implementation.
class MCObjectStreamer : public MCStreamer { class MCObjectStreamer : public MCStreamer {
MCAssembler *Assembler; MCAssembler *Assembler;
MCSectionData *CurSectionData;
protected: protected:
MCObjectStreamer(MCContext &Context, TargetAsmBackend &TAB, MCObjectStreamer(MCContext &Context, TargetAsmBackend &TAB,
raw_ostream &_OS, MCCodeEmitter *_Emitter); raw_ostream &_OS, MCCodeEmitter *_Emitter);
~MCObjectStreamer(); ~MCObjectStreamer();
MCSectionData *getCurrentSectionData() const {
return CurSectionData;
}
public: public:
MCAssembler &getAssembler() { return *Assembler; } MCAssembler &getAssembler() { return *Assembler; }
/// @name MCStreamer Interface
/// @{
virtual void SwitchSection(const MCSection *Section);
virtual void Finish();
/// @}
}; };
} // end namespace llvm } // end namespace llvm

61
lib/MC/MCMachOStreamer.cpp
View File

@ -27,19 +27,16 @@ using namespace llvm;
namespace { namespace {
class MCMachOStreamer : public MCObjectStreamer { class MCMachOStreamer : public MCObjectStreamer {
private: private:
MCSectionData *CurSectionData;
/// Track the current atom for each section. /// Track the current atom for each section.
DenseMap<const MCSectionData*, MCSymbolData*> CurrentAtomMap; DenseMap<const MCSectionData*, MCSymbolData*> CurrentAtomMap;
private: private:
MCFragment *getCurrentFragment() const { MCFragment *getCurrentFragment() const {
assert(CurSectionData && "No current section!"); assert(getCurrentSectionData() && "No current section!");
if (!CurSectionData->empty()) if (!getCurrentSectionData()->empty())
return &CurSectionData->getFragmentList().back(); return &getCurrentSectionData()->getFragmentList().back();
return 0; return 0;
} }
@ -55,8 +52,8 @@ private:
/// Create a new data fragment in the current section. /// Create a new data fragment in the current section.
MCDataFragment *createDataFragment() const { MCDataFragment *createDataFragment() const {
MCDataFragment *DF = new MCDataFragment(CurSectionData); MCDataFragment *DF = new MCDataFragment(getCurrentSectionData());
DF->setAtom(CurrentAtomMap.lookup(CurSectionData)); DF->setAtom(CurrentAtomMap.lookup(getCurrentSectionData()));
return DF; return DF;
} }
@ -66,7 +63,7 @@ private:
public: public:
MCMachOStreamer(MCContext &Context, TargetAsmBackend &TAB, MCMachOStreamer(MCContext &Context, TargetAsmBackend &TAB,
raw_ostream &OS, MCCodeEmitter *Emitter) raw_ostream &OS, MCCodeEmitter *Emitter)
: MCObjectStreamer(Context, TAB, OS, Emitter), CurSectionData(0) {} : MCObjectStreamer(Context, TAB, OS, Emitter) {}
const MCExpr *AddValueSymbols(const MCExpr *Value) { const MCExpr *AddValueSymbols(const MCExpr *Value) {
switch (Value->getKind()) { switch (Value->getKind()) {
@ -97,7 +94,6 @@ public:
/// @name MCStreamer Interface /// @name MCStreamer Interface
/// @{ /// @{
virtual void SwitchSection(const MCSection *Section);
virtual void EmitLabel(MCSymbol *Symbol); virtual void EmitLabel(MCSymbol *Symbol);
virtual void EmitAssemblerFlag(MCAssemblerFlag Flag); virtual void EmitAssemblerFlag(MCAssemblerFlag Flag);
virtual void EmitAssignment(MCSymbol *Symbol, const MCExpr *Value); virtual void EmitAssignment(MCSymbol *Symbol, const MCExpr *Value);
@ -148,23 +144,12 @@ public:
} }
virtual void EmitInstruction(const MCInst &Inst); virtual void EmitInstruction(const MCInst &Inst);
virtual void Finish();
/// @} /// @}
}; };
} // end anonymous namespace. } // 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) { void MCMachOStreamer::EmitLabel(MCSymbol *Symbol) {
assert(Symbol->isUndefined() && "Cannot define a symbol twice!"); assert(Symbol->isUndefined() && "Cannot define a symbol twice!");
assert(!Symbol->isVariable() && "Cannot emit a variable symbol!"); assert(!Symbol->isVariable() && "Cannot emit a variable symbol!");
@ -175,7 +160,7 @@ void MCMachOStreamer::EmitLabel(MCSymbol *Symbol) {
// Update the current atom map, if necessary. // Update the current atom map, if necessary.
bool MustCreateFragment = false; bool MustCreateFragment = false;
if (getAssembler().isSymbolLinkerVisible(&SD)) { if (getAssembler().isSymbolLinkerVisible(&SD)) {
CurrentAtomMap[CurSectionData] = &SD; CurrentAtomMap[getCurrentSectionData()] = &SD;
// We have to create a new fragment, fragments cannot span atoms. // We have to create a new fragment, fragments cannot span atoms.
MustCreateFragment = true; MustCreateFragment = true;
@ -228,7 +213,7 @@ void MCMachOStreamer::EmitSymbolAttribute(MCSymbol *Symbol,
// important for matching the string table that 'as' generates. // important for matching the string table that 'as' generates.
IndirectSymbolData ISD; IndirectSymbolData ISD;
ISD.Symbol = Symbol; ISD.Symbol = Symbol;
ISD.SectionData = CurSectionData; ISD.SectionData = getCurrentSectionData();
getAssembler().getIndirectSymbols().push_back(ISD); getAssembler().getIndirectSymbols().push_back(ISD);
return; return;
} }
@ -389,12 +374,12 @@ void MCMachOStreamer::EmitValueToAlignment(unsigned ByteAlignment,
if (MaxBytesToEmit == 0) if (MaxBytesToEmit == 0)
MaxBytesToEmit = ByteAlignment; MaxBytesToEmit = ByteAlignment;
MCFragment *F = new MCAlignFragment(ByteAlignment, Value, ValueSize, MCFragment *F = new MCAlignFragment(ByteAlignment, Value, ValueSize,
MaxBytesToEmit, CurSectionData); MaxBytesToEmit, getCurrentSectionData());
F->setAtom(CurrentAtomMap.lookup(CurSectionData)); F->setAtom(CurrentAtomMap.lookup(getCurrentSectionData()));
// Update the maximum alignment on the current section if necessary. // Update the maximum alignment on the current section if necessary.
if (ByteAlignment > CurSectionData->getAlignment()) if (ByteAlignment > getCurrentSectionData()->getAlignment())
CurSectionData->setAlignment(ByteAlignment); getCurrentSectionData()->setAlignment(ByteAlignment);
} }
void MCMachOStreamer::EmitCodeAlignment(unsigned ByteAlignment, void MCMachOStreamer::EmitCodeAlignment(unsigned ByteAlignment,
@ -402,24 +387,24 @@ void MCMachOStreamer::EmitCodeAlignment(unsigned ByteAlignment,
if (MaxBytesToEmit == 0) if (MaxBytesToEmit == 0)
MaxBytesToEmit = ByteAlignment; MaxBytesToEmit = ByteAlignment;
MCAlignFragment *F = new MCAlignFragment(ByteAlignment, 0, 1, MaxBytesToEmit, MCAlignFragment *F = new MCAlignFragment(ByteAlignment, 0, 1, MaxBytesToEmit,
CurSectionData); getCurrentSectionData());
F->setEmitNops(true); F->setEmitNops(true);
F->setAtom(CurrentAtomMap.lookup(CurSectionData)); F->setAtom(CurrentAtomMap.lookup(getCurrentSectionData()));
// Update the maximum alignment on the current section if necessary. // Update the maximum alignment on the current section if necessary.
if (ByteAlignment > CurSectionData->getAlignment()) if (ByteAlignment > getCurrentSectionData()->getAlignment())
CurSectionData->setAlignment(ByteAlignment); getCurrentSectionData()->setAlignment(ByteAlignment);
} }
void MCMachOStreamer::EmitValueToOffset(const MCExpr *Offset, void MCMachOStreamer::EmitValueToOffset(const MCExpr *Offset,
unsigned char Value) { unsigned char Value) {
MCFragment *F = new MCOrgFragment(*Offset, Value, CurSectionData); MCFragment *F = new MCOrgFragment(*Offset, Value, getCurrentSectionData());
F->setAtom(CurrentAtomMap.lookup(CurSectionData)); F->setAtom(CurrentAtomMap.lookup(getCurrentSectionData()));
} }
void MCMachOStreamer::EmitInstToFragment(const MCInst &Inst) { void MCMachOStreamer::EmitInstToFragment(const MCInst &Inst) {
MCInstFragment *IF = new MCInstFragment(Inst, CurSectionData); MCInstFragment *IF = new MCInstFragment(Inst, getCurrentSectionData());
IF->setAtom(CurrentAtomMap.lookup(CurSectionData)); IF->setAtom(CurrentAtomMap.lookup(getCurrentSectionData()));
// Add the fixups and data. // Add the fixups and data.
// //
@ -458,7 +443,7 @@ void MCMachOStreamer::EmitInstruction(const MCInst &Inst) {
if (Inst.getOperand(i).isExpr()) if (Inst.getOperand(i).isExpr())
AddValueSymbols(Inst.getOperand(i).getExpr()); AddValueSymbols(Inst.getOperand(i).getExpr());
CurSectionData->setHasInstructions(true); getCurrentSectionData()->setHasInstructions(true);
// If this instruction doesn't need relaxation, just emit it as data. // If this instruction doesn't need relaxation, just emit it as data.
if (!getAssembler().getBackend().MayNeedRelaxation(Inst)) { if (!getAssembler().getBackend().MayNeedRelaxation(Inst)) {
@ -481,10 +466,6 @@ void MCMachOStreamer::EmitInstruction(const MCInst &Inst) {
EmitInstToFragment(Inst); EmitInstToFragment(Inst);
} }
void MCMachOStreamer::Finish() {
getAssembler().Finish();
}
MCStreamer *llvm::createMachOStreamer(MCContext &Context, TargetAsmBackend &TAB, MCStreamer *llvm::createMachOStreamer(MCContext &Context, TargetAsmBackend &TAB,
raw_ostream &OS, MCCodeEmitter *CE, raw_ostream &OS, MCCodeEmitter *CE,
bool RelaxAll) { bool RelaxAll) {

19
lib/MC/MCObjectStreamer.cpp
View File

@ -14,11 +14,26 @@ using namespace llvm;
MCObjectStreamer::MCObjectStreamer(MCContext &Context, TargetAsmBackend &TAB, MCObjectStreamer::MCObjectStreamer(MCContext &Context, TargetAsmBackend &TAB,
raw_ostream &_OS, MCCodeEmitter *_Emitter) raw_ostream &_OS, MCCodeEmitter *_Emitter)
: MCStreamer(Context), : MCStreamer(Context), Assembler(new MCAssembler(Context, TAB,
Assembler(new MCAssembler(Context, TAB, *_Emitter, _OS)) *_Emitter, _OS)),
CurSectionData(0)
{ {
} }
MCObjectStreamer::~MCObjectStreamer() { MCObjectStreamer::~MCObjectStreamer() {
delete Assembler; 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();
}