rename TAI -> MAI, being careful not to make MAILJMP instructions :)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79777 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index e71af5c..211f708 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -52,7 +52,7 @@
AsmPrinter::AsmPrinter(formatted_raw_ostream &o, TargetMachine &tm,
const MCAsmInfo *T, bool VDef)
: MachineFunctionPass(&ID), FunctionNumber(0), O(o),
- TM(tm), TAI(T), TRI(tm.getRegisterInfo()),
+ TM(tm), MAI(T), TRI(tm.getRegisterInfo()),
OutContext(*new MCContext()),
OutStreamer(*createAsmStreamer(OutContext, O, *T, this)),
@@ -99,16 +99,16 @@
const_cast<TargetLoweringObjectFile&>(getObjFileLowering())
.Initialize(OutContext, TM);
- Mang = new Mangler(M, TAI->getGlobalPrefix(), TAI->getPrivateGlobalPrefix(),
- TAI->getLinkerPrivateGlobalPrefix());
+ Mang = new Mangler(M, MAI->getGlobalPrefix(), MAI->getPrivateGlobalPrefix(),
+ MAI->getLinkerPrivateGlobalPrefix());
- if (TAI->doesAllowQuotesInName())
+ if (MAI->doesAllowQuotesInName())
Mang->setUseQuotes(true);
GCModuleInfo *MI = getAnalysisIfAvailable<GCModuleInfo>();
assert(MI && "AsmPrinter didn't require GCModuleInfo?");
- if (TAI->hasSingleParameterDotFile()) {
+ if (MAI->hasSingleParameterDotFile()) {
/* Very minimal debug info. It is ignored if we emit actual
debug info. If we don't, this at helps the user find where
a function came from. */
@@ -117,22 +117,22 @@
for (GCModuleInfo::iterator I = MI->begin(), E = MI->end(); I != E; ++I)
if (GCMetadataPrinter *MP = GetOrCreateGCPrinter(*I))
- MP->beginAssembly(O, *this, *TAI);
+ MP->beginAssembly(O, *this, *MAI);
if (!M.getModuleInlineAsm().empty())
- O << TAI->getCommentString() << " Start of file scope inline assembly\n"
+ O << MAI->getCommentString() << " Start of file scope inline assembly\n"
<< M.getModuleInlineAsm()
- << '\n' << TAI->getCommentString()
+ << '\n' << MAI->getCommentString()
<< " End of file scope inline assembly\n";
- if (TAI->doesSupportDebugInformation() ||
- TAI->doesSupportExceptionHandling()) {
+ if (MAI->doesSupportDebugInformation() ||
+ MAI->doesSupportExceptionHandling()) {
MMI = getAnalysisIfAvailable<MachineModuleInfo>();
if (MMI)
MMI->AnalyzeModule(M);
DW = getAnalysisIfAvailable<DwarfWriter>();
if (DW)
- DW->BeginModule(&M, MMI, O, this, TAI);
+ DW->BeginModule(&M, MMI, O, this, MAI);
}
return false;
@@ -145,11 +145,11 @@
PrintGlobalVariable(I);
// Emit final debug information.
- if (TAI->doesSupportDebugInformation() || TAI->doesSupportExceptionHandling())
+ if (MAI->doesSupportDebugInformation() || MAI->doesSupportExceptionHandling())
DW->EndModule();
// If the target wants to know about weak references, print them all.
- if (TAI->getWeakRefDirective()) {
+ if (MAI->getWeakRefDirective()) {
// FIXME: This is not lazy, it would be nice to only print weak references
// to stuff that is actually used. Note that doing so would require targets
// to notice uses in operands (due to constant exprs etc). This should
@@ -159,16 +159,16 @@
for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
I != E; ++I) {
if (I->hasExternalWeakLinkage())
- O << TAI->getWeakRefDirective() << Mang->getMangledName(I) << '\n';
+ O << MAI->getWeakRefDirective() << Mang->getMangledName(I) << '\n';
}
for (Module::const_iterator I = M.begin(), E = M.end(); I != E; ++I) {
if (I->hasExternalWeakLinkage())
- O << TAI->getWeakRefDirective() << Mang->getMangledName(I) << '\n';
+ O << MAI->getWeakRefDirective() << Mang->getMangledName(I) << '\n';
}
}
- if (TAI->getSetDirective()) {
+ if (MAI->getSetDirective()) {
O << '\n';
for (Module::const_alias_iterator I = M.alias_begin(), E = M.alias_end();
I != E; ++I) {
@@ -177,16 +177,16 @@
const GlobalValue *GV = cast<GlobalValue>(I->getAliasedGlobal());
std::string Target = Mang->getMangledName(GV);
- if (I->hasExternalLinkage() || !TAI->getWeakRefDirective())
+ if (I->hasExternalLinkage() || !MAI->getWeakRefDirective())
O << "\t.globl\t" << Name << '\n';
else if (I->hasWeakLinkage())
- O << TAI->getWeakRefDirective() << Name << '\n';
+ O << MAI->getWeakRefDirective() << Name << '\n';
else if (!I->hasLocalLinkage())
llvm_unreachable("Invalid alias linkage");
printVisibility(Name, I->getVisibility());
- O << TAI->getSetDirective() << ' ' << Name << ", " << Target << '\n';
+ O << MAI->getSetDirective() << ' ' << Name << ", " << Target << '\n';
}
}
@@ -194,14 +194,14 @@
assert(MI && "AsmPrinter didn't require GCModuleInfo?");
for (GCModuleInfo::iterator I = MI->end(), E = MI->begin(); I != E; )
if (GCMetadataPrinter *MP = GetOrCreateGCPrinter(*--I))
- MP->finishAssembly(O, *this, *TAI);
+ MP->finishAssembly(O, *this, *MAI);
// If we don't have any trampolines, then we don't require stack memory
// to be executable. Some targets have a directive to declare this.
Function *InitTrampolineIntrinsic = M.getFunction("llvm.init.trampoline");
if (!InitTrampolineIntrinsic || InitTrampolineIntrinsic->use_empty())
- if (TAI->getNonexecutableStackDirective())
- O << TAI->getNonexecutableStackDirective() << '\n';
+ if (MAI->getNonexecutableStackDirective())
+ O << MAI->getNonexecutableStackDirective() << '\n';
delete Mang; Mang = 0;
DW = 0; MMI = 0;
@@ -214,7 +214,7 @@
AsmPrinter::getCurrentFunctionEHName(const MachineFunction *MF) const {
assert(MF && "No machine function?");
return Mang->getMangledName(MF->getFunction(), ".eh",
- TAI->is_EHSymbolPrivate());
+ MAI->is_EHSymbolPrivate());
}
void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
@@ -309,11 +309,11 @@
const Type *Ty = CPE.getType();
Offset = NewOffset + TM.getTargetData()->getTypeAllocSize(Ty);
- O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() << '_'
+ O << MAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() << '_'
<< CPI << ':';
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " constant ";
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " constant ";
WriteTypeSymbolic(O, CPE.getType(), MF->getFunction()->getParent());
}
O << '\n';
@@ -369,7 +369,7 @@
// the number of relocations the assembler will generate for the jump table.
// Set directives are all printed before the jump table itself.
SmallPtrSet<MachineBasicBlock*, 16> EmittedSets;
- if (TAI->getSetDirective() && IsPic)
+ if (MAI->getSetDirective() && IsPic)
for (unsigned ii = 0, ee = JTBBs.size(); ii != ee; ++ii)
if (EmittedSets.insert(JTBBs[ii]))
printPICJumpTableSetLabel(i, JTBBs[ii]);
@@ -379,11 +379,11 @@
// the assembler and linker the extents of the jump table object. The
// second label is actually referenced by the code.
if (JTInDiffSection) {
- if (const char *JTLabelPrefix = TAI->getJumpTableSpecialLabelPrefix())
+ if (const char *JTLabelPrefix = MAI->getJumpTableSpecialLabelPrefix())
O << JTLabelPrefix << "JTI" << getFunctionNumber() << '_' << i << ":\n";
}
- O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber()
+ O << MAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber()
<< '_' << i << ":\n";
for (unsigned ii = 0, ee = JTBBs.size(); ii != ee; ++ii) {
@@ -400,11 +400,11 @@
// Use JumpTableDirective otherwise honor the entry size from the jump table
// info.
- const char *JTEntryDirective = TAI->getJumpTableDirective(isPIC);
+ const char *JTEntryDirective = MAI->getJumpTableDirective(isPIC);
bool HadJTEntryDirective = JTEntryDirective != NULL;
if (!HadJTEntryDirective) {
JTEntryDirective = MJTI->getEntrySize() == 4 ?
- TAI->getData32bitsDirective() : TAI->getData64bitsDirective();
+ MAI->getData32bitsDirective() : MAI->getData64bitsDirective();
}
O << JTEntryDirective << ' ';
@@ -416,15 +416,15 @@
// references to the target basic blocks.
if (!isPIC) {
printBasicBlockLabel(MBB, false, false, false);
- } else if (TAI->getSetDirective()) {
- O << TAI->getPrivateGlobalPrefix() << getFunctionNumber()
+ } else if (MAI->getSetDirective()) {
+ O << MAI->getPrivateGlobalPrefix() << getFunctionNumber()
<< '_' << uid << "_set_" << MBB->getNumber();
} else {
printBasicBlockLabel(MBB, false, false, false);
// If the arch uses custom Jump Table directives, don't calc relative to
// JT
if (!HadJTEntryDirective)
- O << '-' << TAI->getPrivateGlobalPrefix() << "JTI"
+ O << '-' << MAI->getPrivateGlobalPrefix() << "JTI"
<< getFunctionNumber() << '_' << uid;
}
}
@@ -435,7 +435,7 @@
/// do nothing and return false.
bool AsmPrinter::EmitSpecialLLVMGlobal(const GlobalVariable *GV) {
if (GV->getName() == "llvm.used") {
- if (TAI->getUsedDirective() != 0) // No need to emit this at all.
+ if (MAI->getUsedDirective() != 0) // No need to emit this at all.
EmitLLVMUsedList(GV->getInitializer());
return true;
}
@@ -468,11 +468,11 @@
return false;
}
-/// EmitLLVMUsedList - For targets that define a TAI::UsedDirective, mark each
+/// EmitLLVMUsedList - For targets that define a MAI::UsedDirective, mark each
/// global in the specified llvm.used list for which emitUsedDirectiveFor
/// is true, as being used with this directive.
void AsmPrinter::EmitLLVMUsedList(Constant *List) {
- const char *Directive = TAI->getUsedDirective();
+ const char *Directive = MAI->getUsedDirective();
// Should be an array of 'i8*'.
ConstantArray *InitList = dyn_cast<ConstantArray>(List);
@@ -513,13 +513,13 @@
const std::string &AsmPrinter::getGlobalLinkName(const GlobalVariable *GV,
std::string &LinkName) const {
if (isa<Function>(GV)) {
- LinkName += TAI->getFunctionAddrPrefix();
+ LinkName += MAI->getFunctionAddrPrefix();
LinkName += Mang->getMangledName(GV);
- LinkName += TAI->getFunctionAddrSuffix();
+ LinkName += MAI->getFunctionAddrSuffix();
} else {
- LinkName += TAI->getGlobalVarAddrPrefix();
+ LinkName += MAI->getGlobalVarAddrPrefix();
LinkName += Mang->getMangledName(GV);
- LinkName += TAI->getGlobalVarAddrSuffix();
+ LinkName += MAI->getGlobalVarAddrSuffix();
}
return LinkName;
@@ -586,8 +586,8 @@
void AsmPrinter::EOL(const std::string &Comment) const {
if (VerboseAsm && !Comment.empty()) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< ' '
<< Comment;
}
@@ -596,8 +596,8 @@
void AsmPrinter::EOL(const char* Comment) const {
if (VerboseAsm && *Comment) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< ' '
<< Comment;
}
@@ -607,11 +607,11 @@
/// EmitULEB128Bytes - Emit an assembler byte data directive to compose an
/// unsigned leb128 value.
void AsmPrinter::EmitULEB128Bytes(unsigned Value) const {
- if (TAI->hasLEB128()) {
+ if (MAI->hasLEB128()) {
O << "\t.uleb128\t"
<< Value;
} else {
- O << TAI->getData8bitsDirective();
+ O << MAI->getData8bitsDirective();
PrintULEB128(Value);
}
}
@@ -619,11 +619,11 @@
/// EmitSLEB128Bytes - print an assembler byte data directive to compose a
/// signed leb128 value.
void AsmPrinter::EmitSLEB128Bytes(int Value) const {
- if (TAI->hasLEB128()) {
+ if (MAI->hasLEB128()) {
O << "\t.sleb128\t"
<< Value;
} else {
- O << TAI->getData8bitsDirective();
+ O << MAI->getData8bitsDirective();
PrintSLEB128(Value);
}
}
@@ -631,29 +631,29 @@
/// EmitInt8 - Emit a byte directive and value.
///
void AsmPrinter::EmitInt8(int Value) const {
- O << TAI->getData8bitsDirective();
+ O << MAI->getData8bitsDirective();
PrintHex(Value & 0xFF);
}
/// EmitInt16 - Emit a short directive and value.
///
void AsmPrinter::EmitInt16(int Value) const {
- O << TAI->getData16bitsDirective();
+ O << MAI->getData16bitsDirective();
PrintHex(Value & 0xFFFF);
}
/// EmitInt32 - Emit a long directive and value.
///
void AsmPrinter::EmitInt32(int Value) const {
- O << TAI->getData32bitsDirective();
+ O << MAI->getData32bitsDirective();
PrintHex(Value);
}
/// EmitInt64 - Emit a long long directive and value.
///
void AsmPrinter::EmitInt64(uint64_t Value) const {
- if (TAI->getData64bitsDirective()) {
- O << TAI->getData64bitsDirective();
+ if (MAI->getData64bitsDirective()) {
+ O << MAI->getData64bitsDirective();
PrintHex(Value);
} else {
if (TM.getTargetData()->isBigEndian()) {
@@ -706,11 +706,11 @@
}
void AsmPrinter::EmitString(const char *String, unsigned Size) const {
- const char* AscizDirective = TAI->getAscizDirective();
+ const char* AscizDirective = MAI->getAscizDirective();
if (AscizDirective)
O << AscizDirective;
else
- O << TAI->getAsciiDirective();
+ O << MAI->getAsciiDirective();
O << '\"';
for (unsigned i = 0; i < Size; ++i)
printStringChar(O, String[i]);
@@ -756,7 +756,7 @@
unsigned FillValue = 0;
if (getCurrentSection()->getKind().isText())
- FillValue = TAI->getTextAlignFillValue();
+ FillValue = MAI->getTextAlignFillValue();
OutStreamer.EmitValueToAlignment(1 << NumBits, FillValue, 1, 0);
}
@@ -765,14 +765,14 @@
///
void AsmPrinter::EmitZeros(uint64_t NumZeros, unsigned AddrSpace) const {
if (NumZeros) {
- if (TAI->getZeroDirective()) {
- O << TAI->getZeroDirective() << NumZeros;
- if (TAI->getZeroDirectiveSuffix())
- O << TAI->getZeroDirectiveSuffix();
+ if (MAI->getZeroDirective()) {
+ O << MAI->getZeroDirective() << NumZeros;
+ if (MAI->getZeroDirectiveSuffix())
+ O << MAI->getZeroDirectiveSuffix();
O << '\n';
} else {
for (; NumZeros; --NumZeros)
- O << TAI->getData8bitsDirective(AddrSpace) << "0\n";
+ O << MAI->getData8bitsDirective(AddrSpace) << "0\n";
}
}
}
@@ -790,13 +790,13 @@
// decorating it with GlobalVarAddrPrefix/Suffix or
// FunctionAddrPrefix/Suffix (these all default to "" )
if (isa<Function>(GV)) {
- O << TAI->getFunctionAddrPrefix()
+ O << MAI->getFunctionAddrPrefix()
<< Mang->getMangledName(GV)
- << TAI->getFunctionAddrSuffix();
+ << MAI->getFunctionAddrSuffix();
} else {
- O << TAI->getGlobalVarAddrPrefix()
+ O << MAI->getGlobalVarAddrPrefix()
<< Mang->getMangledName(GV)
- << TAI->getGlobalVarAddrSuffix();
+ << MAI->getGlobalVarAddrSuffix();
}
} else if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CV)) {
const TargetData *TD = TM.getTargetData();
@@ -929,12 +929,12 @@
///
void AsmPrinter::EmitString(const ConstantArray *CVA) const {
unsigned NumElts = CVA->getNumOperands();
- if (TAI->getAscizDirective() && NumElts &&
+ if (MAI->getAscizDirective() && NumElts &&
cast<ConstantInt>(CVA->getOperand(NumElts-1))->getZExtValue() == 0) {
- O << TAI->getAscizDirective();
+ O << MAI->getAscizDirective();
printAsCString(O, CVA, NumElts-1);
} else {
- O << TAI->getAsciiDirective();
+ O << MAI->getAsciiDirective();
printAsCString(O, CVA, NumElts);
}
O << '\n';
@@ -994,40 +994,40 @@
if (CFP->getType() == Type::getDoubleTy(Context)) {
double Val = CFP->getValueAPF().convertToDouble(); // for comment only
uint64_t i = CFP->getValueAPF().bitcastToAPInt().getZExtValue();
- if (TAI->getData64bitsDirective(AddrSpace)) {
- O << TAI->getData64bitsDirective(AddrSpace) << i;
+ if (MAI->getData64bitsDirective(AddrSpace)) {
+ O << MAI->getData64bitsDirective(AddrSpace) << i;
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " double " << Val;
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " double " << Val;
}
O << '\n';
} else if (TD->isBigEndian()) {
- O << TAI->getData32bitsDirective(AddrSpace) << unsigned(i >> 32);
+ O << MAI->getData32bitsDirective(AddrSpace) << unsigned(i >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " most significant word of double " << Val;
}
O << '\n';
- O << TAI->getData32bitsDirective(AddrSpace) << unsigned(i);
+ O << MAI->getData32bitsDirective(AddrSpace) << unsigned(i);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " least significant word of double " << Val;
}
O << '\n';
} else {
- O << TAI->getData32bitsDirective(AddrSpace) << unsigned(i);
+ O << MAI->getData32bitsDirective(AddrSpace) << unsigned(i);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " least significant word of double " << Val;
}
O << '\n';
- O << TAI->getData32bitsDirective(AddrSpace) << unsigned(i >> 32);
+ O << MAI->getData32bitsDirective(AddrSpace) << unsigned(i >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " most significant word of double " << Val;
}
O << '\n';
@@ -1035,11 +1035,11 @@
return;
} else if (CFP->getType() == Type::getFloatTy(Context)) {
float Val = CFP->getValueAPF().convertToFloat(); // for comment only
- O << TAI->getData32bitsDirective(AddrSpace)
+ O << MAI->getData32bitsDirective(AddrSpace)
<< CFP->getValueAPF().bitcastToAPInt().getZExtValue();
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " float " << Val;
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " float " << Val;
}
O << '\n';
return;
@@ -1054,73 +1054,73 @@
DoubleVal.convert(APFloat::IEEEdouble, APFloat::rmNearestTiesToEven,
&ignored);
if (TD->isBigEndian()) {
- O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[1]);
+ O << MAI->getData16bitsDirective(AddrSpace) << uint16_t(p[1]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " most significant halfword of x86_fp80 ~"
<< DoubleVal.convertToDouble();
}
O << '\n';
- O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 48);
+ O << MAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 48);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " next halfword";
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " next halfword";
}
O << '\n';
- O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 32);
+ O << MAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " next halfword";
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " next halfword";
}
O << '\n';
- O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 16);
+ O << MAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 16);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " next halfword";
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " next halfword";
}
O << '\n';
- O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0]);
+ O << MAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " least significant halfword";
}
O << '\n';
} else {
- O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0]);
+ O << MAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " least significant halfword of x86_fp80 ~"
<< DoubleVal.convertToDouble();
}
O << '\n';
- O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 16);
+ O << MAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 16);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " next halfword";
}
O << '\n';
- O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 32);
+ O << MAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " next halfword";
}
O << '\n';
- O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 48);
+ O << MAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 48);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " next halfword";
}
O << '\n';
- O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[1]);
+ O << MAI->getData16bitsDirective(AddrSpace) << uint16_t(p[1]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " most significant halfword";
}
O << '\n';
@@ -1134,60 +1134,60 @@
APInt api = CFP->getValueAPF().bitcastToAPInt();
const uint64_t *p = api.getRawData();
if (TD->isBigEndian()) {
- O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0] >> 32);
+ O << MAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " most significant word of ppc_fp128";
}
O << '\n';
- O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0]);
+ O << MAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " next word";
}
O << '\n';
- O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1] >> 32);
+ O << MAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " next word";
}
O << '\n';
- O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1]);
+ O << MAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " least significant word";
}
O << '\n';
} else {
- O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1]);
+ O << MAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " least significant word of ppc_fp128";
}
O << '\n';
- O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1] >> 32);
+ O << MAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " next word";
}
O << '\n';
- O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0]);
+ O << MAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " next word";
}
O << '\n';
- O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0] >> 32);
+ O << MAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " most significant word";
}
O << '\n';
@@ -1214,35 +1214,35 @@
else
Val = RawData[i];
- if (TAI->getData64bitsDirective(AddrSpace))
- O << TAI->getData64bitsDirective(AddrSpace) << Val << '\n';
+ if (MAI->getData64bitsDirective(AddrSpace))
+ O << MAI->getData64bitsDirective(AddrSpace) << Val << '\n';
else if (TD->isBigEndian()) {
- O << TAI->getData32bitsDirective(AddrSpace) << unsigned(Val >> 32);
+ O << MAI->getData32bitsDirective(AddrSpace) << unsigned(Val >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " most significant half of i64 " << Val;
}
O << '\n';
- O << TAI->getData32bitsDirective(AddrSpace) << unsigned(Val);
+ O << MAI->getData32bitsDirective(AddrSpace) << unsigned(Val);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " least significant half of i64 " << Val;
}
O << '\n';
} else {
- O << TAI->getData32bitsDirective(AddrSpace) << unsigned(Val);
+ O << MAI->getData32bitsDirective(AddrSpace) << unsigned(Val);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " least significant half of i64 " << Val;
}
O << '\n';
- O << TAI->getData32bitsDirective(AddrSpace) << unsigned(Val >> 32);
+ O << MAI->getData32bitsDirective(AddrSpace) << unsigned(Val >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString()
<< " most significant half of i64 " << Val;
}
O << '\n';
@@ -1285,8 +1285,8 @@
if (const ConstantInt *CI = dyn_cast<ConstantInt>(CV)) {
SmallString<40> S;
CI->getValue().toStringUnsigned(S, 16);
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " 0x" << S.str();
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " 0x" << S.str();
}
}
O << '\n';
@@ -1305,10 +1305,10 @@
/// for their own strange codes.
void AsmPrinter::PrintSpecial(const MachineInstr *MI, const char *Code) const {
if (!strcmp(Code, "private")) {
- O << TAI->getPrivateGlobalPrefix();
+ O << MAI->getPrivateGlobalPrefix();
} else if (!strcmp(Code, "comment")) {
if (VerboseAsm)
- O << TAI->getCommentString();
+ O << MAI->getCommentString();
} else if (!strcmp(Code, "uid")) {
// Comparing the address of MI isn't sufficient, because machineinstrs may
// be allocated to the same address across functions.
@@ -1333,10 +1333,10 @@
/// processDebugLoc - Processes the debug information of each machine
/// instruction's DebugLoc.
void AsmPrinter::processDebugLoc(DebugLoc DL) {
- if (!TAI || !DW)
+ if (!MAI || !DW)
return;
- if (TAI->doesSupportDebugInformation() && DW->ShouldEmitDwarfDebug()) {
+ if (MAI->doesSupportDebugInformation() && DW->ShouldEmitDwarfDebug()) {
if (!DL.isUnknown()) {
DebugLocTuple CurDLT = MF->getDebugLocTuple(DL);
@@ -1368,15 +1368,15 @@
// If this asmstr is empty, just print the #APP/#NOAPP markers.
// These are useful to see where empty asm's wound up.
if (AsmStr[0] == 0) {
- O << TAI->getCommentString() << TAI->getInlineAsmStart() << "\n\t";
- O << TAI->getCommentString() << TAI->getInlineAsmEnd() << '\n';
+ O << MAI->getCommentString() << MAI->getInlineAsmStart() << "\n\t";
+ O << MAI->getCommentString() << MAI->getInlineAsmEnd() << '\n';
return;
}
- O << TAI->getCommentString() << TAI->getInlineAsmStart() << "\n\t";
+ O << MAI->getCommentString() << MAI->getInlineAsmStart() << "\n\t";
// The variant of the current asmprinter.
- int AsmPrinterVariant = TAI->getAssemblerDialect();
+ int AsmPrinterVariant = MAI->getAssemblerDialect();
int CurVariant = -1; // The number of the {.|.|.} region we are in.
const char *LastEmitted = AsmStr; // One past the last character emitted.
@@ -1544,15 +1544,15 @@
}
}
}
- O << "\n\t" << TAI->getCommentString() << TAI->getInlineAsmEnd() << '\n';
+ O << "\n\t" << MAI->getCommentString() << MAI->getInlineAsmEnd() << '\n';
}
/// printImplicitDef - This method prints the specified machine instruction
/// that is an implicit def.
void AsmPrinter::printImplicitDef(const MachineInstr *MI) const {
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " implicit-def: "
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " implicit-def: "
<< TRI->getAsmName(MI->getOperand(0).getReg()) << '\n';
}
}
@@ -1564,7 +1564,7 @@
}
void AsmPrinter::printLabel(unsigned Id) const {
- O << TAI->getPrivateGlobalPrefix() << "label" << Id << ":\n";
+ O << MAI->getPrivateGlobalPrefix() << "label" << Id << ":\n";
}
/// PrintAsmOperand - Print the specified operand of MI, an INLINEASM
@@ -1595,15 +1595,15 @@
EmitAlignment(Log2_32(Align));
}
- O << TAI->getPrivateGlobalPrefix() << "BB" << getFunctionNumber() << '_'
+ O << MAI->getPrivateGlobalPrefix() << "BB" << getFunctionNumber() << '_'
<< MBB->getNumber();
if (printColon)
O << ':';
if (printComment) {
if (const BasicBlock *BB = MBB->getBasicBlock())
if (BB->hasName()) {
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << ' ';
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << ' ';
WriteAsOperand(O, BB, /*PrintType=*/false);
}
@@ -1616,26 +1616,26 @@
/// specified MachineBasicBlock for a jumptable entry.
void AsmPrinter::printPICJumpTableSetLabel(unsigned uid,
const MachineBasicBlock *MBB) const {
- if (!TAI->getSetDirective())
+ if (!MAI->getSetDirective())
return;
- O << TAI->getSetDirective() << ' ' << TAI->getPrivateGlobalPrefix()
+ O << MAI->getSetDirective() << ' ' << MAI->getPrivateGlobalPrefix()
<< getFunctionNumber() << '_' << uid << "_set_" << MBB->getNumber() << ',';
printBasicBlockLabel(MBB, false, false, false);
- O << '-' << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber()
+ O << '-' << MAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber()
<< '_' << uid << '\n';
}
void AsmPrinter::printPICJumpTableSetLabel(unsigned uid, unsigned uid2,
const MachineBasicBlock *MBB) const {
- if (!TAI->getSetDirective())
+ if (!MAI->getSetDirective())
return;
- O << TAI->getSetDirective() << ' ' << TAI->getPrivateGlobalPrefix()
+ O << MAI->getSetDirective() << ' ' << MAI->getPrivateGlobalPrefix()
<< getFunctionNumber() << '_' << uid << '_' << uid2
<< "_set_" << MBB->getNumber() << ',';
printBasicBlockLabel(MBB, false, false, false);
- O << '-' << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber()
+ O << '-' << MAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber()
<< '_' << uid << '_' << uid2 << '\n';
}
@@ -1652,15 +1652,15 @@
case Type::IntegerTyID: {
unsigned BitWidth = cast<IntegerType>(type)->getBitWidth();
if (BitWidth <= 8)
- O << TAI->getData8bitsDirective(AddrSpace);
+ O << MAI->getData8bitsDirective(AddrSpace);
else if (BitWidth <= 16)
- O << TAI->getData16bitsDirective(AddrSpace);
+ O << MAI->getData16bitsDirective(AddrSpace);
else if (BitWidth <= 32)
- O << TAI->getData32bitsDirective(AddrSpace);
+ O << MAI->getData32bitsDirective(AddrSpace);
else if (BitWidth <= 64) {
- assert(TAI->getData64bitsDirective(AddrSpace) &&
+ assert(MAI->getData64bitsDirective(AddrSpace) &&
"Target cannot handle 64-bit constant exprs!");
- O << TAI->getData64bitsDirective(AddrSpace);
+ O << MAI->getData64bitsDirective(AddrSpace);
} else {
llvm_unreachable("Target cannot handle given data directive width!");
}
@@ -1668,15 +1668,15 @@
}
case Type::PointerTyID:
if (TD->getPointerSize() == 8) {
- assert(TAI->getData64bitsDirective(AddrSpace) &&
+ assert(MAI->getData64bitsDirective(AddrSpace) &&
"Target cannot handle 64-bit pointer exprs!");
- O << TAI->getData64bitsDirective(AddrSpace);
+ O << MAI->getData64bitsDirective(AddrSpace);
} else if (TD->getPointerSize() == 2) {
- O << TAI->getData16bitsDirective(AddrSpace);
+ O << MAI->getData16bitsDirective(AddrSpace);
} else if (TD->getPointerSize() == 1) {
- O << TAI->getData8bitsDirective(AddrSpace);
+ O << MAI->getData8bitsDirective(AddrSpace);
} else {
- O << TAI->getData32bitsDirective(AddrSpace);
+ O << MAI->getData32bitsDirective(AddrSpace);
}
break;
}
@@ -1685,10 +1685,10 @@
void AsmPrinter::printVisibility(const std::string& Name,
unsigned Visibility) const {
if (Visibility == GlobalValue::HiddenVisibility) {
- if (const char *Directive = TAI->getHiddenDirective())
+ if (const char *Directive = MAI->getHiddenDirective())
O << Directive << Name << '\n';
} else if (Visibility == GlobalValue::ProtectedVisibility) {
- if (const char *Directive = TAI->getProtectedDirective())
+ if (const char *Directive = MAI->getProtectedDirective())
O << Directive << Name << '\n';
}
}
@@ -1737,8 +1737,8 @@
DebugLocTuple DLT = MF->getDebugLocTuple(MI.getDebugLoc());
// Print source line info.
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " SrcLine ";
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " SrcLine ";
if (DLT.CompileUnit->hasInitializer()) {
Constant *Name = DLT.CompileUnit->getInitializer();
if (ConstantArray *NameString = dyn_cast<ConstantArray>(Name))
@@ -1758,8 +1758,8 @@
DebugLocTuple DLT = MF->getDebugLocTuple(MI.getDebugLoc());
// Print source line info
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " SrcLine ";
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " SrcLine ";
if (DLT.CompileUnit->hasInitializer()) {
Constant *Name = DLT.CompileUnit->getInitializer();
if (ConstantArray *NameString = dyn_cast<ConstantArray>(Name))
@@ -1792,7 +1792,7 @@
///
static void PrintChildLoopComment(formatted_raw_ostream &O,
const MachineLoop *loop,
- const MCAsmInfo *TAI,
+ const MCAsmInfo *MAI,
int FunctionNumber) {
// Add child loop information
for(MachineLoop::iterator cl = loop->begin(),
@@ -1803,14 +1803,14 @@
assert(Header && "No header for loop");
O << '\n';
- O.PadToColumn(TAI->getCommentColumn());
+ O.PadToColumn(MAI->getCommentColumn());
- O << TAI->getCommentString();
+ O << MAI->getCommentString();
Indent(O, (*cl)->getLoopDepth()-1)
<< " Child Loop BB" << FunctionNumber << "_"
<< Header->getNumber() << " Depth " << (*cl)->getLoopDepth();
- PrintChildLoopComment(O, *cl, TAI, FunctionNumber);
+ PrintChildLoopComment(O, *cl, MAI, FunctionNumber);
}
}
@@ -1824,28 +1824,28 @@
if (loop) {
// Print a newline after bb# annotation.
O << "\n";
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " Loop Depth " << loop->getLoopDepth()
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " Loop Depth " << loop->getLoopDepth()
<< '\n';
- O.PadToColumn(TAI->getCommentColumn());
+ O.PadToColumn(MAI->getCommentColumn());
MachineBasicBlock *Header = loop->getHeader();
assert(Header && "No header for loop");
if (Header == &MBB) {
- O << TAI->getCommentString() << " Loop Header";
- PrintChildLoopComment(O, loop, TAI, getFunctionNumber());
+ O << MAI->getCommentString() << " Loop Header";
+ PrintChildLoopComment(O, loop, MAI, getFunctionNumber());
}
else {
- O << TAI->getCommentString() << " Loop Header is BB"
+ O << MAI->getCommentString() << " Loop Header is BB"
<< getFunctionNumber() << "_" << loop->getHeader()->getNumber();
}
if (loop->empty()) {
O << '\n';
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString() << " Inner Loop";
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString() << " Inner Loop";
}
// Add parent loop information
@@ -1856,8 +1856,8 @@
assert(Header && "No header for loop");
O << '\n';
- O.PadToColumn(TAI->getCommentColumn());
- O << TAI->getCommentString();
+ O.PadToColumn(MAI->getCommentColumn());
+ O << MAI->getCommentString();
Indent(O, CurLoop->getLoopDepth()-1)
<< " Inside Loop BB" << getFunctionNumber() << "_"
<< Header->getNumber() << " Depth " << CurLoop->getLoopDepth();
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index ca7ea6b..3582810 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -1334,7 +1334,7 @@
// Print out .file directives to specify files for .loc directives. These are
// printed out early so that they precede any .loc directives.
- if (TAI->hasDotLocAndDotFile()) {
+ if (MAI->hasDotLocAndDotFile()) {
for (unsigned i = 1, e = getNumSourceIds()+1; i != e; ++i) {
// Remember source id starts at 1.
std::pair<unsigned, unsigned> Id = getSourceDirectoryAndFileIds(i);
@@ -1654,7 +1654,7 @@
unsigned Line, unsigned Col) {
unsigned LabelID = MMI->NextLabelID();
- if (!TAI->doesDwarfUsesInlineInfoSection())
+ if (!MAI->doesDwarfUsesInlineInfoSection())
return LabelID;
if (TimePassesIsEnabled)
@@ -1732,7 +1732,7 @@
/// RecordInlinedFnEnd - Indicate the end of inlined subroutine.
unsigned DwarfDebug::RecordInlinedFnEnd(DISubprogram &SP) {
- if (!TAI->doesDwarfUsesInlineInfoSection())
+ if (!MAI->doesDwarfUsesInlineInfoSection())
return 0;
if (TimePassesIsEnabled)
@@ -1844,7 +1844,7 @@
const TargetLoweringObjectFile &TLOF = Asm->getObjFileLowering();
// Dwarf sections base addresses.
- if (TAI->doesDwarfRequireFrameSection()) {
+ if (MAI->doesDwarfRequireFrameSection()) {
Asm->OutStreamer.SwitchSection(TLOF.getDwarfFrameSection());
EmitLabel("section_debug_frame", 0);
}
@@ -2037,7 +2037,7 @@
void DwarfDebug::EmitDebugLines() {
// If the target is using .loc/.file, the assembler will be emitting the
// .debug_line table automatically.
- if (TAI->hasDotLocAndDotFile())
+ if (MAI->hasDotLocAndDotFile())
return;
// Minimum line delta, thus ranging from -10..(255-10).
@@ -2116,7 +2116,7 @@
/*if (Asm->isVerbose()) {
const MCSection *S = SectionMap[j + 1];
- O << '\t' << TAI->getCommentString() << " Section"
+ O << '\t' << MAI->getCommentString() << " Section"
<< S->getName() << '\n';
}*/
Asm->EOL();
@@ -2136,7 +2136,7 @@
else {
std::pair<unsigned, unsigned> SourceID =
getSourceDirectoryAndFileIds(LineInfo.getSourceID());
- O << '\t' << TAI->getCommentString() << ' '
+ O << '\t' << MAI->getCommentString() << ' '
<< getSourceDirectoryName(SourceID.first) << ' '
<< getSourceFileName(SourceID.second)
<<" :" << utostr_32(LineInfo.getLine()) << '\n';
@@ -2197,7 +2197,7 @@
/// EmitCommonDebugFrame - Emit common frame info into a debug frame section.
///
void DwarfDebug::EmitCommonDebugFrame() {
- if (!TAI->doesDwarfRequireFrameSection())
+ if (!MAI->doesDwarfRequireFrameSection())
return;
int stackGrowth =
@@ -2243,7 +2243,7 @@
/// section.
void
DwarfDebug::EmitFunctionDebugFrame(const FunctionDebugFrameInfo&DebugFrameInfo){
- if (!TAI->doesDwarfRequireFrameSection())
+ if (!MAI->doesDwarfRequireFrameSection())
return;
// Start the dwarf frame section.
@@ -2427,7 +2427,7 @@
/// __debug_info section, and the low_pc is the starting address for the
/// inlining instance.
void DwarfDebug::EmitDebugInlineInfo() {
- if (!TAI->doesDwarfUsesInlineInfoSection())
+ if (!MAI->doesDwarfUsesInlineInfoSection())
return;
if (!ModuleCU)
@@ -2479,9 +2479,9 @@
Asm->EmitInt32(SP->getOffset()); Asm->EOL("DIE offset");
if (TD->getPointerSize() == sizeof(int32_t))
- O << TAI->getData32bitsDirective();
+ O << MAI->getData32bitsDirective();
else
- O << TAI->getData64bitsDirective();
+ O << MAI->getData64bitsDirective();
PrintLabelName("label", *LI); Asm->EOL("low_pc");
}
diff --git a/lib/CodeGen/AsmPrinter/DwarfException.cpp b/lib/CodeGen/AsmPrinter/DwarfException.cpp
index cc575f5..c44e7b6 100644
--- a/lib/CodeGen/AsmPrinter/DwarfException.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfException.cpp
@@ -60,8 +60,8 @@
// Begin eh frame section.
Asm->OutStreamer.SwitchSection(Asm->getObjFileLowering().getEHFrameSection());
- if (TAI->is_EHSymbolPrivate())
- O << TAI->getPrivateGlobalPrefix();
+ if (MAI->is_EHSymbolPrivate())
+ O << MAI->getPrivateGlobalPrefix();
O << "EH_frame" << Index << ":\n";
EmitLabel("section_eh_frame", Index);
@@ -99,7 +99,7 @@
Asm->EmitULEB128Bytes(7);
Asm->EOL("Augmentation Size");
- if (TAI->getNeedsIndirectEncoding()) {
+ if (MAI->getNeedsIndirectEncoding()) {
Asm->EmitInt8(dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4 |
dwarf::DW_EH_PE_indirect);
Asm->EOL("Personality (pcrel sdata4 indirect)");
@@ -109,11 +109,11 @@
}
PrintRelDirective(true);
- O << TAI->getPersonalityPrefix();
+ O << MAI->getPersonalityPrefix();
Asm->EmitExternalGlobal((const GlobalVariable *)(Personality));
- O << TAI->getPersonalitySuffix();
- if (strcmp(TAI->getPersonalitySuffix(), "+4@GOTPCREL"))
- O << "-" << TAI->getPCSymbol();
+ O << MAI->getPersonalitySuffix();
+ if (strcmp(MAI->getPersonalitySuffix(), "+4@GOTPCREL"))
+ O << "-" << MAI->getPCSymbol();
Asm->EOL("Personality");
Asm->EmitInt8(dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4);
@@ -157,12 +157,12 @@
// Externally visible entry into the functions eh frame info. If the
// corresponding function is static, this should not be externally visible.
if (!TheFunc->hasLocalLinkage())
- if (const char *GlobalEHDirective = TAI->getGlobalEHDirective())
+ if (const char *GlobalEHDirective = MAI->getGlobalEHDirective())
O << GlobalEHDirective << EHFrameInfo.FnName << "\n";
// If corresponding function is weak definition, this should be too.
- if (TheFunc->isWeakForLinker() && TAI->getWeakDefDirective())
- O << TAI->getWeakDefDirective() << EHFrameInfo.FnName << "\n";
+ if (TheFunc->isWeakForLinker() && MAI->getWeakDefDirective())
+ O << MAI->getWeakDefDirective() << EHFrameInfo.FnName << "\n";
// If there are no calls then you can't unwind. This may mean we can omit the
// EH Frame, but some environments do not handle weak absolute symbols. If
@@ -170,13 +170,13 @@
// info is to be available for non-EH uses.
if (!EHFrameInfo.hasCalls && !UnwindTablesMandatory &&
(!TheFunc->isWeakForLinker() ||
- !TAI->getWeakDefDirective() ||
- TAI->getSupportsWeakOmittedEHFrame())) {
+ !MAI->getWeakDefDirective() ||
+ MAI->getSupportsWeakOmittedEHFrame())) {
O << EHFrameInfo.FnName << " = 0\n";
// This name has no connection to the function, so it might get
// dead-stripped when the function is not, erroneously. Prohibit
// dead-stripping unconditionally.
- if (const char *UsedDirective = TAI->getUsedDirective())
+ if (const char *UsedDirective = MAI->getUsedDirective())
O << UsedDirective << EHFrameInfo.FnName << "\n\n";
} else {
O << EHFrameInfo.FnName << ":\n";
@@ -233,7 +233,7 @@
// on unused functions (calling undefined externals) being dead-stripped to
// link correctly. Yes, there really is.
if (MMI->isUsedFunction(EHFrameInfo.function))
- if (const char *UsedDirective = TAI->getUsedDirective())
+ if (const char *UsedDirective = MAI->getUsedDirective())
O << UsedDirective << EHFrameInfo.FnName << "\n\n";
}
}
@@ -430,7 +430,7 @@
// create a call-site entry with no landing pad for the region between the
// try-ranges.
if (SawPotentiallyThrowing &&
- TAI->getExceptionHandlingType() == ExceptionHandling::Dwarf) {
+ MAI->getExceptionHandlingType() == ExceptionHandling::Dwarf) {
CallSiteEntry Site = { LastLabel, BeginLabel, 0, 0 };
CallSites.push_back(Site);
PreviousIsInvoke = false;
@@ -472,7 +472,7 @@
// function may throw, create a call-site entry with no landing pad for the
// region following the try-range.
if (SawPotentiallyThrowing &&
- TAI->getExceptionHandlingType() == ExceptionHandling::Dwarf) {
+ MAI->getExceptionHandlingType() == ExceptionHandling::Dwarf) {
CallSiteEntry Site = { LastLabel, 0, 0, 0 };
CallSites.push_back(Site);
}
@@ -546,18 +546,18 @@
const unsigned LandingPadSize = sizeof(int32_t); // DW_EH_PE_udata4
unsigned SizeSites;
- bool HaveTTData = (TAI->getExceptionHandlingType() == ExceptionHandling::SjLj)
+ bool HaveTTData = (MAI->getExceptionHandlingType() == ExceptionHandling::SjLj)
? (!TypeInfos.empty() || !FilterIds.empty()) : true;
- if (TAI->getExceptionHandlingType() == ExceptionHandling::SjLj) {
+ if (MAI->getExceptionHandlingType() == ExceptionHandling::SjLj) {
SizeSites = 0;
} else
SizeSites = CallSites.size() *
(SiteStartSize + SiteLengthSize + LandingPadSize);
for (unsigned i = 0, e = CallSites.size(); i < e; ++i) {
SizeSites += MCAsmInfo::getULEB128Size(CallSites[i].Action);
- if (TAI->getExceptionHandlingType() == ExceptionHandling::SjLj)
+ if (MAI->getExceptionHandlingType() == ExceptionHandling::SjLj)
SizeSites += MCAsmInfo::getULEB128Size(i);
}
// Type infos.
@@ -588,7 +588,7 @@
}
EmitLabel("exception", SubprogramCount);
- if (TAI->getExceptionHandlingType() == ExceptionHandling::SjLj) {
+ if (MAI->getExceptionHandlingType() == ExceptionHandling::SjLj) {
std::string SjLjName = "_lsda_";
SjLjName += MF->getFunction()->getName().str();
EmitLabel(SjLjName.c_str(), 0);
@@ -657,7 +657,7 @@
#endif
// SjLj Exception handilng
- if (TAI->getExceptionHandlingType() == ExceptionHandling::SjLj) {
+ if (MAI->getExceptionHandlingType() == ExceptionHandling::SjLj) {
Asm->EmitInt8(dwarf::DW_EH_PE_udata4);
Asm->EOL("Call site format (DW_EH_PE_udata4)");
Asm->EmitULEB128Bytes(SizeSites);
@@ -682,7 +682,7 @@
}
} else {
// DWARF Exception handling
- assert(TAI->getExceptionHandlingType() == ExceptionHandling::Dwarf);
+ assert(MAI->getExceptionHandlingType() == ExceptionHandling::Dwarf);
// The call-site table is a list of all call sites that may throw an
// exception (including C++ 'throw' statements) in the procedure
@@ -836,7 +836,7 @@
/// EndModule - Emit all exception information that should come after the
/// content.
void DwarfException::EndModule() {
- if (TAI->getExceptionHandlingType() != ExceptionHandling::Dwarf)
+ if (MAI->getExceptionHandlingType() != ExceptionHandling::Dwarf)
return;
if (TimePassesIsEnabled)
ExceptionTimer->startTimer();
@@ -864,7 +864,7 @@
this->MF = MF;
shouldEmitTable = shouldEmitMoves = false;
- if (MMI && TAI->doesSupportExceptionHandling()) {
+ if (MMI && MAI->doesSupportExceptionHandling()) {
// Map all labels and get rid of any dead landing pads.
MMI->TidyLandingPads();
diff --git a/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp b/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp
index 1c72f5a..857f995 100644
--- a/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp
@@ -28,28 +28,28 @@
Dwarf::Dwarf(raw_ostream &OS, AsmPrinter *A, const MCAsmInfo *T,
const char *flavor)
-: O(OS), Asm(A), TAI(T), TD(Asm->TM.getTargetData()),
+: O(OS), Asm(A), MAI(T), TD(Asm->TM.getTargetData()),
RI(Asm->TM.getRegisterInfo()), M(NULL), MF(NULL), MMI(NULL),
SubprogramCount(0), Flavor(flavor), SetCounter(1) {}
void Dwarf::PrintRelDirective(bool Force32Bit, bool isInSection) const {
- if (isInSection && TAI->getDwarfSectionOffsetDirective())
- O << TAI->getDwarfSectionOffsetDirective();
+ if (isInSection && MAI->getDwarfSectionOffsetDirective())
+ O << MAI->getDwarfSectionOffsetDirective();
else if (Force32Bit || TD->getPointerSize() == sizeof(int32_t))
- O << TAI->getData32bitsDirective();
+ O << MAI->getData32bitsDirective();
else
- O << TAI->getData64bitsDirective();
+ O << MAI->getData64bitsDirective();
}
/// PrintLabelName - Print label name in form used by Dwarf writer.
///
void Dwarf::PrintLabelName(const char *Tag, unsigned Number) const {
- O << TAI->getPrivateGlobalPrefix() << Tag;
+ O << MAI->getPrivateGlobalPrefix() << Tag;
if (Number) O << Number;
}
void Dwarf::PrintLabelName(const char *Tag, unsigned Number,
const char *Suffix) const {
- O << TAI->getPrivateGlobalPrefix() << Tag;
+ O << MAI->getPrivateGlobalPrefix() << Tag;
if (Number) O << Number;
O << Suffix;
}
@@ -67,13 +67,13 @@
bool IsPCRelative, bool Force32Bit) const {
PrintRelDirective(Force32Bit);
PrintLabelName(Tag, Number);
- if (IsPCRelative) O << "-" << TAI->getPCSymbol();
+ if (IsPCRelative) O << "-" << MAI->getPCSymbol();
}
void Dwarf::EmitReference(const std::string &Name, bool IsPCRelative,
bool Force32Bit) const {
PrintRelDirective(Force32Bit);
O << Name;
- if (IsPCRelative) O << "-" << TAI->getPCSymbol();
+ if (IsPCRelative) O << "-" << MAI->getPCSymbol();
}
/// EmitDifference - Emit the difference between two labels. Some assemblers do
@@ -82,7 +82,7 @@
void Dwarf::EmitDifference(const char *TagHi, unsigned NumberHi,
const char *TagLo, unsigned NumberLo,
bool IsSmall) {
- if (TAI->needsSet()) {
+ if (MAI->needsSet()) {
O << "\t.set\t";
PrintLabelName("set", SetCounter, Flavor);
O << ",";
@@ -108,11 +108,11 @@
bool useSet) {
bool printAbsolute = false;
if (isEH)
- printAbsolute = TAI->isAbsoluteEHSectionOffsets();
+ printAbsolute = MAI->isAbsoluteEHSectionOffsets();
else
- printAbsolute = TAI->isAbsoluteDebugSectionOffsets();
+ printAbsolute = MAI->isAbsoluteDebugSectionOffsets();
- if (TAI->needsSet() && useSet) {
+ if (MAI->needsSet() && useSet) {
O << "\t.set\t";
PrintLabelName("set", SetCounter, Flavor);
O << ",";
diff --git a/lib/CodeGen/AsmPrinter/DwarfPrinter.h b/lib/CodeGen/AsmPrinter/DwarfPrinter.h
index 490544b..33ebb3b 100644
--- a/lib/CodeGen/AsmPrinter/DwarfPrinter.h
+++ b/lib/CodeGen/AsmPrinter/DwarfPrinter.h
@@ -43,9 +43,9 @@
///
AsmPrinter *Asm;
- /// TAI - Target asm information.
+ /// MAI - Target asm information.
///
- const MCAsmInfo *TAI;
+ const MCAsmInfo *MAI;
/// TD - Target data.
///
@@ -88,7 +88,7 @@
//
const AsmPrinter *getAsm() const { return Asm; }
MachineModuleInfo *getMMI() const { return MMI; }
- const MCAsmInfo *getMCAsmInfo() const { return TAI; }
+ const MCAsmInfo *getMCAsmInfo() const { return MAI; }
const TargetData *getTargetData() const { return TD; }
void PrintRelDirective(bool Force32Bit = false,
diff --git a/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp b/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
index fac3db2..06b92b7 100644
--- a/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
@@ -30,10 +30,10 @@
class VISIBILITY_HIDDEN OcamlGCMetadataPrinter : public GCMetadataPrinter {
public:
void beginAssembly(raw_ostream &OS, AsmPrinter &AP,
- const MCAsmInfo &TAI);
+ const MCAsmInfo &MAI);
void finishAssembly(raw_ostream &OS, AsmPrinter &AP,
- const MCAsmInfo &TAI);
+ const MCAsmInfo &MAI);
};
}
@@ -44,11 +44,11 @@
void llvm::linkOcamlGCPrinter() { }
static void EmitCamlGlobal(const Module &M, raw_ostream &OS, AsmPrinter &AP,
- const MCAsmInfo &TAI, const char *Id) {
+ const MCAsmInfo &MAI, const char *Id) {
const std::string &MId = M.getModuleIdentifier();
std::string Mangled;
- Mangled += TAI.getGlobalPrefix();
+ Mangled += MAI.getGlobalPrefix();
Mangled += "caml";
size_t Letter = Mangled.size();
Mangled.append(MId.begin(), std::find(MId.begin(), MId.end(), '.'));
@@ -58,18 +58,18 @@
// Capitalize the first letter of the module name.
Mangled[Letter] = toupper(Mangled[Letter]);
- if (const char *GlobalDirective = TAI.getGlobalDirective())
+ if (const char *GlobalDirective = MAI.getGlobalDirective())
OS << GlobalDirective << Mangled << "\n";
OS << Mangled << ":\n";
}
void OcamlGCMetadataPrinter::beginAssembly(raw_ostream &OS, AsmPrinter &AP,
- const MCAsmInfo &TAI) {
+ const MCAsmInfo &MAI) {
AP.OutStreamer.SwitchSection(AP.getObjFileLowering().getTextSection());
- EmitCamlGlobal(getModule(), OS, AP, TAI, "code_begin");
+ EmitCamlGlobal(getModule(), OS, AP, MAI, "code_begin");
AP.OutStreamer.SwitchSection(AP.getObjFileLowering().getDataSection());
- EmitCamlGlobal(getModule(), OS, AP, TAI, "data_begin");
+ EmitCamlGlobal(getModule(), OS, AP, MAI, "data_begin");
}
/// emitAssembly - Print the frametable. The ocaml frametable format is thus:
@@ -89,28 +89,28 @@
/// either condition is detected in a function which uses the GC.
///
void OcamlGCMetadataPrinter::finishAssembly(raw_ostream &OS, AsmPrinter &AP,
- const MCAsmInfo &TAI) {
+ const MCAsmInfo &MAI) {
const char *AddressDirective;
int AddressAlignLog;
if (AP.TM.getTargetData()->getPointerSize() == sizeof(int32_t)) {
- AddressDirective = TAI.getData32bitsDirective();
+ AddressDirective = MAI.getData32bitsDirective();
AddressAlignLog = 2;
} else {
- AddressDirective = TAI.getData64bitsDirective();
+ AddressDirective = MAI.getData64bitsDirective();
AddressAlignLog = 3;
}
AP.OutStreamer.SwitchSection(AP.getObjFileLowering().getTextSection());
- EmitCamlGlobal(getModule(), OS, AP, TAI, "code_end");
+ EmitCamlGlobal(getModule(), OS, AP, MAI, "code_end");
AP.OutStreamer.SwitchSection(AP.getObjFileLowering().getDataSection());
- EmitCamlGlobal(getModule(), OS, AP, TAI, "data_end");
+ EmitCamlGlobal(getModule(), OS, AP, MAI, "data_end");
OS << AddressDirective << 0; // FIXME: Why does ocaml emit this??
AP.EOL();
AP.OutStreamer.SwitchSection(AP.getObjFileLowering().getDataSection());
- EmitCamlGlobal(getModule(), OS, AP, TAI, "frametable");
+ EmitCamlGlobal(getModule(), OS, AP, MAI, "frametable");
for (iterator I = begin(), IE = end(); I != IE; ++I) {
GCFunctionInfo &FI = **I;
@@ -126,7 +126,7 @@
llvm_report_error(Msg.str()); // Very rude!
}
- OS << "\t" << TAI.getCommentString() << " live roots for "
+ OS << "\t" << MAI.getCommentString() << " live roots for "
<< FI.getFunction().getName() << "\n";
for (GCFunctionInfo::iterator J = FI.begin(), JE = FI.end(); J != JE; ++J) {
@@ -141,7 +141,7 @@
}
OS << AddressDirective
- << TAI.getPrivateGlobalPrefix() << "label" << J->Num;
+ << MAI.getPrivateGlobalPrefix() << "label" << J->Num;
AP.EOL("call return address");
AP.EmitInt16(FrameSize);
diff --git a/lib/CodeGen/ELFWriter.cpp b/lib/CodeGen/ELFWriter.cpp
index f2b45cd..b1842ff 100644
--- a/lib/CodeGen/ELFWriter.cpp
+++ b/lib/CodeGen/ELFWriter.cpp
@@ -80,7 +80,7 @@
isLittleEndian(TM.getTargetData()->isLittleEndian()),
ElfHdr(isLittleEndian, is64Bit) {
- TAI = TM.getMCAsmInfo();
+ MAI = TM.getMCAsmInfo();
TEW = TM.getELFWriterInfo();
// Create the object code emitter object for this target.
@@ -687,7 +687,7 @@
SymbolList.push_back(ELFSym::getExtSym(*I));
// Emit non-executable stack note
- if (TAI->getNonexecutableStackDirective())
+ if (MAI->getNonexecutableStackDirective())
getNonExecStackSection();
// Emit a symbol for each section created until now, skip null section
diff --git a/lib/CodeGen/ELFWriter.h b/lib/CodeGen/ELFWriter.h
index 1e43892..e44ab3f 100644
--- a/lib/CodeGen/ELFWriter.h
+++ b/lib/CodeGen/ELFWriter.h
@@ -86,9 +86,9 @@
/// and other object file specific stuff
const TargetLoweringObjectFile &TLOF;
- /// TAI - Target Asm Info, provide information about section names for
+ /// MAI - Target Asm Info, provide information about section names for
/// globals and other target specific stuff.
- const MCAsmInfo *TAI;
+ const MCAsmInfo *MAI;
//===------------------------------------------------------------------===//
// Properties inferred automatically from the target machine.
@@ -118,7 +118,7 @@
unsigned NumSections; // Always = SectionList.size()
/// SectionLookup - This is a mapping from section name to section number in
- /// the SectionList. Used to quickly gather the Section Index from TAI names
+ /// the SectionList. Used to quickly gather the Section Index from MAI names
std::map<std::string, ELFSection*> SectionLookup;
/// PendingGlobals - Globals not processed as symbols yet.
diff --git a/lib/CodeGen/GCMetadataPrinter.cpp b/lib/CodeGen/GCMetadataPrinter.cpp
index d1e43d8..9cd2925 100644
--- a/lib/CodeGen/GCMetadataPrinter.cpp
+++ b/lib/CodeGen/GCMetadataPrinter.cpp
@@ -20,11 +20,11 @@
GCMetadataPrinter::~GCMetadataPrinter() { }
void GCMetadataPrinter::beginAssembly(raw_ostream &OS, AsmPrinter &AP,
- const MCAsmInfo &TAI) {
+ const MCAsmInfo &MAI) {
// Default is no action.
}
void GCMetadataPrinter::finishAssembly(raw_ostream &OS, AsmPrinter &AP,
- const MCAsmInfo &TAI) {
+ const MCAsmInfo &MAI) {
// Default is no action.
}
diff --git a/lib/CodeGen/MachO.h b/lib/CodeGen/MachO.h
index cf8bbbf..f2b40fe 100644
--- a/lib/CodeGen/MachO.h
+++ b/lib/CodeGen/MachO.h
@@ -68,7 +68,7 @@
};
MachOSym(const GlobalValue *gv, std::string name, uint8_t sect,
- const MCAsmInfo *TAI);
+ const MCAsmInfo *MAI);
struct SymCmp {
// FIXME: this does not appear to be sorting 'f' after 'F'
diff --git a/lib/CodeGen/MachOCodeEmitter.cpp b/lib/CodeGen/MachOCodeEmitter.cpp
index f87d1eb..1318477 100644
--- a/lib/CodeGen/MachOCodeEmitter.cpp
+++ b/lib/CodeGen/MachOCodeEmitter.cpp
@@ -35,7 +35,7 @@
ObjectCodeEmitter(&mos), MOW(mow), TM(MOW.TM) {
is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;
isLittleEndian = TM.getTargetData()->isLittleEndian();
- TAI = TM.getMCAsmInfo();
+ MAI = TM.getMCAsmInfo();
}
/// startFunction - This callback is invoked when a new machine function is
@@ -61,7 +61,7 @@
// Create symbol for function entry
const GlobalValue *FuncV = MF.getFunction();
- MachOSym FnSym(FuncV, MOW.Mang->getMangledName(FuncV), MOS->Index, TAI);
+ MachOSym FnSym(FuncV, MOW.Mang->getMangledName(FuncV), MOS->Index, MAI);
FnSym.n_value = getCurrentPCOffset();
// add it to the symtab.
diff --git a/lib/CodeGen/MachOCodeEmitter.h b/lib/CodeGen/MachOCodeEmitter.h
index 0e1a0ec..4752446 100644
--- a/lib/CodeGen/MachOCodeEmitter.h
+++ b/lib/CodeGen/MachOCodeEmitter.h
@@ -30,7 +30,7 @@
/// machine directly, indicating what header values and flags to set.
bool is64Bit, isLittleEndian;
- const MCAsmInfo *TAI;
+ const MCAsmInfo *MAI;
/// Relocations - These are the relocations that the function needs, as
/// emitted.
diff --git a/lib/CodeGen/MachOWriter.cpp b/lib/CodeGen/MachOWriter.cpp
index 6b7441e..1a7734f 100644
--- a/lib/CodeGen/MachOWriter.cpp
+++ b/lib/CodeGen/MachOWriter.cpp
@@ -61,7 +61,7 @@
is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;
isLittleEndian = TM.getTargetData()->isLittleEndian();
- TAI = TM.getMCAsmInfo();
+ MAI = TM.getMCAsmInfo();
// Create the machine code emitter object for this target.
MachOCE = new MachOCodeEmitter(*this, *getTextSection(true));
@@ -221,7 +221,7 @@
}
// Globals without external linkage apparently do not go in the symbol table.
if (!GV->hasLocalLinkage()) {
- MachOSym Sym(GV, Mang->getMangledName(GV), Sec->Index, TAI);
+ MachOSym Sym(GV, Mang->getMangledName(GV), Sec->Index, MAI);
Sym.n_value = Sec->size();
SymbolTable.push_back(Sym);
}
@@ -256,7 +256,7 @@
if (NoInit || GV->hasLinkOnceLinkage() || GV->hasWeakLinkage() ||
GV->hasCommonLinkage()) {
MachOSym ExtOrCommonSym(GV, Mang->getMangledName(GV),
- MachOSym::NO_SECT, TAI);
+ MachOSym::NO_SECT, MAI);
// For undefined (N_UNDF) external (N_EXT) types, n_value is the size in
// bytes of the symbol.
ExtOrCommonSym.n_value = Size;
@@ -454,7 +454,7 @@
for (std::vector<GlobalValue*>::iterator I = PendingGlobals.begin(),
E = PendingGlobals.end(); I != E; ++I) {
if (GVOffset[*I] == 0 && GVSection[*I] == 0) {
- MachOSym UndfSym(*I, Mang->getMangledName(*I), MachOSym::NO_SECT, TAI);
+ MachOSym UndfSym(*I, Mang->getMangledName(*I), MachOSym::NO_SECT, MAI);
SymbolTable.push_back(UndfSym);
GVOffset[*I] = -1;
}
@@ -743,7 +743,7 @@
//===----------------------------------------------------------------------===//
MachOSym::MachOSym(const GlobalValue *gv, std::string name, uint8_t sect,
- const MCAsmInfo *TAI) :
+ const MCAsmInfo *MAI) :
GV(gv), n_strx(0), n_type(sect == NO_SECT ? N_UNDF : N_SECT), n_sect(sect),
n_desc(0), n_value(0) {
@@ -759,17 +759,17 @@
case GlobalValue::CommonLinkage:
assert(!isa<Function>(gv) && "Unexpected linkage type for Function!");
case GlobalValue::ExternalLinkage:
- GVName = TAI->getGlobalPrefix() + name;
+ GVName = MAI->getGlobalPrefix() + name;
n_type |= GV->hasHiddenVisibility() ? N_PEXT : N_EXT;
break;
case GlobalValue::PrivateLinkage:
- GVName = TAI->getPrivateGlobalPrefix() + name;
+ GVName = MAI->getPrivateGlobalPrefix() + name;
break;
case GlobalValue::LinkerPrivateLinkage:
- GVName = TAI->getLinkerPrivateGlobalPrefix() + name;
+ GVName = MAI->getLinkerPrivateGlobalPrefix() + name;
break;
case GlobalValue::InternalLinkage:
- GVName = TAI->getGlobalPrefix() + name;
+ GVName = MAI->getGlobalPrefix() + name;
break;
}
}
diff --git a/lib/CodeGen/MachOWriter.h b/lib/CodeGen/MachOWriter.h
index 0d6f132..9273f38 100644
--- a/lib/CodeGen/MachOWriter.h
+++ b/lib/CodeGen/MachOWriter.h
@@ -78,7 +78,7 @@
bool is64Bit, isLittleEndian;
// Target Asm Info
- const MCAsmInfo *TAI;
+ const MCAsmInfo *MAI;
/// Header - An instance of MachOHeader that we will update while we build
/// the file, and then emit during finalization.