arm920t line length cleanup

[openocd] / src / target / armv7m.c

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 233fb959cdf2e77a2bacff15e921412a0d5b8634..9fe705af7c92c600e5a1a7deda61fe912cd14466 100644 (file)
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -538,7 +538,7 @@ struct reg_cache *armv7m_build_reg_cache(struct target *target)
 /** Sets up target as a generic ARMv7-M core */
 int armv7m_init_arch_info(struct target *target, struct armv7m_common *armv7m)
 {
-       /* register arch-specific functions */
+       armv7m->common_magic = ARMV7M_COMMON_MAGIC;
 
        target->arch_info = armv7m;
        armv7m->read_core_reg = armv7m_read_core_reg;
@@ -694,13 +694,49 @@ int armv7m_blank_check_memory(struct target *target,
        return ERROR_OK;
 }
 
+int armv7m_maybe_skip_bkpt_inst(struct target *target, bool *inst_found)
+{
+       struct armv7m_common *armv7m = target_to_armv7m(target);
+       struct reg *r = armv7m->core_cache->reg_list + 15;
+       bool result = false;
+
+
+       /* if we halted last time due to a bkpt instruction
+        * then we have to manually step over it, otherwise
+        * the core will break again */
+
+       if (target->debug_reason == DBG_REASON_BREAKPOINT)
+       {
+               uint16_t op;
+               uint32_t pc = buf_get_u32(r->value, 0, 32);
+
+               pc &= ~1;
+               if (target_read_u16(target, pc, &op) == ERROR_OK)
+               {
+                       if ((op & 0xFF00) == 0xBE00)
+                       {
+                               pc = buf_get_u32(r->value, 0, 32) + 2;
+                               buf_set_u32(r->value, 0, 32, pc);
+                               r->dirty = true;
+                               r->valid = true;
+                               result = true;
+                               LOG_DEBUG("Skipping over BKPT instruction");
+                       }
+               }
+       }
+
+       if (inst_found) {
+               *inst_found = result;
+       }
+
+       return ERROR_OK;
+}
+
 /*--------------------------------------------------------------------------*/
 
 /*
  * Only stuff below this line should need to verify that its target
  * is an ARMv7-M node.
- *
- * FIXME yet none of it _does_ verify target types yet!
  */
 
 
@@ -713,37 +749,13 @@ COMMAND_HANDLER(handle_dap_baseaddr_command)
        struct target *target = get_current_target(CMD_CTX);
        struct armv7m_common *armv7m = target_to_armv7m(target);
        struct swjdp_common *swjdp = &armv7m->swjdp_info;
-       uint32_t apsel, apselsave, baseaddr;
-       int retval;
 
-       apselsave = swjdp->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;
+       if (!is_armv7m(armv7m)) {
+               command_print(CMD_CTX, "current target isn't an ARM7-M");
+               return ERROR_TARGET_INVALID;
        }
 
-       if (apselsave != apsel)
-               dap_ap_select(swjdp, apsel);
-
-       /* NOTE:  assumes we're talking to a MEM-AP, which
-        * has a base address.  There are other kinds of AP,
-        * though they're not common for now.  This should
-        * use the ID register to verify it's a MEM-AP.
-        */
-       dap_ap_read_reg_u32(swjdp, AP_REG_BASE, &baseaddr);
-       retval = swjdp_transaction_endcheck(swjdp);
-       command_print(CMD_CTX, "0x%8.8" PRIx32 "", baseaddr);
-
-       if (apselsave != apsel)
-               dap_ap_select(swjdp, apselsave);
-
-       return retval;
+       return CALL_COMMAND_HANDLER(dap_baseaddr_command, swjdp);
 }
 
 /*
@@ -756,6 +768,11 @@ COMMAND_HANDLER(handle_dap_apid_command)
        struct armv7m_common *armv7m = target_to_armv7m(target);
        struct swjdp_common *swjdp = &armv7m->swjdp_info;
 
+       if (!is_armv7m(armv7m)) {
+               command_print(CMD_CTX, "current target isn't an ARM7-M");
+               return ERROR_TARGET_INVALID;
+       }
+
        return CALL_COMMAND_HANDLER(dap_apid_command, swjdp);
 }
 
@@ -765,6 +782,11 @@ COMMAND_HANDLER(handle_dap_apsel_command)
        struct armv7m_common *armv7m = target_to_armv7m(target);
        struct swjdp_common *swjdp = &armv7m->swjdp_info;
 
+       if (!is_armv7m(armv7m)) {
+               command_print(CMD_CTX, "current target isn't an ARM7-M");
+               return ERROR_TARGET_INVALID;
+       }
+
        return CALL_COMMAND_HANDLER(dap_apsel_command, swjdp);
 }
 
@@ -774,6 +796,11 @@ COMMAND_HANDLER(handle_dap_memaccess_command)
        struct armv7m_common *armv7m = target_to_armv7m(target);
        struct swjdp_common *swjdp = &armv7m->swjdp_info;
 
+       if (!is_armv7m(armv7m)) {
+               command_print(CMD_CTX, "current target isn't an ARM7-M");
+               return ERROR_TARGET_INVALID;
+       }
+
        return CALL_COMMAND_HANDLER(dap_memaccess_command, swjdp);
 }
 
@@ -785,6 +812,11 @@ COMMAND_HANDLER(handle_dap_info_command)
        struct swjdp_common *swjdp = &armv7m->swjdp_info;
        uint32_t apsel;
 
+       if (!is_armv7m(armv7m)) {
+               command_print(CMD_CTX, "current target isn't an ARM7-M");
+               return ERROR_TARGET_INVALID;
+       }
+
        switch (CMD_ARGC) {
        case 0:
                apsel = swjdp->apsel;