[llvm] r184491 - [PowerPC] Clean up VK_PPC_TOC... names
Ulrich Weigand
ulrich.weigand at de.ibm.com
Thu Jun 20 15:39:42 PDT 2013
Author: uweigand
Date: Thu Jun 20 17:39:42 2013
New Revision: 184491
URL: http://llvm.org/viewvc/llvm-project?rev=184491&view=rev
Log:
[PowerPC] Clean up VK_PPC_TOC... names
This is another minor cleanup; to bring enum names in line
with the corresponding @modifier names, this renames:
VK_PPC_TOC -> VK_PPC_TOCBASE
VK_PPC_TOC_ENTRY -> VK_PPC_TOC16
No code change intended.
Modified:
llvm/trunk/include/llvm/MC/MCExpr.h
llvm/trunk/lib/MC/MCExpr.cpp
llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
Modified: llvm/trunk/include/llvm/MC/MCExpr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCExpr.h?rev=184491&r1=184490&r2=184491&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExpr.h (original)
+++ llvm/trunk/include/llvm/MC/MCExpr.h Thu Jun 20 17:39:42 2013
@@ -171,16 +171,16 @@ public:
VK_ARM_TARGET2,
VK_ARM_PREL31,
- VK_PPC_TOC, // TOC base
- VK_PPC_TOC_ENTRY, // TOC entry
- VK_PPC_ADDR16_HA, // symbol at ha
- VK_PPC_ADDR16_LO, // symbol at l
- VK_PPC_TPREL16_HA, // symbol at tprel@ha
- VK_PPC_TPREL16_LO, // symbol at tprel@l
- VK_PPC_DTPREL16_HA, // symbol at dtprel@ha
- VK_PPC_DTPREL16_LO, // symbol at dtprel@l
- VK_PPC_TOC16_HA, // symbol at toc@ha
- VK_PPC_TOC16_LO, // symbol at toc@l
+ VK_PPC_ADDR16_HA, // symbol at ha
+ VK_PPC_ADDR16_LO, // symbol at l
+ VK_PPC_TOCBASE, // symbol at tocbase
+ VK_PPC_TOC16, // symbol at toc
+ VK_PPC_TOC16_HA, // symbol at toc@ha
+ VK_PPC_TOC16_LO, // symbol at toc@l
+ VK_PPC_TPREL16_HA, // symbol at tprel@ha
+ VK_PPC_TPREL16_LO, // symbol at tprel@l
+ VK_PPC_DTPREL16_HA, // symbol at dtprel@ha
+ VK_PPC_DTPREL16_LO, // symbol at dtprel@l
VK_PPC_GOT_TPREL16_HA, // symbol at got@tprel at ha
VK_PPC_GOT_TPREL16_LO, // symbol at got@tprel at l
VK_PPC_TLS, // symbol at tls
Modified: llvm/trunk/lib/MC/MCExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCExpr.cpp?rev=184491&r1=184490&r2=184491&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCExpr.cpp (original)
+++ llvm/trunk/lib/MC/MCExpr.cpp Thu Jun 20 17:39:42 2013
@@ -196,16 +196,16 @@ StringRef MCSymbolRefExpr::getVariantKin
case VK_ARM_TARGET1: return "(target1)";
case VK_ARM_TARGET2: return "(target2)";
case VK_ARM_PREL31: return "(prel31)";
- case VK_PPC_TOC: return "tocbase";
- case VK_PPC_TOC_ENTRY: return "toc";
case VK_PPC_ADDR16_HA: return "ha";
case VK_PPC_ADDR16_LO: return "l";
+ case VK_PPC_TOCBASE: return "tocbase";
+ case VK_PPC_TOC16: return "toc";
+ case VK_PPC_TOC16_HA: return "toc at ha";
+ case VK_PPC_TOC16_LO: return "toc at l";
case VK_PPC_TPREL16_HA: return "tprel at ha";
case VK_PPC_TPREL16_LO: return "tprel at l";
case VK_PPC_DTPREL16_HA: return "dtprel at ha";
case VK_PPC_DTPREL16_LO: return "dtprel at l";
- case VK_PPC_TOC16_HA: return "toc at ha";
- case VK_PPC_TOC16_LO: return "toc at l";
case VK_PPC_GOT_TPREL16_HA: return "got at tprel@ha";
case VK_PPC_GOT_TPREL16_LO: return "got at tprel@l";
case VK_PPC_TLS: return "tls";
@@ -283,10 +283,10 @@ MCSymbolRefExpr::getVariantKindForName(S
.Case("ha", VK_PPC_ADDR16_HA)
.Case("L", VK_PPC_ADDR16_LO)
.Case("l", VK_PPC_ADDR16_LO)
- .Case("TOCBASE", VK_PPC_TOC)
- .Case("tocbase", VK_PPC_TOC)
- .Case("TOC", VK_PPC_TOC_ENTRY)
- .Case("toc", VK_PPC_TOC_ENTRY)
+ .Case("TOCBASE", VK_PPC_TOCBASE)
+ .Case("tocbase", VK_PPC_TOCBASE)
+ .Case("TOC", VK_PPC_TOC16)
+ .Case("toc", VK_PPC_TOC16)
.Case("TOC at HA", VK_PPC_TOC16_HA)
.Case("toc at ha", VK_PPC_TOC16_HA)
.Case("TOC at L", VK_PPC_TOC16_LO)
Modified: llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp?rev=184491&r1=184490&r2=184491&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp Thu Jun 20 17:39:42 2013
@@ -93,7 +93,7 @@ unsigned PPCELFObjectWriter::getRelocTyp
case MCSymbolRefExpr::VK_PPC_ADDR16_HA:
Type = ELF::R_PPC_ADDR16_HA;
break;
- case MCSymbolRefExpr::VK_PPC_TOC_ENTRY:
+ case MCSymbolRefExpr::VK_PPC_TOC16:
Type = ELF::R_PPC64_TOC16;
break;
case MCSymbolRefExpr::VK_PPC_TOC16_LO:
@@ -140,7 +140,7 @@ unsigned PPCELFObjectWriter::getRelocTyp
case MCSymbolRefExpr::VK_PPC_ADDR16_LO:
Type = ELF::R_PPC64_ADDR16_LO_DS;
break;
- case MCSymbolRefExpr::VK_PPC_TOC_ENTRY:
+ case MCSymbolRefExpr::VK_PPC_TOC16:
Type = ELF::R_PPC64_TOC16_DS;
break;
case MCSymbolRefExpr::VK_PPC_TOC16_LO:
@@ -168,7 +168,7 @@ unsigned PPCELFObjectWriter::getRelocTyp
case FK_Data_8:
switch (Modifier) {
default: llvm_unreachable("Unsupported Modifier");
- case MCSymbolRefExpr::VK_PPC_TOC:
+ case MCSymbolRefExpr::VK_PPC_TOCBASE:
Type = ELF::R_PPC64_TOC;
break;
case MCSymbolRefExpr::VK_None:
Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=184491&r1=184490&r2=184491&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Thu Jun 20 17:39:42 2013
@@ -372,7 +372,7 @@ void PPCAsmPrinter::EmitInstruction(cons
MCSymbol *TOCEntry = lookUpOrCreateTOCEntry(MOSymbol);
const MCExpr *Exp =
- MCSymbolRefExpr::Create(TOCEntry, MCSymbolRefExpr::VK_PPC_TOC_ENTRY,
+ MCSymbolRefExpr::Create(TOCEntry, MCSymbolRefExpr::VK_PPC_TOC16,
OutContext);
TmpInst.getOperand(1) = MCOperand::CreateExpr(Exp);
OutStreamer.EmitInstruction(TmpInst);
@@ -706,7 +706,7 @@ void PPCLinuxAsmPrinter::EmitFunctionEnt
MCSymbol *Symbol2 = OutContext.GetOrCreateSymbol(StringRef(".TOC."));
// Generates a R_PPC64_TOC relocation for TOC base insertion.
OutStreamer.EmitValue(MCSymbolRefExpr::Create(Symbol2,
- MCSymbolRefExpr::VK_PPC_TOC, OutContext),
+ MCSymbolRefExpr::VK_PPC_TOCBASE, OutContext),
8/*size*/);
// Emit a null environment pointer.
OutStreamer.EmitIntValue(0, 8 /* size */);
More information about the llvm-commits
mailing list