190,191c190,191
< def tB : TI<(outs), (ins brtarget:$target), "b $target",
< [(br bb:$target)]>;
---
> def tB : T1I<(outs), (ins brtarget:$target), "b $target",
> [(br bb:$target)]>;
194c194,195
< def tBfar : TIx2<(outs), (ins brtarget:$target), "bl $target\t@ far jump",[]>;
---
> def tBfar : T1Ix2<(outs), (ins brtarget:$target),
> "bl $target\t@ far jump",[]>;
196,199c197,200
< def tBR_JTr : TJTI<(outs),
< (ins tGPR:$target, jtblock_operand:$jt, i32imm:$id),
< "cpy pc, $target \n\t.align\t2\n$jt",
< [(ARMbrjt tGPR:$target, tjumptable:$jt, imm:$id)]>;
---
> def tBR_JTr : T1JTI<(outs),
> (ins tGPR:$target, jtblock_operand:$jt, i32imm:$id),
> "cpy pc, $target \n\t.align\t2\n$jt",
> [(ARMbrjt tGPR:$target, tjumptable:$jt, imm:$id)]>;
206c207
< def tBcc : TI<(outs), (ins brtarget:$target, pred:$cc), "b$cc $target",
---
> def tBcc : T1I<(outs), (ins brtarget:$target, pred:$cc), "b$cc $target",
214c215
< def tLDR : TI4<(outs tGPR:$dst), (ins t_addrmode_s4:$addr),
---
> def tLDR : T1I4<(outs tGPR:$dst), (ins t_addrmode_s4:$addr),
218c219
< def tLDRB : TI1<(outs tGPR:$dst), (ins t_addrmode_s1:$addr),
---
> def tLDRB : T1I1<(outs tGPR:$dst), (ins t_addrmode_s1:$addr),
222c223
< def tLDRH : TI2<(outs tGPR:$dst), (ins t_addrmode_s2:$addr),
---
> def tLDRH : T1I2<(outs tGPR:$dst), (ins t_addrmode_s2:$addr),
226c227
< def tLDRSB : TI1<(outs tGPR:$dst), (ins t_addrmode_rr:$addr),
---
> def tLDRSB : T1I1<(outs tGPR:$dst), (ins t_addrmode_rr:$addr),
230c231
< def tLDRSH : TI2<(outs tGPR:$dst), (ins t_addrmode_rr:$addr),
---
> def tLDRSH : T1I2<(outs tGPR:$dst), (ins t_addrmode_rr:$addr),
235c236
< def tLDRspi : TIs<(outs tGPR:$dst), (ins t_addrmode_sp:$addr),
---
> def tLDRspi : T1Is<(outs tGPR:$dst), (ins t_addrmode_sp:$addr),
242c243
< def tRestore : TIs<(outs tGPR:$dst), (ins t_addrmode_sp:$addr),
---
> def tRestore : T1Is<(outs tGPR:$dst), (ins t_addrmode_sp:$addr),
247c248
< def tLDRpci : TIs<(outs tGPR:$dst), (ins i32imm:$addr),
---
> def tLDRpci : T1Is<(outs tGPR:$dst), (ins i32imm:$addr),
253c254
< def tLDRcp : TIs<(outs tGPR:$dst), (ins i32imm:$addr),
---
> def tLDRcp : T1Is<(outs tGPR:$dst), (ins i32imm:$addr),
256c257
< def tSTR : TI4<(outs), (ins tGPR:$src, t_addrmode_s4:$addr),
---
> def tSTR : T1I4<(outs), (ins tGPR:$src, t_addrmode_s4:$addr),
260c261
< def tSTRB : TI1<(outs), (ins tGPR:$src, t_addrmode_s1:$addr),
---
> def tSTRB : T1I1<(outs), (ins tGPR:$src, t_addrmode_s1:$addr),
264c265
< def tSTRH : TI2<(outs), (ins tGPR:$src, t_addrmode_s2:$addr),
---
> def tSTRH : T1I2<(outs), (ins tGPR:$src, t_addrmode_s2:$addr),
268c269
< def tSTRspi : TIs<(outs), (ins tGPR:$src, t_addrmode_sp:$addr),
---
> def tSTRspi : T1Is<(outs), (ins tGPR:$src, t_addrmode_sp:$addr),
275c276
< def tSpill : TIs<(outs), (ins tGPR:$src, t_addrmode_sp:$addr),
---
> def tSpill : T1Is<(outs), (ins tGPR:$src, t_addrmode_sp:$addr),
365,367c366,368
< def tCMNNZ : T1I<(outs), (ins tGPR:$lhs, tGPR:$rhs),
< "cmn $lhs, $rhs",
< [(ARMcmpNZ tGPR:$lhs, (ineg tGPR:$rhs))]>;
---
> def tCMNZ : T1I<(outs), (ins tGPR:$lhs, tGPR:$rhs),
> "cmn $lhs, $rhs",
> [(ARMcmpZ tGPR:$lhs, (ineg tGPR:$rhs))]>;
375,377c376,378
< def tCMPNZi8 : T1I<(outs), (ins tGPR:$lhs, i32imm:$rhs),
< "cmp $lhs, $rhs",
< [(ARMcmpNZ tGPR:$lhs, imm0_255:$rhs)]>;
---
> def tCMPZi8 : T1I<(outs), (ins tGPR:$lhs, i32imm:$rhs),
> "cmp $lhs, $rhs",
> [(ARMcmpZ tGPR:$lhs, imm0_255:$rhs)]>;
386,388c387,389
< def tCMPNZr : T1I<(outs), (ins tGPR:$lhs, tGPR:$rhs),
< "cmp $lhs, $rhs",
< [(ARMcmpNZ tGPR:$lhs, tGPR:$rhs)]>;
---
> def tCMPZr : T1I<(outs), (ins tGPR:$lhs, tGPR:$rhs),
> "cmp $lhs, $rhs",
> [(ARMcmpZ tGPR:$lhs, tGPR:$rhs)]>;
554c555
< [(ARMcmpNZ (and tGPR:$lhs, tGPR:$rhs), 0)]>;
---
> [(ARMcmpZ (and tGPR:$lhs, tGPR:$rhs), 0)]>;
625,626c626,627
< def : TPat<(zextloadi1 t_addrmode_s1:$addr),
< (tLDRB t_addrmode_s1:$addr)>;
---
> def : T1Pat<(zextloadi1 t_addrmode_s1:$addr),
> (tLDRB t_addrmode_s1:$addr)>;
629,631c630,632
< def : TPat<(extloadi1 t_addrmode_s1:$addr), (tLDRB t_addrmode_s1:$addr)>;
< def : TPat<(extloadi8 t_addrmode_s1:$addr), (tLDRB t_addrmode_s1:$addr)>;
< def : TPat<(extloadi16 t_addrmode_s2:$addr), (tLDRH t_addrmode_s2:$addr)>;
---
> def : T1Pat<(extloadi1 t_addrmode_s1:$addr), (tLDRB t_addrmode_s1:$addr)>;
> def : T1Pat<(extloadi8 t_addrmode_s1:$addr), (tLDRB t_addrmode_s1:$addr)>;
> def : T1Pat<(extloadi16 t_addrmode_s2:$addr), (tLDRH t_addrmode_s2:$addr)>;