Cortex-M: Delete an unnecessary local variable

The dhcsr_save variable was used to save the value of
cortex_m->dcb_dhcsr so it could be restored later. However, all writes
in between the save and the restore use mem_ap_write_atomic_u32, not
cortex_m_write_debug_halt_mask, which means cortex_m->dcb_dhcsr isn’t
changed anyway. Delete the unnecessary local.

Change-Id: I064a3134e21398e1ecfc9f1fa7efd7b020b52341
Signed-off-by: Christopher Head <chead@zaber.com>
Reviewed-on: http://openocd.zylin.com/4240
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 11dbf24f28eb871fffd7ed05ebfb6875a37acd53..2f8c2a2c8d7573f4b86955de32c793b362f16342 100644 (file)
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -168,12 +168,8 @@ static int cortex_m_single_step_core(struct target *target)
 {
        struct cortex_m_common *cortex_m = target_to_cm(target);
        struct armv7m_common *armv7m = &cortex_m->armv7m;
-       uint32_t dhcsr_save;
        int retval;
 
-       /* backup dhcsr reg */
-       dhcsr_save = cortex_m->dcb_dhcsr;
-
        /* Mask interrupts before clearing halt, if done already.  This avoids
         * Erratum 377497 (fixed in r1p0) where setting MASKINTS while clearing
         * HALT can put the core into an unknown state.
@@ -191,7 +187,6 @@ static int cortex_m_single_step_core(struct target *target)
        LOG_DEBUG(" ");
 
        /* restore dhcsr reg */
-       cortex_m->dcb_dhcsr = dhcsr_save;
        cortex_m_clear_halt(target);
 
        return ERROR_OK;