* Copyright (C) 2006 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
+ * Copyright (C) 2009 by David Brownell *
+ * *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
break;
case 0x9:
instruction->type = ARM_RSB;
- mnemonic = "NEGS";
+ mnemonic = "RSBS";
instruction->info.data_proc.variant = 0 /*immediate*/;
instruction->info.data_proc.shifter_operand.immediate.immediate = 0;
instruction->info.data_proc.Rn = Rm;
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);
if ((opcode & 0xf000) == 0xc000)
{ /* generic load/store multiple */
+ char *wback = "!";
+
if (L)
{
instruction->type = ARM_LDM;
mnemonic = "LDM";
+ if (opcode & (1 << Rn))
+ wback = "";
}
else
{
instruction->type = ARM_STM;
mnemonic = "STM";
}
- snprintf(ptr_name,7,"r%i!, ",Rn);
+ snprintf(ptr_name, sizeof ptr_name, "r%i%s, ", Rn, wback);
}
else
{ /* push/pop */
(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" : "",
char *suffix;
/* added in ARMv6 */
- switch (opcode & 0x00c0) {
+ switch ((opcode >> 6) & 3) {
case 0:
suffix = "";
break;
}
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;
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_ADC;
mnemonic = "ADC";
+ suffix2 = ".W";
break;
case 11:
instruction->type = ARM_SBC;
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;
}
bool add = false;
bool is_signed = false;
- immed = (opcode & 0x0ff) | ((opcode & 0x7000) >> 12);
- if (opcode & (1 << 27))
+ immed = (opcode & 0x0ff) | ((opcode & 0x7000) >> 4);
+ if (opcode & (1 << 26))
immed |= (1 << 11);
switch ((opcode >> 20) & 0x1f) {
add = true;
goto do_adr;
}
- mnemonic = "ADD.W";
+ mnemonic = "ADDW";
break;
case 4:
- mnemonic = "MOV.W";
- break;
+ immed |= (opcode >> 4) & 0xf000;
+ sprintf(cp, "MOVW\tr%d, #%d\t; %#3.3x", rd, immed, immed);
+ return ERROR_OK;
case 0x0a:
if (rn == 0xf)
goto do_adr;
- mnemonic = "SUB.W";
+ mnemonic = "SUBW";
break;
case 0x0c:
/* move constant to top 16 bits of register */
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) + is_signed, 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);
+ return ERROR_OK;
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;
switch (op) {
case 2:
- sprintf(cp, "STMB\tr%d%s, ", rn, t ? "!" : "");
+ sprintf(cp, "STM.W\tr%d%s, ", rn, t ? "!" : "");
break;
case 3:
if (rn == 13 && t)
- sprintf(cp, "POP\t");
+ sprintf(cp, "POP.W\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");
+ sprintf(cp, "PUSH.W\t");
else
- sprintf(cp, "STM\tr%d%s, ", rn, t ? "!" : "");
+ sprintf(cp, "STMDB\tr%d%s, ", rn, t ? "!" : "");
break;
case 5:
- sprintf(cp, "LDMB\tr%d%s, ", rn, t ? "!" : "");
+ sprintf(cp, "LDMDB.W\tr%d%s, ", rn, t ? "!" : "");
break;
default:
return ERROR_INVALID_ARGUMENTS;
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;
}
suffix = "S";
sprintf(cp, "%s%s.W\tr%d, r%d, r%d",
mnemonic, suffix,
- (opcode >> 8) & 0xf,
- (opcode >> 16) & 0xf,
- (opcode >> 0) & 0xf);
+ (int) (opcode >> 8) & 0xf,
+ (int) (opcode >> 16) & 0xf,
+ (int) (opcode >> 0) & 0xf);
} else if (opcode & (1 << 7)) {
- switch ((opcode >> 24) & 0xf) {
+ switch ((opcode >> 20) & 0xf) {
case 0:
case 1:
case 4:
sprintf(cp, "%cXT%c.W\tr%d, r%d%s",
(opcode & (1 << 24)) ? 'U' : 'S',
(opcode & (1 << 26)) ? 'B' : 'H',
- (opcode >> 8) & 0xf,
- (opcode >> 16) & 0xf,
+ (int) (opcode >> 8) & 0xf,
+ (int) (opcode >> 0) & 0xf,
suffix);
break;
case 8:
case 0xb:
if (opcode & (1 << 6))
return ERROR_INVALID_ARGUMENTS;
- if (~opcode & (0xff << 12))
+ if (((opcode >> 12) & 0xf) != 0xf)
return ERROR_INVALID_ARGUMENTS;
if (!(opcode & (1 << 20)))
return ERROR_INVALID_ARGUMENTS;
}
sprintf(cp, "%s\tr%d, r%d",
mnemonic,
- (opcode >> 8) & 0xf,
- (opcode >> 0) & 0xf);
+ (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)) == 0)
+ 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 & 0x0500))
+ 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;
+}
+
+static int t2ev_load_byte_hints(uint32_t opcode, uint32_t address,
+ arm_instruction_t *instruction, char *cp)
+{
+ int rn = (opcode >> 16) & 0xf;
+ int rt = (opcode >> 12) & 0xf;
+ int op2 = (opcode >> 6) & 0x3f;
+ unsigned immed;
+ char *p1 = "", *p2 = "]";
+ char *mnemonic;
+
+ switch ((opcode >> 23) & 0x3) {
+ case 0:
+ if ((rn & rt) == 0xf) {
+pld_literal:
+ immed = opcode & 0xfff;
+ address = thumb_alignpc4(address);
+ if (opcode & (1 << 23))
+ address += immed;
+ else
+ address -= immed;
+ sprintf(cp, "PLD\tr%d, %#8.8" PRIx32,
+ rt, address);
+ return ERROR_OK;
+ }
+ if (rn == 0x0f && rt != 0x0f) {
+ldrb_literal:
+ immed = opcode & 0xfff;
+ address = thumb_alignpc4(address);
+ if (opcode & (1 << 23))
+ address += immed;
+ else
+ address -= immed;
+ sprintf(cp, "LDRB\tr%d, %#8.8" PRIx32,
+ rt, address);
+ return ERROR_OK;
+ }
+ if (rn == 0x0f)
+ break;
+ if ((op2 & 0x3c) == 0x38) {
+ immed = opcode & 0xff;
+ sprintf(cp, "LDRBT\tr%d, [r%d, #%d]\t; %#2.2x",
+ rt, rn, immed, immed);
+ return ERROR_OK;
+ }
+ if ((op2 & 0x3c) == 0x30) {
+ if (rt == 0x0f) {
+ immed = opcode & 0xff;
+ immed = -immed;
+preload_immediate:
+ p1 = (opcode & (1 << 21)) ? "W" : "";
+ sprintf(cp, "PLD%s\t[r%d, #%d]\t; %#6.6x",
+ p1, rn, immed, immed);
+ return ERROR_OK;
+ }
+ mnemonic = "LDRB";
+ldrxb_immediate_t3:
+ immed = opcode & 0xff;
+ if (!(opcode & 0x200))
+ immed = -immed;
+
+ /* two indexed modes will write back rn */
+ if (opcode & 0x100) {
+ if (opcode & 0x400) /* pre-indexed */
+ p2 = "]!";
+ else { /* post-indexed */
+ p1 = "]";
+ p2 = "";
+ }
+ }
+ldrxb_immediate_t2:
+ sprintf(cp, "%s\tr%d, [r%d%s, #%d%s\t; %#8.8x",
+ mnemonic, rt, rn, p1,
+ immed, p2, immed);
+ return ERROR_OK;
+ }
+ if ((op2 & 0x24) == 0x24) {
+ mnemonic = "LDRB";
+ goto ldrxb_immediate_t3;
+ }
+ if (op2 == 0) {
+ int rm = opcode & 0xf;
+
+ if (rt == 0x0f)
+ sprintf(cp, "PLD\t");
+ else
+ sprintf(cp, "LDRB.W\tr%d, ", rt);
+ immed = (opcode >> 4) & 0x3;
+ cp = strchr(cp, 0);
+ sprintf(cp, "[r%d, r%d, LSL #%d]", rn, rm, immed);
+ return ERROR_OK;
+ }
+ break;
+ case 1:
+ if ((rn & rt) == 0xf)
+ goto pld_literal;
+ if (rt == 0xf) {
+ immed = opcode & 0xfff;
+ goto preload_immediate;
+ }
+ if (rn == 0x0f)
+ goto ldrb_literal;
+ mnemonic = "LDRB.W";
+ immed = opcode & 0xfff;
+ goto ldrxb_immediate_t2;
+ case 2:
+ if ((rn & rt) == 0xf) {
+ immed = opcode & 0xfff;
+ address = thumb_alignpc4(address);
+ if (opcode & (1 << 23))
+ address += immed;
+ else
+ address -= immed;
+ sprintf(cp, "PLI\t%#8.8" PRIx32, address);
+ return ERROR_OK;
+ }
+ if (rn == 0xf && rt != 0xf) {
+ldrsb_literal:
+ immed = opcode & 0xfff;
+ address = thumb_alignpc4(address);
+ if (opcode & (1 << 23))
+ address += immed;
+ else
+ address -= immed;
+ sprintf(cp, "LDRSB\t%#8.8" PRIx32, address);
+ return ERROR_OK;
+ }
+ if (rn == 0xf)
+ break;
+ if ((op2 & 0x3c) == 0x38) {
+ immed = opcode & 0xff;
+ sprintf(cp, "LDRSBT\tr%d, [r%d, #%d]\t; %#2.2x",
+ rt, rn, immed, immed);
+ return ERROR_OK;
+ }
+ if ((op2 & 0x3c) == 0x30) {
+ if (rt == 0xf) {
+ immed = opcode & 0xff;
+ immed = -immed; // pli
+ sprintf(cp, "PLI\t[r%d, #%d]\t; -%#2.2x",
+ rn, immed, -immed);
+ return ERROR_OK;
+ }
+ mnemonic = "LDRSB";
+ goto ldrxb_immediate_t3;
+ }
+ if ((op2 & 0x24) == 0x24) {
+ mnemonic = "LDRSB";
+ goto ldrxb_immediate_t3;
+ }
+ if (op2 == 0) {
+ int rm = opcode & 0xf;
+
+ if (rt == 0x0f)
+ sprintf(cp, "PLI\t");
+ else
+ sprintf(cp, "LDRSB.W\tr%d, ", rt);
+ immed = (opcode >> 4) & 0x3;
+ cp = strchr(cp, 0);
+ sprintf(cp, "[r%d, r%d, LSL #%d]", rn, rm, immed);
+ return ERROR_OK;
+ }
+ break;
+ case 3:
+ if (rt == 0xf) {
+ immed = opcode & 0xfff;
+ sprintf(cp, "PLI\t[r%d, #%d]\t; %#3.3" PRIx32,
+ rn, immed, immed);
+ return ERROR_OK;
+ }
+ if (rn == 0xf)
+ goto ldrsb_literal;
+ immed = opcode & 0xfff;
+ mnemonic = "LDRSB";
+ goto ldrxb_immediate_t2;
+ }
+
+ return ERROR_INVALID_ARGUMENTS;
+}
+
+static int t2ev_load_halfword(uint32_t opcode, uint32_t address,
+ arm_instruction_t *instruction, char *cp)
+{
+ int rn = (opcode >> 16) & 0xf;
+ int rt = (opcode >> 12) & 0xf;
+ int op2 = (opcode >> 6) & 0x3f;
+ char *sign = "";
+ unsigned immed;
+
+ if (rt == 0xf) {
+ sprintf(cp, "HINT (UNALLOCATED)");
+ return ERROR_OK;
+ }
+
+ if (opcode & (1 << 24))
+ sign = "S";
+
+ if ((opcode & (1 << 23)) == 0) {
+ if (rn == 0xf) {
+ldrh_literal:
+ immed = opcode & 0xfff;
+ address = thumb_alignpc4(address);
+ if (opcode & (1 << 23))
+ address += immed;
+ else
+ address -= immed;
+ sprintf(cp, "LDR%sH\tr%d, %#8.8" PRIx32,
+ sign, rt, address);
+ return ERROR_OK;
+ }
+ if (op2 == 0) {
+ int rm = opcode & 0xf;
+
+ immed = (opcode >> 4) & 0x3;
+ sprintf(cp, "LDR%sH.W\tr%d, [r%d, r%d, LSL #%d]",
+ sign, rt, rn, rm, immed);
+ return ERROR_OK;
+ }
+ if ((op2 & 0x3c) == 0x38) {
+ immed = opcode & 0xff;
+ sprintf(cp, "LDR%sHT\tr%d, [r%d, #%d]\t; %#2.2x",
+ sign, rt, rn, immed, immed);
+ return ERROR_OK;
+ }
+ if ((op2 & 0x3c) == 0x30 || (op2 & 0x24) == 0x24) {
+ char *p1 = "", *p2 = "]";
+
+ immed = opcode & 0xff;
+ if (!(opcode & 0x200))
+ immed = -immed;
+
+ /* two indexed modes will write back rn */
+ if (opcode & 0x100) {
+ if (opcode & 0x400) /* pre-indexed */
+ p2 = "]!";
+ else { /* post-indexed */
+ p1 = "]";
+ p2 = "";
+ }
+ }
+ sprintf(cp, "LDR%sH\tr%d, [r%d%s, #%d%s\t; %#8.8x",
+ sign, rt, rn, p1, immed, p2, immed);
+ return ERROR_OK;
+ }
+ } else {
+ if (rn == 0xf)
+ goto ldrh_literal;
+
+ immed = opcode & 0xfff;
+ sprintf(cp, "LDR%sH%s\tr%d, [r%d, #%d]\t; %#6.6x",
+ sign, *sign ? "" : ".W",
+ rt, rn, immed, 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.8 Load halfword, unallocated memory hints */
+ else if ((opcode & 0x1e700000) == 0x18300000)
+ retval = t2ev_load_halfword(opcode, address, instruction, cp);
+
+ /* ARMv7-M: A5.3.9 Load byte, memory hints */
+ else if ((opcode & 0x1e700000) == 0x18100000)
+ retval = t2ev_load_byte_hints(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) */
+ /* ARMv7-M: A5.3.12 Data processing (register)
+ * and A5.3.13 Miscellaneous operations
+ */
else if ((opcode & 0x1f000000) == 0x1a000000)
retval = t2ev_data_reg(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;
Code Review / openocd.git / blobdiff