6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-05-20 05:38:50 +00:00
Code Issues Projects Releases Wiki Activity

Move PPCTargetLowering off of the TargetMachine and onto the subtarget.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210852 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2014-06-12 22:50:10 +00:00
parent cb7dc25df1
commit a7159144c2
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Target/PowerPC/PPCISelLowering.h
View File

@ -18,7 +18,6 @@
#include "PPC.h" #include "PPC.h"
#include "PPCInstrInfo.h" #include "PPCInstrInfo.h"
#include "PPCRegisterInfo.h" #include "PPCRegisterInfo.h"
#include "PPCSubtarget.h"
#include "llvm/CodeGen/CallingConvLower.h" #include "llvm/CodeGen/CallingConvLower.h"
#include "llvm/CodeGen/SelectionDAG.h" #include "llvm/CodeGen/SelectionDAG.h"
#include "llvm/Target/TargetLowering.h" #include "llvm/Target/TargetLowering.h"
@ -345,6 +344,7 @@ namespace llvm {
SDValue get_VSPLTI_elt(SDNode *N, unsigned ByteSize, SelectionDAG &DAG); SDValue get_VSPLTI_elt(SDNode *N, unsigned ByteSize, SelectionDAG &DAG);
} }
class PPCSubtarget;
class PPCTargetLowering : public TargetLowering { class PPCTargetLowering : public TargetLowering {
const PPCSubtarget &Subtarget; const PPCSubtarget &Subtarget;

7
lib/Target/PowerPC/PPCSubtarget.cpp
View File

@ -75,12 +75,13 @@ PPCSubtarget &PPCSubtarget::initializeSubtargetDependencies(StringRef CPU,
} }
PPCSubtarget::PPCSubtarget(const std::string &TT, const std::string &CPU, PPCSubtarget::PPCSubtarget(const std::string &TT, const std::string &CPU,
const std::string &FS, bool is64Bit, const std::string &FS, PPCTargetMachine &TM,
CodeGenOpt::Level OptLevel) bool is64Bit, CodeGenOpt::Level OptLevel)
: 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)), InstrInfo(*this), JITInfo(*this) {} DL(getDataLayoutString(*this)), InstrInfo(*this), JITInfo(*this),
TLInfo(TM) {}
/// 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.

5
lib/Target/PowerPC/PPCSubtarget.h
View File

@ -16,6 +16,7 @@
#include "PPCFrameLowering.h" #include "PPCFrameLowering.h"
#include "PPCInstrInfo.h" #include "PPCInstrInfo.h"
#include "PPCISelLowering.h"
#include "PPCJITInfo.h" #include "PPCJITInfo.h"
#include "llvm/ADT/Triple.h" #include "llvm/ADT/Triple.h"
#include "llvm/IR/DataLayout.h" #include "llvm/IR/DataLayout.h"
@ -110,13 +111,14 @@ protected:
const DataLayout DL; const DataLayout DL;
PPCInstrInfo InstrInfo; PPCInstrInfo InstrInfo;
PPCJITInfo JITInfo; PPCJITInfo JITInfo;
PPCTargetLowering TLInfo;
public: public:
/// This constructor initializes the data members to match that /// This constructor initializes the data members to match that
/// of the specified triple. /// of the specified triple.
/// ///
PPCSubtarget(const std::string &TT, const std::string &CPU, PPCSubtarget(const std::string &TT, const std::string &CPU,
const std::string &FS, bool is64Bit, const std::string &FS, PPCTargetMachine &TM, bool is64Bit,
CodeGenOpt::Level OptLevel); CodeGenOpt::Level OptLevel);
/// ParseSubtargetFeatures - Parses features string setting specified /// ParseSubtargetFeatures - Parses features string setting specified
@ -144,6 +146,7 @@ public:
const DataLayout *getDataLayout() const { return &DL; } const DataLayout *getDataLayout() const { return &DL; }
const PPCInstrInfo *getInstrInfo() const { return &InstrInfo; } const PPCInstrInfo *getInstrInfo() const { return &InstrInfo; }
PPCJITInfo *getJITInfo() { return &JITInfo; } PPCJITInfo *getJITInfo() { return &JITInfo; }
const PPCTargetLowering *getTargetLowering() const { return &TLInfo; }
/// 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.

2
lib/Target/PowerPC/PPCTargetMachine.cpp
View File

@ -42,7 +42,7 @@ 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), TLInfo(*this), TSInfo(*this) { Subtarget(TT, CPU, FS, *this, is64Bit, OL), TSInfo(*this) {
initAsmInfo(); initAsmInfo();
} }

3
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;
PPCTargetLowering TLInfo;
PPCSelectionDAGInfo TSInfo; PPCSelectionDAGInfo TSInfo;
public: public:
@ -46,7 +45,7 @@ public:
} }
PPCJITInfo *getJITInfo() override { return Subtarget.getJITInfo(); } PPCJITInfo *getJITInfo() override { return Subtarget.getJITInfo(); }
const PPCTargetLowering *getTargetLowering() const override { const PPCTargetLowering *getTargetLowering() const override {
return &TLInfo; return getSubtargetImpl()->getTargetLowering();
} }
const PPCSelectionDAGInfo* getSelectionDAGInfo() const override { const PPCSelectionDAGInfo* getSelectionDAGInfo() const override {
return &TSInfo; return &TSInfo;