diff options
| -rw-r--r-- | lib/Target/X86/X86ISelDAGToDAG.cpp | 18 | ||||
| -rw-r--r-- | utils/TableGen/DAGISelMatcherEmitter.cpp | 4 |
2 files changed, 2 insertions, 20 deletions
diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp index 40b12c7..586d6ef 100644 --- a/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -198,26 +198,12 @@ namespace { SDValue &Scale, SDValue &Index, SDValue &Disp); bool SelectTLSADDRAddr(SDNode *Op, SDValue N, SDValue &Base, SDValue &Scale, SDValue &Index, SDValue &Disp); - bool SelectScalarSSELoadXXX(SDNode *Root, SDValue N, + bool SelectScalarSSELoad(SDNode *Root, SDValue N, SDValue &Base, SDValue &Scale, SDValue &Index, SDValue &Disp, SDValue &Segment, SDValue &NodeWithChain); - // FIXME: Remove this hacky wrapper. - bool SelectScalarSSELoad(SDNode *Root, SDValue N, SDValue &Base, - SDValue &Scale, SDValue &Index, - SDValue &Disp, SDValue &Segment, - SDValue &PatternChainResult, - SDValue &PatternInputChain) { - SDValue Tmp; - if (!SelectScalarSSELoadXXX(Root, N, Base, Scale, Index, Disp, Segment, - Tmp)) - return false; - PatternInputChain = Tmp.getOperand(0); - PatternChainResult = Tmp.getValue(1); - return true; - } bool TryFoldLoad(SDNode *P, SDValue N, SDValue &Base, SDValue &Scale, SDValue &Index, SDValue &Disp, @@ -1317,7 +1303,7 @@ bool X86DAGToDAGISel::SelectAddr(SDNode *Op, SDValue N, SDValue &Base, /// We also return: /// PatternChainNode: this is the matched node that has a chain input and /// output. -bool X86DAGToDAGISel::SelectScalarSSELoadXXX(SDNode *Root, +bool X86DAGToDAGISel::SelectScalarSSELoad(SDNode *Root, SDValue N, SDValue &Base, SDValue &Scale, SDValue &Index, SDValue &Disp, SDValue &Segment, diff --git a/utils/TableGen/DAGISelMatcherEmitter.cpp b/utils/TableGen/DAGISelMatcherEmitter.cpp index 7df62a6..36d6f14 100644 --- a/utils/TableGen/DAGISelMatcherEmitter.cpp +++ b/utils/TableGen/DAGISelMatcherEmitter.cpp @@ -608,10 +608,6 @@ void MatcherTableEmitter::EmitPredicateFunctions(const CodeGenDAGPatterns &CGP, OS << " Result.resize(Result.size()+" << NumOps << ");\n"; OS << " return " << P.getSelectFunc(); - // FIXME: Temporary hack until old isel dies. - if (P.hasProperty(SDNPHasChain)) - OS << "XXX"; - OS << "(Root, N"; for (unsigned i = 0; i != NumOps; ++i) OS << ", Result[Result.size()-" << (NumOps-i) << ']'; |