diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-08-13 17:08:54 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-08-13 17:08:54 +0000 |
| commit | 7f88d0d6452f2bf0f30338af643302bf9c85c16d (patch) | |
| tree | cd6f8af589ae8079e52e9dcc8b9c0c4ae7f92782 | |
| parent | 744ee54b644163cf59fb7ad556ef25a342828921 (diff) | |
| download | external_llvm-7f88d0d6452f2bf0f30338af643302bf9c85c16d.zip external_llvm-7f88d0d6452f2bf0f30338af643302bf9c85c16d.tar.gz external_llvm-7f88d0d6452f2bf0f30338af643302bf9c85c16d.tar.bz2 | |
Reapply pieces of 78914 reverted in 78916, this has been fixed.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78921 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/PIC16/Makefile | 4 | ||||
| -rw-r--r-- | lib/Target/PIC16/PIC16TargetMachine.cpp | 23 | ||||
| -rw-r--r-- | lib/Target/PIC16/PIC16TargetMachine.h | 7 |
3 files changed, 15 insertions, 19 deletions
diff --git a/lib/Target/PIC16/Makefile b/lib/Target/PIC16/Makefile index 4ce60a9..f913675 100644 --- a/lib/Target/PIC16/Makefile +++ b/lib/Target/PIC16/Makefile @@ -7,7 +7,7 @@ # ##===----------------------------------------------------------------------===## LEVEL = ../../.. -LIBRARYNAME = LLVMPIC16 +LIBRARYNAME = LLVMPIC16CodeGen TARGET = PIC16 # Make sure that tblgen is run, first thing. @@ -17,7 +17,7 @@ BUILT_SOURCES = PIC16GenRegisterInfo.h.inc PIC16GenRegisterNames.inc \ PIC16GenDAGISel.inc PIC16GenCallingConv.inc \ PIC16GenSubtarget.inc -DIRS = TargetInfo +DIRS = AsmPrinter TargetInfo include $(LEVEL)/Makefile.common diff --git a/lib/Target/PIC16/PIC16TargetMachine.cpp b/lib/Target/PIC16/PIC16TargetMachine.cpp index 6af693f..2cdaff3 100644 --- a/lib/Target/PIC16/PIC16TargetMachine.cpp +++ b/lib/Target/PIC16/PIC16TargetMachine.cpp @@ -16,25 +16,28 @@ #include "PIC16TargetMachine.h" #include "llvm/PassManager.h" #include "llvm/CodeGen/Passes.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/Target/TargetRegistry.h" using namespace llvm; -// PIC16TargetMachine - Traditional PIC16 Machine. +extern "C" void LLVMInitializePIC16Target() { + // Register the target. Curretnly the codegen works for + // enhanced pic16 mid-range. + RegisterTargetMachine<PIC16TargetMachine> X(ThePIC16Target); + RegisterAsmInfo<PIC16TargetAsmInfo> A(ThePIC16Target); +} + + +// PIC16TargetMachine - Enhanced PIC16 mid-range Machine. May also represent +// a Traditional Machine if 'Trad' is true. PIC16TargetMachine::PIC16TargetMachine(const Target &T, const std::string &TT, - const std::string &FS, bool Cooper) + const std::string &FS, bool Trad) : LLVMTargetMachine(T, TT), - Subtarget(TT, FS, Cooper), + Subtarget(TT, FS, Trad), DataLayout("e-p:16:8:8-i8:8:8-i16:8:8-i32:8:8"), InstrInfo(*this), TLInfo(*this), FrameInfo(TargetFrameInfo::StackGrowsUp, 8, 0) { } -// CooperTargetMachine - Uses the same PIC16TargetMachine, but makes IsCooper -// as true. -CooperTargetMachine::CooperTargetMachine(const Target &T, const std::string &TT, - const std::string &FS) - : PIC16TargetMachine(T, TT, FS, true) {} - bool PIC16TargetMachine::addInstSelector(PassManagerBase &PM, CodeGenOpt::Level OptLevel) { diff --git a/lib/Target/PIC16/PIC16TargetMachine.h b/lib/Target/PIC16/PIC16TargetMachine.h index 51efdb2..b11fdd5 100644 --- a/lib/Target/PIC16/PIC16TargetMachine.h +++ b/lib/Target/PIC16/PIC16TargetMachine.h @@ -59,13 +59,6 @@ public: virtual bool addPreEmitPass(PassManagerBase &PM, CodeGenOpt::Level OptLevel); }; // PIC16TargetMachine. -/// CooperTargetMachine -class CooperTargetMachine : public PIC16TargetMachine { -public: - CooperTargetMachine(const Target &T, const std::string &TT, - const std::string &FS); -}; // CooperTargetMachine. - } // end namespace llvm #endif |