6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 04:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Move MipsJITInfo to the subtarget rather than the target machine.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@212151 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2014-07-02 00:54:12 +00:00
parent d5c4b1a558
commit b40edb9a1b
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Target/Mips/MipsSubtarget.cpp
View File

@ -85,7 +85,7 @@ MipsSubtarget::MipsSubtarget(const std::string &TT, const std::string &CPU,
InMips16Mode(false), InMips16HardFloat(Mips16HardFloat), InMips16Mode(false), InMips16HardFloat(Mips16HardFloat),
InMicroMipsMode(false), HasDSP(false), HasDSPR2(false), InMicroMipsMode(false), HasDSP(false), HasDSPR2(false),
AllowMixed16_32(Mixed16_32 | Mips_Os16), Os16(Mips_Os16), HasMSA(false), AllowMixed16_32(Mixed16_32 | Mips_Os16), Os16(Mips_Os16), HasMSA(false),
RM(_RM), OverrideMode(NoOverride), TM(_TM), TargetTriple(TT) { RM(_RM), OverrideMode(NoOverride), TM(_TM), TargetTriple(TT), JITInfo() {
std::string CPUName = CPU; std::string CPUName = CPU;
CPUName = selectMipsCPU(TT, CPUName); CPUName = selectMipsCPU(TT, CPUName);

5
lib/Target/Mips/MipsSubtarget.h
View File

@ -14,6 +14,7 @@
#ifndef MIPSSUBTARGET_H #ifndef MIPSSUBTARGET_H
#define MIPSSUBTARGET_H #define MIPSSUBTARGET_H
#include "MipsJITInfo.h"
#include "llvm/MC/MCInstrItineraries.h" #include "llvm/MC/MCInstrItineraries.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Target/TargetSubtargetInfo.h" #include "llvm/Target/TargetSubtargetInfo.h"
@ -132,6 +133,8 @@ protected:
MipsTargetMachine *TM; MipsTargetMachine *TM;
Triple TargetTriple; Triple TargetTriple;
MipsJITInfo JITInfo;
public: public:
bool enablePostRAScheduler(CodeGenOpt::Level OptLevel, bool enablePostRAScheduler(CodeGenOpt::Level OptLevel,
AntiDepBreakMode& Mode, AntiDepBreakMode& Mode,
@ -248,6 +251,8 @@ public:
/// specify which component of the system provides it. Hardware, software, and /// specify which component of the system provides it. Hardware, software, and
/// hybrid implementations are all valid. /// hybrid implementations are all valid.
bool systemSupportsUnalignedAccess() const { return hasMips32r6(); } bool systemSupportsUnalignedAccess() const { return hasMips32r6(); }
MipsJITInfo *getJITInfo() { return &JITInfo; }
}; };
} // End llvm namespace } // End llvm namespace

2
lib/Target/Mips/MipsTargetMachine.cpp
View File

@ -89,7 +89,7 @@ MipsTargetMachine::MipsTargetMachine(const Target &T, StringRef TT,
Subtarget(TT, CPU, FS, isLittle, RM, this), Subtarget(TT, CPU, FS, isLittle, RM, this),
DL(computeDataLayout(Subtarget)), InstrInfo(MipsInstrInfo::create(*this)), DL(computeDataLayout(Subtarget)), InstrInfo(MipsInstrInfo::create(*this)),
FrameLowering(MipsFrameLowering::create(*this, Subtarget)), FrameLowering(MipsFrameLowering::create(*this, Subtarget)),
TLInfo(MipsTargetLowering::create(*this)), TSInfo(DL), JITInfo() { TLInfo(MipsTargetLowering::create(*this)), TSInfo(DL) {
initAsmInfo(); initAsmInfo();
} }

6
lib/Target/Mips/MipsTargetMachine.h
View File

@ -17,7 +17,6 @@
#include "MipsFrameLowering.h" #include "MipsFrameLowering.h"
#include "MipsISelLowering.h" #include "MipsISelLowering.h"
#include "MipsInstrInfo.h" #include "MipsInstrInfo.h"
#include "MipsJITInfo.h"
#include "MipsSelectionDAGInfo.h" #include "MipsSelectionDAGInfo.h"
#include "MipsSubtarget.h" #include "MipsSubtarget.h"
#include "llvm/CodeGen/Passes.h" #include "llvm/CodeGen/Passes.h"
@ -43,7 +42,6 @@ class MipsTargetMachine : public LLVMTargetMachine {
std::unique_ptr<const MipsFrameLowering> FrameLoweringSE; std::unique_ptr<const MipsFrameLowering> FrameLoweringSE;
std::unique_ptr<const MipsTargetLowering> TLInfoSE; std::unique_ptr<const MipsTargetLowering> TLInfoSE;
MipsSelectionDAGInfo TSInfo; MipsSelectionDAGInfo TSInfo;
MipsJITInfo JITInfo;
public: public:
MipsTargetMachine(const Target &T, StringRef TT, MipsTargetMachine(const Target &T, StringRef TT,
@ -71,7 +69,9 @@ public:
: &getSubtargetImpl()->getInstrItineraryData(); : &getSubtargetImpl()->getInstrItineraryData();
} }
MipsJITInfo *getJITInfo() override { return &JITInfo; } MipsJITInfo *getJITInfo() override {
return Subtarget.getJITInfo();
}
const MipsRegisterInfo *getRegisterInfo() const override { const MipsRegisterInfo *getRegisterInfo() const override {
return &InstrInfo->getRegisterInfo(); return &InstrInfo->getRegisterInfo();