zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More instruction decoding fixes: 

A5.3.5 Load/store multiple
       A5.3.7 Load word

There was a longstanding bug in Thumb-1 LDM; the rest of the LDM/STM
fixes are just using width specs to match UAL syntax, except for two
opcode name typos.  Load word had two bitmask goofs.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2567 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
oharboe 2009-07-26 19:59:33 +00:00
parent 3bcf8a8a25
commit 49e2267f1f
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/target/arm_disassembler.c
View File

@ -2853,6 +2853,7 @@ static int t2ev_store_single(uint32_t opcode, uint32_t address,
sprintf(cp, "STR%s.W\tr%d, [r%d, r%d, LSL #%d]", sprintf(cp, "STR%s.W\tr%d, [r%d, r%d, LSL #%d]",
size, rt, rn, (int) opcode & 0x0f, size, rt, rn, (int) opcode & 0x0f,
(int) (opcode >> 4) & 0x03); (int) (opcode >> 4) & 0x03);
return ERROR_OK;
imm12: imm12:
immed = opcode & 0x0fff; immed = opcode & 0x0fff;
@ -3354,18 +3355,21 @@ static int t2ev_load_byte_hints(uint32_t opcode, uint32_t address,
int rt = (opcode >> 12) & 0xf; int rt = (opcode >> 12) & 0xf;
int op2 = (opcode >> 6) & 0x3f; int op2 = (opcode >> 6) & 0x3f;
unsigned immed; unsigned immed;
char *p1 = "]", *p2 = ""; char *p1 = "", *p2 = "]";
char *mnemonic; char *mnemonic;
switch ((opcode >> 23) & 0x3) { switch ((opcode >> 23) & 0x3) {
case 0: case 0:
if ((rn & rt) == 0xf) { if ((rn & rt) == 0xf) {
preload_immediate_t2: pld_literal:
immed = opcode & 0xfff; immed = opcode & 0xfff;
preload_immediate_t1: address = thumb_alignpc4(address);
p1 = (opcode & (1 << 21)) ? "W" : ""; if (opcode & (1 << 23))
sprintf(cp, "PLD%s\t[r%d, #%d]\t; %#6.6x", address += immed;
p1, rn, immed, immed); else
address -= immed;
sprintf(cp, "PLD\tr%d, %#8.8" PRIx32,
rt, address);
return ERROR_OK; return ERROR_OK;
} }
if (rn == 0x0f && rt != 0x0f) { if (rn == 0x0f && rt != 0x0f) {
@ -3391,12 +3395,17 @@ ldrb_literal:
if ((op2 & 0x3c) == 0x30) { if ((op2 & 0x3c) == 0x30) {
if (rt == 0x0f) { if (rt == 0x0f) {
immed = opcode & 0xff; immed = opcode & 0xff;
goto preload_immediate_t1; 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"; mnemonic = "LDRB";
ldrxb_immediate_t3: ldrxb_immediate_t3:
immed = opcode & 0xff; immed = opcode & 0xff;
if (opcode & 0x200) if (!(opcode & 0x200))
immed = -immed; immed = -immed;
/* two indexed modes will write back rn */ /* two indexed modes will write back rn */
@ -3432,8 +3441,12 @@ ldrxb_immediate_t2:
} }
break; break;
case 1: case 1:
if (rt == 0xf) if ((rn & rt) == 0xf)
goto preload_immediate_t2; goto pld_literal;
if (rt == 0xf) {
immed = opcode & 0xfff;
goto preload_immediate;
}
if (rn == 0x0f) if (rn == 0x0f)
goto ldrb_literal; goto ldrb_literal;
mnemonic = "LDRB.W"; mnemonic = "LDRB.W";
@ -3441,7 +3454,6 @@ ldrxb_immediate_t2:
goto ldrxb_immediate_t2; goto ldrxb_immediate_t2;
case 2: case 2:
if ((rn & rt) == 0xf) { if ((rn & rt) == 0xf) {
pli_immediate:
immed = opcode & 0xfff; immed = opcode & 0xfff;
address = thumb_alignpc4(address); address = thumb_alignpc4(address);
if (opcode & (1 << 23)) if (opcode & (1 << 23))
@ -3466,7 +3478,7 @@ ldrsb_literal:
break; break;
if ((op2 & 0x3c) == 0x38) { if ((op2 & 0x3c) == 0x38) {
immed = opcode & 0xff; immed = opcode & 0xff;
sprintf(cp, "LDRSBT\tr%d, [r%d, #%d]\t; %2.2x", sprintf(cp, "LDRSBT\tr%d, [r%d, #%d]\t; %#2.2x",
rt, rn, immed, immed); rt, rn, immed, immed);
return ERROR_OK; return ERROR_OK;
} }
@ -3474,8 +3486,8 @@ ldrsb_literal:
if (rt == 0xf) { if (rt == 0xf) {
immed = opcode & 0xff; immed = opcode & 0xff;
immed = -immed; // pli immed = -immed; // pli
sprintf(cp, "PLI\t[r%d, #-%d]\t; %2.2x", sprintf(cp, "PLI\t[r%d, #%d]\t; -%#2.2x",
rn, immed, immed); rn, immed, -immed);
return ERROR_OK; return ERROR_OK;
} }
mnemonic = "LDRSB"; mnemonic = "LDRSB";
@ -3499,8 +3511,12 @@ ldrsb_literal:
} }
break; break;
case 3: case 3:
if (rt == 0xf) if (rt == 0xf) {
goto pli_immediate; immed = opcode & 0xfff;
sprintf(cp, "PLI\t[r%d, #%d]\t; %#3.3" PRIx32,
rn, immed, immed);
return ERROR_OK;
}
if (rn == 0xf) if (rn == 0xf)
goto ldrsb_literal; goto ldrsb_literal;
immed = opcode & 0xfff; immed = opcode & 0xfff;