[llvm-commits] [llvm] r111264 - in /llvm/trunk: include/llvm/Support/ELF.h lib/MC/ELFObjectWriter.cpp

[Benjamin Kramer]

Author: d0k
Date: Tue Aug 17 13:20:28 2010
New Revision: 111264

URL: http://llvm.org/viewvc/llvm-project?rev=111264&view=rev
Log:
Sketch i386 relocations handling, from Roman Divacky.

Hello world builds & runs now on i386/ELF with -integrated-as.

Modified:
    llvm/trunk/include/llvm/Support/ELF.h
    llvm/trunk/lib/MC/ELFObjectWriter.cpp

Modified: llvm/trunk/include/llvm/Support/ELF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/ELF.h?rev=111264&r1=111263&r2=111264&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/ELF.h (original)
+++ llvm/trunk/include/llvm/Support/ELF.h Tue Aug 17 13:20:28 2010
@@ -216,6 +216,27 @@
   R_X86_64_TLSDESC    = 36
 };
 
+// i386 relocations.
+// TODO: this is just a subset
+enum {
+  R_386_NONE          = 0,
+  R_386_32            = 1,
+  R_386_PC32          = 2,
+  R_386_GOT32         = 3,
+  R_386_PLT32         = 4,
+  R_386_COPY          = 5,
+  R_386_GLOB_DAT      = 6,
+  R_386_JUMP_SLOT     = 7,
+  R_386_RELATIVE      = 8,
+  R_386_GOTOFF        = 9,
+  R_386_GOTPC         = 10,
+  R_386_32PLT         = 11,
+  R_386_16            = 20,
+  R_386_PC16          = 21,
+  R_386_8             = 22,
+  R_386_PC8           = 23
+};
+
 // Section header.
 struct Elf32_Shdr {
   Elf32_Word sh_name;      // Section name (index into string table)

Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=111264&r1=111263&r2=111264&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Tue Aug 17 13:20:28 2010
@@ -487,7 +487,7 @@
   }
 }
 
-// FIXME: this is currently X86_64 only
+// FIXME: this is currently X86/X86_64 only
 void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
                                            const MCAsmLayout &Layout,
                                            const MCFragment *Fragment,
@@ -495,8 +495,6 @@
                                            MCValue Target,
                                            uint64_t &FixedValue) {
   unsigned IsPCRel = isFixupKindX86PCRel(Fixup.getKind());
-  ELFRelocationEntry ERE;
-  struct ELF::Elf64_Rela ERE64;
 
   uint64_t FixupOffset =
     Layout.getFragmentOffset(Fragment) + Fixup.getOffset();
@@ -508,7 +506,7 @@
   Value = Target.getConstant();
 
   if (Target.isAbsolute()) {
-    Type = ELF::R_X86_64_NONE;
+    Type = Is64Bit ? ELF::R_X86_64_NONE : ELF::R_386_NONE;
     Index = 0;
   } else {
     const MCSymbol *Symbol = &Target.getSymA()->getSymbol();
@@ -540,34 +538,57 @@
   }
 
   // determine the type of the relocation
-  if (IsPCRel) {
-    Type = ELF::R_X86_64_PC32;
+  if (Is64Bit) {
+    if (IsPCRel) {
+      Type = ELF::R_X86_64_PC32;
+    } else {
+      switch ((unsigned)Fixup.getKind()) {
+      default: llvm_unreachable("invalid fixup kind!");
+      case FK_Data_8: Type = ELF::R_X86_64_64; break;
+      case X86::reloc_pcrel_4byte:
+      case FK_Data_4:
+        // check that the offset fits within a signed long
+        if (isInt<32>(Target.getConstant()))
+          Type = ELF::R_X86_64_32S;
+        else
+          Type = ELF::R_X86_64_32;
+        break;
+      case FK_Data_2: Type = ELF::R_X86_64_16; break;
+      case X86::reloc_pcrel_1byte:
+      case FK_Data_1: Type = ELF::R_X86_64_8; break;
+      }
+    }
   } else {
-    switch ((unsigned)Fixup.getKind()) {
-    default: llvm_unreachable("invalid fixup kind!");
-    case FK_Data_8: Type = ELF::R_X86_64_64; break;
-    case X86::reloc_pcrel_4byte:
-    case FK_Data_4:
-      // check that the offset fits within a signed long
-      if (isInt<32>(Target.getConstant()))
-        Type = ELF::R_X86_64_32S;
-      else
-        Type = ELF::R_X86_64_32;
-      break;
-    case FK_Data_2: Type = ELF::R_X86_64_16; break;
-    case X86::reloc_pcrel_1byte:
-    case FK_Data_1:
-      Type = ELF::R_X86_64_8;
-      break;
+    if (IsPCRel) {
+      Type = ELF::R_386_PC32;
+    } else {
+      switch ((unsigned)Fixup.getKind()) {
+      default: llvm_unreachable("invalid fixup kind!");
+      case X86::reloc_pcrel_4byte:
+      case FK_Data_4: Type = ELF::R_386_32; break;
+      case FK_Data_2: Type = ELF::R_386_16; break;
+      case X86::reloc_pcrel_1byte:
+      case FK_Data_1: Type = ELF::R_386_8; break;
+      }
     }
   }
 
   FixedValue = Value;
 
-  ERE64.setSymbolAndType(Index, Type);
+  ELFRelocationEntry ERE;
+
+  if (Is64Bit) {
+    struct ELF::Elf64_Rela ERE64;
+    ERE64.setSymbolAndType(Index, Type);
+    ERE.r_info = ERE64.r_info;
+  } else {
+    struct ELF::Elf32_Rela ERE32;
+    ERE32.setSymbolAndType(Index, Type);
+    ERE.r_info = ERE32.r_info;
+  }
 
   ERE.r_offset = FixupOffset;
-  ERE.r_info = ERE64.r_info;
+
   if (HasRelocationAddend)
     ERE.r_addend = Addend;
   else