[Sparc] Add fixups for the GOTdata_op model

[dcederman]

Summary

This makes it possible to assemble position independent code using the GOTdata_op model. It gives the linker the possibility to change a load into an add when the location of the symbol is less than 2 GB away.

lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp

static unsigned adjustFixupValue(unsigned Kind, uint64_t Value) {
   case Sparc::fixup_sparc_tls_gd_add:
   case Sparc::fixup_sparc_tls_gd_call:
   case Sparc::fixup_sparc_tls_ldm_add:
   case Sparc::fixup_sparc_tls_ldm_call:
   case Sparc::fixup_sparc_tls_ldo_add:
   case Sparc::fixup_sparc_tls_ie_ld:
   case Sparc::fixup_sparc_tls_ie_ldx:
   case Sparc::fixup_sparc_tls_ie_add:
+  case Sparc::fixup_sparc_gdop:
+  case Sparc::fixup_sparc_gdop_hix22:
+  case Sparc::fixup_sparc_gdop_lox10:
     return 0;
   }
 }
 
 /// getFixupKindNumBytes - The number of bytes the fixup may change.
 static unsigned getFixupKindNumBytes(unsigned Kind) {
     switch (Kind) {
   default:
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override {
         { "fixup_sparc_tls_ldo_lox10", 22, 10,  0 },
         { "fixup_sparc_tls_ldo_add",    0,  0,  0 },
         { "fixup_sparc_tls_ie_hi22",   10, 22,  0 },
         { "fixup_sparc_tls_ie_lo10",   22, 10,  0 },
         { "fixup_sparc_tls_ie_ld",      0,  0,  0 },
         { "fixup_sparc_tls_ie_ldx",     0,  0,  0 },
         { "fixup_sparc_tls_ie_add",     0,  0,  0 },
         { "fixup_sparc_tls_le_hix22",   0,  0,  0 },
-        { "fixup_sparc_tls_le_lox10",   0,  0,  0 }
+        { "fixup_sparc_tls_le_lox10",   0,  0,  0 },
+        { "fixup_sparc_gdop",           0,  0,  0 },
+        { "fixup_sparc_gdop_hix22",     0,  0,  0 },
+        { "fixup_sparc_gdop_lox10",     0,  0,  0 },
       };
 
       const static MCFixupKindInfo InfosLE[Sparc::NumTargetFixupKinds] = {
         // name                    offset bits  flags
         { "fixup_sparc_call30",     0,     30,  MCFixupKindInfo::FKF_IsPCRel },
         { "fixup_sparc_br22",       0,     22,  MCFixupKindInfo::FKF_IsPCRel },
         { "fixup_sparc_br19",       0,     19,  MCFixupKindInfo::FKF_IsPCRel },
         { "fixup_sparc_br16_2",    20,      2,  MCFixupKindInfo::FKF_IsPCRel },
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override {
         { "fixup_sparc_tls_ldo_lox10",  0, 10,  0 },
         { "fixup_sparc_tls_ldo_add",    0,  0,  0 },
         { "fixup_sparc_tls_ie_hi22",    0, 22,  0 },
         { "fixup_sparc_tls_ie_lo10",    0, 10,  0 },
         { "fixup_sparc_tls_ie_ld",      0,  0,  0 },
         { "fixup_sparc_tls_ie_ldx",     0,  0,  0 },
         { "fixup_sparc_tls_ie_add",     0,  0,  0 },
         { "fixup_sparc_tls_le_hix22",   0,  0,  0 },
-        { "fixup_sparc_tls_le_lox10",   0,  0,  0 }
+        { "fixup_sparc_tls_le_lox10",   0,  0,  0 },
+        { "fixup_sparc_gdop",           0,  0,  0 },
+        { "fixup_sparc_gdop_hix22",     0,  0,  0 },
+        { "fixup_sparc_gdop_lox10",     0,  0,  0 },
       };
 
       if (Kind < FirstTargetFixupKind)
         return MCAsmBackend::getFixupKindInfo(Kind);
 
       assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
              "Invalid kind!");
       if (Endian == support::little)

lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp

unsigned SparcELFObjectWriter::getRelocType(MCContext &Ctx,
   case Sparc::fixup_sparc_tls_ldo_add:   return ELF::R_SPARC_TLS_LDO_ADD;
   case Sparc::fixup_sparc_tls_ie_hi22:   return ELF::R_SPARC_TLS_IE_HI22;
   case Sparc::fixup_sparc_tls_ie_lo10:   return ELF::R_SPARC_TLS_IE_LO10;
   case Sparc::fixup_sparc_tls_ie_ld:     return ELF::R_SPARC_TLS_IE_LD;
   case Sparc::fixup_sparc_tls_ie_ldx:    return ELF::R_SPARC_TLS_IE_LDX;
   case Sparc::fixup_sparc_tls_ie_add:    return ELF::R_SPARC_TLS_IE_ADD;
   case Sparc::fixup_sparc_tls_le_hix22:  return ELF::R_SPARC_TLS_LE_HIX22;
   case Sparc::fixup_sparc_tls_le_lox10:  return ELF::R_SPARC_TLS_LE_LOX10;
+  case Sparc::fixup_sparc_gdop:          return ELF::R_SPARC_GOTDATA_OP;
+  case Sparc::fixup_sparc_gdop_hix22:    return ELF::R_SPARC_GOTDATA_OP_HIX22;
+  case Sparc::fixup_sparc_gdop_lox10:    return ELF::R_SPARC_GOTDATA_OP_LOX10;
   }
 
   return ELF::R_SPARC_NONE;
 }
 
 bool SparcELFObjectWriter::needsRelocateWithSymbol(const MCSymbol &Sym,
                                                  unsigned Type) const {
   switch (Type) {

lib/Target/Sparc/MCTargetDesc/SparcFixupKinds.h

enum Fixups {
       fixup_sparc_tls_ie_hi22,
       fixup_sparc_tls_ie_lo10,
       fixup_sparc_tls_ie_ld,
       fixup_sparc_tls_ie_ldx,
       fixup_sparc_tls_ie_add,
       fixup_sparc_tls_le_hix22,
       fixup_sparc_tls_le_lox10,
 
+      /// fixups for GOTdata_op model
+      fixup_sparc_gdop_hix22,
+      fixup_sparc_gdop_lox10,
+      fixup_sparc_gdop,
+
       // Marker
       LastTargetFixupKind,
       NumTargetFixupKinds = LastTargetFixupKind - FirstTargetFixupKind
     };
   }
 }
 
 #endif

lib/Target/Sparc/MCTargetDesc/SparcMCExpr.h

enum VariantKind {
     VK_Sparc_TLS_LDO_LOX10,
     VK_Sparc_TLS_LDO_ADD,
     VK_Sparc_TLS_IE_HI22,
     VK_Sparc_TLS_IE_LO10,
     VK_Sparc_TLS_IE_LD,
     VK_Sparc_TLS_IE_LDX,
     VK_Sparc_TLS_IE_ADD,
     VK_Sparc_TLS_LE_HIX22,
-    VK_Sparc_TLS_LE_LOX10
+    VK_Sparc_TLS_LE_LOX10,
+    VK_Sparc_GDOP_HIX22,
+    VK_Sparc_GDOP_LOX10,
+    VK_Sparc_GDOP,
   };
 
 private:
   const VariantKind Kind;
   const MCExpr *Expr;
 
   explicit SparcMCExpr(VariantKind Kind, const MCExpr *Expr)
       : Kind(Kind), Expr(Expr) {}

lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp

bool SparcMCExpr::printVariantKind(raw_ostream &OS, VariantKind Kind)
   case VK_Sparc_TLS_LDO_ADD:   OS << "%tldo_add(";   break;
   case VK_Sparc_TLS_IE_HI22:   OS << "%tie_hi22(";   break;
   case VK_Sparc_TLS_IE_LO10:   OS << "%tie_lo10(";   break;
   case VK_Sparc_TLS_IE_LD:     OS << "%tie_ld(";     break;
   case VK_Sparc_TLS_IE_LDX:    OS << "%tie_ldx(";    break;
   case VK_Sparc_TLS_IE_ADD:    OS << "%tie_add(";    break;
   case VK_Sparc_TLS_LE_HIX22:  OS << "%tle_hix22(";  break;
   case VK_Sparc_TLS_LE_LOX10:  OS << "%tle_lox10(";  break;
+  case VK_Sparc_GDOP_HIX22:    OS << "%gdop_hix22("; break;
+  case VK_Sparc_GDOP_LOX10:    OS << "%gdop_lox10("; break;
+  case VK_Sparc_GDOP:          OS << "%gdop(";       break;
   }
   return closeParen;
 }
 
 SparcMCExpr::VariantKind SparcMCExpr::parseVariantKind(StringRef name)
 {
   return StringSwitch<SparcMCExpr::VariantKind>(name)
     .Case("lo",  VK_Sparc_LO)
return StringSwitch<SparcMCExpr::VariantKind>(name)
     .Case("tldo_add",   VK_Sparc_TLS_LDO_ADD)
     .Case("tie_hi22",   VK_Sparc_TLS_IE_HI22)
     .Case("tie_lo10",   VK_Sparc_TLS_IE_LO10)
     .Case("tie_ld",     VK_Sparc_TLS_IE_LD)
     .Case("tie_ldx",    VK_Sparc_TLS_IE_LDX)
     .Case("tie_add",    VK_Sparc_TLS_IE_ADD)
     .Case("tle_hix22",  VK_Sparc_TLS_LE_HIX22)
     .Case("tle_lox10",  VK_Sparc_TLS_LE_LOX10)
+    .Case("gdop_hix22", VK_Sparc_GDOP_HIX22)
+    .Case("gdop_lox10", VK_Sparc_GDOP_LOX10)
+    .Case("gdop",       VK_Sparc_GDOP)
     .Default(VK_Sparc_None);
 }
 
 Sparc::Fixups SparcMCExpr::getFixupKind(SparcMCExpr::VariantKind Kind) {
   switch (Kind) {
   default: llvm_unreachable("Unhandled SparcMCExpr::VariantKind");
   case VK_Sparc_LO:       return Sparc::fixup_sparc_lo10;
   case VK_Sparc_HI:       return Sparc::fixup_sparc_hi22;
Sparc::Fixups SparcMCExpr::getFixupKind(SparcMCExpr::VariantKind Kind) {
   case VK_Sparc_TLS_LDO_ADD:   return Sparc::fixup_sparc_tls_ldo_add;
   case VK_Sparc_TLS_IE_HI22:   return Sparc::fixup_sparc_tls_ie_hi22;
   case VK_Sparc_TLS_IE_LO10:   return Sparc::fixup_sparc_tls_ie_lo10;
   case VK_Sparc_TLS_IE_LD:     return Sparc::fixup_sparc_tls_ie_ld;
   case VK_Sparc_TLS_IE_LDX:    return Sparc::fixup_sparc_tls_ie_ldx;
   case VK_Sparc_TLS_IE_ADD:    return Sparc::fixup_sparc_tls_ie_add;
   case VK_Sparc_TLS_LE_HIX22:  return Sparc::fixup_sparc_tls_le_hix22;
   case VK_Sparc_TLS_LE_LOX10:  return Sparc::fixup_sparc_tls_le_lox10;
+  case VK_Sparc_GDOP_HIX22:    return Sparc::fixup_sparc_gdop_hix22;
+  case VK_Sparc_GDOP_LOX10:    return Sparc::fixup_sparc_gdop_lox10;
+  case VK_Sparc_GDOP:          return Sparc::fixup_sparc_gdop;
   }
 }
 
 bool
 SparcMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
                                        const MCAsmLayout *Layout,
                                        const MCFixup *Fixup) const {
   return getSubExpr()->evaluateAsRelocatable(Res, Layout, Fixup);

test/MC/Sparc/sparc-pic.s

 ! PIC-NEXT:   0x{{[0-9,A-F]+}} R_SPARC_GOT22 AGlobalVar 0x0
 ! PIC-NEXT:   0x{{[0-9,A-F]+}} R_SPARC_GOT10 AGlobalVar 0x0
 ! PIC-NEXT:   0x{{[0-9,A-F]+}} R_SPARC_GOT22 AGlobalVar 0x0
 ! PIC-NEXT:   0x{{[0-9,A-F]+}} R_SPARC_GOT10 AGlobalVar 0x0
 ! PIC-NEXT:   0x{{[0-9,A-F]+}} R_SPARC_GOT22 .LC0 0x0
 ! PIC-NEXT:   0x{{[0-9,A-F]+}} R_SPARC_GOT10 .LC0 0x0
 ! PIC-NEXT:   0x{{[0-9,A-F]+}} R_SPARC_WPLT30 bar 0x0
 ! PIC:        0x{{[0-9,A-F]+}} R_SPARC_GOT13 value 0x0
+! PIC:        0x{{[0-9,A-F]+}} R_SPARC_GOTDATA_OP_HIX22 AGlobalVar 0x0
+! PIC:        0x{{[0-9,A-F]+}} R_SPARC_GOTDATA_OP_LOX10 AGlobalVar 0x0
+! PIC:        0x{{[0-9,A-F]+}} R_SPARC_GOTDATA_OP AGlobalVar 0x0
 ! PIC:      ]
 
 ! NOPIC:      Relocations [
 ! NOPIC-NOT:    0x{{[0-9,A-F]+}} R_SPARC_WPLT30 .text 0xC
 ! NOPIC:        0x{{[0-9,A-F]+}} R_SPARC_HI22 _GLOBAL_OFFSET_TABLE_ 0x4
 ! NOPIC-NEXT:   0x{{[0-9,A-F]+}} R_SPARC_LO10 _GLOBAL_OFFSET_TABLE_ 0x8
 ! NOPIC-NEXT:   0x{{[0-9,A-F]+}} R_SPARC_HI22 _GLOBAL_OFFSET_TABLE_ 0x0
 ! NOPIC-NEXT:   0x{{[0-9,A-F]+}} R_SPARC_LO10 _GLOBAL_OFFSET_TABLE_ 0x0
.Ltmp1:
         or %i0, %lo(_GLOBAL_OFFSET_TABLE_+(.Ltmp1-.Ltmp0)), %i0
         add %i0, %o7, %i0
         ldx [%i0+value], %i0
         ld [%i0], %i0
         ret
         restore
 .Lfunc_end0:
         .size pic13, .Lfunc_end0-pic13
+
+! Test GOTdata_op model relocations
+
+gotdataop:
+        save %sp, -128, %sp
+.Ltmpg0:
+        call .Ltmpg1
+.Ltmpg2:
+        sethi %hi(_GLOBAL_OFFSET_TABLE_+(.Ltmpg2-.Ltmpg0)), %i0
+.Ltmpg1:
+        or %i0, %lo(_GLOBAL_OFFSET_TABLE_+(.Ltmpg1-.Ltmpg0)), %i0
+        add %i0, %o7, %i0
+        sethi %gdop_hix22(AGlobalVar), %i1
+        xor %i1, %gdop_lox10(AGlobalVar), %i1
+        ld [%i0+%i1], %i0, %gdop(AGlobalVar)
+        ldsw [%i0], %i0
+        ret
+        restore