diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/Target.td | 6 | ||||
| -rw-r--r-- | lib/Target/TargetSelectionDAG.td | 3 | ||||
| -rw-r--r-- | lib/Target/X86/X86InstrInfo.td | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/lib/Target/Target.td b/lib/Target/Target.td index 92c40570af..a268e16410 100644 --- a/lib/Target/Target.td +++ b/lib/Target/Target.td @@ -259,12 +259,6 @@ def ins; /// of operands. def variable_ops; -/// discard definition - Mark this operand as being matched in the input -/// but omitted from the output. This is necessary in some situations -/// involving variable_ops to help the pattern matcher determine which -/// input nodes to forward on to the variable_ops portion of the output. -def discard; - /// ptr_rc definition - Mark this operand as being a pointer value whose /// register class is resolved dynamically via a callback to TargetInstrInfo. /// FIXME: We should probably change this to a class which contain a list of diff --git a/lib/Target/TargetSelectionDAG.td b/lib/Target/TargetSelectionDAG.td index 9def220337..474f910026 100644 --- a/lib/Target/TargetSelectionDAG.td +++ b/lib/Target/TargetSelectionDAG.td @@ -62,7 +62,7 @@ class SDTCisIntVectorOfSameSize<int ThisOp, int OtherOp> /// SDTCisEltOfVec - This indicates that ThisOp is a scalar type of the same /// type as the element type of OtherOp, which is a vector type. -class SDTCisEltOfVec<int ThisOp, int OtherOp> +class SDTCisEltOfVec<int ThisOp, int OtherOp> : SDTypeConstraint<ThisOp> { int OtherOpNum = OtherOp; } @@ -470,7 +470,6 @@ class PatLeaf<dag frag, code pred = [{}], SDNodeXForm xform = NOOP_SDNodeXForm> def vtInt : PatLeaf<(vt), [{ return MVT::isInteger(N->getVT()); }]>; def vtFP : PatLeaf<(vt), [{ return MVT::isFloatingPoint(N->getVT()); }]>; -def immAllZeros : PatLeaf<(imm), [{ return N->isNullValue(); }]>; def immAllOnes : PatLeaf<(imm), [{ return N->isAllOnesValue(); }]>; def immAllOnesV: PatLeaf<(build_vector), [{ return ISD::isBuildVectorAllOnes(N); diff --git a/lib/Target/X86/X86InstrInfo.td b/lib/Target/X86/X86InstrInfo.td index 4ffc303c37..4b8dc100b9 100644 --- a/lib/Target/X86/X86InstrInfo.td +++ b/lib/Target/X86/X86InstrInfo.td @@ -322,9 +322,9 @@ let neverHasSideEffects = 1, isNotDuplicable = 1 in // Return instructions. let isTerminator = 1, isReturn = 1, isBarrier = 1, hasCtrlDep = 1, FPForm = SpecialFP, FPFormBits = SpecialFP.Value in { - def RET : I <0xC3, RawFrm, (outs), (ins discard:$amt, variable_ops), + def RET : I <0xC3, RawFrm, (outs), (ins variable_ops), "ret", - [(X86retflag immAllZeros:$amt)]>; + [(X86retflag 0)]>; def RETI : Ii16<0xC2, RawFrm, (outs), (ins i16imm:$amt, variable_ops), "ret\t$amt", [(X86retflag imm:$amt)]>; |