Date: Tue, 17 Jan 2012 04:45:11 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r230255 - in projects/llvm-ia64: contrib/llvm/lib/Target/IA64 contrib/llvm/lib/Target/IA64/InstPrinter contrib/llvm/lib/Target/IA64/MCTargetDesc contrib/llvm/lib/Target/IA64/TargetInfo ... Message-ID: <201201170445.q0H4jB1t067665@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Tue Jan 17 04:45:11 2012 New Revision: 230255 URL: http://svn.freebsd.org/changeset/base/230255 Log: Bring IA64 in sync with the current code base. Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64AsmPrinter.cpp projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64InstrInfo.cpp projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64RegisterInfo.cpp projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64RegisterInfo.h projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64Subtarget.cpp projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64TargetMachine.cpp projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64TargetMachine.h projects/llvm-ia64/contrib/llvm/lib/Target/IA64/InstPrinter/IA64InstPrinter.cpp projects/llvm-ia64/contrib/llvm/lib/Target/IA64/InstPrinter/IA64InstPrinter.h projects/llvm-ia64/contrib/llvm/lib/Target/IA64/MCTargetDesc/IA64MCTargetDesc.cpp projects/llvm-ia64/contrib/llvm/lib/Target/IA64/TargetInfo/IA64TargetInfo.cpp projects/llvm-ia64/lib/clang/libllvmia64desc/Makefile Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64AsmPrinter.cpp ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64AsmPrinter.cpp Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64AsmPrinter.cpp Tue Jan 17 04:45:11 2012 (r230255) @@ -18,10 +18,8 @@ #include "llvm/MC/MCStreamer.h" #include "llvm/MC/MCSymbol.h" #include "llvm/Target/Mangler.h" -#include "llvm/Target/TargetData.h" -#include "llvm/Target/TargetLoweringObjectFile.h" -#include "llvm/Target/TargetRegistry.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/TargetRegistry.h" #include "llvm/Support/raw_ostream.h" using namespace llvm; @@ -112,20 +110,9 @@ IA64AsmPrinter::EmitInstruction(const Ma OutStreamer.EmitInstruction(TmpInst); } -static -MCInstPrinter *createIA64MCInstPrinter(const Target &T, unsigned SyntaxVariant, - const MCAsmInfo &MAI) -{ - if (SyntaxVariant == 0) - return new IA64InstPrinter(MAI); - return 0; -} - // Force static initialization. extern "C" void LLVMInitializeIA64AsmPrinter() { RegisterAsmPrinter<IA64AsmPrinter> X(TheIA64Target); - TargetRegistry::RegisterMCInstPrinter(TheIA64Target, - createIA64MCInstPrinter); } Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64InstrInfo.cpp ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64InstrInfo.cpp Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64InstrInfo.cpp Tue Jan 17 04:45:11 2012 (r230255) @@ -8,7 +8,7 @@ #include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/CodeGen/PseudoSourceValue.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Target/TargetRegistry.h" +#include "llvm/Support/TargetRegistry.h" #define GET_INSTRINFO_CTOR #include "IA64GenInstrInfo.inc" Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64RegisterInfo.cpp ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64RegisterInfo.cpp Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64RegisterInfo.cpp Tue Jan 17 04:45:11 2012 (r230255) @@ -19,7 +19,7 @@ using namespace llvm; // FIXME: Provide proper call frame setup / destroy opcodes. IA64RegisterInfo::IA64RegisterInfo(IA64TargetMachine &tm, const TargetInstrInfo &tii) : - IA64GenRegisterInfo(), + IA64GenRegisterInfo(IA64::B0), TM(tm), TII(tii) { @@ -87,26 +87,8 @@ IA64RegisterInfo::eliminateFrameIndex(Ma llvm_unreachable(__func__); } -int -IA64RegisterInfo::getDwarfRegNum(unsigned RegNum, bool isEH) const -{ - return IA64GenRegisterInfo::getDwarfRegNumFull(RegNum, 0); -} - -int -IA64RegisterInfo::getLLVMRegNum(unsigned RegNum, bool isEH) const -{ - llvm_unreachable(__func__); -} - unsigned IA64RegisterInfo::getFrameRegister(const MachineFunction &MF) const { llvm_unreachable(__func__); } - -unsigned -IA64RegisterInfo::getRARegister() const -{ - llvm_unreachable(__func__); -} Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64RegisterInfo.h ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64RegisterInfo.h Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64RegisterInfo.h Tue Jan 17 04:45:11 2012 (r230255) @@ -30,11 +30,7 @@ namespace llvm { void eliminateFrameIndex(MachineBasicBlock::iterator II, int SPAdj, RegScavenger *RS = NULL) const; - int getDwarfRegNum(unsigned RegNum, bool isEH) const; - int getLLVMRegNum(unsigned RegNum, bool isEH) const; - unsigned getFrameRegister(const MachineFunction &MF) const; - unsigned getRARegister() const; }; } // namespace llvm Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64Subtarget.cpp ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64Subtarget.cpp Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64Subtarget.cpp Tue Jan 17 04:45:11 2012 (r230255) @@ -2,7 +2,7 @@ #include "IA64Subtarget.h" #include "llvm/Support/Host.h" -#include "llvm/Target/TargetRegistry.h" +#include "llvm/Support/TargetRegistry.h" #define GET_SUBTARGETINFO_TARGET_DESC #define GET_SUBTARGETINFO_CTOR Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64TargetMachine.cpp ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64TargetMachine.cpp Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64TargetMachine.cpp Tue Jan 17 04:45:11 2012 (r230255) @@ -4,7 +4,7 @@ #include "llvm/PassManager.h" #include "llvm/CodeGen/Passes.h" #include "llvm/MC/MCAsmInfo.h" -#include "llvm/Target/TargetRegistry.h" +#include "llvm/Support/TargetRegistry.h" using namespace llvm; @@ -13,9 +13,9 @@ LLVMInitializeIA64Target() { RegisterTargetMachine<IA64TargetMachine> X(TheIA64Target); } -IA64TargetMachine::IA64TargetMachine(const Target &T, const std::string &TT, - const std::string &CPU, const std::string &FS) : - LLVMTargetMachine(T, TT, CPU, FS), +IA64TargetMachine::IA64TargetMachine(const Target &T, StringRef TT, + StringRef CPU, StringRef FS, Reloc::Model RM, CodeModel::Model CM) : + LLVMTargetMachine(T, TT, CPU, FS, RM, CM), Subtarget(TT, CPU, FS), DataLayout("e-i64:64:64-f80:128:128-f128:128:128-n8:16:32:64"), InstrInfo(*this), Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64TargetMachine.h ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64TargetMachine.h Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/IA64TargetMachine.h Tue Jan 17 04:45:11 2012 (r230255) @@ -22,8 +22,8 @@ namespace llvm { IA64FrameLowering FrameLowering; public: - IA64TargetMachine(const Target &T, const std::string &TT, - const std::string &CPU, const std::string &FS); + IA64TargetMachine(const Target &T, StringRef TT, StringRef CPU, + StringRef FS, Reloc::Model RM, CodeModel::Model CM); virtual const TargetFrameLowering *getFrameLowering() const { return &FrameLowering; Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/InstPrinter/IA64InstPrinter.cpp ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/InstPrinter/IA64InstPrinter.cpp Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/InstPrinter/IA64InstPrinter.cpp Tue Jan 17 04:45:11 2012 (r230255) @@ -13,9 +13,10 @@ using namespace llvm; #include "IA64GenAsmWriter.inc" void -IA64InstPrinter::printInst(const MCInst *MI, raw_ostream &O) +IA64InstPrinter::printInst(const MCInst *MI, raw_ostream &O, StringRef Annot) { printInstruction(MI, O); + printAnnotation(O, Annot); } void Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/InstPrinter/IA64InstPrinter.h ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/InstPrinter/IA64InstPrinter.h Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/InstPrinter/IA64InstPrinter.h Tue Jan 17 04:45:11 2012 (r230255) @@ -12,7 +12,7 @@ namespace llvm { IA64InstPrinter(const MCAsmInfo &MAI) : MCInstPrinter(MAI) {} - virtual void printInst(const MCInst *MI, raw_ostream &O); + virtual void printInst(const MCInst *MI, raw_ostream &O, StringRef Annot); // Autogenerated by tblgen. void printInstruction(const MCInst *MI, raw_ostream &O); Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/MCTargetDesc/IA64MCTargetDesc.cpp ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/MCTargetDesc/IA64MCTargetDesc.cpp Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/MCTargetDesc/IA64MCTargetDesc.cpp Tue Jan 17 04:45:11 2012 (r230255) @@ -1,9 +1,11 @@ #include "IA64MCTargetDesc.h" #include "IA64MCAsmInfo.h" +#include "InstPrinter/IA64InstPrinter.h" +#include "llvm/MC/MCCodeGenInfo.h" #include "llvm/MC/MCInstrInfo.h" #include "llvm/MC/MCRegisterInfo.h" #include "llvm/MC/MCSubtargetInfo.h" -#include "llvm/Target/TargetRegistry.h" +#include "llvm/Support/TargetRegistry.h" #define GET_INSTRINFO_MC_DESC #include "IA64GenInstrInfo.inc" @@ -16,38 +18,66 @@ using namespace llvm; -static -MCInstrInfo *createIA64MCInstrInfo() +static MCInstrInfo * +createIA64MCInstrInfo() { MCInstrInfo *X = new MCInstrInfo(); InitIA64MCInstrInfo(X); return X; } -extern "C" void -LLVMInitializeIA64MCInstrInfo() +static MCRegisterInfo * +createIA64MCRegisterInfo(StringRef TT) { - TargetRegistry::RegisterMCInstrInfo(TheIA64Target, createIA64MCInstrInfo); + MCRegisterInfo *X = new MCRegisterInfo(); + InitIA64MCRegisterInfo(X, IA64::B0); + return X; } -static -MCSubtargetInfo *createIA64MCSubtargetInfo(StringRef TT, StringRef CPU, - StringRef FS) +static MCSubtargetInfo * +createIA64MCSubtargetInfo(StringRef TT, StringRef CPU, StringRef FS) { MCSubtargetInfo *X = new MCSubtargetInfo(); InitIA64MCSubtargetInfo(X, TT, CPU, FS); return X; } -extern "C" void -LLVMInitializeIA64MCSubtargetInfo() +static MCCodeGenInfo * +createIA64MCCodeGenInfo(StringRef TT, Reloc::Model RM, CodeModel::Model CM) { - TargetRegistry::RegisterMCSubtargetInfo(TheIA64Target, - createIA64MCSubtargetInfo); + MCCodeGenInfo *X = new MCCodeGenInfo(); + X->InitMCCodeGenInfo(RM, CM); + return X; +} + +static MCInstPrinter * +createIA64MCInstPrinter(const Target &T, unsigned SyntaxVariant, + const MCAsmInfo &MAI, const MCSubtargetInfo &STI) +{ + if (SyntaxVariant == 0) + return new IA64InstPrinter(MAI); + return 0; } extern "C" void -LLVMInitializeIA64MCAsmInfo() +LLVMInitializeIA64TargetMC() { + // Register the MC asm info. RegisterMCAsmInfo<IA64MCAsmInfo> X(TheIA64Target); + + // Register the MC codegen info. + TargetRegistry::RegisterMCCodeGenInfo(TheIA64Target, createIA64MCCodeGenInfo); + + // Register the MC instruction info. + TargetRegistry::RegisterMCInstrInfo(TheIA64Target, createIA64MCInstrInfo); + + // Register the MC register info. + TargetRegistry::RegisterMCRegInfo(TheIA64Target, createIA64MCRegisterInfo); + + // Register the MC subtarget info. + TargetRegistry::RegisterMCSubtargetInfo(TheIA64Target, + createIA64MCSubtargetInfo); + + // Register the MCInstPrinter. + TargetRegistry::RegisterMCInstPrinter(TheIA64Target, createIA64MCInstPrinter); } Modified: projects/llvm-ia64/contrib/llvm/lib/Target/IA64/TargetInfo/IA64TargetInfo.cpp ============================================================================== --- projects/llvm-ia64/contrib/llvm/lib/Target/IA64/TargetInfo/IA64TargetInfo.cpp Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/contrib/llvm/lib/Target/IA64/TargetInfo/IA64TargetInfo.cpp Tue Jan 17 04:45:11 2012 (r230255) @@ -1,6 +1,6 @@ #include "IA64.h" #include "llvm/Module.h" -#include "llvm/Target/TargetRegistry.h" +#include "llvm/Support/TargetRegistry.h" using namespace llvm; Modified: projects/llvm-ia64/lib/clang/libllvmia64desc/Makefile ============================================================================== --- projects/llvm-ia64/lib/clang/libllvmia64desc/Makefile Tue Jan 17 02:49:23 2012 (r230254) +++ projects/llvm-ia64/lib/clang/libllvmia64desc/Makefile Tue Jan 17 04:45:11 2012 (r230255) @@ -6,6 +6,8 @@ SRCDIR= lib/Target/IA64/MCTargetDesc SRCS= IA64MCAsmInfo.cpp \ IA64MCTargetDesc.cpp +CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/.. + TGHDRS= IA64GenInstrInfo \ IA64GenRegisterInfo \ IA64GenSubtargetInfo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201170445.q0H4jB1t067665>