6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-06 04:31:08 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210839 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2014-06-12 22:05:46 +00:00
parent 647ab7f728
commit e3466d3777
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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),
OptLevel(OptLevel),
FrameLowering(initializeSubtargetDependencies(CPU, FS)),
DL(getDataLayoutString(*this)) {}
DL(getDataLayoutString(*this)), InstrInfo(*this) {}
/// SetJITMode - This is called to inform the subtarget info that we are
/// producing code for the JIT.

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

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

4
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,
CodeGenOpt::Level OL, bool is64Bit)
: LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
Subtarget(TT, CPU, FS, is64Bit, OL), InstrInfo(Subtarget),
JITInfo(*this, is64Bit), TLInfo(*this), TSInfo(*this) {
Subtarget(TT, CPU, FS, is64Bit, OL), JITInfo(*this, is64Bit),
TLInfo(*this), TSInfo(*this) {
initAsmInfo();
}

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

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