diff --git a/llvm/lib/Target/M68k/M68kInstrData.td b/llvm/lib/Target/M68k/M68kInstrData.td --- a/llvm/lib/Target/M68k/M68kInstrData.td +++ b/llvm/lib/Target/M68k/M68kInstrData.td @@ -385,13 +385,13 @@ let Uses = [CCR] in { class MxMoveFromCCR_R : MxInst<(outs MxDRD16:$dst), (ins CCRC:$src), "move.w\t$src, $dst", []>, - Requires<[ IsM68010 ]> { + Requires<[ AtLeastM68010 ]> { let Inst = (descend 0b0100001011, MxEncAddrMode_d<"dst">.EA); } class MxMoveFromCCR_M : MxInst<(outs), (ins MEMOp:$dst, CCRC:$src), "move.w\t$src, $dst", []>, - Requires<[ IsM68010 ]> { + Requires<[ AtLeastM68010 ]> { let Inst = (ascend (descend 0b0100001011, DST_ENC.EA), DST_ENC.Supplement diff --git a/llvm/lib/Target/M68k/M68kInstrInfo.td b/llvm/lib/Target/M68k/M68kInstrInfo.td --- a/llvm/lib/Target/M68k/M68kInstrInfo.td +++ b/llvm/lib/Target/M68k/M68kInstrInfo.td @@ -429,12 +429,12 @@ "TM.getCodeModel() == CodeModel::Kernel">; def IsPIC : Predicate<"TM.isPositionIndependent()">; def IsNotPIC : Predicate<"!TM.isPositionIndependent()">; -def IsM68000 : Predicate<"Subtarget.IsM68000()">; -def IsM68010 : Predicate<"Subtarget.IsM68010()">; -def IsM68020 : Predicate<"Subtarget.IsM68020()">; -def IsM68030 : Predicate<"Subtarget.IsM68030()">; -def IsM68040 : Predicate<"Subtarget.IsM68040()">; +def AtLeastM68000 : Predicate<"Subtarget->atLeastM68000()">; +def AtLeastM68010 : Predicate<"Subtarget->atLeastM68010()">; +def AtLeastM68020 : Predicate<"Subtarget->atLeastM68020()">; +def AtLeastM68030 : Predicate<"Subtarget->atLeastM68030()">; +def AtLeastM68040 : Predicate<"Subtarget->atLeastM68040()">; //===----------------------------------------------------------------------===// // Condition Codes