1.1 --- a/src/aica/armdasm.c	Mon Jan 02 23:07:17 2006 +0000
     1.2 +++ b/src/aica/armdasm.c	Tue Jan 03 12:20:36 2006 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: armdasm.c,v 1.10 2006-01-02 14:49:51 nkeynes Exp $
     1.6 + * $Id: armdasm.c,v 1.11 2006-01-03 12:20:36 nkeynes Exp $
     1.7   * 
     1.8   * armdasm.c    21 Aug 2004  - ARM7tdmi (ARMv4) disassembler
     1.9   *
    1.10 @@ -369,19 +369,19 @@
    1.11  				break;
    1.12  			case 17: /* TST Rd, Rn, operand */
    1.13  				arm_disasm_shift_operand(ir, operand, sizeof(operand));
    1.14 -				snprintf(buf, len, "TST%s    R%d, R%d, %s", cond, RD(ir), RN(ir), operand);
    1.15 +				snprintf(buf, len, "TST%s    R%d, %s", cond, RN(ir), operand);
    1.16  				break;
    1.17  			case 19: /* TEQ Rd, Rn, operand */
    1.18  				arm_disasm_shift_operand(ir, operand, sizeof(operand));
    1.19 -				snprintf(buf, len, "TEQ%s    R%d, R%d, %s", cond, RD(ir), RN(ir), operand);
    1.20 +				snprintf(buf, len, "TEQ%s    R%d, %s", cond, RN(ir), operand);
    1.21  				break;
    1.22  			case 21: /* CMP Rd, Rn, operand */
    1.23  				arm_disasm_shift_operand(ir, operand, sizeof(operand));
    1.24 -				snprintf(buf, len, "CMP%s    R%d, R%d, %s", cond, RD(ir), RN(ir), operand);
    1.25 +				snprintf(buf, len, "CMP%s    R%d, %s", cond, RN(ir), operand);
    1.26  				break;
    1.27  			case 23: /* CMN Rd, Rn, operand */
    1.28  				arm_disasm_shift_operand(ir, operand, sizeof(operand));
    1.29 -				snprintf(buf, len, "CMN%s    R%d, R%d, %s", cond, RD(ir), RN(ir), operand);
    1.30 +				snprintf(buf, len, "CMN%s    R%d, %s", cond, RN(ir), operand);
    1.31  				break;
    1.32  			case 24: /* ORR Rd, Rn, operand */
    1.33  				arm_disasm_shift_operand(ir, operand, sizeof(operand));