Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
ARM: add arm_mode_name()
[openocd.git] / src / target / armv7a.c
diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 7b33053da491bc55258d9b4cadfdca8cb8899a90..e13b33b4e04ff667c995d67a7012ee9be9b48b5b 100644 (file)
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -25,7 +25,6 @@
 #include "armv7a.h"
 #include "arm_disassembler.h"
 
-#include "target.h"
 #include "register.h"
 #include "binarybuffer.h"
 #include "command.h"
@@ -48,15 +47,6 @@ char* armv7a_core_reg_list[] =
        "r13_mon", "lr_mon", "spsr_mon"
 };
 
-char * armv7a_mode_strings_list[] =
-{
-       "Illegal mode value", "User", "FIQ", "IRQ",
-       "Supervisor", "Abort", "Undefined", "System", "Monitor"
-};
-
-/* Hack! Yuk! allow -1 index, which simplifies codepaths elsewhere in the code */
-char** armv7a_mode_strings = armv7a_mode_strings_list+1;
-
 char* armv7a_state_strings[] =
 {
        "ARM", "Thumb", "Jazelle", "ThumbEE"
@@ -145,22 +135,6 @@ int armv7a_core_reg_map[8][17] =
        }
 };
 
-/* FIXME this dummy is IDENTICAL to the armv4_5, arm11, and armv7m
- * ones... except for naming/scoping
- */
-uint8_t armv7a_gdb_dummy_fp_value[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-struct reg armv7a_gdb_dummy_fp_reg =
-{
-       .name = "GDB dummy floating-point register",
-       .value = armv7a_gdb_dummy_fp_value,
-       .dirty = 0,
-       .valid = 1,
-       .size = 96,
-       .arch_info = NULL,
-       .arch_type = 0,
-};
-
 void armv7a_show_fault_registers(struct target *target)
 {
        uint32_t dfsr, ifsr, dfar, ifar;
@@ -188,10 +162,10 @@ int armv7a_arch_state(struct target *target)
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common;
 
-       if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC)
+       if (armv7a->common_magic != ARMV7_COMMON_MAGIC)
        {
-               LOG_ERROR("BUG: called for a non-ARMv4/5 target");
-               exit(-1);
+               LOG_ERROR("BUG: called for a non-ARMv7A target");
+               return ERROR_INVALID_ARGUMENTS;
        }
 
        LOG_USER("target halted in %s state due to %s, current mode: %s\n"
@@ -200,8 +174,7 @@ int armv7a_arch_state(struct target *target)
                 armv7a_state_strings[armv7a->core_state],
                 Jim_Nvp_value2name_simple(nvp_target_debug_reason,
                                target->debug_reason)->name,
-                armv7a_mode_strings[
-                       armv7a_mode_to_number(armv4_5->core_mode)],
+                arm_mode_name(armv4_5->core_mode),
                 armv7a_core_reg_list[armv7a_core_reg_map[
                        armv7a_mode_to_number(armv4_5->core_mode)][16]],
                 buf_get_u32(ARMV7A_CORE_REG_MODE(armv4_5->core_cache,
@@ -220,7 +193,7 @@ int armv7a_arch_state(struct target *target)
 
 COMMAND_HANDLER(handle_dap_baseaddr_command)
 {
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct swjdp_common *swjdp = &armv7a->swjdp_info;
 
@@ -229,7 +202,7 @@ COMMAND_HANDLER(handle_dap_baseaddr_command)
 
 COMMAND_HANDLER(handle_dap_memaccess_command)
 {
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct swjdp_common *swjdp = &armv7a->swjdp_info;
 
@@ -238,7 +211,7 @@ COMMAND_HANDLER(handle_dap_memaccess_command)
 
 COMMAND_HANDLER(handle_dap_apsel_command)
 {
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct swjdp_common *swjdp = &armv7a->swjdp_info;
 
@@ -247,7 +220,7 @@ COMMAND_HANDLER(handle_dap_apsel_command)
 
 COMMAND_HANDLER(handle_dap_apid_command)
 {
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct swjdp_common *swjdp = &armv7a->swjdp_info;
 
@@ -256,103 +229,28 @@ COMMAND_HANDLER(handle_dap_apid_command)
 
 COMMAND_HANDLER(handle_dap_info_command)
 {
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct swjdp_common *swjdp = &armv7a->swjdp_info;
        uint32_t apsel;
 
-       switch (argc) {
+       switch (CMD_ARGC) {
        case 0:
                apsel = swjdp->apsel;
                break;
        case 1:
-               COMMAND_PARSE_NUMBER(u32, args[0], apsel);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
                break;
        default:
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       return dap_info_command(cmd_ctx, swjdp, apsel);
-}
-
-COMMAND_HANDLER(handle_armv7a_disassemble_command)
-{
-       struct target *target = get_current_target(cmd_ctx);
-       struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
-       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:
-               COMMAND_PARSE_NUMBER(int, args[1], count);
-               /* FALL THROUGH */
-       case 1:
-               COMMAND_PARSE_NUMBER(u32, args[0], address);
-               if (address & 0x01) {
-                       if (!thumb) {
-                               command_print(cmd_ctx, "Disassemble as Thumb");
-                               thumb = 1;
-                       }
-                       address &= ~1;
-               }
-               break;
-       default:
-usage:
-               command_print(cmd_ctx,
-                       "usage: armv7a disassemble <address> [<count> ['thumb']]");
-               return ERROR_OK;
-       }
-
-       for (i = 0; i < count; i++) {
-               struct arm_instruction 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;
+       return dap_info_command(CMD_CTX, swjdp, apsel);
 }
 
 int armv7a_register_commands(struct command_context *cmd_ctx)
 {
        struct command *arm_adi_v5_dap_cmd;
-       struct command *armv7a_cmd;
 
        arm_adi_v5_dap_cmd = register_command(cmd_ctx, NULL, "dap",
                        NULL, COMMAND_ANY,
@@ -378,13 +276,5 @@ int armv7a_register_commands(struct command_context *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;
 }
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)