Use pointers to the MCAsmInfo and MCRegInfo.
Someone may want to do something crazy, like replace these objects if they
change or something.
No functionality change intended.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184175 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp
index 4f07882..7dfe23c 100644
--- a/lib/MC/MCAsmStreamer.cpp
+++ b/lib/MC/MCAsmStreamer.cpp
@@ -38,7 +38,7 @@
class MCAsmStreamer : public MCStreamer {
protected:
formatted_raw_ostream &OS;
- const MCAsmInfo &MAI;
+ const MCAsmInfo *MAI;
private:
OwningPtr<MCInstPrinter> InstPrinter;
OwningPtr<MCCodeEmitter> Emitter;
@@ -312,9 +312,9 @@
"Comment array not newline terminated");
do {
// Emit a line of comments.
- OS.PadToColumn(MAI.getCommentColumn());
+ OS.PadToColumn(MAI->getCommentColumn());
size_t Position = Comments.find('\n');
- OS << MAI.getCommentString() << ' ' << Comments.substr(0, Position) << '\n';
+ OS << MAI->getCommentString() << ' ' << Comments.substr(0, Position) <<'\n';
Comments = Comments.substr(Position+1);
} while (!Comments.empty());
@@ -332,7 +332,7 @@
void MCAsmStreamer::ChangeSection(const MCSection *Section,
const MCExpr *Subsection) {
assert(Section && "Cannot switch to a null section!");
- Section->PrintSwitchToSection(MAI, OS, Subsection);
+ Section->PrintSwitchToSection(*MAI, OS, Subsection);
}
void MCAsmStreamer::EmitEHSymAttributes(const MCSymbol *Symbol,
@@ -354,7 +354,7 @@
assert(Symbol->isUndefined() && "Cannot define a symbol twice!");
MCStreamer::EmitLabel(Symbol);
- OS << *Symbol << MAI.getLabelSuffix();
+ OS << *Symbol << MAI->getLabelSuffix();
EmitEOL();
}
@@ -362,7 +362,7 @@
assert(Symbol->isUndefined() && "Cannot define a symbol twice!");
MCStreamer::EmitDebugLabel(Symbol);
- OS << *Symbol << MAI.getDebugLabelSuffix();
+ OS << *Symbol << MAI->getDebugLabelSuffix();
EmitEOL();
}
@@ -370,9 +370,9 @@
switch (Flag) {
case MCAF_SyntaxUnified: OS << "\t.syntax unified"; break;
case MCAF_SubsectionsViaSymbols: OS << ".subsections_via_symbols"; break;
- case MCAF_Code16: OS << '\t'<< MAI.getCode16Directive(); break;
- case MCAF_Code32: OS << '\t'<< MAI.getCode32Directive(); break;
- case MCAF_Code64: OS << '\t'<< MAI.getCode64Directive(); break;
+ case MCAF_Code16: OS << '\t'<< MAI->getCode16Directive();break;
+ case MCAF_Code32: OS << '\t'<< MAI->getCode32Directive();break;
+ case MCAF_Code64: OS << '\t'<< MAI->getCode64Directive();break;
}
EmitEOL();
}
@@ -388,9 +388,7 @@
}
void MCAsmStreamer::EmitDataRegion(MCDataRegionType Kind) {
- MCContext &Ctx = getContext();
- const MCAsmInfo &MAI = Ctx.getAsmInfo();
- if (!MAI.doesSupportDataRegionDirectives())
+ if (!MAI->doesSupportDataRegionDirectives())
return;
switch (Kind) {
case MCDR_DataRegion: OS << "\t.data_region"; break;
@@ -407,7 +405,7 @@
// MCSymbols when they have spaces in them.
OS << "\t.thumb_func";
// Only Mach-O hasSubsectionsViaSymbols()
- if (MAI.hasSubsectionsViaSymbols())
+ if (MAI->hasSubsectionsViaSymbols())
OS << '\t' << *Func;
EmitEOL();
}
@@ -452,9 +450,9 @@
case MCSA_ELF_TypeCommon: /// .type _foo, STT_COMMON # aka @common
case MCSA_ELF_TypeNoType: /// .type _foo, STT_NOTYPE # aka @notype
case MCSA_ELF_TypeGnuUniqueObject: /// .type _foo, @gnu_unique_object
- assert(MAI.hasDotTypeDotSizeDirective() && "Symbol Attr not supported");
+ assert(MAI->hasDotTypeDotSizeDirective() && "Symbol Attr not supported");
OS << "\t.type\t" << *Symbol << ','
- << ((MAI.getCommentString()[0] != '@') ? '@' : '%');
+ << ((MAI->getCommentString()[0] != '@') ? '@' : '%');
switch (Attribute) {
default: llvm_unreachable("Unknown ELF .type");
case MCSA_ELF_TypeFunction: OS << "function"; break;
@@ -468,7 +466,7 @@
EmitEOL();
return;
case MCSA_Global: // .globl/.global
- OS << MAI.getGlobalDirective();
+ OS << MAI->getGlobalDirective();
FlagMap[Symbol] |= EHGlobal;
break;
case MCSA_Hidden: OS << "\t.hidden\t"; break;
@@ -490,7 +488,7 @@
FlagMap[Symbol] |= EHWeakDefinition;
break;
// .weak_reference
- case MCSA_WeakReference: OS << MAI.getWeakRefDirective(); break;
+ case MCSA_WeakReference: OS << MAI->getWeakRefDirective(); break;
case MCSA_WeakDefAutoPrivate: OS << "\t.weak_def_can_be_hidden\t"; break;
}
@@ -529,7 +527,7 @@
}
void MCAsmStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {
- assert(MAI.hasDotTypeDotSizeDirective());
+ assert(MAI->hasDotTypeDotSizeDirective());
OS << "\t.size\t" << *Symbol << ", " << *Value << '\n';
}
@@ -537,7 +535,7 @@
unsigned ByteAlignment) {
OS << "\t.comm\t" << *Symbol << ',' << Size;
if (ByteAlignment != 0) {
- if (MAI.getCOMMDirectiveAlignmentIsInBytes())
+ if (MAI->getCOMMDirectiveAlignmentIsInBytes())
OS << ',' << ByteAlignment;
else
OS << ',' << Log2_32(ByteAlignment);
@@ -553,7 +551,7 @@
unsigned ByteAlign) {
OS << "\t.lcomm\t" << *Symbol << ',' << Size;
if (ByteAlign > 1) {
- switch (MAI.getLCOMMDirectiveAlignmentType()) {
+ switch (MAI->getLCOMMDirectiveAlignmentType()) {
case LCOMM::NoAlignment:
llvm_unreachable("alignment not supported on .lcomm!");
case LCOMM::ByteAlignment:
@@ -644,7 +642,7 @@
if (Data.empty()) return;
if (Data.size() == 1) {
- OS << MAI.getData8bitsDirective(AddrSpace);
+ OS << MAI->getData8bitsDirective(AddrSpace);
OS << (unsigned)(unsigned char)Data[0];
EmitEOL();
return;
@@ -652,11 +650,11 @@
// If the data ends with 0 and the target supports .asciz, use it, otherwise
// use .ascii
- if (MAI.getAscizDirective() && Data.back() == 0) {
- OS << MAI.getAscizDirective();
+ if (MAI->getAscizDirective() && Data.back() == 0) {
+ OS << MAI->getAscizDirective();
Data = Data.substr(0, Data.size()-1);
} else {
- OS << MAI.getAsciiDirective();
+ OS << MAI->getAsciiDirective();
}
OS << ' ';
@@ -676,17 +674,17 @@
const char *Directive = 0;
switch (Size) {
default: break;
- case 1: Directive = MAI.getData8bitsDirective(AddrSpace); break;
- case 2: Directive = MAI.getData16bitsDirective(AddrSpace); break;
- case 4: Directive = MAI.getData32bitsDirective(AddrSpace); break;
+ case 1: Directive = MAI->getData8bitsDirective(AddrSpace); break;
+ case 2: Directive = MAI->getData16bitsDirective(AddrSpace); break;
+ case 4: Directive = MAI->getData32bitsDirective(AddrSpace); break;
case 8:
- Directive = MAI.getData64bitsDirective(AddrSpace);
+ Directive = MAI->getData64bitsDirective(AddrSpace);
// If the target doesn't support 64-bit data, emit as two 32-bit halves.
if (Directive) break;
int64_t IntValue;
if (!Value->EvaluateAsAbsolute(IntValue))
report_fatal_error("Don't know how to emit this value.");
- if (getContext().getAsmInfo().isLittleEndian()) {
+ if (MAI->isLittleEndian()) {
EmitIntValue((uint32_t)(IntValue >> 0 ), 4, AddrSpace);
EmitIntValue((uint32_t)(IntValue >> 32), 4, AddrSpace);
} else {
@@ -707,7 +705,7 @@
EmitULEB128IntValue(IntValue);
return;
}
- assert(MAI.hasLEB128() && "Cannot print a .uleb");
+ assert(MAI->hasLEB128() && "Cannot print a .uleb");
OS << ".uleb128 " << *Value;
EmitEOL();
}
@@ -718,20 +716,20 @@
EmitSLEB128IntValue(IntValue);
return;
}
- assert(MAI.hasLEB128() && "Cannot print a .sleb");
+ assert(MAI->hasLEB128() && "Cannot print a .sleb");
OS << ".sleb128 " << *Value;
EmitEOL();
}
void MCAsmStreamer::EmitGPRel64Value(const MCExpr *Value) {
- assert(MAI.getGPRel64Directive() != 0);
- OS << MAI.getGPRel64Directive() << *Value;
+ assert(MAI->getGPRel64Directive() != 0);
+ OS << MAI->getGPRel64Directive() << *Value;
EmitEOL();
}
void MCAsmStreamer::EmitGPRel32Value(const MCExpr *Value) {
- assert(MAI.getGPRel32Directive() != 0);
- OS << MAI.getGPRel32Directive() << *Value;
+ assert(MAI->getGPRel32Directive() != 0);
+ OS << MAI->getGPRel32Directive() << *Value;
EmitEOL();
}
@@ -743,7 +741,7 @@
if (NumBytes == 0) return;
if (AddrSpace == 0)
- if (const char *ZeroDirective = MAI.getZeroDirective()) {
+ if (const char *ZeroDirective = MAI->getZeroDirective()) {
OS << ZeroDirective << NumBytes;
if (FillValue != 0)
OS << ',' << (int)FillValue;
@@ -763,14 +761,14 @@
if (isPowerOf2_32(ByteAlignment)) {
switch (ValueSize) {
default: llvm_unreachable("Invalid size for machine code value!");
- case 1: OS << MAI.getAlignDirective(); break;
+ case 1: OS << MAI->getAlignDirective(); break;
// FIXME: use MAI for this!
case 2: OS << ".p2alignw "; break;
case 4: OS << ".p2alignl "; break;
case 8: llvm_unreachable("Unsupported alignment size!");
}
- if (MAI.getAlignmentIsInBytes())
+ if (MAI->getAlignmentIsInBytes())
OS << ByteAlignment;
else
OS << Log2_32(ByteAlignment);
@@ -806,7 +804,7 @@
void MCAsmStreamer::EmitCodeAlignment(unsigned ByteAlignment,
unsigned MaxBytesToEmit) {
// Emit with a text fill value.
- EmitValueToAlignment(ByteAlignment, MAI.getTextAlignFillValue(),
+ EmitValueToAlignment(ByteAlignment, MAI->getTextAlignFillValue(),
1, MaxBytesToEmit);
}
@@ -820,7 +818,7 @@
void MCAsmStreamer::EmitFileDirective(StringRef Filename) {
- assert(MAI.hasSingleParameterDotFile());
+ assert(MAI->hasSingleParameterDotFile());
OS << "\t.file\t";
PrintQuotedString(Filename, OS);
EmitEOL();
@@ -886,8 +884,8 @@
OS << "discriminator " << Discriminator;
if (IsVerboseAsm) {
- OS.PadToColumn(MAI.getCommentColumn());
- OS << MAI.getCommentString() << ' ' << FileName << ':'
+ OS.PadToColumn(MAI->getCommentColumn());
+ OS << MAI->getCommentString() << ' ' << FileName << ':'
<< Line << ':' << Column;
}
EmitEOL();
@@ -936,9 +934,9 @@
}
void MCAsmStreamer::EmitRegisterName(int64_t Register) {
- if (InstPrinter && !MAI.useDwarfRegNumForCFI()) {
- const MCRegisterInfo &MRI = getContext().getRegisterInfo();
- unsigned LLVMRegister = MRI.getLLVMRegNum(Register, true);
+ if (InstPrinter && !MAI->useDwarfRegNumForCFI()) {
+ const MCRegisterInfo *MRI = getContext().getRegisterInfo();
+ unsigned LLVMRegister = MRI->getLLVMRegNum(Register, true);
InstPrinter->printRegName(OS, LLVMRegister);
} else {
OS << Register;
@@ -1276,7 +1274,7 @@
unsigned Bit = (Code[i] >> j) & 1;
unsigned FixupBit;
- if (getContext().getAsmInfo().isLittleEndian())
+ if (MAI->isLittleEndian())
FixupBit = i * 8 + j;
else
FixupBit = i * 8 + (7-j);
@@ -1376,7 +1374,7 @@
// Show the MCInst if enabled.
if (ShowInst) {
- Inst.dump_pretty(GetCommentOS(), &MAI, InstPrinter.get(), "\n ");
+ Inst.dump_pretty(GetCommentOS(), MAI, InstPrinter.get(), "\n ");
GetCommentOS() << "\n";
}
@@ -1384,7 +1382,7 @@
if (InstPrinter)
InstPrinter->printInst(&Inst, OS, "");
else
- Inst.print(OS, &MAI);
+ Inst.print(OS, MAI);
EmitEOL();
}