maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Move PPCInstrInfo off of the target machine and onto the subtarget. 

llvm-svn: 210839
This commit is contained in:
Eric Christopher 2014-06-12 22:05:46 +00:00
parent 002840cf66
commit bd14dc519c
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Target/PowerPC/PPCSubtarget.cpp
View File

@ -80,7 +80,7 @@ PPCSubtarget::PPCSubtarget(const std::string &TT, const std::string &CPU,
: PPCGenSubtargetInfo(TT, CPU, FS), IsPPC64(is64Bit), TargetTriple(TT), : PPCGenSubtargetInfo(TT, CPU, FS), IsPPC64(is64Bit), TargetTriple(TT),
OptLevel(OptLevel), OptLevel(OptLevel),
FrameLowering(initializeSubtargetDependencies(CPU, FS)), FrameLowering(initializeSubtargetDependencies(CPU, FS)),
DL(getDataLayoutString(*this)) {} DL(getDataLayoutString(*this)), InstrInfo(*this) {}
/// SetJITMode - This is called to inform the subtarget info that we are /// SetJITMode - This is called to inform the subtarget info that we are
/// producing code for the JIT. /// producing code for the JIT.

3
llvm/lib/Target/PowerPC/PPCSubtarget.h
View File

@ -15,6 +15,7 @@
#define POWERPCSUBTARGET_H #define POWERPCSUBTARGET_H
#include "PPCFrameLowering.h" #include "PPCFrameLowering.h"
#include "PPCInstrInfo.h"
#include "llvm/ADT/Triple.h" #include "llvm/ADT/Triple.h"
#include "llvm/IR/DataLayout.h" #include "llvm/IR/DataLayout.h"
#include "llvm/MC/MCInstrItineraries.h" #include "llvm/MC/MCInstrItineraries.h"
@ -106,6 +107,7 @@ protected:
PPCFrameLowering FrameLowering; PPCFrameLowering FrameLowering;
const DataLayout DL; const DataLayout DL;
PPCInstrInfo InstrInfo;
public: public:
/// This constructor initializes the data members to match that /// This constructor initializes the data members to match that
@ -138,6 +140,7 @@ public:
const PPCFrameLowering *getFrameLowering() const { return &FrameLowering; } const PPCFrameLowering *getFrameLowering() const { return &FrameLowering; }
const DataLayout *getDataLayout() const { return &DL; } const DataLayout *getDataLayout() const { return &DL; }
const PPCInstrInfo *getInstrInfo() const { return &InstrInfo; }
/// initializeSubtargetDependencies - Initializes using a CPU and feature string /// initializeSubtargetDependencies - Initializes using a CPU and feature string
/// so that we can use initializer lists for subtarget initialization. /// so that we can use initializer lists for subtarget initialization.

4
llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
View File

@ -42,8 +42,8 @@ PPCTargetMachine::PPCTargetMachine(const Target &T, StringRef TT, StringRef CPU,
Reloc::Model RM, CodeModel::Model CM, Reloc::Model RM, CodeModel::Model CM,
CodeGenOpt::Level OL, bool is64Bit) CodeGenOpt::Level OL, bool is64Bit)
: LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL), : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
Subtarget(TT, CPU, FS, is64Bit, OL), InstrInfo(Subtarget), Subtarget(TT, CPU, FS, is64Bit, OL), JITInfo(*this, is64Bit),
JITInfo(*this, is64Bit), TLInfo(*this), TSInfo(*this) { TLInfo(*this), TSInfo(*this) {
initAsmInfo(); initAsmInfo();
} }

9
llvm/lib/Target/PowerPC/PPCTargetMachine.h
View File

@ -29,7 +29,6 @@ namespace llvm {
/// ///
class PPCTargetMachine : public LLVMTargetMachine { class PPCTargetMachine : public LLVMTargetMachine {
PPCSubtarget Subtarget; PPCSubtarget Subtarget;
PPCInstrInfo InstrInfo;
PPCJITInfo JITInfo; PPCJITInfo JITInfo;
PPCTargetLowering TLInfo; PPCTargetLowering TLInfo;
PPCSelectionDAGInfo TSInfo; PPCSelectionDAGInfo TSInfo;
@ -40,7 +39,9 @@ public:
Reloc::Model RM, CodeModel::Model CM, Reloc::Model RM, CodeModel::Model CM,
CodeGenOpt::Level OL, bool is64Bit); CodeGenOpt::Level OL, bool is64Bit);
const PPCInstrInfo *getInstrInfo() const override { return &InstrInfo; } const PPCInstrInfo *getInstrInfo() const override {
return getSubtargetImpl()->getInstrInfo();
}
const PPCFrameLowering *getFrameLowering() const override { const PPCFrameLowering *getFrameLowering() const override {
return getSubtargetImpl()->getFrameLowering(); return getSubtargetImpl()->getFrameLowering();
} }
@ -51,8 +52,8 @@ public:
const PPCSelectionDAGInfo* getSelectionDAGInfo() const override { const PPCSelectionDAGInfo* getSelectionDAGInfo() const override {
return &TSInfo; return &TSInfo;
} }
const PPCRegisterInfo *getRegisterInfo() const override { const PPCRegisterInfo *getRegisterInfo() const override {
return &InstrInfo.getRegisterInfo(); return &getInstrInfo()->getRegisterInfo();
} }
const DataLayout *getDataLayout() const override { const DataLayout *getDataLayout() const override {