43c43
< return new %(className)sDRegCc(machInst, %(dest)s, %(op1)s,
---
> return new %(className)sRegCc(machInst, %(dest)s, %(op1)s,
46c46
< return new %(className)sDReg(machInst, %(dest)s, %(op1)s,
---
> return new %(className)sReg(machInst, %(dest)s, %(op1)s,
51c51
< return new %(className)sDRegRegCc(machInst, %(dest)s,
---
> return new %(className)sRegRegCc(machInst, %(dest)s,
54c54
< return new %(className)sDRegReg(machInst, %(dest)s,
---
> return new %(className)sRegReg(machInst, %(dest)s,
108c108
< return new %(className)sDImmCc(machInst, %(dest)s, %(op1)s,
---
> return new %(className)sImmCc(machInst, %(dest)s, %(op1)s,
111c111
< return new %(className)sDImm(machInst, %(dest)s, %(op1)s,
---
> return new %(className)sImm(machInst, %(dest)s, %(op1)s,
171c171
< return new MovDReg(machInst, rd, INTREG_ZERO, rn, imm5, LSL);
---
> return new MovReg(machInst, rd, INTREG_ZERO, rn, imm5, LSL);
173c173
< return new MovDReg(machInst, rd, INTREG_ZERO, rn, imm5, LSR);
---
> return new MovReg(machInst, rd, INTREG_ZERO, rn, imm5, LSR);
175c175
< return new MovDReg(machInst, rd, INTREG_ZERO, rn, imm5, ASR);
---
> return new MovReg(machInst, rd, INTREG_ZERO, rn, imm5, ASR);
179c179
< return new AddDReg(machInst, rd, rn, rm, 0, LSL);
---
> return new AddReg(machInst, rd, rn, rm, 0, LSL);
181c181
< return new SubDReg(machInst, rd, rn, rm, 0, LSL);
---
> return new SubReg(machInst, rd, rn, rm, 0, LSL);
183c183
< return new AddDImm(machInst, rd, rn, imm3, true);
---
> return new AddImm(machInst, rd, rn, imm3, true);
185c185
< return new SubDImm(machInst, rd, rn, imm3, true);
---
> return new SubImm(machInst, rd, rn, imm3, true);
188c188
< return new MovDImm(machInst, rd8, INTREG_ZERO, imm8, true);
---
> return new MovImm(machInst, rd8, INTREG_ZERO, imm8, true);
190c190
< return new CmpDImmCc(machInst, INTREG_ZERO, rd8, imm8, true);
---
> return new CmpImmCc(machInst, INTREG_ZERO, rd8, imm8, true);
192c192
< return new AddDImm(machInst, rd8, rd8, imm8, true);
---
> return new AddImm(machInst, rd8, rd8, imm8, true);
194c194
< return new SubDImm(machInst, rd8, rd8, imm8, true);
---
> return new SubImm(machInst, rd8, rd8, imm8, true);
207c207
< return new AndDReg(machInst, rdn, rdn, rm, 0, LSL);
---
> return new AndReg(machInst, rdn, rdn, rm, 0, LSL);
209c209
< return new EorDReg(machInst, rdn, rdn, rm, 0, LSL);
---
> return new EorReg(machInst, rdn, rdn, rm, 0, LSL);
211c211
< return new MovDRegReg(machInst, rdn, INTREG_ZERO, rdn, rm, LSL);
---
> return new MovRegReg(machInst, rdn, INTREG_ZERO, rdn, rm, LSL);
213c213
< return new MovDRegReg(machInst, rdn, INTREG_ZERO, rdn, rm, LSR);
---
> return new MovRegReg(machInst, rdn, INTREG_ZERO, rdn, rm, LSR);
215c215
< return new MovDRegReg(machInst, rdn, INTREG_ZERO, rdn, rm, ASR);
---
> return new MovRegReg(machInst, rdn, INTREG_ZERO, rdn, rm, ASR);
217c217
< return new AdcDReg(machInst, rdn, rdn, rm, 0, LSL);
---
> return new AdcReg(machInst, rdn, rdn, rm, 0, LSL);
219c219
< return new SbcDReg(machInst, rdn, rdn, rm, 0, LSL);
---
> return new SbcReg(machInst, rdn, rdn, rm, 0, LSL);
221c221
< return new MovDRegReg(machInst, rdn, INTREG_ZERO, rdn, rm, ROR);
---
> return new MovRegReg(machInst, rdn, INTREG_ZERO, rdn, rm, ROR);
223c223
< return new TstDReg(machInst, INTREG_ZERO, rdn, rm, 0, LSL);
---
> return new TstReg(machInst, INTREG_ZERO, rdn, rm, 0, LSL);
225c225
< return new RsbDImm(machInst, rdn, rm, 0, true);
---
> return new RsbImm(machInst, rdn, rm, 0, true);
227c227
< return new CmpDReg(machInst, INTREG_ZERO, rdn, rm, 0, LSL);
---
> return new CmpReg(machInst, INTREG_ZERO, rdn, rm, 0, LSL);
229c229
< return new CmnDReg(machInst, INTREG_ZERO, rdn, rm, 0, LSL);
---
> return new CmnReg(machInst, INTREG_ZERO, rdn, rm, 0, LSL);
231c231
< return new OrrDReg(machInst, rdn, rdn, rm, 0, LSL);
---
> return new OrrReg(machInst, rdn, rdn, rm, 0, LSL);
236c236
< return new BicDReg(machInst, rdn, rdn, rm, 0, LSL);
---
> return new BicReg(machInst, rdn, rdn, rm, 0, LSL);
238c238
< return new MvnDReg(machInst, rdn, INTREG_ZERO, rm, 0, LSL);
---
> return new MvnReg(machInst, rdn, INTREG_ZERO, rm, 0, LSL);
253c253
< return new AddDReg(machInst, rdn, rdn, rm, 0, LSL);
---
> return new AddReg(machInst, rdn, rdn, rm, 0, LSL);
255c255
< return new CmpDReg(machInst, INTREG_ZERO, rdn, rm, 0, LSL);
---
> return new CmpReg(machInst, INTREG_ZERO, rdn, rm, 0, LSL);
257c257
< return new MovDReg(machInst, rdn, INTREG_ZERO, rm, 0, LSL);
---
> return new MovReg(machInst, rdn, INTREG_ZERO, rm, 0, LSL);
274c274
< return new AddDImm(machInst, rd, INTREG_PC, imm8, true);
---
> return new AddImm(machInst, rd, INTREG_PC, imm8, true);
284c284
< return new AddDImm(machInst, rd, INTREG_SP, imm8, true);
---
> return new AddImm(machInst, rd, INTREG_SP, imm8, true);
295c295
< return new SubDImm(machInst, INTREG_SP, INTREG_SP,
---
> return new SubImm(machInst, INTREG_SP, INTREG_SP,
298c298
< return new AddDImm(machInst, INTREG_SP, INTREG_SP,
---
> return new AddImm(machInst, INTREG_SP, INTREG_SP,
379c379
< return new %(mnem)sDImmCc(machInst, %(dest)s,
---
> return new %(mnem)sImmCc(machInst, %(dest)s,
382c382
< return new %(mnem)sDImm(machInst, %(dest)s,
---
> return new %(mnem)sImm(machInst, %(dest)s,
471c471
< return new %(mnem)sDRegCc(machInst, %(dest)s,
---
> return new %(mnem)sRegCc(machInst, %(dest)s,
474c474
< return new %(mnem)sDReg(machInst, %(dest)s,
---
> return new %(mnem)sReg(machInst, %(dest)s,