auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
For ARMv4/ARMv5:
  - better command parameter error checking
  - don't require an instruction count; default to one
  - recognize thumb function addresses
  - make function static
  - shorten some too-long lines
 For Cortex-M3:
  - don't require an instruction count; default to one

With the relevant doc updates.
---
Nyet done:  invoke the thumb2 disassembler on v4/v5,
to better handle branch instructions.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2624 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe
2009-08-25 20:02:19 +00:00
parent 24f011ebb4
commit bc075606b7
3 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/target/cortex_m3.c
View File

@@ -1702,23 +1702,27 @@ handle_cortex_m3_disassemble_command(struct command_context_s *cmd_ctx,
int retval = ERROR_OK;
target_t *target = get_current_target(cmd_ctx);
uint32_t address;
unsigned long count;
unsigned long count = 1;
arm_instruction_t cur_instruction;
if (argc != 2) {
errno = 0;
switch (argc) {
case 2:
count = strtoul(args[1], NULL, 0);
if (errno)
return ERROR_FAIL;
/* FALL THROUGH */
case 1:
address = strtoul(args[0], NULL, 0);
if (errno)
return ERROR_FAIL;
break;
default:
command_print(cmd_ctx,
"usage: cortex_m3 disassemble <address> <count>");
"usage: cortex_m3 disassemble <address> [<count>]");
return ERROR_OK;
}
errno = 0;
address = strtoul(args[0], NULL, 0);
if (errno)
return ERROR_FAIL;
count = strtoul(args[1], NULL, 0);
if (errno)
return ERROR_FAIL;
while (count--) {
retval = thumb2_opcode(target, address, &cur_instruction);
if (retval != ERROR_OK)
@@ -1809,7 +1813,7 @@ int cortex_m3_register_commands(struct command_context_s *cmd_ctx)
register_command(cmd_ctx, cortex_m3_cmd, "disassemble",
handle_cortex_m3_disassemble_command, COMMAND_EXEC,
"disassemble Thumb2 instructions <address> <count>");
"disassemble Thumb2 instructions <address> [<count>]");
register_command(cmd_ctx, cortex_m3_cmd, "maskisr",
handle_cortex_m3_mask_interrupts_command, COMMAND_EXEC,
"mask cortex_m3 interrupts ['on'|'off']");