cortex_a hybrid & context breakpoints

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

diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 3cc86bc63c8a8d90dd7a7060c83532853c5e72a7..151deb41534ac19afdecd49c2beec78501002b89 100644 (file)
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -100,7 +100,7 @@ int armv7a_arch_state(struct target *target)
                return ERROR_INVALID_ARGUMENTS;
        }
 
-       armv4_5_arch_state(target);
+       arm_arch_state(target);
 
        LOG_USER("MMU: %s, D-Cache: %s, I-Cache: %s",
                 state[armv7a->armv4_5_mmu.mmu_enabled],
@@ -117,106 +117,9 @@ int armv7a_arch_state(struct target *target)
 }
 
 
-COMMAND_HANDLER(handle_dap_baseaddr_command)
-{
-       struct target *target = get_current_target(CMD_CTX);
-       struct armv7a_common *armv7a = target_to_armv7a(target);
-       struct swjdp_common *swjdp = &armv7a->swjdp_info;
-
-       return CALL_COMMAND_HANDLER(dap_baseaddr_command, swjdp);
-}
-
-COMMAND_HANDLER(handle_dap_memaccess_command)
-{
-       struct target *target = get_current_target(CMD_CTX);
-       struct armv7a_common *armv7a = target_to_armv7a(target);
-       struct swjdp_common *swjdp = &armv7a->swjdp_info;
-
-       return CALL_COMMAND_HANDLER(dap_memaccess_command, swjdp);
-}
-
-COMMAND_HANDLER(handle_dap_apsel_command)
-{
-       struct target *target = get_current_target(CMD_CTX);
-       struct armv7a_common *armv7a = target_to_armv7a(target);
-       struct swjdp_common *swjdp = &armv7a->swjdp_info;
-
-       return CALL_COMMAND_HANDLER(dap_apsel_command, swjdp);
-}
-
-COMMAND_HANDLER(handle_dap_apid_command)
-{
-       struct target *target = get_current_target(CMD_CTX);
-       struct armv7a_common *armv7a = target_to_armv7a(target);
-       struct swjdp_common *swjdp = &armv7a->swjdp_info;
-
-       return CALL_COMMAND_HANDLER(dap_apid_command, swjdp);
-}
-
-COMMAND_HANDLER(handle_dap_info_command)
-{
-       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 (CMD_ARGC) {
-       case 0:
-               apsel = swjdp->apsel;
-               break;
-       case 1:
-               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
-               break;
-       default:
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-
-       return dap_info_command(CMD_CTX, swjdp, apsel);
-}
-
-static const struct command_registration armv7a_exec_command_handlers[] = {
-       {
-               .name = "info",
-               .handler = &handle_dap_info_command,
-               .mode = COMMAND_EXEC,
-               .help = "dap info for ap [num], "
-                       "default currently selected AP",
-       },
-       {
-               .name = "apsel",
-               .handler = &handle_dap_apsel_command,
-               .mode = COMMAND_EXEC,
-               .help = "select a different AP [num] (default 0)",
-       },
-       {
-               .name = "apid",
-               .handler = &handle_dap_apid_command,
-               .mode = COMMAND_EXEC,
-               .help = "return id reg from AP [num], "
-                       "default currently selected AP",
-       },
-       {
-               .name = "baseaddr",
-               .handler = &handle_dap_baseaddr_command,
-               .mode = COMMAND_EXEC,
-               .help = "return debug base address from AP [num], "
-                       "default currently selected AP",
-       },
-       {
-               .name = "memaccess",
-               .handler = &handle_dap_memaccess_command,
-               .mode = COMMAND_EXEC,
-               .help = "set/get number of extra tck for mem-ap memory "
-                       "bus access [0-255]",
-       },
-       COMMAND_REGISTRATION_DONE
-};
 const struct command_registration armv7a_command_handlers[] = {
        {
-               .name = "dap",
-               .mode = COMMAND_ANY,
-               .help = "Cortex DAP command group",
-               .chain = armv7a_exec_command_handlers,
+               .chain = dap_command_handlers,
        },
        COMMAND_REGISTRATION_DONE
 };