ARM: label SP and LR correctly

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

diff --git a/src/target/arm11.c b/src/target/arm11.c
index daba3b847cc4cfb88a0b1d36dda73e947179bb4c..605e741b3db0819c5ea1d9168a4345f9edd1d35f 100644 (file)
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -293,12 +293,11 @@ static int arm11_on_enter_debug_state(struct arm11_common *arm11)
        return ERROR_OK;
 }
 
-/** Restore processor state
-  *
-  * This is called in preparation for the RESTART function.
-  *
-  */
-static int arm11_leave_debug_state(struct arm11_common *arm11)
+/**
+ * Restore processor state.  This is called in preparation for
+ * the RESTART function.
+ */
+static int arm11_leave_debug_state(struct arm11_common *arm11, bool bpwp)
 {
        int retval;
 
@@ -354,7 +353,7 @@ static int arm11_leave_debug_state(struct arm11_common *arm11)
        /* restore CPSR, PC, and R0 ... after flushing any modified
         * registers.
         */
-       retval = arm_dpm_write_dirty_registers(&arm11->dpm);
+       retval = arm_dpm_write_dirty_registers(&arm11->dpm, bpwp);
 
        register_cache_invalidate(arm11->arm.core_cache);
 
@@ -598,7 +597,7 @@ static int arm11_resume(struct target *target, int current,
                arm11_sc7_set_vcr(arm11, arm11_vcr);
        }
 
-       arm11_leave_debug_state(arm11);
+       arm11_leave_debug_state(arm11, handle_breakpoints);
 
        arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
 
@@ -762,7 +761,7 @@ static int arm11_step(struct target *target, int current,
                        R(DSCR) |= ARM11_DSCR_INTERRUPTS_DISABLE;
 
 
-               CHECK_RETVAL(arm11_leave_debug_state(arm11));
+               CHECK_RETVAL(arm11_leave_debug_state(arm11, handle_breakpoints));
 
                arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
 
@@ -1203,22 +1202,6 @@ static int arm11_remove_breakpoint(struct target *target,
        return ERROR_OK;
 }
 
-static int arm11_add_watchpoint(struct target *target,
-               struct watchpoint *watchpoint)
-{
-       LOG_WARNING("Not implemented: %s", __func__);
-
-       return ERROR_FAIL;
-}
-
-static int arm11_remove_watchpoint(struct target *target,
-               struct watchpoint *watchpoint)
-{
-       LOG_WARNING("Not implemented: %s", __func__);
-
-       return ERROR_FAIL;
-}
-
 static int arm11_target_create(struct target *target, Jim_Interp *interp)
 {
        struct arm11_common *arm11;
@@ -1510,71 +1493,6 @@ COMMAND_HANDLER(arm11_handle_vcr)
        return ERROR_OK;
 }
 
-static const uint32_t arm11_coproc_instruction_limits[] =
-{
-       15,                             /* coprocessor */
-       7,                              /* opcode 1 */
-       15,                             /* CRn */
-       15,                             /* CRm */
-       7,                              /* opcode 2 */
-       0xFFFFFFFF,             /* value */
-};
-
-static int arm11_mrc_inner(struct target *target, int cpnum,
-               uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm,
-               uint32_t *value, bool read)
-{
-       int retval;
-       struct arm11_common *arm11 = target_to_arm11(target);
-
-       if (target->state != TARGET_HALTED)
-       {
-               LOG_ERROR("Target not halted");
-               return ERROR_FAIL;
-       }
-
-       uint32_t instr = 0xEE000010     |
-               (cpnum <<  8) |
-               (op1 << 21) |
-               (CRn << 16) |
-               (CRm <<  0) |
-               (op2 <<  5);
-
-       if (read)
-               instr |= 0x00100000;
-
-       retval = arm11_run_instr_data_prepare(arm11);
-       if (retval != ERROR_OK)
-               return retval;
-
-       if (read)
-       {
-               retval = arm11_run_instr_data_from_core_via_r0(arm11, instr, value);
-               if (retval != ERROR_OK)
-                       return retval;
-       }
-       else
-       {
-               retval = arm11_run_instr_data_to_core_via_r0(arm11, instr, *value);
-               if (retval != ERROR_OK)
-                       return retval;
-       }
-
-       return arm11_run_instr_data_finish(arm11);
-}
-
-static int arm11_mrc(struct target *target, int cpnum,
-               uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value)
-{
-       return arm11_mrc_inner(target, cpnum, op1, op2, CRn, CRm, value, true);
-}
-
-static int arm11_mcr(struct target *target, int cpnum,
-               uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value)
-{
-       return arm11_mrc_inner(target, cpnum, op1, op2, CRn, CRm, &value, false);
-}
-
 static const struct command_registration arm11_mw_command_handlers[] = {
        {
                .name = "burst",
@@ -1670,8 +1588,6 @@ struct target_type arm11_target = {
 
        .add_breakpoint =       arm11_add_breakpoint,
        .remove_breakpoint =    arm11_remove_breakpoint,
-       .add_watchpoint =       arm11_add_watchpoint,
-       .remove_watchpoint =    arm11_remove_watchpoint,
 
        .run_algorithm =        armv4_5_run_algorithm,
 
@@ -1679,7 +1595,4 @@ struct target_type arm11_target = {
        .target_create =        arm11_target_create,
        .init_target =          arm11_init_target,
        .examine =              arm11_examine,
-
-       .mrc =                  arm11_mrc,
-       .mcr =                  arm11_mcr,
 };