mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-22 10:24:26 +00:00
MC: style tweaks to WinCOFFStreamer
Stylistic changes to prepare for splitting up the COFFStreamer into target specific streamers. Tweak some assertion messages. No functional change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207342 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -40,9 +40,7 @@ class WinCOFFStreamer : public MCObjectStreamer {
|
|||||||
public:
|
public:
|
||||||
MCSymbol const *CurSymbol;
|
MCSymbol const *CurSymbol;
|
||||||
|
|
||||||
WinCOFFStreamer(MCContext &Context,
|
WinCOFFStreamer(MCContext &Context, MCAsmBackend &MAB, MCCodeEmitter &CE,
|
||||||
MCAsmBackend &MAB,
|
|
||||||
MCCodeEmitter &CE,
|
|
||||||
raw_ostream &OS);
|
raw_ostream &OS);
|
||||||
|
|
||||||
// MCStreamer interface
|
// MCStreamer interface
|
||||||
@ -65,10 +63,10 @@ public:
|
|||||||
unsigned ByteAlignment) override;
|
unsigned ByteAlignment) override;
|
||||||
void EmitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size,
|
void EmitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size,
|
||||||
unsigned ByteAlignment) override;
|
unsigned ByteAlignment) override;
|
||||||
void EmitZerofill(const MCSection *Section, MCSymbol *Symbol,
|
void EmitZerofill(const MCSection *Section, MCSymbol *Symbol, uint64_t Size,
|
||||||
uint64_t Size,unsigned ByteAlignment) override;
|
unsigned ByteAlignment) override;
|
||||||
void EmitTBSSSymbol(const MCSection *Section, MCSymbol *Symbol,
|
void EmitTBSSSymbol(const MCSection *Section, MCSymbol *Symbol, uint64_t Size,
|
||||||
uint64_t Size, unsigned ByteAlignment) override;
|
unsigned ByteAlignment) override;
|
||||||
void EmitFileDirective(StringRef Filename) override;
|
void EmitFileDirective(StringRef Filename) override;
|
||||||
void EmitIdent(StringRef IdentString) override;
|
void EmitIdent(StringRef IdentString) override;
|
||||||
void EmitWin64EHHandlerData() override;
|
void EmitWin64EHHandlerData() override;
|
||||||
@ -124,6 +122,7 @@ void WinCOFFStreamer::EmitLabel(MCSymbol *Symbol) {
|
|||||||
void WinCOFFStreamer::EmitDebugLabel(MCSymbol *Symbol) {
|
void WinCOFFStreamer::EmitDebugLabel(MCSymbol *Symbol) {
|
||||||
EmitLabel(Symbol);
|
EmitLabel(Symbol);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::EmitAssemblerFlag(MCAssemblerFlag Flag) {
|
void WinCOFFStreamer::EmitAssemblerFlag(MCAssemblerFlag Flag) {
|
||||||
llvm_unreachable("not implemented");
|
llvm_unreachable("not implemented");
|
||||||
}
|
}
|
||||||
@ -135,24 +134,22 @@ void WinCOFFStreamer::EmitThumbFunc(MCSymbol *Func) {
|
|||||||
bool WinCOFFStreamer::EmitSymbolAttribute(MCSymbol *Symbol,
|
bool WinCOFFStreamer::EmitSymbolAttribute(MCSymbol *Symbol,
|
||||||
MCSymbolAttr Attribute) {
|
MCSymbolAttr Attribute) {
|
||||||
assert(Symbol && "Symbol must be non-null!");
|
assert(Symbol && "Symbol must be non-null!");
|
||||||
assert((Symbol->isInSection()
|
assert((!Symbol->isInSection() ||
|
||||||
? Symbol->getSection().getVariant() == MCSection::SV_COFF
|
Symbol->getSection().getVariant() == MCSection::SV_COFF) &&
|
||||||
: true) && "Got non-COFF section in the COFF backend!");
|
"Got non-COFF section in the COFF backend!");
|
||||||
|
|
||||||
|
MCSymbolData &SD = getAssembler().getOrCreateSymbolData(*Symbol);
|
||||||
|
|
||||||
switch (Attribute) {
|
switch (Attribute) {
|
||||||
|
default: return false;
|
||||||
case MCSA_WeakReference:
|
case MCSA_WeakReference:
|
||||||
case MCSA_Weak: {
|
case MCSA_Weak:
|
||||||
MCSymbolData &SD = getAssembler().getOrCreateSymbolData(*Symbol);
|
SD.modifyFlags(COFF::SF_WeakExternal, COFF::SF_WeakExternal);
|
||||||
SD.modifyFlags(COFF::SF_WeakExternal, COFF::SF_WeakExternal);
|
SD.setExternal(true);
|
||||||
SD.setExternal(true);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MCSA_Global:
|
case MCSA_Global:
|
||||||
getAssembler().getOrCreateSymbolData(*Symbol).setExternal(true);
|
SD.setExternal(true);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -163,68 +160,64 @@ void WinCOFFStreamer::EmitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::BeginCOFFSymbolDef(MCSymbol const *Symbol) {
|
void WinCOFFStreamer::BeginCOFFSymbolDef(MCSymbol const *Symbol) {
|
||||||
assert((Symbol->isInSection()
|
assert((!Symbol->isInSection() ||
|
||||||
? Symbol->getSection().getVariant() == MCSection::SV_COFF
|
Symbol->getSection().getVariant() == MCSection::SV_COFF) &&
|
||||||
: true) && "Got non-COFF section in the COFF backend!");
|
"Got non-COFF section in the COFF backend!");
|
||||||
assert(!CurSymbol && "EndCOFFSymbolDef must be called between calls "
|
assert(!CurSymbol && "starting new symbol definition in a symbol definition");
|
||||||
"to BeginCOFFSymbolDef!");
|
|
||||||
CurSymbol = Symbol;
|
CurSymbol = Symbol;
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::EmitCOFFSymbolStorageClass(int StorageClass) {
|
void WinCOFFStreamer::EmitCOFFSymbolStorageClass(int StorageClass) {
|
||||||
assert(CurSymbol && "BeginCOFFSymbolDef must be called first!");
|
assert(CurSymbol && "StorageClass specified outside of symbol definition");
|
||||||
assert((StorageClass & ~0xFF) == 0 && "StorageClass must only have data in "
|
assert((StorageClass & ~0xFF) == 0 &&
|
||||||
"the first byte!");
|
"StorageClass must only have data in the first byte!");
|
||||||
|
|
||||||
getAssembler().getOrCreateSymbolData(*CurSymbol).modifyFlags(
|
MCSymbolData &SD = getAssembler().getOrCreateSymbolData(*CurSymbol);
|
||||||
StorageClass << COFF::SF_ClassShift,
|
SD.modifyFlags(StorageClass << COFF::SF_ClassShift, COFF::SF_ClassMask);
|
||||||
COFF::SF_ClassMask);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::EmitCOFFSymbolType(int Type) {
|
void WinCOFFStreamer::EmitCOFFSymbolType(int Type) {
|
||||||
assert(CurSymbol && "BeginCOFFSymbolDef must be called first!");
|
assert(CurSymbol && "SymbolType specified outside of a symbol definition");
|
||||||
assert((Type & ~0xFFFF) == 0 && "Type must only have data in the first 2 "
|
assert((Type & ~0xFFFF) == 0 &&
|
||||||
"bytes");
|
"Type must only have data in the first 2 bytes");
|
||||||
|
|
||||||
getAssembler().getOrCreateSymbolData(*CurSymbol).modifyFlags(
|
MCSymbolData &SD = getAssembler().getOrCreateSymbolData(*CurSymbol);
|
||||||
Type << COFF::SF_TypeShift,
|
SD.modifyFlags(Type << COFF::SF_TypeShift, COFF::SF_TypeMask);
|
||||||
COFF::SF_TypeMask);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::EndCOFFSymbolDef() {
|
void WinCOFFStreamer::EndCOFFSymbolDef() {
|
||||||
assert(CurSymbol && "BeginCOFFSymbolDef must be called first!");
|
assert(CurSymbol && "ending symbol definition without beginning one");
|
||||||
CurSymbol = nullptr;
|
CurSymbol = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::EmitCOFFSectionIndex(MCSymbol const *Symbol) {
|
void WinCOFFStreamer::EmitCOFFSectionIndex(MCSymbol const *Symbol) {
|
||||||
MCDataFragment *DF = getOrCreateDataFragment();
|
MCDataFragment *DF = getOrCreateDataFragment();
|
||||||
DF->getFixups().push_back(MCFixup::Create(
|
const MCSymbolRefExpr *SRE = MCSymbolRefExpr::Create(Symbol, getContext());
|
||||||
DF->getContents().size(), MCSymbolRefExpr::Create(Symbol, getContext()),
|
MCFixup Fixup = MCFixup::Create(DF->getContents().size(), SRE, FK_SecRel_2);
|
||||||
FK_SecRel_2));
|
DF->getFixups().push_back(Fixup);
|
||||||
DF->getContents().resize(DF->getContents().size() + 4, 0);
|
DF->getContents().resize(DF->getContents().size() + 4, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::EmitCOFFSecRel32(MCSymbol const *Symbol) {
|
void WinCOFFStreamer::EmitCOFFSecRel32(MCSymbol const *Symbol) {
|
||||||
MCDataFragment *DF = getOrCreateDataFragment();
|
MCDataFragment *DF = getOrCreateDataFragment();
|
||||||
DF->getFixups().push_back(MCFixup::Create(
|
const MCSymbolRefExpr *SRE = MCSymbolRefExpr::Create(Symbol, getContext());
|
||||||
DF->getContents().size(), MCSymbolRefExpr::Create(Symbol, getContext()),
|
MCFixup Fixup = MCFixup::Create(DF->getContents().size(), SRE, FK_SecRel_4);
|
||||||
FK_SecRel_4));
|
DF->getFixups().push_back(Fixup);
|
||||||
DF->getContents().resize(DF->getContents().size() + 4, 0);
|
DF->getContents().resize(DF->getContents().size() + 4, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {
|
void WinCOFFStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {
|
||||||
llvm_unreachable("not implemented");
|
llvm_unreachable("not supported");
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
|
void WinCOFFStreamer::EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
|
||||||
unsigned ByteAlignment) {
|
unsigned ByteAlignment) {
|
||||||
assert((Symbol->isInSection()
|
assert((!Symbol->isInSection() ||
|
||||||
? Symbol->getSection().getVariant() == MCSection::SV_COFF
|
Symbol->getSection().getVariant() == MCSection::SV_COFF) &&
|
||||||
: true) && "Got non-COFF section in the COFF backend!");
|
"Got non-COFF section in the COFF backend!");
|
||||||
|
|
||||||
if (ByteAlignment > 32)
|
if (ByteAlignment > 32)
|
||||||
report_fatal_error(
|
report_fatal_error("alignment is limited to 32-bytes");
|
||||||
"The linker won't align common symbols beyond 32 bytes.");
|
|
||||||
|
|
||||||
AssignSection(Symbol, nullptr);
|
AssignSection(Symbol, nullptr);
|
||||||
|
|
||||||
@ -251,12 +244,13 @@ void WinCOFFStreamer::EmitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size,
|
|||||||
new MCAlignFragment(ByteAlignment, /*_Value=*/0, /*_ValueSize=*/0,
|
new MCAlignFragment(ByteAlignment, /*_Value=*/0, /*_ValueSize=*/0,
|
||||||
ByteAlignment, &SectionData);
|
ByteAlignment, &SectionData);
|
||||||
|
|
||||||
SD.setFragment(
|
MCFillFragment *Fragment =
|
||||||
new MCFillFragment(/*_Value=*/0, /*_ValueSize=*/0, Size, &SectionData));
|
new MCFillFragment(/*_Value=*/0, /*_ValueSize=*/0, Size, &SectionData);
|
||||||
|
SD.setFragment(Fragment);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::EmitZerofill(const MCSection *Section, MCSymbol *Symbol,
|
void WinCOFFStreamer::EmitZerofill(const MCSection *Section, MCSymbol *Symbol,
|
||||||
uint64_t Size,unsigned ByteAlignment) {
|
uint64_t Size, unsigned ByteAlignment) {
|
||||||
llvm_unreachable("not implemented");
|
llvm_unreachable("not implemented");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -271,7 +265,7 @@ void WinCOFFStreamer::EmitFileDirective(StringRef Filename) {
|
|||||||
|
|
||||||
// TODO: Implement this if you want to emit .comment section in COFF obj files.
|
// TODO: Implement this if you want to emit .comment section in COFF obj files.
|
||||||
void WinCOFFStreamer::EmitIdent(StringRef IdentString) {
|
void WinCOFFStreamer::EmitIdent(StringRef IdentString) {
|
||||||
llvm_unreachable("unsupported directive");
|
llvm_unreachable("not implemented");
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinCOFFStreamer::EmitWin64EHHandlerData() {
|
void WinCOFFStreamer::EmitWin64EHHandlerData() {
|
||||||
@ -288,15 +282,13 @@ void WinCOFFStreamer::FinishImpl() {
|
|||||||
MCObjectStreamer::FinishImpl();
|
MCObjectStreamer::FinishImpl();
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace llvm
|
namespace llvm {
|
||||||
{
|
MCStreamer *createWinCOFFStreamer(MCContext &Context, MCAsmBackend &MAB,
|
||||||
MCStreamer *createWinCOFFStreamer(MCContext &Context,
|
MCCodeEmitter &CE, raw_ostream &OS,
|
||||||
MCAsmBackend &MAB,
|
bool RelaxAll) {
|
||||||
MCCodeEmitter &CE,
|
WinCOFFStreamer *S = new WinCOFFStreamer(Context, MAB, CE, OS);
|
||||||
raw_ostream &OS,
|
S->getAssembler().setRelaxAll(RelaxAll);
|
||||||
bool RelaxAll) {
|
return S;
|
||||||
WinCOFFStreamer *S = new WinCOFFStreamer(Context, MAB, CE, OS);
|
|
||||||
S->getAssembler().setRelaxAll(RelaxAll);
|
|
||||||
return S;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user