Alexei Babich <a.babich@rez.ru> cleanup

[openocd.git] / src / target / armv7a.c

diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 42f1c770406dc19415b992c33d4cf7fadc369962..cebf79da76f48e1fb0855757c9cd4593aa84e99d 100644 (file)
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -23,6 +23,7 @@
 #include "replacements.h"
 
 #include "armv7a.h"
+#include "arm_disassembler.h"
 
 #include "target.h"
 #include "register.h"
@@ -189,9 +190,9 @@ int armv7a_arch_state(struct target_s *target)
        }
 
        LOG_USER("target halted in %s state due to %s, current mode: %s\n"
-                        "%s: 0x%8.8x pc: 0x%8.8x\n"
+                        "%s: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n"
                         "MMU: %s, D-Cache: %s, I-Cache: %s",
-                armv7a_state_strings[armv4_5->core_state],
+                armv7a_state_strings[armv7a->core_state],
                 Jim_Nvp_value2name_simple(nvp_target_debug_reason,
                                target->debug_reason)->name,
                 armv7a_mode_strings[
@@ -269,9 +270,86 @@ static int handle_dap_info_command(struct command_context_s *cmd_ctx,
        return dap_info_command(cmd_ctx, swjdp, apsel);
 }
 
+static int
+handle_armv7a_disassemble_command(struct command_context_s *cmd_ctx,
+               char *cmd, char **args, int argc)
+{
+       target_t *target = get_current_target(cmd_ctx);
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       int thumb = 0;
+       int count = 1;
+       uint32_t address;
+       int i;
+
+       if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC) {
+               command_print(cmd_ctx, "current target isn't an ARM target");
+               return ERROR_OK;
+       }
+
+       /* REVISIT:  eventually support ThumbEE disassembly too;
+        * some opcodes work differently.
+        */
+
+       switch (argc) {
+       case 3:
+               if (strcmp(args[2], "thumb") != 0)
+                       goto usage;
+               thumb = 1;
+               /* FALL THROUGH */
+       case 2:
+               count = strtoul(args[1], NULL, 0);
+               /* FALL THROUGH */
+       case 1:
+               address = strtoul(args[0], NULL, 0);
+               if (address & 0x01) {
+                       if (!thumb) {
+                               command_print(cmd_ctx, "Disassemble as Thumb");
+                               thumb = 1;
+                       }
+                       address &= ~1;
+               }
+               break;
+       default:
+usage:
+               command_print(cmd_ctx,
+                       "usage: armv4_5 disassemble <address> [<count> ['thumb']]");
+               return ERROR_OK;
+       }
+
+       for (i = 0; i < count; i++) {
+               arm_instruction_t cur_instruction;
+               int retval;
+
+               if (thumb) {
+                       retval = thumb2_opcode(target, address, &cur_instruction);
+                       if (retval != ERROR_OK)
+                               return retval;
+
+                       address += cur_instruction.instruction_size;
+               } else {
+                       uint32_t opcode;
+
+                       retval = target_read_u32(target, address, &opcode);
+                       if (retval != ERROR_OK)
+                               return retval;
+
+                       retval = arm_evaluate_opcode(opcode, address,
+                                       &cur_instruction);
+                       if (retval != ERROR_OK)
+                               return retval;
+
+                       address += 4;
+               }
+               command_print(cmd_ctx, "%s", cur_instruction.text);
+       }
+
+       return ERROR_OK;
+}
+
 int armv7a_register_commands(struct command_context_s *cmd_ctx)
 {
        command_t *arm_adi_v5_dap_cmd;
+       command_t *armv7a_cmd;
 
        arm_adi_v5_dap_cmd = register_command(cmd_ctx, NULL, "dap",
                        NULL, COMMAND_ANY,
@@ -297,5 +375,13 @@ int armv7a_register_commands(struct command_context_s *cmd_ctx)
                        "set/get number of extra tck for mem-ap memory "
                        "bus access [0-255]");
 
+       armv7a_cmd = register_command(cmd_ctx, NULL, "armv7a",
+                       NULL, COMMAND_ANY,
+                       "ARMv7-A specific commands");
+
+       register_command(cmd_ctx, armv7a_cmd, "disassemble",
+                       handle_armv7a_disassemble_command, COMMAND_EXEC,
+                       "disassemble instructions <address> [<count> ['thumb']]");
+
        return ERROR_OK;
 }