855c855,859
< return new MovRegCc(machInst, rd, INTREG_ZERO, rn, imm5, LSL);
---
> if (machInst.itstateMask) {
> return new MovReg(machInst, rd, INTREG_ZERO, rn, imm5, LSL);
> } else {
> return new MovRegCc(machInst, rd, INTREG_ZERO, rn, imm5, LSL);
> }
857c861,865
< return new MovRegCc(machInst, rd, INTREG_ZERO, rn, imm5, LSR);
---
> if (machInst.itstateMask) {
> return new MovReg(machInst, rd, INTREG_ZERO, rn, imm5, LSR);
> } else {
> return new MovRegCc(machInst, rd, INTREG_ZERO, rn, imm5, LSR);
> }
859c867,871
< return new MovRegCc(machInst, rd, INTREG_ZERO, rn, imm5, ASR);
---
> if (machInst.itstateMask) {
> return new MovReg(machInst, rd, INTREG_ZERO, rn, imm5, ASR);
> } else {
> return new MovRegCc(machInst, rd, INTREG_ZERO, rn, imm5, ASR);
> }
863c875,879
< return new AddRegCc(machInst, rd, rn, rm, 0, LSL);
---
> if (machInst.itstateMask) {
> return new AddReg(machInst, rd, rn, rm, 0, LSL);
> } else {
> return new AddRegCc(machInst, rd, rn, rm, 0, LSL);
> }
865c881,885
< return new SubRegCc(machInst, rd, rn, rm, 0, LSL);
---
> if (machInst.itstateMask) {
> return new SubReg(machInst, rd, rn, rm, 0, LSL);
> } else {
> return new SubRegCc(machInst, rd, rn, rm, 0, LSL);
> }
867c887,891
< return new AddImmCc(machInst, rd, rn, imm3, true);
---
> if (machInst.itstateMask) {
> return new AddImm(machInst, rd, rn, imm3, true);
> } else {
> return new AddImmCc(machInst, rd, rn, imm3, true);
> }
869c893,897
< return new SubImmCc(machInst, rd, rn, imm3, true);
---
> if (machInst.itstateMask) {
> return new SubImm(machInst, rd, rn, imm3, true);
> } else {
> return new SubImmCc(machInst, rd, rn, imm3, true);
> }
872c900,904
< return new MovImmCc(machInst, rd8, INTREG_ZERO, imm8, false);
---
> if (machInst.itstateMask) {
> return new MovImm(machInst, rd8, INTREG_ZERO, imm8, false);
> } else {
> return new MovImmCc(machInst, rd8, INTREG_ZERO, imm8, false);
> }
876c908,912
< return new AddImmCc(machInst, rd8, rd8, imm8, true);
---
> if (machInst.itstateMask) {
> return new AddImm(machInst, rd8, rd8, imm8, true);
> } else {
> return new AddImmCc(machInst, rd8, rd8, imm8, true);
> }
878c914,918
< return new SubImmCc(machInst, rd8, rd8, imm8, true);
---
> if (machInst.itstateMask) {
> return new SubImm(machInst, rd8, rd8, imm8, true);
> } else {
> return new SubImmCc(machInst, rd8, rd8, imm8, true);
> }
891c931,935
< return new AndRegCc(machInst, rdn, rdn, rm, 0, LSL);
---
> if (machInst.itstateMask) {
> return new AndReg(machInst, rdn, rdn, rm, 0, LSL);
> } else {
> return new AndRegCc(machInst, rdn, rdn, rm, 0, LSL);
> }
893c937,941
< return new EorRegCc(machInst, rdn, rdn, rm, 0, LSL);
---
> if (machInst.itstateMask) {
> return new EorReg(machInst, rdn, rdn, rm, 0, LSL);
> } else {
> return new EorRegCc(machInst, rdn, rdn, rm, 0, LSL);
> }
895c943,949
< return new MovRegRegCc(machInst, rdn, INTREG_ZERO, rdn, rm, LSL);
---
> if (machInst.itstateMask) {
> return new MovRegReg(machInst, rdn,
> INTREG_ZERO, rdn, rm, LSL);
> } else {
> return new MovRegRegCc(machInst, rdn,
> INTREG_ZERO, rdn, rm, LSL);
> }
897c951,957
< return new MovRegRegCc(machInst, rdn, INTREG_ZERO, rdn, rm, LSR);
---
> if (machInst.itstateMask) {
> return new MovRegReg(machInst, rdn,
> INTREG_ZERO, rdn, rm, LSR);
> } else {
> return new MovRegRegCc(machInst, rdn,
> INTREG_ZERO, rdn, rm, LSR);
> }
899c959,965
< return new MovRegRegCc(machInst, rdn, INTREG_ZERO, rdn, rm, ASR);
---
> if (machInst.itstateMask) {
> return new MovRegReg(machInst, rdn,
> INTREG_ZERO, rdn, rm, ASR);
> } else {
> return new MovRegRegCc(machInst, rdn,
> INTREG_ZERO, rdn, rm, ASR);
> }
901c967,971
< return new AdcRegCc(machInst, rdn, rdn, rm, 0, LSL);
---
> if (machInst.itstateMask) {
> return new AdcReg(machInst, rdn, rdn, rm, 0, LSL);
> } else {
> return new AdcRegCc(machInst, rdn, rdn, rm, 0, LSL);
> }
903c973,977
< return new SbcRegCc(machInst, rdn, rdn, rm, 0, LSL);
---
> if (machInst.itstateMask) {
> return new SbcReg(machInst, rdn, rdn, rm, 0, LSL);
> } else {
> return new SbcRegCc(machInst, rdn, rdn, rm, 0, LSL);
> }
905c979,985
< return new MovRegRegCc(machInst, rdn, INTREG_ZERO, rdn, rm, ROR);
---
> if (machInst.itstateMask) {
> return new MovRegReg(machInst, rdn,
> INTREG_ZERO, rdn, rm, ROR);
> } else {
> return new MovRegRegCc(machInst, rdn,
> INTREG_ZERO, rdn, rm, ROR);
> }
909c989,993
< return new RsbImmCc(machInst, rdn, rm, 0, true);
---
> if (machInst.itstateMask) {
> return new RsbImm(machInst, rdn, rm, 0, true);
> } else {
> return new RsbImmCc(machInst, rdn, rm, 0, true);
> }
915c999,1003
< return new OrrRegCc(machInst, rdn, rdn, rm, 0, LSL);
---
> if (machInst.itstateMask) {
> return new OrrReg(machInst, rdn, rdn, rm, 0, LSL);
> } else {
> return new OrrRegCc(machInst, rdn, rdn, rm, 0, LSL);
> }
917c1005,1009
< return new MulCc(machInst, rdn, rm, rdn);
---
> if (machInst.itstateMask) {
> return new Mul(machInst, rdn, rm, rdn);
> } else {
> return new MulCc(machInst, rdn, rm, rdn);
> }
919c1011,1015
< return new BicRegCc(machInst, rdn, rdn, rm, 0, LSL);
---
> if (machInst.itstateMask) {
> return new BicReg(machInst, rdn, rdn, rm, 0, LSL);
> } else {
> return new BicRegCc(machInst, rdn, rdn, rm, 0, LSL);
> }
921c1017,1021
< return new MvnRegCc(machInst, rdn, INTREG_ZERO, rm, 0, LSL);
---
> if (machInst.itstateMask) {
> return new MvnReg(machInst, rdn, INTREG_ZERO, rm, 0, LSL);
> } else {
> return new MvnRegCc(machInst, rdn, INTREG_ZERO, rm, 0, LSL);
> }
1073c1173
< return new WarnUnimplemented("it", machInst);
---
> return new ItInst(machInst);