[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCMachOWriter.cpp

[Bill Wendling]

Changes in directory llvm/lib/Target/PowerPC:

PPCMachOWriter.cpp updated: 1.15 -> 1.16
---
Log message:

Moved the GetTargetRelocation method to the PPCMachOWriterInfo object. The
PPCMachOWriter is now trivial.


---
Diffs of the changes:  (+1 -131)

 PPCMachOWriter.cpp |  132 -----------------------------------------------------
 1 files changed, 1 insertion(+), 131 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
diff -u llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.15 llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.16
--- llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.15	Fri Jan 26 16:39:48 2007
+++ llvm/lib/Target/PowerPC/PPCMachOWriter.cpp	Fri Feb  2 20:40:57 2007
@@ -12,35 +12,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PPCRelocations.h"
 #include "PPCTargetMachine.h"
 #include "llvm/PassManager.h"
 #include "llvm/CodeGen/MachOWriter.h"
 #include "llvm/Support/Compiler.h"
-#include "llvm/Support/OutputBuffer.h"
 using namespace llvm;
 
 namespace {
-  class VISIBILITY_HIDDEN PPCMachOWriter : public MachOWriter {
-  public:
+  struct VISIBILITY_HIDDEN PPCMachOWriter : public MachOWriter {
     PPCMachOWriter(std::ostream &O, PPCTargetMachine &TM)
       : MachOWriter(O, TM) {}
-
-    virtual void GetTargetRelocation(MachineRelocation &MR, MachOSection &From,
-                                     MachOSection &To, bool Scattered);
-
-    // Constants for the relocation r_type field.
-    // see <mach-o/ppc/reloc.h>
-    enum { PPC_RELOC_VANILLA, // generic relocation
-           PPC_RELOC_PAIR,    // the second relocation entry of a pair
-           PPC_RELOC_BR14,    // 14 bit branch displacement to word address
-           PPC_RELOC_BR24,    // 24 bit branch displacement to word address
-           PPC_RELOC_HI16,    // a PAIR follows with the low 16 bits
-           PPC_RELOC_LO16,    // a PAIR follows with the high 16 bits
-           PPC_RELOC_HA16,    // a PAIR follows, which is sign extended to 32b
-           PPC_RELOC_LO14     // LO16 with low 2 bits implicitly zero
     };
-  };
 }
 
 /// addPPCMachOObjectWriterPass - Returns a pass that outputs the generated code
@@ -52,115 +34,3 @@
   FPM.add(MOW);
   FPM.add(createPPCCodeEmitterPass(TM, MOW->getMachineCodeEmitter()));
 }
-
-/// GetTargetRelocation - For the MachineRelocation MR, convert it to one or
-/// more PowerPC MachORelocation(s), add the new relocations to the
-/// MachOSection, and rewrite the instruction at the section offset if required
-/// by that relocation type.
-void PPCMachOWriter::GetTargetRelocation(MachineRelocation &MR,
-                                         MachOSection &From,
-                                         MachOSection &To,
-                                         bool Scattered) {
-  uint64_t Addr = 0;
-
-  // Keep track of whether or not this is an externally defined relocation.
-  bool     isExtern = false;
-
-  // Get the address of whatever it is we're relocating, if possible.
-  if (!isExtern)
-    Addr = (uintptr_t)MR.getResultPointer() + To.addr;
-
-  switch ((PPC::RelocationType)MR.getRelocationType()) {
-  default: assert(0 && "Unknown PPC relocation type!");
-  case PPC::reloc_absolute_low_ix:
-    assert(0 && "Unhandled PPC relocation type!");
-    break;
-  case PPC::reloc_vanilla:
-    {
-      // FIXME: need to handle 64 bit vanilla relocs
-      MachORelocation VANILLA(MR.getMachineCodeOffset(), To.Index, false, 2, 
-                              isExtern, PPC_RELOC_VANILLA, Scattered,
-                              (intptr_t)MR.getResultPointer());
-      ++From.nreloc;
-      OutputBuffer RelocOut(From.RelocBuffer, is64Bit, isLittleEndian);
-      OutputBuffer SecOut(From.SectionData, is64Bit, isLittleEndian);
-
-      if (Scattered) {
-        RelocOut.outword(VANILLA.getPackedFields());
-        RelocOut.outword(VANILLA.getAddress());
-      } else {
-        RelocOut.outword(VANILLA.getAddress());
-        RelocOut.outword(VANILLA.getPackedFields());
-      }
-      
-      intptr_t SymbolOffset;
-      if (Scattered)
-        SymbolOffset = Addr + MR.getConstantVal();
-      else
-        SymbolOffset = Addr;
-      printf("vanilla fixup: sec_%x[%x] = %x\n", From.Index, unsigned(MR.getMachineCodeOffset()), (unsigned)SymbolOffset);
-      SecOut.fixword(SymbolOffset, MR.getMachineCodeOffset());
-    }
-    break;
-  case PPC::reloc_pcrel_bx:
-    {
-      Addr -= MR.getMachineCodeOffset();
-      Addr >>= 2;
-      Addr &= 0xFFFFFF;
-      Addr <<= 2;
-      Addr |= (From.SectionData[MR.getMachineCodeOffset()] << 24);
-
-      OutputBuffer SecOut(From.SectionData, is64Bit, isLittleEndian);
-      SecOut.fixword(Addr, MR.getMachineCodeOffset());
-      break;
-    }
-  case PPC::reloc_pcrel_bcx:
-    {
-      Addr -= MR.getMachineCodeOffset();
-      Addr &= 0xFFFC;
-
-      OutputBuffer SecOut(From.SectionData, is64Bit, isLittleEndian);
-      SecOut.fixhalf(Addr, MR.getMachineCodeOffset() + 2);
-      break;
-    }
-  case PPC::reloc_absolute_high:
-    {
-      MachORelocation HA16(MR.getMachineCodeOffset(), To.Index, false, 2,
-                           isExtern, PPC_RELOC_HA16);
-      MachORelocation PAIR(Addr & 0xFFFF, 0xFFFFFF, false, 2, isExtern,
-                           PPC_RELOC_PAIR);
-      ++From.nreloc;
-      ++From.nreloc;
-
-      OutputBuffer RelocOut(From.RelocBuffer, is64Bit, isLittleEndian);
-      RelocOut.outword(HA16.r_address);
-      RelocOut.outword(HA16.getPackedFields());
-      RelocOut.outword(PAIR.r_address);
-      RelocOut.outword(PAIR.getPackedFields());
-      Addr += 0x8000;
-
-      OutputBuffer SecOut(From.SectionData, is64Bit, isLittleEndian);
-      SecOut.fixhalf(Addr >> 16, MR.getMachineCodeOffset() + 2);
-      break;
-    }
-  case PPC::reloc_absolute_low:
-    {
-      MachORelocation LO16(MR.getMachineCodeOffset(), To.Index, false, 2,
-                           isExtern, PPC_RELOC_LO16);
-      MachORelocation PAIR(Addr >> 16, 0xFFFFFF, false, 2, isExtern,
-                           PPC_RELOC_PAIR);
-      ++From.nreloc;
-      ++From.nreloc;
-
-      OutputBuffer RelocOut(From.RelocBuffer, is64Bit, isLittleEndian);
-      RelocOut.outword(LO16.r_address);
-      RelocOut.outword(LO16.getPackedFields());
-      RelocOut.outword(PAIR.r_address);
-      RelocOut.outword(PAIR.getPackedFields());
-
-      OutputBuffer SecOut(From.SectionData, is64Bit, isLittleEndian);
-      SecOut.fixhalf(Addr, MR.getMachineCodeOffset() + 2);
-      break;
-    }
-  }
-}