snprintf(instruction->text, 128,
"0x%8.8" PRIx32 " 0x%4.4x \t"
- "LDR\tr%i, [pc, #%#" PRIx32 "]\t; %#8.8x",
+ "LDR\tr%i, [pc, #%#" PRIx32 "]\t; %#8.8" PRIx32,
address, opcode, Rd, immediate,
thumb_alignpc4(address) + immediate);
(opcode & 0x80) ? "BE" : "LE");
else /* ASSUME (opcode & 0x0fe0) == 0x0660 */
snprintf(instruction->text, 128,
- "0x%8.8" PRIx32 " 0x%4.4x \tCPSI%c %s%s%s",
+ "0x%8.8" PRIx32 " 0x%4.4x \tCPSI%c\t%s%s%s",
address, opcode,
(opcode & 0x0010) ? 'D' : 'E',
(opcode & 0x0004) ? "A" : "",
}
if (opcode & 0x00f0) {
- sprintf(cp, "DBG\t#%d", opcode & 0xf);
+ sprintf(cp, "DBG\t#%d", (int) opcode & 0xf);
return ERROR_OK;
}
case 0x4:
goto undef;
case 0:
- if (((opcode >> 23) & 0x07) == 0x07)
+ if (((opcode >> 23) & 0x07) != 0x07)
return t2ev_cond_b(opcode, address, instruction, cp);
if (opcode & (1 << 26))
goto undef;
case 0x38:
case 0x39:
sprintf(cp, "MSR\t%s, r%d", special_name(opcode & 0xff),
- (opcode >> 16) & 0x0f);
+ (int) (opcode >> 16) & 0x0f);
return ERROR_OK;
case 0x3a:
return t2ev_hint(opcode, address, instruction, cp);
return t2ev_misc(opcode, address, instruction, cp);
case 0x3e:
case 0x3f:
- sprintf(cp, "MRS\tr%d, %s", (opcode >> 16) & 0x0f,
+ sprintf(cp, "MRS\tr%d, %s", (int) (opcode >> 8) & 0x0f,
special_name(opcode & 0xff));
return ERROR_OK;
}
unsigned func;
bool one = false;
char *suffix = "";
+ char *suffix2 = "";
/* ARMv7-M: A5.3.2 Modified immediate constants */
func = (opcode >> 11) & 0x0e;
mnemonic = "TST";
one = true;
suffix = "";
+ suffix2 = ".W";
rd = rn;
} else {
instruction->type = ARM_AND;
instruction->type = ARM_MOV;
mnemonic = "MOV";
one = true;
+ suffix2 = ".W";
} else {
instruction->type = ARM_ORR;
mnemonic = "ORR";
} else {
instruction->type = ARM_ADD;
mnemonic = "ADD";
+ suffix2 = ".W";
}
break;
case 10:
instruction->type = ARM_SUB;
mnemonic = "SUB";
}
+ suffix2 = ".W";
break;
case 14:
instruction->type = ARM_RSB;
mnemonic = "RSB";
+ suffix2 = ".W";
break;
default:
return ERROR_INVALID_ARGUMENTS;
}
if (one)
- sprintf(cp, "%s\tr%d, #%d\t; %#8.8x",
- mnemonic, rd, immed, immed);
+ sprintf(cp, "%s%s\tr%d, #%d\t; %#8.8x",
+ mnemonic, suffix2 ,rd, immed, immed);
else
- sprintf(cp, "%s%s\tr%d, r%d, #%d\t; %#8.8x",
- mnemonic, suffix, rd, rn, immed, immed);
+ sprintf(cp, "%s%s%s\tr%d, r%d, #%d\t; %#8.8x",
+ mnemonic, suffix, suffix2,
+ rd, rn, immed, immed);
return ERROR_OK;
}
immed |= (opcode >> 10) & 0x1c;
sprintf(cp, "%sSAT\tr%d, #%d, r%d, %s #%d\t",
is_signed ? "S" : "U",
- rd, (opcode & 0x1f) + 1, rn,
+ rd, (int) (opcode & 0x1f) + 1, rn,
(opcode & (1 << 21)) ? "ASR" : "LSL",
immed ? immed : 32);
return ERROR_OK;
sprintf(cp, "%sBFX\tr%d, r%d, #%d, #%d\t",
is_signed ? "S" : "U",
rd, rn, immed,
- (opcode & 0x1f) + 1);
+ (int) (opcode & 0x1f) + 1);
return ERROR_OK;
case 0x16:
immed = (opcode >> 6) & 0x03;
if (rn == 0xf) /* bitfield clear */
sprintf(cp, "BFC\tr%d, #%d, #%d\t",
rd, immed,
- (opcode & 0x1f) + 1 - immed);
+ (int) (opcode & 0x1f) + 1 - immed);
else /* bitfield insert */
sprintf(cp, "BFI\tr%d, r%d, #%d, #%d\t",
rd, rn, immed,
- (opcode & 0x1f) + 1 - immed);
+ (int) (opcode & 0x1f) + 1 - immed);
return ERROR_OK;
default:
return ERROR_INVALID_ARGUMENTS;
}
sprintf(cp, "STR%s.W\tr%d, [r%d, r%d, LSL #%d]",
- size, rt, rn, opcode & 0x0f,
- (opcode >> 4) & 0x03);
+ size, rt, rn, (int) opcode & 0x0f,
+ (int) (opcode >> 4) & 0x03);
imm12:
immed = opcode & 0x0fff;
{
int ra = (opcode >> 12) & 0xf;
-
switch (opcode & 0x007000f0) {
case 0:
if (ra == 0xf)
sprintf(cp, "MUL\tr%d, r%d, r%d",
- (opcode >> 8) & 0xf, (opcode >> 16) & 0xf,
- (opcode >> 0) & 0xf);
+ (int) (opcode >> 8) & 0xf,
+ (int) (opcode >> 16) & 0xf,
+ (int) (opcode >> 0) & 0xf);
else
sprintf(cp, "MLA\tr%d, r%d, r%d, r%d",
- (opcode >> 8) & 0xf, (opcode >> 16) & 0xf,
- (opcode >> 0) & 0xf, ra);
+ (int) (opcode >> 8) & 0xf,
+ (int) (opcode >> 16) & 0xf,
+ (int) (opcode >> 0) & 0xf, ra);
break;
case 0x10:
sprintf(cp, "MLS\tr%d, r%d, r%d, r%d",
- (opcode >> 8) & 0xf, (opcode >> 16) & 0xf,
- (opcode >> 0) & 0xf, ra);
+ (int) (opcode >> 8) & 0xf,
+ (int) (opcode >> 16) & 0xf,
+ (int) (opcode >> 0) & 0xf, ra);
break;
default:
return ERROR_INVALID_ARGUMENTS;
sprintf(cp, "%c%sL\tr%d, r%d, r%d, r%d",
(op & 0x20) ? 'U' : 'S',
infix,
- (opcode >> 12) & 0xf,
- (opcode >> 8) & 0xf,
- (opcode >> 16) & 0xf,
- (opcode >> 0) & 0xf);
+ (int) (opcode >> 12) & 0xf,
+ (int) (opcode >> 8) & 0xf,
+ (int) (opcode >> 16) & 0xf,
+ (int) (opcode >> 0) & 0xf);
break;
case 0x1f:
case 0x3f:
sprintf(cp, "%cDIV\tr%d, r%d, r%d",
(op & 0x20) ? 'U' : 'S',
- (opcode >> 8) & 0xf,
- (opcode >> 16) & 0xf,
- (opcode >> 0) & 0xf);
+ (int) (opcode >> 8) & 0xf,
+ (int) (opcode >> 16) & 0xf,
+ (int) (opcode >> 0) & 0xf);
break;
default:
return ERROR_INVALID_ARGUMENTS;
if (rn == 13 && t)
sprintf(cp, "POP\t");
else
- sprintf(cp, "LDM\tr%d%s, ", rn, t ? "!" : "");
+ sprintf(cp, "LDM.W\tr%d%s, ", rn, t ? "!" : "");
break;
case 4:
if (rn == 13 && t)
sprintf(cp, "PUSH\t");
else
- sprintf(cp, "STM\tr%d%s, ", rn, t ? "!" : "");
+ sprintf(cp, "STM.W\tr%d%s, ", rn, t ? "!" : "");
break;
case 5:
sprintf(cp, "LDMB\tr%d%s, ", rn, t ? "!" : "");
if ((registers & 1) == 0)
continue;
registers &= ~1;
- sprintf(cp, "r%d%s", t, registers ? "," : "");
+ sprintf(cp, "r%d%s", t, registers ? ", " : "");
cp = strchr(cp, 0);
}
*cp++ = '}';
case 0:
if (immed == 0) {
sprintf(cp, "MOV%s.W\tr%d, r%d",
- suffix, rd, (opcode & 0xf));
+ suffix, rd,
+ (int) (opcode & 0xf));
return ERROR_OK;
}
mnemonic = "LSL";
default:
if (immed == 0) {
sprintf(cp, "RRX%s.W\tr%d, r%d",
- suffix, rd, (opcode & 0xf));
+ suffix, rd,
+ (int) (opcode & 0xf));
return ERROR_OK;
}
mnemonic = "ROR";
}
sprintf(cp, "%s%s.W\tr%d, r%d, r%d",
- mnemonic, suffix, rd, rn, (opcode & 0xf));
+ mnemonic, suffix, rd, rn, (int) (opcode & 0xf));
shift:
cp = strchr(cp, 0);
suffix = "ROR";
break;
}
- sprintf(cp, " %s #%d", suffix, immed ? immed : 32);
+ sprintf(cp, ", %s #%d", suffix, immed ? immed : 32);
return ERROR_OK;
two:
sprintf(cp, "%s%s.W\tr%d, r%d",
- mnemonic, suffix, rn, (opcode & 0xf));
+ mnemonic, suffix, rn, (int) (opcode & 0xf));
goto shift;
immediate:
sprintf(cp, "%s%s.W\tr%d, r%d, #%d",
- mnemonic, suffix, rd, (opcode & 0xf), immed ? immed : 32);
+ mnemonic, suffix, rd,
+ (int) (opcode & 0xf), immed ? immed : 32);
return ERROR_OK;
}
+static int t2ev_data_reg(uint32_t opcode, uint32_t address,
+ arm_instruction_t *instruction, char *cp)
+{
+ char *mnemonic;
+ char * suffix = "";
+
+ if (((opcode >> 4) & 0xf) == 0) {
+ switch ((opcode >> 21) & 0x7) {
+ case 0:
+ mnemonic = "LSL";
+ break;
+ case 1:
+ mnemonic = "LSR";
+ break;
+ case 2:
+ mnemonic = "ASR";
+ break;
+ case 3:
+ mnemonic = "ROR";
+ break;
+ default:
+ return ERROR_INVALID_ARGUMENTS;
+ }
+
+ instruction->type = ARM_MOV;
+ if (opcode & (1 << 20))
+ suffix = "S";
+ sprintf(cp, "%s%s.W\tr%d, r%d, r%d",
+ mnemonic, suffix,
+ (int) (opcode >> 8) & 0xf,
+ (int) (opcode >> 16) & 0xf,
+ (int) (opcode >> 0) & 0xf);
+
+ } else if (opcode & (1 << 7)) {
+ switch ((opcode >> 24) & 0xf) {
+ case 0:
+ case 1:
+ case 4:
+ case 5:
+ switch ((opcode >> 4) & 0x3) {
+ case 1:
+ suffix = ", ROR #8";
+ break;
+ case 2:
+ suffix = ", ROR #16";
+ break;
+ case 3:
+ suffix = ", ROR #24";
+ break;
+ }
+ sprintf(cp, "%cXT%c.W\tr%d, r%d%s",
+ (opcode & (1 << 24)) ? 'U' : 'S',
+ (opcode & (1 << 26)) ? 'B' : 'H',
+ (int) (opcode >> 8) & 0xf,
+ (int) (opcode >> 16) & 0xf,
+ suffix);
+ break;
+ case 8:
+ case 9:
+ case 0xa:
+ case 0xb:
+ if (opcode & (1 << 6))
+ return ERROR_INVALID_ARGUMENTS;
+ if (~opcode & (0xff << 12))
+ return ERROR_INVALID_ARGUMENTS;
+ if (!(opcode & (1 << 20)))
+ return ERROR_INVALID_ARGUMENTS;
+
+ switch (((opcode >> 19) & 0x04)
+ | ((opcode >> 4) & 0x3)) {
+ case 0:
+ mnemonic = "REV.W";
+ break;
+ case 1:
+ mnemonic = "REV16.W";
+ break;
+ case 2:
+ mnemonic = "RBIT";
+ break;
+ case 3:
+ mnemonic = "REVSH.W";
+ break;
+ case 4:
+ mnemonic = "CLZ";
+ break;
+ default:
+ return ERROR_INVALID_ARGUMENTS;
+ }
+ sprintf(cp, "%s\tr%d, r%d",
+ mnemonic,
+ (int) (opcode >> 8) & 0xf,
+ (int) (opcode >> 0) & 0xf);
+ break;
+ default:
+ return ERROR_INVALID_ARGUMENTS;
+ }
+ }
+
+ return ERROR_OK;
+}
+
+static int t2ev_load_word(uint32_t opcode, uint32_t address,
+ arm_instruction_t *instruction, char *cp)
+{
+ int rn = (opcode >> 16) & 0xf;
+ int immed;
+
+ instruction->type = ARM_LDR;
+
+ if (rn == 0xf) {
+ immed = opcode & 0x0fff;
+ if (opcode & (1 << 23))
+ immed = -immed;
+ sprintf(cp, "LDR\tr%d, %#8.8" PRIx32,
+ (int) (opcode >> 12) & 0xf,
+ thumb_alignpc4(address) + immed);
+ return ERROR_OK;
+ }
+
+ if (opcode & (1 << 23)) {
+ immed = opcode & 0x0fff;
+ sprintf(cp, "LDR.W\tr%d, [r%d, #%d]\t; %#3.3x",
+ (int) (opcode >> 12) & 0xf,
+ rn, immed, immed);
+ return ERROR_OK;
+ }
+
+ if (!(opcode & (0x3f << 6))) {
+ sprintf(cp, "LDR.W\tr%d, [r%d, r%d, LSL #%d]",
+ (int) (opcode >> 12) & 0xf,
+ rn,
+ (int) (opcode >> 0) & 0xf,
+ (int) (opcode >> 4) & 0x3);
+ return ERROR_OK;
+ }
+
+
+ if (((opcode >> 8) & 0xf) == 0xe) {
+ immed = opcode & 0x00ff;
+
+ sprintf(cp, "LDRT\tr%d, [r%d, #%d]\t; %#2.2x",
+ (int) (opcode >> 12) & 0xf,
+ rn, immed, immed);
+ return ERROR_OK;
+ }
+
+ if (((opcode >> 8) & 0xf) == 0xc || (opcode & 0x0900) == 0x0900) {
+ char *p1 = "]", *p2 = "";
+
+ if (!(opcode & 0x0600))
+ return ERROR_INVALID_ARGUMENTS;
+
+ immed = opcode & 0x00ff;
+
+ /* two indexed modes will write back rn */
+ if (opcode & 0x100) {
+ if (opcode & 0x400) /* pre-indexed */
+ p2 = "]!";
+ else { /* post-indexed */
+ p1 = "]";
+ p2 = "";
+ }
+ }
+
+ sprintf(cp, "LDR\tr%d, [r%d%s, #%s%u%s\t; %#2.2x",
+ (int) (opcode >> 12) & 0xf,
+ rn, p1,
+ (opcode & 0x200) ? "" : "-",
+ immed, p2, immed);
+ return ERROR_OK;
+ }
+
+ return ERROR_INVALID_ARGUMENTS;
+}
+
/*
* REVISIT for Thumb2 instructions, instruction->type and friends aren't
* always set. That means eventual arm_simulate_step() support for Thumb2
else if ((opcode & 0x1e400000) == 0x08000000)
retval = t2ev_ldm_stm(opcode, address, instruction, cp);
+ /* ARMv7-M: A5.3.7 Load word */
+ else if ((opcode & 0x1f700000) == 0x18500000)
+ retval = t2ev_load_word(opcode, address, instruction, cp);
+
/* ARMv7-M: A5.3.10 Store single data item */
else if ((opcode & 0x1f100000) == 0x18000000)
retval = t2ev_store_single(opcode, address, instruction, cp);
else if ((opcode & 0x1e000000) == 0x0a000000)
retval = t2ev_data_shift(opcode, address, instruction, cp);
+ /* ARMv7-M: A5.3.12 Data processing (register) */
+ else if ((opcode & 0x1f000000) == 0x1a000000)
+ retval = t2ev_data_reg(opcode, address, instruction, cp);
+
/* ARMv7-M: A5.3.14 Multiply, and multiply accumulate */
else if ((opcode & 0x1f800000) == 0x1b000000)
retval = t2ev_mul32(opcode, address, instruction, cp);
return ERROR_OK;
}
- LOG_DEBUG("Can't decode 32-bit Thumb2 yet (opcode=%08x)", opcode);
+ LOG_DEBUG("Can't decode 32-bit Thumb2 yet (opcode=%08" PRIx32 ")",
+ opcode);
strcpy(cp, "(32-bit Thumb2 ...)");
return ERROR_OK;