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

Remove the redundant TM member from X86DAGToDAGISel; replace it

Browse Source 
with an accessor method which simply casts the parent class
SelectionDAGISel's TM to the target-specific type.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@72801 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2009-06-03 20:20:00 +00:00
parent 68c9344056
commit c553462c29
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Target/X86/X86ISelDAGToDAG.cpp
View File

@ -113,10 +113,6 @@ namespace {
/// SelectionDAG operations. /// SelectionDAG operations.
/// ///
class VISIBILITY_HIDDEN X86DAGToDAGISel : public SelectionDAGISel { class VISIBILITY_HIDDEN X86DAGToDAGISel : public SelectionDAGISel {
/// TM - Keep a reference to X86TargetMachine.
///
X86TargetMachine &TM;
/// X86Lowering - This object fully describes how to lower LLVM code to an /// X86Lowering - This object fully describes how to lower LLVM code to an
/// X86-specific SelectionDAG. /// X86-specific SelectionDAG.
X86TargetLowering &X86Lowering; X86TargetLowering &X86Lowering;
@ -136,8 +132,8 @@ namespace {
public: public:
explicit X86DAGToDAGISel(X86TargetMachine &tm, CodeGenOpt::Level OptLevel) explicit X86DAGToDAGISel(X86TargetMachine &tm, CodeGenOpt::Level OptLevel)
: SelectionDAGISel(tm, OptLevel), : SelectionDAGISel(tm, OptLevel),
TM(tm), X86Lowering(*TM.getTargetLowering()), X86Lowering(*tm.getTargetLowering()),
Subtarget(&TM.getSubtarget<X86Subtarget>()), Subtarget(&tm.getSubtarget<X86Subtarget>()),
OptForSize(false) {} OptForSize(false) {}
virtual const char *getPassName() const { virtual const char *getPassName() const {
@ -243,6 +239,18 @@ namespace {
/// ///
SDNode *getGlobalBaseReg(); SDNode *getGlobalBaseReg();
/// getTargetMachine - Return a reference to the TargetMachine, casted
/// to the target-specific type.
const X86TargetMachine &getTargetMachine() {
return static_cast<const X86TargetMachine &>(TM);
}
/// getInstrInfo - Return a reference to the TargetInstrInfo, casted
/// to the target-specific type.
const X86InstrInfo *getInstrInfo() {
return getTargetMachine().getInstrInfo();
}
#ifndef NDEBUG #ifndef NDEBUG
unsigned Indent; unsigned Indent;
#endif #endif
@ -674,6 +682,8 @@ bool X86DAGToDAGISel::MatchLoad(SDValue N, X86ISelAddressMode &AM) {
} }
bool X86DAGToDAGISel::MatchWrapper(SDValue N, X86ISelAddressMode &AM) { bool X86DAGToDAGISel::MatchWrapper(SDValue N, X86ISelAddressMode &AM) {
bool SymbolicAddressesAreRIPRel =
getTargetMachine().symbolicAddressesAreRIPRel();
bool is64Bit = Subtarget->is64Bit(); bool is64Bit = Subtarget->is64Bit();
DOUT << "Wrapper: 64bit " << is64Bit; DOUT << "Wrapper: 64bit " << is64Bit;
DOUT << " AM "; DEBUG(AM.dump()); DOUT << "\n"; DOUT << " AM "; DEBUG(AM.dump()); DOUT << "\n";
@ -684,7 +694,7 @@ bool X86DAGToDAGISel::MatchWrapper(SDValue N, X86ISelAddressMode &AM) {
// Base and index reg must be 0 in order to use rip as base. // Base and index reg must be 0 in order to use rip as base.
bool canUsePICRel = !AM.Base.Reg.getNode() && !AM.IndexReg.getNode(); bool canUsePICRel = !AM.Base.Reg.getNode() && !AM.IndexReg.getNode();
if (is64Bit && !canUsePICRel && TM.symbolicAddressesAreRIPRel()) if (is64Bit && !canUsePICRel && SymbolicAddressesAreRIPRel)
return true; return true;
if (AM.hasSymbolicDisplacement()) if (AM.hasSymbolicDisplacement())
@ -698,7 +708,7 @@ bool X86DAGToDAGISel::MatchWrapper(SDValue N, X86ISelAddressMode &AM) {
uint64_t Offset = G->getOffset(); uint64_t Offset = G->getOffset();
if (!is64Bit || isInt32(AM.Disp + Offset)) { if (!is64Bit || isInt32(AM.Disp + Offset)) {
GlobalValue *GV = G->getGlobal(); GlobalValue *GV = G->getGlobal();
bool isRIPRel = TM.symbolicAddressesAreRIPRel(); bool isRIPRel = SymbolicAddressesAreRIPRel;
if (N0.getOpcode() == llvm::ISD::TargetGlobalTLSAddress) { if (N0.getOpcode() == llvm::ISD::TargetGlobalTLSAddress) {
TLSModel::Model model = TLSModel::Model model =
getTLSModel (GV, TM.getRelocationModel()); getTLSModel (GV, TM.getRelocationModel());
@ -716,16 +726,16 @@ bool X86DAGToDAGISel::MatchWrapper(SDValue N, X86ISelAddressMode &AM) {
AM.CP = CP->getConstVal(); AM.CP = CP->getConstVal();
AM.Align = CP->getAlignment(); AM.Align = CP->getAlignment();
AM.Disp += Offset; AM.Disp += Offset;
AM.isRIPRel = TM.symbolicAddressesAreRIPRel(); AM.isRIPRel = SymbolicAddressesAreRIPRel;
return false; return false;
} }
} else if (ExternalSymbolSDNode *S =dyn_cast<ExternalSymbolSDNode>(N0)) { } else if (ExternalSymbolSDNode *S =dyn_cast<ExternalSymbolSDNode>(N0)) {
AM.ES = S->getSymbol(); AM.ES = S->getSymbol();
AM.isRIPRel = TM.symbolicAddressesAreRIPRel(); AM.isRIPRel = SymbolicAddressesAreRIPRel;
return false; return false;
} else if (JumpTableSDNode *J = dyn_cast<JumpTableSDNode>(N0)) { } else if (JumpTableSDNode *J = dyn_cast<JumpTableSDNode>(N0)) {
AM.JT = J->getIndex(); AM.JT = J->getIndex();
AM.isRIPRel = TM.symbolicAddressesAreRIPRel(); AM.isRIPRel = SymbolicAddressesAreRIPRel;
return false; return false;
} }
@ -1300,7 +1310,7 @@ bool X86DAGToDAGISel::TryFoldLoad(SDValue P, SDValue N,
/// ///
SDNode *X86DAGToDAGISel::getGlobalBaseReg() { SDNode *X86DAGToDAGISel::getGlobalBaseReg() {
MachineFunction *MF = CurBB->getParent(); MachineFunction *MF = CurBB->getParent();
unsigned GlobalBaseReg = TM.getInstrInfo()->getGlobalBaseReg(MF); unsigned GlobalBaseReg = getInstrInfo()->getGlobalBaseReg(MF);
return CurDAG->getRegister(GlobalBaseReg, TLI.getPointerTy()).getNode(); return CurDAG->getRegister(GlobalBaseReg, TLI.getPointerTy()).getNode();
} }