diff options
author | Daniel Dunbar <daniel@zuster.org> | 2010-12-16 16:09:19 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2010-12-16 16:09:19 +0000 |
commit | ae5abd595f5442767313a4c8a24008ad19323ceb (patch) | |
tree | 69c40cc4be41c1f859e3d22c8a10582c5df5a7bf /lib/MC/MachObjectWriter.cpp | |
parent | 297ed28bf9c633db52ff31115d439a0133b00efb (diff) |
MC/Mach-O: Stub out explicit MCMachObjectTargetWriter interface.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121973 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MachObjectWriter.cpp')
-rw-r--r-- | lib/MC/MachObjectWriter.cpp | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp index 7c6e59175f..fa132d8aeb 100644 --- a/lib/MC/MachObjectWriter.cpp +++ b/lib/MC/MachObjectWriter.cpp @@ -7,12 +7,13 @@ // //===----------------------------------------------------------------------===// +#include "llvm/MC/MCMachObjectWriter.h" +#include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/Twine.h" #include "llvm/MC/MCAssembler.h" #include "llvm/MC/MCAsmLayout.h" #include "llvm/MC/MCExpr.h" -#include "llvm/MC/MCMachObjectWriter.h" #include "llvm/MC/MCObjectWriter.h" #include "llvm/MC/MCSectionMachO.h" #include "llvm/MC/MCSymbol.h" @@ -162,17 +163,8 @@ class MachObjectWriter : public MCObjectWriter { } }; - /// @name Utility Methods - /// @{ - - bool isFixupKindPCRel(const MCAssembler &Asm, unsigned Kind) { - const MCFixupKindInfo &FKI = Asm.getBackend().getFixupKindInfo( - (MCFixupKind) Kind); - - return FKI.Flags & MCFixupKindInfo::FKF_IsPCRel; - } - - /// @} + /// The target specific Mach-O writer instance. + llvm::OwningPtr<MCMachObjectTargetWriter> TargetObjectWriter; /// @name Relocation Data /// @{ @@ -192,6 +184,19 @@ class MachObjectWriter : public MCObjectWriter { /// @} +private: + /// @name Utility Methods + /// @{ + + bool isFixupKindPCRel(const MCAssembler &Asm, unsigned Kind) { + const MCFixupKindInfo &FKI = Asm.getBackend().getFixupKindInfo( + (MCFixupKind) Kind); + + return FKI.Flags & MCFixupKindInfo::FKF_IsPCRel; + } + + /// @} + SectionAddrMap SectionAddress; uint64_t getSectionAddress(const MCSectionData* SD) const { return SectionAddress.lookup(SD); @@ -226,10 +231,10 @@ class MachObjectWriter : public MCObjectWriter { uint32_t CPUSubtype; public: - MachObjectWriter(raw_ostream &_OS, + MachObjectWriter(MCMachObjectTargetWriter *MOTW, raw_ostream &_OS, bool _Is64Bit, uint32_t _CPUType, uint32_t _CPUSubtype, bool _IsLittleEndian) - : MCObjectWriter(_OS, _IsLittleEndian), + : MCObjectWriter(_OS, _IsLittleEndian), TargetObjectWriter(MOTW), Is64Bit(_Is64Bit), CPUType(_CPUType), CPUSubtype(_CPUSubtype) { } @@ -1321,9 +1326,11 @@ public: } -MCObjectWriter *llvm::createMachObjectWriter(raw_ostream &OS, bool is64Bit, +MCObjectWriter *llvm::createMachObjectWriter(MCMachObjectTargetWriter *MOTW, + raw_ostream &OS, bool is64Bit, uint32_t CPUType, uint32_t CPUSubtype, bool IsLittleEndian) { - return new MachObjectWriter(OS, is64Bit, CPUType, CPUSubtype, IsLittleEndian); + return new MachObjectWriter(MOTW, OS, is64Bit, CPUType, CPUSubtype, + IsLittleEndian); } |