interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

David Brownell <david-b@pacbell.net> Bugfix some instruction decoding ... I've crafted asm files 

with testcases covering several new encodings in these sections
of the ARMv7-M arch manual:

 A5.3.12 Data processing (register)
 A5.3.13 Miscellaneous operations
 A5.3.14 Multiply, and multiply accumulate
 A5.3.15 Long multiply, long multiply accumulate, and divide

The issues were mostly in '12 and '13; some new related 16-bit
opcodes had issues too.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2563 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-07-24 16:48:12 +00:00
parent 431925a452
commit ad3a24f944
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/target/arm_disassembler.c
View File

@ -2098,7 +2098,7 @@ static int evaluate_byterev_thumb(uint16_t opcode, uint32_t address,
char *suffix; char *suffix;
/* added in ARMv6 */ /* added in ARMv6 */
switch (opcode & 0x00c0) { switch ((opcode >> 6) & 3) {
case 0: case 0:
suffix = ""; suffix = "";
break; break;
@ -3201,7 +3201,7 @@ static int t2ev_data_reg(uint32_t opcode, uint32_t address,
(int) (opcode >> 0) & 0xf); (int) (opcode >> 0) & 0xf);
} else if (opcode & (1 << 7)) { } else if (opcode & (1 << 7)) {
switch ((opcode >> 24) & 0xf) { switch ((opcode >> 20) & 0xf) {
case 0: case 0:
case 1: case 1:
case 4: case 4:
@ -3221,7 +3221,7 @@ static int t2ev_data_reg(uint32_t opcode, uint32_t address,
(opcode & (1 << 24)) ? 'U' : 'S', (opcode & (1 << 24)) ? 'U' : 'S',
(opcode & (1 << 26)) ? 'B' : 'H', (opcode & (1 << 26)) ? 'B' : 'H',
(int) (opcode >> 8) & 0xf, (int) (opcode >> 8) & 0xf,
(int) (opcode >> 16) & 0xf, (int) (opcode >> 0) & 0xf,
suffix); suffix);
break; break;
case 8: case 8:
@ -3230,7 +3230,7 @@ static int t2ev_data_reg(uint32_t opcode, uint32_t address,
case 0xb: case 0xb:
if (opcode & (1 << 6)) if (opcode & (1 << 6))
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;
if (~opcode & (0xff << 12)) if (((opcode >> 12) & 0xf) != 0xf)
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;
if (!(opcode & (1 << 20))) if (!(opcode & (1 << 20)))
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;