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

target: arm: disassembler: add v5T Thumb BLX decoding 

Reported by thesourcerer on IRC.

Change-Id: I36d4d95de176a19fdd0bf80d8b419be6ca637e98
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/3893
Tested-by: jenkins
This commit is contained in:
Paul Fertser 2016-12-02 19:04:17 +03:00
parent c652f44ca3
commit de974eaed3
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/target/arm_disassembler.c
View File

@ -2896,12 +2896,26 @@ static int t2ev_b_bl(uint32_t opcode, uint32_t address,
address += 4; address += 4;
address += offset << 1; address += offset << 1;
instruction->type = (opcode & (1 << 14)) ? ARM_BL : ARM_B; char *inst;
switch ((opcode >> 12) & 0x5) {
case 0x1:
inst = "B.W";
instruction->type = ARM_B;
break;
case 0x4:
inst = "BLX";
instruction->type = ARM_BLX;
break;
case 0x5:
inst = "BL";
instruction->type = ARM_BL;
break;
default:
return ERROR_COMMAND_SYNTAX_ERROR;
}
instruction->info.b_bl_bx_blx.reg_operand = -1; instruction->info.b_bl_bx_blx.reg_operand = -1;
instruction->info.b_bl_bx_blx.target_address = address; instruction->info.b_bl_bx_blx.target_address = address;
sprintf(cp, "%s\t%#8.8" PRIx32, sprintf(cp, "%s\t%#8.8" PRIx32, inst, address);
(opcode & (1 << 14)) ? "BL" : "B.W",
address);
return ERROR_OK; return ERROR_OK;
} }
@ -3078,10 +3092,9 @@ static int t2ev_b_misc(uint32_t opcode, uint32_t address,
switch ((opcode >> 12) & 0x5) { switch ((opcode >> 12) & 0x5) {
case 0x1: case 0x1:
case 0x4:
case 0x5: case 0x5:
return t2ev_b_bl(opcode, address, instruction, cp); return t2ev_b_bl(opcode, address, instruction, cp);
case 0x4:
goto undef;
case 0: case 0:
if (((opcode >> 23) & 0x07) != 0x07) if (((opcode >> 23) & 0x07) != 0x07)
return t2ev_cond_b(opcode, address, instruction, cp); return t2ev_cond_b(opcode, address, instruction, cp);