[llvm] r184549 - [PowerPC] Support @toc at h modifier

[Ulrich Weigand]

Author: uweigand
Date: Fri Jun 21 09:43:10 2013
New Revision: 184549

URL: http://llvm.org/viewvc/llvm-project?rev=184549&view=rev
Log:

[PowerPC] Support @toc at h modifier

This adds the relocation type and other necessary infrastructure
to use the @toc at h modifier in the assembler.


Modified:
    llvm/trunk/include/llvm/MC/MCExpr.h
    llvm/trunk/include/llvm/Object/ELF.h
    llvm/trunk/include/llvm/Support/ELF.h
    llvm/trunk/lib/MC/MCExpr.cpp
    llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
    llvm/trunk/test/MC/PowerPC/ppc64-fixups.s

Modified: llvm/trunk/include/llvm/MC/MCExpr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCExpr.h?rev=184549&r1=184548&r2=184549&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExpr.h (original)
+++ llvm/trunk/include/llvm/MC/MCExpr.h Fri Jun 21 09:43:10 2013
@@ -177,6 +177,7 @@ public:
     VK_PPC_TOCBASE,        // symbol at tocbase
     VK_PPC_TOC,            // symbol at toc
     VK_PPC_TOC_LO,         // symbol at toc@l
+    VK_PPC_TOC_HI,         // symbol at toc@h
     VK_PPC_TOC_HA,         // symbol at toc@ha
     VK_PPC_TPREL_LO,       // symbol at tprel@l
     VK_PPC_TPREL_HA,       // symbol at tprel@ha

Modified: llvm/trunk/include/llvm/Object/ELF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELF.h?rev=184549&r1=184548&r2=184549&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ELF.h (original)
+++ llvm/trunk/include/llvm/Object/ELF.h Fri Jun 21 09:43:10 2013
@@ -2057,6 +2057,7 @@ StringRef ELFObjectFile<ELFT>::getReloca
       LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_REL64);
       LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_TOC16);
       LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_TOC16_LO);
+      LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_TOC16_HI);
       LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_TOC16_HA);
       LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_TOC);
       LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_ADDR16_DS);

Modified: llvm/trunk/include/llvm/Support/ELF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/ELF.h?rev=184549&r1=184548&r2=184549&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/ELF.h (original)
+++ llvm/trunk/include/llvm/Support/ELF.h Fri Jun 21 09:43:10 2013
@@ -488,6 +488,7 @@ enum {
   R_PPC64_REL64               = 44,
   R_PPC64_TOC16               = 47,
   R_PPC64_TOC16_LO            = 48,
+  R_PPC64_TOC16_HI            = 49,
   R_PPC64_TOC16_HA            = 50,
   R_PPC64_TOC                 = 51,
   R_PPC64_ADDR16_DS           = 56,

Modified: llvm/trunk/lib/MC/MCExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCExpr.cpp?rev=184549&r1=184548&r2=184549&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCExpr.cpp (original)
+++ llvm/trunk/lib/MC/MCExpr.cpp Fri Jun 21 09:43:10 2013
@@ -202,6 +202,7 @@ StringRef MCSymbolRefExpr::getVariantKin
   case VK_PPC_TOCBASE: return "tocbase";
   case VK_PPC_TOC: return "toc";
   case VK_PPC_TOC_LO: return "toc at l";
+  case VK_PPC_TOC_HI: return "toc at h";
   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";
@@ -292,6 +293,8 @@ MCSymbolRefExpr::getVariantKindForName(S
     .Case("toc", VK_PPC_TOC)
     .Case("TOC at L", VK_PPC_TOC_LO)
     .Case("toc at l", VK_PPC_TOC_LO)
+    .Case("TOC at H", VK_PPC_TOC_HI)
+    .Case("toc at h", VK_PPC_TOC_HI)
     .Case("TOC at HA", VK_PPC_TOC_HA)
     .Case("toc at ha", VK_PPC_TOC_HA)
     .Case("TLS", VK_PPC_TLS)

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=184549&r1=184548&r2=184549&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp Fri Jun 21 09:43:10 2013
@@ -102,6 +102,9 @@ unsigned PPCELFObjectWriter::getRelocTyp
       case MCSymbolRefExpr::VK_PPC_TOC_LO:
         Type = ELF::R_PPC64_TOC16_LO;
         break;
+      case MCSymbolRefExpr::VK_PPC_TOC_HI:
+        Type = ELF::R_PPC64_TOC16_HI;
+        break;
       case MCSymbolRefExpr::VK_PPC_TOC_HA:
         Type = ELF::R_PPC64_TOC16_HA;
         break;

Modified: llvm/trunk/test/MC/PowerPC/ppc64-fixups.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/PowerPC/ppc64-fixups.s?rev=184549&r1=184548&r2=184549&view=diff
==============================================================================
--- llvm/trunk/test/MC/PowerPC/ppc64-fixups.s (original)
+++ llvm/trunk/test/MC/PowerPC/ppc64-fixups.s Fri Jun 21 09:43:10 2013
@@ -82,6 +82,11 @@
 # CHECK-REL:                             0x{{[0-9A-F]*[26AE]}} R_PPC64_TOC16_LO target 0x0
          addi 4, 3, target at toc@l
 
+# CHECK: addis 3, 2, target at toc@h        # encoding: [0x3c,0x62,A,A]
+# CHECK-NEXT:                            #   fixup A - offset: 2, value: target at toc@h, kind: fixup_ppc_half16
+# CHECK-REL:                             0x{{[0-9A-F]*[26AE]}} R_PPC64_TOC16_HI target 0x0
+         addis 3, 2, target at toc@h
+
 # CHECK: lwz 1, target at toc@l(3)          # encoding: [0x80,0x23,A,A]
 # CHECK-NEXT:                            #   fixup A - offset: 2, value: target at toc@l, kind: fixup_ppc_half16
 # CHECK-REL:                             0x{{[0-9A-F]*[26AE]}} R_PPC64_TOC16_LO target 0x0