Completely rewrite ELFObjectWriter::RecordRelocation.

[oota-llvm.git] / include / llvm / MC / MCELFObjectWriter.h

diff --git a/include/llvm/MC/MCELFObjectWriter.h b/include/llvm/MC/MCELFObjectWriter.h
index 65dd1e8998cc657474f0e89a7c2dca12de4302e5..127f1624878b3ca7244610053511a71948946b42 100644 (file)
--- a/include/llvm/MC/MCELFObjectWriter.h
+++ b/include/llvm/MC/MCELFObjectWriter.h
@@ -20,42 +20,10 @@ class MCAssembler;
 class MCFixup;
 class MCFragment;
 class MCObjectWriter;
+class MCSectionData;
 class MCSymbol;
 class MCValue;
 
-/// @name Relocation Data
-/// @{
-
-struct ELFRelocationEntry {
-  // Make these big enough for both 32-bit and 64-bit
-  uint64_t r_offset;
-  int Index;
-  unsigned Type;
-  const MCSymbol *Symbol;
-  uint64_t r_addend;
-  const MCFixup *Fixup;
-
-  ELFRelocationEntry()
-    : r_offset(0), Index(0), Type(0), Symbol(0), r_addend(0), Fixup(0) {}
-
-  ELFRelocationEntry(uint64_t RelocOffset, int Idx, unsigned RelType,
-                     const MCSymbol *Sym, uint64_t Addend, const MCFixup &Fixup)
-    : r_offset(RelocOffset), Index(Idx), Type(RelType), Symbol(Sym),
-      r_addend(Addend), Fixup(&Fixup) {}
-
-  // Support lexicographic sorting.
-  bool operator<(const ELFRelocationEntry &RE) const {
-    if (RE.r_offset != r_offset)
-      return RE.r_offset < r_offset;
-    if (Type != RE.Type)
-      return Type < RE.Type;
-    if (Index != RE.Index)
-      return Index < RE.Index;
-    llvm_unreachable("ELFRelocs might be unstable!");
-    return 0;
-  }
-};
-
 class MCELFObjectTargetWriter {
   const uint8_t OSABI;
   const uint16_t EMachine;
@@ -84,21 +52,9 @@ public:
   virtual ~MCELFObjectTargetWriter() {}
 
   virtual unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup,
-                                bool IsPCRel, bool IsRelocWithSymbol,
-                                int64_t Addend) const = 0;
-  virtual const MCSymbol *ExplicitRelSym(const MCAssembler &Asm,
-                                         const MCValue &Target,
-                                         const MCFragment &F,
-                                         const MCFixup &Fixup,
-                                         bool IsPCRel) const;
-  virtual const MCSymbol *undefinedExplicitRelSym(const MCValue &Target,
-                                                  const MCFixup &Fixup,
-                                                  bool IsPCRel) const;
-  virtual void adjustFixupOffset(const MCFixup &Fixup,
-                                 uint64_t &RelocOffset);
-
-  virtual void sortRelocs(const MCAssembler &Asm,
-                          std::vector<ELFRelocationEntry> &Relocs);
+                                bool IsPCRel) const = 0;
+
+  virtual bool needsRelocateWithSymbol(unsigned Type) const;
 
   /// @name Accessors
   /// @{
@@ -121,16 +77,16 @@ public:
 #define R_SSYM_MASK 0x00ffffff
 
   // N64 relocation type accessors
-  unsigned getRType(uint32_t Type) const {
+  uint8_t getRType(uint32_t Type) const {
     return (unsigned)((Type >> R_TYPE_SHIFT) & 0xff);
   }
-  unsigned getRType2(uint32_t Type) const {
+  uint8_t getRType2(uint32_t Type) const {
     return (unsigned)((Type >> R_TYPE2_SHIFT) & 0xff);
   }
-  unsigned getRType3(uint32_t Type) const {
+  uint8_t getRType3(uint32_t Type) const {
     return (unsigned)((Type >> R_TYPE3_SHIFT) & 0xff);
   }
-  unsigned getRSsym(uint32_t Type) const {
+  uint8_t getRSsym(uint32_t Type) const {
     return (unsigned)((Type >> R_SSYM_SHIFT) & 0xff);
   }