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

David Brownell <david-b@pacbell.net>: 

Make disassembly of the Thumb load-literal instruction show the
address of the literal being loaded (so users can avoid doing
that math themselves).  Add and use an Align(PC,4) utility.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2535 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
zwelch 2009-07-15 23:48:27 +00:00
parent f163d0009d
commit d2088f0d29
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/target/arm_disassembler.c
View File

@ -1678,6 +1678,12 @@ int evaluate_data_proc_thumb(uint16_t opcode, uint32_t address, arm_instruction_
return ERROR_OK; return ERROR_OK;
} }
/* PC-relative data addressing is word-aligned even with Thumb */
static inline uint32_t thumb_alignpc4(uint32_t addr)
{
return (addr + 4) & ~3;
}
int evaluate_load_literal_thumb(uint16_t opcode, uint32_t address, arm_instruction_t *instruction) int evaluate_load_literal_thumb(uint16_t opcode, uint32_t address, arm_instruction_t *instruction)
{ {
uint32_t immediate; uint32_t immediate;
@ -1685,16 +1691,19 @@ int evaluate_load_literal_thumb(uint16_t opcode, uint32_t address, arm_instructi
instruction->type = ARM_LDR; instruction->type = ARM_LDR;
immediate = opcode & 0x000000ff; immediate = opcode & 0x000000ff;
immediate *= 4;
snprintf(instruction->text, 128,
"0x%8.8" PRIx32 " 0x%4.4x \tLDR\tr%i, [pc, #%#" PRIx32 "]",
address, opcode, Rd, immediate*4);
instruction->info.load_store.Rd = Rd; instruction->info.load_store.Rd = Rd;
instruction->info.load_store.Rn = 15 /*PC*/; instruction->info.load_store.Rn = 15 /*PC*/;
instruction->info.load_store.index_mode = 0; /*offset*/ instruction->info.load_store.index_mode = 0; /*offset*/
instruction->info.load_store.offset_mode = 0; /*immediate*/ instruction->info.load_store.offset_mode = 0; /*immediate*/
instruction->info.load_store.offset.offset = immediate*4; instruction->info.load_store.offset.offset = immediate;
snprintf(instruction->text, 128,
"0x%8.8" PRIx32 " 0x%4.4x \t"
"LDR\tr%i, [pc, #%#" PRIx32 "]\t; %#8.8x",
address, opcode, Rd, immediate,
thumb_alignpc4(address) + immediate);
return ERROR_OK; return ERROR_OK;
} }
@ -2753,8 +2762,7 @@ static int t2ev_data_immed(uint32_t opcode, uint32_t address,
return ERROR_OK; return ERROR_OK;
do_adr: do_adr:
address &= ~0x03; address = thumb_alignpc4(address);
address += 4;
if (add) if (add)
address += immed; address += immed;
else else