[llvm] r184547 - [PowerPC] Rename some more VK_PPC_ enums
Ulrich Weigand
ulrich.weigand at de.ibm.com
Fri Jun 21 07:42:21 PDT 2013
Author: uweigand
Date: Fri Jun 21 09:42:20 2013
New Revision: 184547
URL: http://llvm.org/viewvc/llvm-project?rev=184547&view=rev
Log:
[PowerPC] Rename some more VK_PPC_ enums
This renames more VK_PPC_ enums, to make them more closely reflect
the @modifier string they represent. This also prepares for adding
a bunch of new VK_PPC_ enums in upcoming patches.
For consistency, some MO_ flags related to VK_PPC_ enums are
likewise renamed.
No change in behaviour.
Modified:
llvm/trunk/include/llvm/MC/MCExpr.h
llvm/trunk/lib/MC/MCELFStreamer.cpp
llvm/trunk/lib/MC/MCExpr.cpp
llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h
llvm/trunk/lib/Target/PowerPC/PPC.h
llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
llvm/trunk/lib/Target/PowerPC/PPCCodeEmitter.cpp
llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
llvm/trunk/lib/Target/PowerPC/PPCMCInstLower.cpp
Modified: llvm/trunk/include/llvm/MC/MCExpr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCExpr.h?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExpr.h (original)
+++ llvm/trunk/include/llvm/MC/MCExpr.h Fri Jun 21 09:42:20 2013
@@ -171,24 +171,24 @@ public:
VK_ARM_TARGET2,
VK_ARM_PREL31,
- VK_PPC_ADDR16_HA, // symbol at ha
- VK_PPC_ADDR16_LO, // symbol at l
+ VK_PPC_LO, // symbol at l
+ VK_PPC_HA, // symbol at ha
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_TOC, // symbol at toc
+ VK_PPC_TOC_LO, // symbol at toc@l
+ VK_PPC_TOC_HA, // symbol at toc@ha
+ VK_PPC_TPREL_LO, // symbol at tprel@l
+ VK_PPC_TPREL_HA, // symbol at tprel@ha
+ VK_PPC_DTPREL_LO, // symbol at dtprel@l
+ VK_PPC_DTPREL_HA, // symbol at dtprel@ha
+ VK_PPC_GOT_TPREL_LO, // symbol at got@tprel at l
+ VK_PPC_GOT_TPREL_HA, // symbol at got@tprel at ha
VK_PPC_TLS, // symbol at tls
- VK_PPC_GOT_TLSGD16_HA, // symbol at got@tlsgd at ha
- VK_PPC_GOT_TLSGD16_LO, // symbol at got@tlsgd at l
+ VK_PPC_GOT_TLSGD_LO, // symbol at got@tlsgd at l
+ VK_PPC_GOT_TLSGD_HA, // symbol at got@tlsgd at ha
VK_PPC_TLSGD, // symbol at tlsgd
- VK_PPC_GOT_TLSLD16_HA, // symbol at got@tlsld at ha
- VK_PPC_GOT_TLSLD16_LO, // symbol at got@tlsld at l
+ VK_PPC_GOT_TLSLD_LO, // symbol at got@tlsld at l
+ VK_PPC_GOT_TLSLD_HA, // symbol at got@tlsld at ha
VK_PPC_TLSLD, // symbol at tlsld
VK_Mips_GPREL,
Modified: llvm/trunk/lib/MC/MCELFStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCELFStreamer.cpp?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCELFStreamer.cpp (original)
+++ llvm/trunk/lib/MC/MCELFStreamer.cpp Fri Jun 21 09:42:20 2013
@@ -363,18 +363,18 @@ void MCELFStreamer::fixSymbolsInTLSFixu
case MCSymbolRefExpr::VK_Mips_GOTTPREL:
case MCSymbolRefExpr::VK_Mips_TPREL_HI:
case MCSymbolRefExpr::VK_Mips_TPREL_LO:
- case MCSymbolRefExpr::VK_PPC_TPREL16_HA:
- case MCSymbolRefExpr::VK_PPC_TPREL16_LO:
- case MCSymbolRefExpr::VK_PPC_DTPREL16_HA:
- case MCSymbolRefExpr::VK_PPC_DTPREL16_LO:
- case MCSymbolRefExpr::VK_PPC_GOT_TPREL16_HA:
- case MCSymbolRefExpr::VK_PPC_GOT_TPREL16_LO:
+ case MCSymbolRefExpr::VK_PPC_TPREL_LO:
+ case MCSymbolRefExpr::VK_PPC_TPREL_HA:
+ case MCSymbolRefExpr::VK_PPC_DTPREL_LO:
+ case MCSymbolRefExpr::VK_PPC_DTPREL_HA:
+ case MCSymbolRefExpr::VK_PPC_GOT_TPREL_LO:
+ case MCSymbolRefExpr::VK_PPC_GOT_TPREL_HA:
case MCSymbolRefExpr::VK_PPC_TLS:
- case MCSymbolRefExpr::VK_PPC_GOT_TLSGD16_HA:
- case MCSymbolRefExpr::VK_PPC_GOT_TLSGD16_LO:
+ case MCSymbolRefExpr::VK_PPC_GOT_TLSGD_LO:
+ case MCSymbolRefExpr::VK_PPC_GOT_TLSGD_HA:
case MCSymbolRefExpr::VK_PPC_TLSGD:
- case MCSymbolRefExpr::VK_PPC_GOT_TLSLD16_HA:
- case MCSymbolRefExpr::VK_PPC_GOT_TLSLD16_LO:
+ case MCSymbolRefExpr::VK_PPC_GOT_TLSLD_LO:
+ case MCSymbolRefExpr::VK_PPC_GOT_TLSLD_HA:
case MCSymbolRefExpr::VK_PPC_TLSLD:
break;
}
Modified: llvm/trunk/lib/MC/MCExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCExpr.cpp?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCExpr.cpp (original)
+++ llvm/trunk/lib/MC/MCExpr.cpp Fri Jun 21 09:42:20 2013
@@ -196,24 +196,24 @@ StringRef MCSymbolRefExpr::getVariantKin
case VK_ARM_TARGET1: return "(target1)";
case VK_ARM_TARGET2: return "(target2)";
case VK_ARM_PREL31: return "(prel31)";
- case VK_PPC_ADDR16_HA: return "ha";
- case VK_PPC_ADDR16_LO: return "l";
+ case VK_PPC_LO: return "l";
+ case VK_PPC_HA: return "ha";
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_GOT_TPREL16_HA: return "got at tprel@ha";
- case VK_PPC_GOT_TPREL16_LO: return "got at tprel@l";
+ case VK_PPC_TOC: return "toc";
+ case VK_PPC_TOC_LO: return "toc at l";
+ case VK_PPC_TOC_HA: return "toc at ha";
+ case VK_PPC_TPREL_LO: return "tprel at l";
+ case VK_PPC_TPREL_HA: return "tprel at ha";
+ case VK_PPC_DTPREL_LO: return "dtprel at l";
+ case VK_PPC_DTPREL_HA: return "dtprel at ha";
+ case VK_PPC_GOT_TPREL_LO: return "got at tprel@l";
+ case VK_PPC_GOT_TPREL_HA: return "got at tprel@ha";
case VK_PPC_TLS: return "tls";
- case VK_PPC_GOT_TLSGD16_HA: return "got at tlsgd@ha";
- case VK_PPC_GOT_TLSGD16_LO: return "got at tlsgd@l";
- case VK_PPC_GOT_TLSLD16_HA: return "got at tlsld@ha";
- case VK_PPC_GOT_TLSLD16_LO: return "got at tlsld@l";
+ case VK_PPC_GOT_TLSGD_LO: return "got at tlsgd@l";
+ case VK_PPC_GOT_TLSGD_HA: return "got at tlsgd@ha";
case VK_PPC_TLSGD: return "tlsgd";
+ case VK_PPC_GOT_TLSLD_LO: return "got at tlsld@l";
+ case VK_PPC_GOT_TLSLD_HA: return "got at tlsld@ha";
case VK_PPC_TLSLD: return "tlsld";
case VK_Mips_GPREL: return "GPREL";
case VK_Mips_GOT_CALL: return "GOT_CALL";
@@ -279,40 +279,40 @@ MCSymbolRefExpr::getVariantKindForName(S
.Case("imgrel", VK_COFF_IMGREL32)
.Case("SECREL32", VK_SECREL)
.Case("secrel32", VK_SECREL)
- .Case("HA", VK_PPC_ADDR16_HA)
- .Case("ha", VK_PPC_ADDR16_HA)
- .Case("L", VK_PPC_ADDR16_LO)
- .Case("l", VK_PPC_ADDR16_LO)
+ .Case("L", VK_PPC_LO)
+ .Case("l", VK_PPC_LO)
+ .Case("HA", VK_PPC_HA)
+ .Case("ha", VK_PPC_HA)
.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)
- .Case("toc at l", VK_PPC_TOC16_LO)
+ .Case("TOC", VK_PPC_TOC)
+ .Case("toc", VK_PPC_TOC)
+ .Case("TOC at L", VK_PPC_TOC_LO)
+ .Case("toc at l", VK_PPC_TOC_LO)
+ .Case("TOC at HA", VK_PPC_TOC_HA)
+ .Case("toc at ha", VK_PPC_TOC_HA)
.Case("TLS", VK_PPC_TLS)
.Case("tls", VK_PPC_TLS)
- .Case("TPREL at HA", VK_PPC_TPREL16_HA)
- .Case("tprel at ha", VK_PPC_TPREL16_HA)
- .Case("TPREL at L", VK_PPC_TPREL16_LO)
- .Case("tprel at l", VK_PPC_TPREL16_LO)
- .Case("DTPREL at HA", VK_PPC_DTPREL16_HA)
- .Case("dtprel at ha", VK_PPC_DTPREL16_HA)
- .Case("DTPREL at L", VK_PPC_DTPREL16_LO)
- .Case("dtprel at l", VK_PPC_DTPREL16_LO)
- .Case("GOT at TPREL@HA", VK_PPC_GOT_TPREL16_HA)
- .Case("got at tprel@ha", VK_PPC_GOT_TPREL16_HA)
- .Case("GOT at TPREL@L", VK_PPC_GOT_TPREL16_LO)
- .Case("got at tprel@l", VK_PPC_GOT_TPREL16_LO)
- .Case("GOT at TLSGD@HA", VK_PPC_GOT_TLSGD16_HA)
- .Case("got at tlsgd@ha", VK_PPC_GOT_TLSGD16_HA)
- .Case("GOT at TLSGD@L", VK_PPC_GOT_TLSGD16_LO)
- .Case("got at tlsgd@l", VK_PPC_GOT_TLSGD16_LO)
- .Case("GOT at TLSLD@HA", VK_PPC_GOT_TLSLD16_HA)
- .Case("got at tlsld@ha", VK_PPC_GOT_TLSLD16_HA)
- .Case("GOT at TLSLD@L", VK_PPC_GOT_TLSLD16_LO)
- .Case("got at tlsld@l", VK_PPC_GOT_TLSLD16_LO)
+ .Case("TPREL at L", VK_PPC_TPREL_LO)
+ .Case("tprel at l", VK_PPC_TPREL_LO)
+ .Case("TPREL at HA", VK_PPC_TPREL_HA)
+ .Case("tprel at ha", VK_PPC_TPREL_HA)
+ .Case("DTPREL at L", VK_PPC_DTPREL_LO)
+ .Case("dtprel at l", VK_PPC_DTPREL_LO)
+ .Case("DTPREL at HA", VK_PPC_DTPREL_HA)
+ .Case("dtprel at ha", VK_PPC_DTPREL_HA)
+ .Case("GOT at TPREL@L", VK_PPC_GOT_TPREL_LO)
+ .Case("got at tprel@l", VK_PPC_GOT_TPREL_LO)
+ .Case("GOT at TPREL@HA", VK_PPC_GOT_TPREL_HA)
+ .Case("got at tprel@ha", VK_PPC_GOT_TPREL_HA)
+ .Case("GOT at TLSGD@L", VK_PPC_GOT_TLSGD_LO)
+ .Case("got at tlsgd@l", VK_PPC_GOT_TLSGD_LO)
+ .Case("GOT at TLSGD@HA", VK_PPC_GOT_TLSGD_HA)
+ .Case("got at tlsgd@ha", VK_PPC_GOT_TLSGD_HA)
+ .Case("GOT at TLSLD@L", VK_PPC_GOT_TLSLD_LO)
+ .Case("got at tlsld@l", VK_PPC_GOT_TLSLD_LO)
+ .Case("GOT at TLSLD@HA", VK_PPC_GOT_TLSLD_HA)
+ .Case("got at tlsld@ha", VK_PPC_GOT_TLSLD_HA)
.Default(VK_Invalid);
}
Modified: llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp Fri Jun 21 09:42:20 2013
@@ -546,7 +546,7 @@ ParseRegister(unsigned &RegNo, SMLoc &St
}
/// Extract @l/@ha modifier from expression. Recursively scan
-/// the expression and check for VK_PPC_ADDR16_HA/VK_PPC_ADDR16_LO
+/// the expression and check for VK_PPC_LO / VK_PPC_HA
/// symbol variants. If all symbols with modifier use the same
/// variant, return the corresponding PPCMCExpr::VariantKind,
/// and a modified expression using the default symbol variant.
@@ -566,11 +566,11 @@ ExtractModifierFromExpr(const MCExpr *E,
const MCSymbolRefExpr *SRE = cast<MCSymbolRefExpr>(E);
switch (SRE->getKind()) {
- case MCSymbolRefExpr::VK_PPC_ADDR16_HA:
- Variant = PPCMCExpr::VK_PPC_HA16;
+ case MCSymbolRefExpr::VK_PPC_LO:
+ Variant = PPCMCExpr::VK_PPC_LO;
break;
- case MCSymbolRefExpr::VK_PPC_ADDR16_LO:
- Variant = PPCMCExpr::VK_PPC_LO16;
+ case MCSymbolRefExpr::VK_PPC_HA:
+ Variant = PPCMCExpr::VK_PPC_HA;
break;
default:
return 0;
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=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp Fri Jun 21 09:42:20 2013
@@ -87,46 +87,46 @@ unsigned PPCELFObjectWriter::getRelocTyp
case MCSymbolRefExpr::VK_None:
Type = ELF::R_PPC_ADDR16;
break;
- case MCSymbolRefExpr::VK_PPC_ADDR16_LO:
+ case MCSymbolRefExpr::VK_PPC_LO:
Type = ELF::R_PPC_ADDR16_LO;
break;
- case MCSymbolRefExpr::VK_PPC_ADDR16_HA:
+ case MCSymbolRefExpr::VK_PPC_HA:
Type = ELF::R_PPC_ADDR16_HA;
break;
- case MCSymbolRefExpr::VK_PPC_TOC16:
+ case MCSymbolRefExpr::VK_PPC_TOC:
Type = ELF::R_PPC64_TOC16;
break;
- case MCSymbolRefExpr::VK_PPC_TOC16_LO:
+ case MCSymbolRefExpr::VK_PPC_TOC_LO:
Type = ELF::R_PPC64_TOC16_LO;
break;
- case MCSymbolRefExpr::VK_PPC_TOC16_HA:
+ case MCSymbolRefExpr::VK_PPC_TOC_HA:
Type = ELF::R_PPC64_TOC16_HA;
break;
- case MCSymbolRefExpr::VK_PPC_TPREL16_LO:
+ case MCSymbolRefExpr::VK_PPC_TPREL_LO:
Type = ELF::R_PPC_TPREL16_LO;
break;
- case MCSymbolRefExpr::VK_PPC_TPREL16_HA:
+ case MCSymbolRefExpr::VK_PPC_TPREL_HA:
Type = ELF::R_PPC_TPREL16_HA;
break;
- case MCSymbolRefExpr::VK_PPC_DTPREL16_LO:
+ case MCSymbolRefExpr::VK_PPC_DTPREL_LO:
Type = ELF::R_PPC64_DTPREL16_LO;
break;
- case MCSymbolRefExpr::VK_PPC_DTPREL16_HA:
+ case MCSymbolRefExpr::VK_PPC_DTPREL_HA:
Type = ELF::R_PPC64_DTPREL16_HA;
break;
- case MCSymbolRefExpr::VK_PPC_GOT_TLSGD16_LO:
+ case MCSymbolRefExpr::VK_PPC_GOT_TLSGD_LO:
Type = ELF::R_PPC64_GOT_TLSGD16_LO;
break;
- case MCSymbolRefExpr::VK_PPC_GOT_TLSGD16_HA:
+ case MCSymbolRefExpr::VK_PPC_GOT_TLSGD_HA:
Type = ELF::R_PPC64_GOT_TLSGD16_HA;
break;
- case MCSymbolRefExpr::VK_PPC_GOT_TLSLD16_LO:
+ case MCSymbolRefExpr::VK_PPC_GOT_TLSLD_LO:
Type = ELF::R_PPC64_GOT_TLSLD16_LO;
break;
- case MCSymbolRefExpr::VK_PPC_GOT_TLSLD16_HA:
+ case MCSymbolRefExpr::VK_PPC_GOT_TLSLD_HA:
Type = ELF::R_PPC64_GOT_TLSLD16_HA;
break;
- case MCSymbolRefExpr::VK_PPC_GOT_TPREL16_HA:
+ case MCSymbolRefExpr::VK_PPC_GOT_TPREL_HA:
Type = ELF::R_PPC64_GOT_TPREL16_HA;
break;
}
@@ -137,16 +137,16 @@ unsigned PPCELFObjectWriter::getRelocTyp
case MCSymbolRefExpr::VK_None:
Type = ELF::R_PPC64_ADDR16_DS;
break;
- case MCSymbolRefExpr::VK_PPC_ADDR16_LO:
+ case MCSymbolRefExpr::VK_PPC_LO:
Type = ELF::R_PPC64_ADDR16_LO_DS;
break;
- case MCSymbolRefExpr::VK_PPC_TOC16:
+ case MCSymbolRefExpr::VK_PPC_TOC:
Type = ELF::R_PPC64_TOC16_DS;
break;
- case MCSymbolRefExpr::VK_PPC_TOC16_LO:
+ case MCSymbolRefExpr::VK_PPC_TOC_LO:
Type = ELF::R_PPC64_TOC16_LO_DS;
break;
- case MCSymbolRefExpr::VK_PPC_GOT_TPREL16_LO:
+ case MCSymbolRefExpr::VK_PPC_GOT_TPREL_LO:
Type = ELF::R_PPC64_GOT_TPREL16_LO_DS;
break;
}
Modified: llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp Fri Jun 21 09:42:20 2013
@@ -26,8 +26,8 @@ void PPCMCExpr::PrintImpl(raw_ostream &O
if (isDarwinSyntax()) {
switch (Kind) {
default: llvm_unreachable("Invalid kind!");
- case VK_PPC_HA16: OS << "ha16"; break;
- case VK_PPC_LO16: OS << "lo16"; break;
+ case VK_PPC_LO: OS << "lo16"; break;
+ case VK_PPC_HA: OS << "ha16"; break;
}
OS << '(';
@@ -38,8 +38,8 @@ void PPCMCExpr::PrintImpl(raw_ostream &O
switch (Kind) {
default: llvm_unreachable("Invalid kind!");
- case VK_PPC_HA16: OS << "@ha"; break;
- case VK_PPC_LO16: OS << "@l"; break;
+ case VK_PPC_LO: OS << "@l"; break;
+ case VK_PPC_HA: OS << "@ha"; break;
}
}
}
@@ -57,12 +57,12 @@ PPCMCExpr::EvaluateAsRelocatableImpl(MCV
switch (Kind) {
default:
llvm_unreachable("Invalid kind!");
- case VK_PPC_HA16:
- Result = ((Result >> 16) + ((Result & 0x8000) ? 1 : 0)) & 0xffff;
- break;
- case VK_PPC_LO16:
+ case VK_PPC_LO:
Result = Result & 0xffff;
break;
+ case VK_PPC_HA:
+ Result = ((Result >> 16) + ((Result & 0x8000) ? 1 : 0)) & 0xffff;
+ break;
}
Res = MCValue::get(Result);
} else {
@@ -74,11 +74,11 @@ PPCMCExpr::EvaluateAsRelocatableImpl(MCV
switch (Kind) {
default:
llvm_unreachable("Invalid kind!");
- case VK_PPC_HA16:
- Modifier = MCSymbolRefExpr::VK_PPC_ADDR16_HA;
+ case VK_PPC_LO:
+ Modifier = MCSymbolRefExpr::VK_PPC_LO;
break;
- case VK_PPC_LO16:
- Modifier = MCSymbolRefExpr::VK_PPC_ADDR16_LO;
+ case VK_PPC_HA:
+ Modifier = MCSymbolRefExpr::VK_PPC_HA;
break;
}
Sym = MCSymbolRefExpr::Create(&Sym->getSymbol(), Modifier, Context);
Modified: llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h (original)
+++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h Fri Jun 21 09:42:20 2013
@@ -20,8 +20,8 @@ class PPCMCExpr : public MCTargetExpr {
public:
enum VariantKind {
VK_PPC_None,
- VK_PPC_HA16,
- VK_PPC_LO16
+ VK_PPC_LO,
+ VK_PPC_HA
};
private:
@@ -40,12 +40,12 @@ public:
static const PPCMCExpr *Create(VariantKind Kind, const MCExpr *Expr,
MCContext &Ctx);
- static const PPCMCExpr *CreateHa16(const MCExpr *Expr, MCContext &Ctx) {
- return Create(VK_PPC_HA16, Expr, Ctx);
+ static const PPCMCExpr *CreateLo(const MCExpr *Expr, MCContext &Ctx) {
+ return Create(VK_PPC_LO, Expr, Ctx);
}
- static const PPCMCExpr *CreateLo16(const MCExpr *Expr, MCContext &Ctx) {
- return Create(VK_PPC_LO16, Expr, Ctx);
+ static const PPCMCExpr *CreateHa(const MCExpr *Expr, MCContext &Ctx) {
+ return Create(VK_PPC_HA, Expr, Ctx);
}
/// @}
Modified: llvm/trunk/lib/Target/PowerPC/PPC.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPC.h?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPC.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPC.h Fri Jun 21 09:42:20 2013
@@ -74,18 +74,18 @@ namespace llvm {
/// The next are not flags but distinct values.
MO_ACCESS_MASK = 0xf0,
- /// MO_LO16, MO_HA16 - lo16(symbol) and ha16(symbol)
- MO_LO16 = 1 << 4,
- MO_HA16 = 2 << 4,
+ /// MO_LO, MO_HA - lo16(symbol) and ha16(symbol)
+ MO_LO = 1 << 4,
+ MO_HA = 2 << 4,
- MO_TPREL16_HA = 3 << 4,
- MO_TPREL16_LO = 4 << 4,
+ MO_TPREL_LO = 4 << 4,
+ MO_TPREL_HA = 3 << 4,
/// These values identify relocations on immediates folded
/// into memory operations.
- MO_DTPREL16_LO = 5 << 4,
- MO_TLSLD16_LO = 6 << 4,
- MO_TOC16_LO = 7 << 4
+ MO_DTPREL_LO = 5 << 4,
+ MO_TLSLD_LO = 6 << 4,
+ MO_TOC_LO = 7 << 4
};
} // end namespace PPCII
Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Jun 21 09:42:20 2013
@@ -372,7 +372,7 @@ void PPCAsmPrinter::EmitInstruction(cons
MCSymbol *TOCEntry = lookUpOrCreateTOCEntry(MOSymbol);
const MCExpr *Exp =
- MCSymbolRefExpr::Create(TOCEntry, MCSymbolRefExpr::VK_PPC_TOC16,
+ MCSymbolRefExpr::Create(TOCEntry, MCSymbolRefExpr::VK_PPC_TOC,
OutContext);
TmpInst.getOperand(1) = MCOperand::CreateExpr(Exp);
OutStreamer.EmitInstruction(TmpInst);
@@ -417,7 +417,7 @@ void PPCAsmPrinter::EmitInstruction(cons
MOSymbol = lookUpOrCreateTOCEntry(MOSymbol);
const MCExpr *Exp =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_TOC16_HA,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_TOC_HA,
OutContext);
TmpInst.getOperand(2) = MCOperand::CreateExpr(Exp);
OutStreamer.EmitInstruction(TmpInst);
@@ -454,7 +454,7 @@ void PPCAsmPrinter::EmitInstruction(cons
}
const MCExpr *Exp =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_TOC16_LO,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_TOC_LO,
OutContext);
TmpInst.getOperand(1) = MCOperand::CreateExpr(Exp);
OutStreamer.EmitInstruction(TmpInst);
@@ -490,7 +490,7 @@ void PPCAsmPrinter::EmitInstruction(cons
MOSymbol = lookUpOrCreateTOCEntry(MOSymbol);
const MCExpr *Exp =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_TOC16_LO,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_TOC_LO,
OutContext);
TmpInst.getOperand(2) = MCOperand::CreateExpr(Exp);
OutStreamer.EmitInstruction(TmpInst);
@@ -504,7 +504,7 @@ void PPCAsmPrinter::EmitInstruction(cons
const GlobalValue *GValue = MO.getGlobal();
MCSymbol *MOSymbol = Mang->getSymbol(GValue);
const MCExpr *SymGotTprel =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TPREL16_HA,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TPREL_HA,
OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADDIS8)
.addReg(MI->getOperand(0).getReg())
@@ -522,7 +522,7 @@ void PPCAsmPrinter::EmitInstruction(cons
const GlobalValue *GValue = MO.getGlobal();
MCSymbol *MOSymbol = Mang->getSymbol(GValue);
const MCExpr *Exp =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TPREL16_LO,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TPREL_LO,
OutContext);
TmpInst.getOperand(1) = MCOperand::CreateExpr(Exp);
OutStreamer.EmitInstruction(TmpInst);
@@ -536,7 +536,7 @@ void PPCAsmPrinter::EmitInstruction(cons
const GlobalValue *GValue = MO.getGlobal();
MCSymbol *MOSymbol = Mang->getSymbol(GValue);
const MCExpr *SymGotTlsGD =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSGD16_HA,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSGD_HA,
OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADDIS8)
.addReg(MI->getOperand(0).getReg())
@@ -552,7 +552,7 @@ void PPCAsmPrinter::EmitInstruction(cons
const GlobalValue *GValue = MO.getGlobal();
MCSymbol *MOSymbol = Mang->getSymbol(GValue);
const MCExpr *SymGotTlsGD =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSGD16_LO,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSGD_LO,
OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADDI8)
.addReg(MI->getOperand(0).getReg())
@@ -588,7 +588,7 @@ void PPCAsmPrinter::EmitInstruction(cons
const GlobalValue *GValue = MO.getGlobal();
MCSymbol *MOSymbol = Mang->getSymbol(GValue);
const MCExpr *SymGotTlsLD =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSLD16_HA,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSLD_HA,
OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADDIS8)
.addReg(MI->getOperand(0).getReg())
@@ -604,7 +604,7 @@ void PPCAsmPrinter::EmitInstruction(cons
const GlobalValue *GValue = MO.getGlobal();
MCSymbol *MOSymbol = Mang->getSymbol(GValue);
const MCExpr *SymGotTlsLD =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSLD16_LO,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSLD_LO,
OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADDI8)
.addReg(MI->getOperand(0).getReg())
@@ -640,7 +640,7 @@ void PPCAsmPrinter::EmitInstruction(cons
const GlobalValue *GValue = MO.getGlobal();
MCSymbol *MOSymbol = Mang->getSymbol(GValue);
const MCExpr *SymDtprel =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_DTPREL16_HA,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_DTPREL_HA,
OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADDIS8)
.addReg(MI->getOperand(0).getReg())
@@ -656,7 +656,7 @@ void PPCAsmPrinter::EmitInstruction(cons
const GlobalValue *GValue = MO.getGlobal();
MCSymbol *MOSymbol = Mang->getSymbol(GValue);
const MCExpr *SymDtprel =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_DTPREL16_LO,
+ MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_DTPREL_LO,
OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADDI8)
.addReg(MI->getOperand(0).getReg())
@@ -891,7 +891,7 @@ EmitFunctionStubs(const MachineModuleInf
// mflr r11
OutStreamer.EmitInstruction(MCInstBuilder(PPC::MFLR).addReg(PPC::R11));
// addis r11, r11, ha16(LazyPtr - AnonSymbol)
- const MCExpr *SubHa16 = PPCMCExpr::CreateHa16(Sub, OutContext);
+ const MCExpr *SubHa16 = PPCMCExpr::CreateHa(Sub, OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADDIS)
.addReg(PPC::R11)
.addReg(PPC::R11)
@@ -901,7 +901,7 @@ EmitFunctionStubs(const MachineModuleInf
// ldu r12, lo16(LazyPtr - AnonSymbol)(r11)
// lwzu r12, lo16(LazyPtr - AnonSymbol)(r11)
- const MCExpr *SubLo16 = PPCMCExpr::CreateLo16(Sub, OutContext);
+ const MCExpr *SubLo16 = PPCMCExpr::CreateLo(Sub, OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(isPPC64 ? PPC::LDU : PPC::LWZU)
.addReg(PPC::R12)
.addExpr(SubLo16).addExpr(SubLo16)
@@ -946,14 +946,14 @@ EmitFunctionStubs(const MachineModuleInf
OutStreamer.EmitSymbolAttribute(RawSym, MCSA_IndirectSymbol);
// lis r11, ha16(LazyPtr)
- const MCExpr *LazyPtrHa16 = PPCMCExpr::CreateHa16(LazyPtrExpr, OutContext);
+ const MCExpr *LazyPtrHa16 = PPCMCExpr::CreateHa(LazyPtrExpr, OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(PPC::LIS)
.addReg(PPC::R11)
.addExpr(LazyPtrHa16));
// ldu r12, lo16(LazyPtr)(r11)
// lwzu r12, lo16(LazyPtr)(r11)
- const MCExpr *LazyPtrLo16 = PPCMCExpr::CreateLo16(LazyPtrExpr, OutContext);
+ const MCExpr *LazyPtrLo16 = PPCMCExpr::CreateLo(LazyPtrExpr, OutContext);
OutStreamer.EmitInstruction(MCInstBuilder(isPPC64 ? PPC::LDU : PPC::LWZU)
.addReg(PPC::R12)
.addExpr(LazyPtrLo16).addExpr(LazyPtrLo16)
Modified: llvm/trunk/lib/Target/PowerPC/PPCCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCCodeEmitter.cpp?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCCodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCCodeEmitter.cpp Fri Jun 21 09:42:20 2013
@@ -201,8 +201,8 @@ unsigned PPCCodeEmitter::getS16ImmEncodi
unsigned RelocID;
switch (MO.getTargetFlags() & PPCII::MO_ACCESS_MASK) {
default: llvm_unreachable("Unsupported target operand flags!");
- case PPCII::MO_HA16: RelocID = PPC::reloc_absolute_high; break;
- case PPCII::MO_LO16: RelocID = PPC::reloc_absolute_low; break;
+ case PPCII::MO_LO: RelocID = PPC::reloc_absolute_low; break;
+ case PPCII::MO_HA: RelocID = PPC::reloc_absolute_high; break;
}
MCE.addRelocation(GetRelocation(MO, RelocID));
Modified: llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Fri Jun 21 09:42:20 2013
@@ -1502,13 +1502,13 @@ void PPCDAGToDAGISel::PostprocessISelDAG
continue;
break;
case PPC::ADDIdtprelL:
- Flags = PPCII::MO_DTPREL16_LO;
+ Flags = PPCII::MO_DTPREL_LO;
break;
case PPC::ADDItlsldL:
- Flags = PPCII::MO_TLSLD16_LO;
+ Flags = PPCII::MO_TLSLD_LO;
break;
case PPC::ADDItocL:
- Flags = PPCII::MO_TOC16_LO;
+ Flags = PPCII::MO_TOC_LO;
break;
}
Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Fri Jun 21 09:42:20 2013
@@ -1236,8 +1236,8 @@ bool PPCTargetLowering::getPreIndexedAdd
/// PICBase, set the HiOpFlags and LoOpFlags to the target MO flags.
static bool GetLabelAccessInfo(const TargetMachine &TM, unsigned &HiOpFlags,
unsigned &LoOpFlags, const GlobalValue *GV = 0) {
- HiOpFlags = PPCII::MO_HA16;
- LoOpFlags = PPCII::MO_LO16;
+ HiOpFlags = PPCII::MO_HA;
+ LoOpFlags = PPCII::MO_LO;
// Don't use the pic base if not in PIC relocation model. Or if we are on a
// non-darwin platform. We don't support PIC on other platforms yet.
@@ -1350,9 +1350,9 @@ SDValue PPCTargetLowering::LowerGlobalTL
if (Model == TLSModel::LocalExec) {
SDValue TGAHi = DAG.getTargetGlobalAddress(GV, dl, PtrVT, 0,
- PPCII::MO_TPREL16_HA);
+ PPCII::MO_TPREL_HA);
SDValue TGALo = DAG.getTargetGlobalAddress(GV, dl, PtrVT, 0,
- PPCII::MO_TPREL16_LO);
+ PPCII::MO_TPREL_LO);
SDValue TLSReg = DAG.getRegister(is64bit ? PPC::X13 : PPC::R2,
is64bit ? MVT::i64 : MVT::i32);
SDValue Hi = DAG.getNode(PPCISD::Hi, dl, PtrVT, TGAHi, TLSReg);
Modified: llvm/trunk/lib/Target/PowerPC/PPCMCInstLower.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCMCInstLower.cpp?rev=184547&r1=184546&r2=184547&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCMCInstLower.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCMCInstLower.cpp Fri Jun 21 09:42:20 2013
@@ -112,20 +112,20 @@ static MCOperand GetSymbolRef(const Mach
unsigned access = MO.getTargetFlags() & PPCII::MO_ACCESS_MASK;
switch (access) {
- case PPCII::MO_TPREL16_HA:
- RefKind = MCSymbolRefExpr::VK_PPC_TPREL16_HA;
+ case PPCII::MO_TPREL_LO:
+ RefKind = MCSymbolRefExpr::VK_PPC_TPREL_LO;
break;
- case PPCII::MO_TPREL16_LO:
- RefKind = MCSymbolRefExpr::VK_PPC_TPREL16_LO;
+ case PPCII::MO_TPREL_HA:
+ RefKind = MCSymbolRefExpr::VK_PPC_TPREL_HA;
break;
- case PPCII::MO_DTPREL16_LO:
- RefKind = MCSymbolRefExpr::VK_PPC_DTPREL16_LO;
+ case PPCII::MO_DTPREL_LO:
+ RefKind = MCSymbolRefExpr::VK_PPC_DTPREL_LO;
break;
- case PPCII::MO_TLSLD16_LO:
- RefKind = MCSymbolRefExpr::VK_PPC_GOT_TLSLD16_LO;
+ case PPCII::MO_TLSLD_LO:
+ RefKind = MCSymbolRefExpr::VK_PPC_GOT_TLSLD_LO;
break;
- case PPCII::MO_TOC16_LO:
- RefKind = MCSymbolRefExpr::VK_PPC_TOC16_LO;
+ case PPCII::MO_TOC_LO:
+ RefKind = MCSymbolRefExpr::VK_PPC_TOC_LO;
break;
}
@@ -146,11 +146,11 @@ static MCOperand GetSymbolRef(const Mach
// Add ha16() / lo16() markers if required.
switch (access) {
- case PPCII::MO_HA16:
- Expr = PPCMCExpr::CreateHa16(Expr, Ctx);
+ case PPCII::MO_LO:
+ Expr = PPCMCExpr::CreateLo(Expr, Ctx);
break;
- case PPCII::MO_LO16:
- Expr = PPCMCExpr::CreateLo16(Expr, Ctx);
+ case PPCII::MO_HA:
+ Expr = PPCMCExpr::CreateHa(Expr, Ctx);
break;
}
More information about the llvm-commits
mailing list