fixed warning
[fw/openocd] / src / target / arm7_9_common.c
index b4ab4ef940584b95dc39bb72a81ae1bfc20c7f28..c08f6aa20c4b33d248d3d22325c00f21aebafb95 100644 (file)
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Ã˜yvind Harboe                                      *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -50,130 +53,162 @@ int handle_arm7_9_write_xpsr_command(struct command_context_s *cmd_ctx, char *cm
 int handle_arm7_9_write_xpsr_im8_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_arm7_9_read_core_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_arm7_9_write_core_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_arm7_9_sw_bkpts_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_arm7_9_force_hw_bkpts_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_arm7_9_dbgrq_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_arm7_9_fast_memory_access_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_arm7_9_dcc_downloads_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_arm7_9_etm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
-int arm7_9_reinit_embeddedice(target_t *target)
+
+static int arm7_9_clear_watchpoints(arm7_9_common_t *arm7_9)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
-       breakpoint_t *breakpoint = target->breakpoints;
-       
-       arm7_9->wp_available = 2;
+       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], 0x0);
+       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE], 0x0);
+       arm7_9->sw_breakpoints_added = 0;
        arm7_9->wp0_used = 0;
-       arm7_9->wp1_used = 0;
-               
-       /* mark all hardware breakpoints as unset */
-       while (breakpoint)
+       arm7_9->wp1_used = arm7_9->wp1_used_default;
+       arm7_9->wp_available = arm7_9->wp_available_max;
+
+       return jtag_execute_queue();
+}
+
+/* set up embedded ice registers */
+static int arm7_9_set_software_breakpoints(arm7_9_common_t *arm7_9)
+{
+       if (arm7_9->sw_breakpoints_added)
        {
-               if (breakpoint->type == BKPT_HARD)
-               {
-                       breakpoint->set = 0;
-               }
-               breakpoint = breakpoint->next;
+               return ERROR_OK;
        }
-               
-       if (arm7_9->sw_bkpts_enabled && arm7_9->sw_bkpts_use_wp)
+       if (arm7_9->wp_available < 1)
        {
-               arm7_9->sw_bkpts_enabled = 0;
-               arm7_9_enable_sw_bkpts(target);
+               LOG_WARNING("can't enable sw breakpoints with no watchpoint unit available");
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
+       arm7_9->wp_available--;
        
-       return ERROR_OK;
+       /* pick a breakpoint unit */
+       if (!arm7_9->wp0_used)
+       {
+               arm7_9->sw_breakpoints_added=1;
+               arm7_9->wp0_used = 3;
+       } else if (!arm7_9->wp1_used)
+       {
+               arm7_9->sw_breakpoints_added=2;
+               arm7_9->wp1_used = 3;
+       }
+       else
+       {
+               LOG_ERROR("BUG: both watchpoints used, but wp_available >= 1");
+               return ERROR_FAIL;
+       }
+
+       if (arm7_9->sw_breakpoints_added==1)
+       {
+               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_VALUE], arm7_9->arm_bkpt);
+               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK], 0x0);
+               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK], 0xffffffffu);
+               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], ~EICE_W_CTRL_nOPC & 0xff);
+               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], EICE_W_CTRL_ENABLE);
+       }
+       else if (arm7_9->sw_breakpoints_added==2)
+       {
+               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_DATA_VALUE], arm7_9->arm_bkpt);
+               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_DATA_MASK], 0x0);
+               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_ADDR_MASK], 0xffffffffu);
+               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_MASK], ~EICE_W_CTRL_nOPC & 0xff);
+               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE], EICE_W_CTRL_ENABLE);
+       }
+       else
+       {
+               LOG_ERROR("BUG: both watchpoints used, but wp_available >= 1");
+               return ERROR_FAIL;
+       }
+
+       return jtag_execute_queue();
 }
 
 /* set things up after a reset / on startup */
 int arm7_9_setup(target_t *target)
 {
-       /* a test-logic reset have occured
-        * the EmbeddedICE registers have been reset
-        * hardware breakpoints have been cleared
-        */
-       return arm7_9_reinit_embeddedice(target);
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+
+       return arm7_9_clear_watchpoints(arm7_9);
 }
 
+
 int arm7_9_get_arch_pointers(target_t *target, armv4_5_common_t **armv4_5_p, arm7_9_common_t **arm7_9_p)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
+
        if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC)
        {
                return -1;
        }
-       
+
        if (arm7_9->common_magic != ARM7_9_COMMON_MAGIC)
        {
                return -1;
        }
-       
+
        *armv4_5_p = armv4_5;
        *arm7_9_p = arm7_9;
-       
+
        return ERROR_OK;
 }
 
+/* we set up the breakpoint even if it is already set. Some action, e.g. reset
+ * might have erased the values in embedded ice
+ */
 int arm7_9_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
+       int retval=ERROR_OK;
+
        if (target->state != TARGET_HALTED)
        {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-       
-       if (arm7_9->force_hw_bkpts)
-               breakpoint->type = BKPT_HARD;
-
-       if (breakpoint->set)
-       {
-               LOG_WARNING("breakpoint already set");
-               return ERROR_OK;
-       }
 
        if (breakpoint->type == BKPT_HARD)
        {
                /* either an ARM (4 byte) or Thumb (2 byte) breakpoint */
                u32 mask = (breakpoint->length == 4) ? 0x3u : 0x1u;
-               if (!arm7_9->wp0_used)
+               if (breakpoint->set==1)
                {
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_VALUE], breakpoint->address);
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK], mask);
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK], 0xffffffffu);
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], ~EICE_W_CTRL_nOPC & 0xff);
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], EICE_W_CTRL_ENABLE);
-
-                       jtag_execute_queue();
-                       arm7_9->wp0_used = 1;
-                       breakpoint->set = 1;
                }
-               else if (!arm7_9->wp1_used)
+               else if (breakpoint->set==2)
                {
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_ADDR_VALUE], breakpoint->address);
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_ADDR_MASK], mask);
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_DATA_MASK], 0xffffffffu);
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_MASK], ~EICE_W_CTRL_nOPC & 0xff);
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE], EICE_W_CTRL_ENABLE);
-
-                       jtag_execute_queue();
-                       arm7_9->wp1_used = 1;
-                       breakpoint->set = 2;
                }
                else
                {
                        LOG_ERROR("BUG: no hardware comparator available");
                        return ERROR_OK;
                }
+
+               retval=jtag_execute_queue();
        }
        else if (breakpoint->type == BKPT_SOFT)
        {
+               if ((retval=arm7_9_set_software_breakpoints(arm7_9))!=ERROR_OK)
+                       return retval;
+               
+               /* did we already set this breakpoint? */
+               if (breakpoint->set)
+                       return ERROR_OK;
+               
                if (breakpoint->length == 4)
                {
                        u32 verify = 0xffffffff;
@@ -181,11 +216,11 @@ int arm7_9_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
                        target->type->read_memory(target, breakpoint->address, 4, 1, breakpoint->orig_instr);
                        /* write the breakpoint instruction in target endianness (arm7_9->arm_bkpt is host endian) */
                        target_write_u32(target, breakpoint->address, arm7_9->arm_bkpt);
-                       
+
                        target->type->read_memory(target, breakpoint->address, 4, 1, (u8 *)&verify);
                        if (verify != arm7_9->arm_bkpt)
                        {
-                               LOG_ERROR("Unable to set 32 bit software breakpoint at address %08x", breakpoint->address);
+                               LOG_ERROR("Unable to set 32 bit software breakpoint at address %08x - check that memory is read/writable", breakpoint->address);
                                return ERROR_OK;
                        }
                }
@@ -196,18 +231,18 @@ int arm7_9_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
                        target->type->read_memory(target, breakpoint->address, 2, 1, breakpoint->orig_instr);
                        /* write the breakpoint instruction in target endianness (arm7_9->thumb_bkpt is host endian) */
                        target_write_u16(target, breakpoint->address, arm7_9->thumb_bkpt);
-                       
+
                        target->type->read_memory(target, breakpoint->address, 2, 1, (u8 *)&verify);
                        if (verify != arm7_9->thumb_bkpt)
                        {
-                               LOG_ERROR("Unable to set thumb software breakpoint at address %08x", breakpoint->address);
+                               LOG_ERROR("Unable to set thumb software breakpoint at address %08x - check that memory is read/writable", breakpoint->address);
                                return ERROR_OK;
                        }
                }
                breakpoint->set = 1;
        }
 
-       return ERROR_OK;
+       return retval;
 
 }
 
@@ -215,33 +250,26 @@ int arm7_9_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
-       if (target->state != TARGET_HALTED)
-       {
-               LOG_WARNING("target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
 
        if (!breakpoint->set)
        {
                LOG_WARNING("breakpoint not set");
                return ERROR_OK;
        }
-       
+
        if (breakpoint->type == BKPT_HARD)
        {
                if (breakpoint->set == 1)
                {
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], 0x0);
-                       jtag_execute_queue();
                        arm7_9->wp0_used = 0;
                }
                else if (breakpoint->set == 2)
                {
                        embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE], 0x0);
-                       jtag_execute_queue();
                        arm7_9->wp1_used = 0;
                }
+               jtag_execute_queue();
                breakpoint->set = 0;
        }
        else
@@ -273,62 +301,76 @@ int arm7_9_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
        
-       if (arm7_9->force_hw_bkpts)
+       if (arm7_9->breakpoint_count==0)
        {
-               LOG_DEBUG("forcing use of hardware breakpoint at address 0x%8.8x", breakpoint->address);
-               breakpoint->type = BKPT_HARD;
-       }
-       
-       if ((breakpoint->type == BKPT_SOFT) && (arm7_9->sw_bkpts_enabled == 0))
-       {
-               LOG_INFO("sw breakpoint requested, but software breakpoints not enabled");
-               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+               /* make sure we don't have any dangling breakpoints. This is vital upon 
+                * GDB connect/disconnect 
+                */
+               arm7_9_clear_watchpoints(arm7_9);       
        }
-       
+
        if ((breakpoint->type == BKPT_HARD) && (arm7_9->wp_available < 1))
        {
                LOG_INFO("no watchpoint unit available for hardware breakpoint");
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
-       
+
        if ((breakpoint->length != 2) && (breakpoint->length != 4))
        {
                LOG_INFO("only breakpoints of two (Thumb) or four (ARM) bytes length supported");
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
-       
+
        if (breakpoint->type == BKPT_HARD)
+       {
                arm7_9->wp_available--;
+               
+               if (!arm7_9->wp0_used)
+               {
+                       arm7_9->wp0_used = 1;
+                       breakpoint->set = 1;
+               }
+               else if (!arm7_9->wp1_used)
+               {
+                       arm7_9->wp1_used = 1;
+                       breakpoint->set = 2;
+               }
+               else
+               {
+                       LOG_ERROR("BUG: no hardware comparator available");
+               }
+       }
        
-       return ERROR_OK;
+
+       arm7_9->breakpoint_count++;
+       
+       return arm7_9_set_breakpoint(target, breakpoint);
 }
 
 int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
-       if (target->state != TARGET_HALTED)
-       {
-               LOG_WARNING("target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-       
-       if (breakpoint->set)
-       {
-               arm7_9_unset_breakpoint(target, breakpoint);
-       }
-       
+
+       arm7_9_unset_breakpoint(target, breakpoint);
+
        if (breakpoint->type == BKPT_HARD)
                arm7_9->wp_available++;
        
+       arm7_9->breakpoint_count--;
+       if (arm7_9->breakpoint_count==0)
+       {
+               /* make sure we don't have any dangling breakpoints */
+               arm7_9_clear_watchpoints(arm7_9);       
+       }
+
        return ERROR_OK;
 }
 
@@ -338,20 +380,20 @@ int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
        int rw_mask = 1;
        u32 mask;
-       
+
        mask = watchpoint->length - 1;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        if (watchpoint->rw == WPT_ACCESS)
                rw_mask = 0;
        else
                rw_mask = 1;
-       
+
        if (!arm7_9->wp0_used)
        {
                embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_VALUE], watchpoint->address);
@@ -379,13 +421,13 @@ int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
                jtag_execute_queue();
                watchpoint->set = 2;
                arm7_9->wp1_used = 2;
-       } 
+       }
        else
        {
                LOG_ERROR("BUG: no hardware comparator available");
                return ERROR_OK;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -393,19 +435,19 @@ int arm7_9_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        if (!watchpoint->set)
        {
                LOG_WARNING("breakpoint not set");
                return ERROR_OK;
        }
-       
+
        if (watchpoint->set == 1)
        {
                embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], 0x0);
@@ -427,25 +469,25 @@ int arm7_9_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        if (arm7_9->wp_available < 1)
        {
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
-       
+
        if ((watchpoint->length != 1) && (watchpoint->length != 2) && (watchpoint->length != 4))
        {
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
-       
+
        arm7_9->wp_available--;
-               
+
        return ERROR_OK;
 }
 
@@ -453,114 +495,38 @@ int arm7_9_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
-       if (target->state != TARGET_HALTED)
-       {
-               LOG_WARNING("target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-       
+
        if (watchpoint->set)
        {
                arm7_9_unset_watchpoint(target, watchpoint);
        }
-               
+
        arm7_9->wp_available++;
-       
-       return ERROR_OK;
-}
 
-int arm7_9_enable_sw_bkpts(struct target_s *target)
-{
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       int retval;
-       
-       if (arm7_9->sw_bkpts_enabled)
-               return ERROR_OK;
-       
-       if (arm7_9->wp_available < 1)
-       {
-               LOG_WARNING("can't enable sw breakpoints with no watchpoint unit available");
-               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-       }
-       arm7_9->wp_available--;
-       
-       if (!arm7_9->wp0_used)
-       {
-               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_VALUE], arm7_9->arm_bkpt);
-               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK], 0x0);
-               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK], 0xffffffffu);
-               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], ~EICE_W_CTRL_nOPC & 0xff);
-               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], EICE_W_CTRL_ENABLE);
-               arm7_9->sw_bkpts_enabled = 1;
-               arm7_9->wp0_used = 3;
-       }
-       else if (!arm7_9->wp1_used)
-       {
-               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_DATA_VALUE], arm7_9->arm_bkpt);
-               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_DATA_MASK], 0x0);
-               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_ADDR_MASK], 0xffffffffu);
-               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_MASK], ~EICE_W_CTRL_nOPC & 0xff);
-               embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE], EICE_W_CTRL_ENABLE);
-               arm7_9->sw_bkpts_enabled = 2;
-               arm7_9->wp1_used = 3;
-       }
-       else
-       {
-               LOG_ERROR("BUG: both watchpoints used, but wp_available >= 1");
-               return ERROR_FAIL;
-       }
-       
-       if ((retval = jtag_execute_queue()) != ERROR_OK)
-       {
-               LOG_ERROR("error writing EmbeddedICE registers to enable sw breakpoints");
-               return ERROR_FAIL;
-       };
-       
        return ERROR_OK;
 }
 
-int arm7_9_disable_sw_bkpts(struct target_s *target)
-{
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
-       if (!arm7_9->sw_bkpts_enabled)
-               return ERROR_OK;
-       
-       if (arm7_9->sw_bkpts_enabled == 1)
-       {
-               embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], 0x0);
-               arm7_9->sw_bkpts_enabled = 0;
-               arm7_9->wp0_used = 0;
-               arm7_9->wp_available++;
-       }
-       else if (arm7_9->sw_bkpts_enabled == 2)
-       {
-               embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE], 0x0);
-               arm7_9->sw_bkpts_enabled = 0;
-               arm7_9->wp1_used = 0;
-               arm7_9->wp_available++;
-       }
 
-       return ERROR_OK;
-}
+
 
 int arm7_9_execute_sys_speed(struct target_s *target)
 {
        int timeout;
        int retval;
-       
+
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
        arm_jtag_t *jtag_info = &arm7_9->jtag_info;
        reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
-                               
+
        /* set RESTART instruction */
        jtag_add_end_state(TAP_RTI);
+       if (arm7_9->need_bypass_before_restart) {
+               arm7_9->need_bypass_before_restart = 0;
+               arm_jtag_set_instr(jtag_info, 0xf, NULL);
+       }
        arm_jtag_set_instr(jtag_info, 0x4, NULL);
-       
+
        for (timeout=0; timeout<50; timeout++)
        {
                /* read debug status register */
@@ -570,14 +536,14 @@ int arm7_9_execute_sys_speed(struct target_s *target)
                if ((buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_DBGACK, 1))
                                   && (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_SYSCOMP, 1)))
                        break;
-               usleep(100000); 
+               alive_sleep(100);
        }
        if (timeout == 50)
        {
                LOG_ERROR("timeout waiting for SYSCOMP & DBGACK, last DBG_STATUS: %x", buf_get_u32(dbg_stat->value, 0, dbg_stat->size));
                return ERROR_TARGET_TIMEOUT;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -585,20 +551,24 @@ int arm7_9_execute_fast_sys_speed(struct target_s *target)
 {
        static int set=0;
        static u8 check_value[4], check_mask[4];
-       
+
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
        arm_jtag_t *jtag_info = &arm7_9->jtag_info;
        reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
-                               
+
        /* set RESTART instruction */
        jtag_add_end_state(TAP_RTI);
+       if (arm7_9->need_bypass_before_restart) {
+               arm7_9->need_bypass_before_restart = 0;
+               arm_jtag_set_instr(jtag_info, 0xf, NULL);
+       }
        arm_jtag_set_instr(jtag_info, 0x4, NULL);
-       
+
        if (!set)
        {
                /* check for DBGACK and SYSCOMP set (others don't care) */
-               
+
                /* NB! These are constants that must be available until after next jtag_execute() and
                   we evaluate the values upon first execution in lieu of setting up these constants
                   during early setup.
@@ -607,7 +577,7 @@ int arm7_9_execute_fast_sys_speed(struct target_s *target)
                buf_set_u32(check_mask, 0, 32, 0x9);
                set=1;
        }
-       
+
        /* read debug status register */
        embeddedice_read_reg_w_check(dbg_stat, check_value, check_value);
 
@@ -621,18 +591,18 @@ int arm7_9_target_request_data(target_t *target, u32 size, u8 *buffer)
        arm_jtag_t *jtag_info = &arm7_9->jtag_info;
        u32 *data;
        int i;
-       
+
        data = malloc(size * (sizeof(u32)));
-       
+
        embeddedice_receive(jtag_info, data, size);
-       
+
        for (i = 0; i < size; i++)
        {
                h_u32_to_le(buffer + (i * 4), data[i]);
        }
-       
+
        free(data);
-       
+
        return ERROR_OK;
 }
 
@@ -643,29 +613,29 @@ int arm7_9_handle_target_request(void *priv)
                return ERROR_OK;
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info; 
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
        reg_t *dcc_control = &arm7_9->eice_cache->reg_list[EICE_COMMS_CTRL];
-       
-       
+
+
        if (!target->dbg_msg_enabled)
                return ERROR_OK;
-               
+
        if (target->state == TARGET_RUNNING)
        {
                /* read DCC control register */
                embeddedice_read_reg(dcc_control);
                jtag_execute_queue();
-               
+
                /* check W bit */
                if (buf_get_u32(dcc_control->value, 1, 1) == 1)
                {
                        u32 request;
-                       
+
                        embeddedice_receive(jtag_info, &request, 1);
                        target_request(target, request);
                }
        }
-       
+
        return ERROR_OK;
 }
 
@@ -682,7 +652,7 @@ int arm7_9_poll(target_t *target)
        {
                return retval;
        }
-       
+
        if (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_DBGACK, 1))
        {
 /*             LOG_DEBUG("DBGACK set, dbg_state->value: 0x%x", buf_get_u32(dbg_stat->value, 0, 32));*/
@@ -694,11 +664,9 @@ int arm7_9_poll(target_t *target)
                if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET))
                {
                        int check_pc=0;
-                       target->state = TARGET_HALTED;
-                       
                        if (target->state == TARGET_RESET)
                        {
-                               if ((target->reset_mode == RESET_HALT) || (target->reset_mode == RESET_INIT))
+                               if (target->reset_halt)
                                {
                                        if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0)
                                        {
@@ -706,20 +674,22 @@ int arm7_9_poll(target_t *target)
                                        }
                                }
                        }
-                       
+
+                       target->state = TARGET_HALTED;
+
                        if ((retval = arm7_9_debug_entry(target)) != ERROR_OK)
                                return retval;
-                       
+
                        if (check_pc)
                        {
                                reg_t *reg = register_get_by_name(target->reg_cache, "pc", 1);
                                u32 t=*((u32 *)reg->value);
                                if (t!=0)
                                {
-                                       LOG_ERROR("PC was not 0. Does this target does target need srst_pulls_trst?");
+                                       LOG_ERROR("PC was not 0. Does this target need srst_pulls_trst?");
                                }
                        }
-                       
+
                        target_call_event_callbacks(target, TARGET_EVENT_HALTED);
                }
                if (target->state == TARGET_DEBUG_RUNNING)
@@ -727,7 +697,7 @@ int arm7_9_poll(target_t *target)
                        target->state = TARGET_HALTED;
                        if ((retval = arm7_9_debug_entry(target)) != ERROR_OK)
                                return retval;
-                       
+
                        target_call_event_callbacks(target, TARGET_EVENT_DEBUG_HALTED);
                }
                if (target->state != TARGET_HALTED)
@@ -740,7 +710,7 @@ int arm7_9_poll(target_t *target)
                if (target->state != TARGET_DEBUG_RUNNING)
                        target->state = TARGET_RUNNING;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -757,21 +727,21 @@ int arm7_9_assert_reset(target_t *target)
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
        LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
-       
+
        if (!(jtag_reset_config & RESET_HAS_SRST))
        {
                LOG_ERROR("Can't assert SRST");
                return ERROR_FAIL;
        }
 
-       if ((target->reset_mode == RESET_HALT) || (target->reset_mode == RESET_INIT))
+       if (target->reset_halt)
        {
                /*
                 * Some targets do not support communication while SRST is asserted. We need to
                 * set up the reset vector catch here.
-                * 
+                *
                 * If TRST is asserted, then these settings will be reset anyway, so setting them
-                * here is harmless.  
+                * here is harmless.
                 */
                if (arm7_9->has_vector_catch)
                {
@@ -781,10 +751,11 @@ int arm7_9_assert_reset(target_t *target)
                else
                {
                        /* program watchpoint unit to match on reset vector address */
+                       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_VALUE], 0x0);
                        embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK], 0x3);
-                       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK], 0x0);
-                       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], 0x100);
-                       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], 0xf7);
+                       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK], 0xffffffff);
+                       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], EICE_W_CTRL_ENABLE);
+                       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], ~EICE_W_CTRL_nOPC & 0xff);
                }
        }
 
@@ -796,25 +767,50 @@ int arm7_9_assert_reset(target_t *target)
        {
                jtag_add_reset(0, 1);
        }
-       
+
 
        target->state = TARGET_RESET;
        jtag_add_sleep(50000);
 
        armv4_5_invalidate_core_regs(target);
 
+    if ((target->reset_halt)&&((jtag_reset_config & RESET_SRST_PULLS_TRST)==0))
+       {
+               /* debug entry was already prepared in arm7_9_assert_reset() */
+               target->debug_reason = DBG_REASON_DBGRQ;
+       }
+       
        return ERROR_OK;
 
 }
 
 int arm7_9_deassert_reset(target_t *target)
 {
+       int retval=ERROR_OK;
        LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
-       
+
        /* deassert reset lines */
        jtag_add_reset(0, 0);
-       
-       return ERROR_OK;
+
+       if (target->reset_halt&&(jtag_reset_config & RESET_SRST_PULLS_TRST)!=0)
+       {
+               LOG_WARNING("srst pulls trst - can not reset into halted mode. Issuing halt after reset.");
+               /* set up embedded ice registers again */
+               if ((retval=target->type->examine(target))!=ERROR_OK)
+                       return retval;
+
+               if ((retval=target_poll(target))!=ERROR_OK)
+               {
+                       return retval;
+               }
+               
+               if ((retval=target_halt(target))!=ERROR_OK)
+               {
+                       return retval;
+               }
+               
+       }
+       return retval;
 }
 
 int arm7_9_clear_halt(target_t *target)
@@ -822,13 +818,13 @@ int arm7_9_clear_halt(target_t *target)
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
        reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
-       
+
        /* we used DBGRQ only if we didn't come out of reset */
        if (!arm7_9->debug_entry_from_reset && arm7_9->use_dbgrq)
        {
                /* program EmbeddedICE Debug Control Register to deassert DBGRQ
                 */
-               buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGRQ, 1, 0);     
+               buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGRQ, 1, 0);
                embeddedice_store_reg(dbg_ctrl);
        }
        else
@@ -847,17 +843,21 @@ int arm7_9_clear_halt(target_t *target)
                         */
                        if (arm7_9->wp0_used)
                        {
+                               if (arm7_9->debug_entry_from_reset)
+                               {
+                                       embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_VALUE]);
+                               }
                                embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK]);
                                embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK]);
                                embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK]);
                        }
-                       /* control value always has to be restored, as it was either disabled, 
+                       /* control value always has to be restored, as it was either disabled,
                         * or enabled with possibly different bits
                         */
                        embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE]);
                }
        }
-       
+
        return ERROR_OK;
 }
 
@@ -869,10 +869,10 @@ int arm7_9_soft_reset_halt(struct target_s *target)
        reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
        int i;
        int retval;
-       
+
        if ((retval=target_halt(target))!=ERROR_OK)
                return retval;
-       
+
        for (i=0; i<10; i++)
        {
                if (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_DBGACK, 1) != 0)
@@ -882,7 +882,7 @@ int arm7_9_soft_reset_halt(struct target_s *target)
                        return retval;
                /* do not eat all CPU, time out after 1 se*/
                usleep(100*1000);
-               
+
        }
        if (i==10)
        {
@@ -890,7 +890,7 @@ int arm7_9_soft_reset_halt(struct target_s *target)
                return ERROR_TARGET_TIMEOUT;
        }
        target->state = TARGET_HALTED;
-       
+
        /* program EmbeddedICE Debug Control Register to assert DBGACK and INTDIS
         * ensure that DBGRQ is cleared
         */
@@ -898,9 +898,9 @@ int arm7_9_soft_reset_halt(struct target_s *target)
        buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGRQ, 1, 0);
        buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_INTDIS, 1, 1);
        embeddedice_store_reg(dbg_ctrl);
-       
+
        arm7_9_clear_halt(target);
-       
+
        /* if the target is in Thumb state, change to ARM state */
        if (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_ITBIT, 1))
        {
@@ -910,82 +910,74 @@ int arm7_9_soft_reset_halt(struct target_s *target)
                armv4_5->core_state = ARMV4_5_STATE_THUMB;
                arm7_9->change_to_arm(target, &r0_thumb, &pc_thumb);
        }
-       
+
        /* all register content is now invalid */
        armv4_5_invalidate_core_regs(target);
-       
+
        /* SVC, ARM state, IRQ and FIQ disabled */
        buf_set_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 8, 0xd3);
        armv4_5->core_cache->reg_list[ARMV4_5_CPSR].dirty = 1;
        armv4_5->core_cache->reg_list[ARMV4_5_CPSR].valid = 1;
-       
+
        /* start fetching from 0x0 */
        buf_set_u32(armv4_5->core_cache->reg_list[15].value, 0, 32, 0x0);
        armv4_5->core_cache->reg_list[15].dirty = 1;
        armv4_5->core_cache->reg_list[15].valid = 1;
-       
+
        armv4_5->core_mode = ARMV4_5_MODE_SVC;
        armv4_5->core_state = ARMV4_5_STATE_ARM;
 
        if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
                return ERROR_FAIL;
-       
+
        /* reset registers */
        for (i = 0; i <= 14; i++)
-       {       
+       {
                buf_set_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, i).value, 0, 32, 0xffffffff);
                ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, i).dirty = 1;
                ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, i).valid = 1;
        }
-       
+
        target_call_event_callbacks(target, TARGET_EVENT_HALTED);
-       
+
        return ERROR_OK;
 }
 
 int arm7_9_halt(target_t *target)
 {
+       if (target->state==TARGET_RESET)
+       {
+               LOG_ERROR("BUG: arm7/9 does not support halt during reset. This is handled in arm7_9_assert_reset()");
+               return ERROR_OK;
+       }
+
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
        reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
-       
+
        LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
-       
+
        if (target->state == TARGET_HALTED)
        {
                LOG_DEBUG("target was already halted");
                return ERROR_OK;
        }
-       
+
        if (target->state == TARGET_UNKNOWN)
        {
                LOG_WARNING("target was in unknown state when halt was requested");
        }
-       
-       if (target->state == TARGET_RESET) 
-       {
-               if ((jtag_reset_config & RESET_SRST_PULLS_TRST) && jtag_srst)
-               {
-                       LOG_ERROR("can't request a halt while in reset if nSRST pulls nTRST");
-                       return ERROR_TARGET_FAILURE;
-               }
-               else
-               {
-                       /* we came here in a reset_halt or reset_init sequence
-                        * debug entry was already prepared in arm7_9_prepare_reset_halt()
-                        */
-                       target->debug_reason = DBG_REASON_DBGRQ;
-                       
-                       return ERROR_OK; 
-               }
-       }
 
        if (arm7_9->use_dbgrq)
        {
                /* program EmbeddedICE Debug Control Register to assert DBGRQ
                 */
-               buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGRQ, 1, 1);     
-               embeddedice_store_reg(dbg_ctrl);
+               if (arm7_9->set_special_dbgrq) {
+                       arm7_9->set_special_dbgrq(target);
+               } else {
+                       buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGRQ, 1, 1);
+                       embeddedice_store_reg(dbg_ctrl);
+               }
        }
        else
        {
@@ -993,12 +985,12 @@ int arm7_9_halt(target_t *target)
                 */
                embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK], 0xffffffff);
                embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK], 0xffffffff);
-               embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], 0x100);
-               embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], 0xf7);
+               embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], EICE_W_CTRL_ENABLE);
+               embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], ~EICE_W_CTRL_nOPC & 0xff);
        }
 
        target->debug_reason = DBG_REASON_DBGRQ;
-       
+
        return ERROR_OK;
 }
 
@@ -1030,9 +1022,9 @@ int arm7_9_debug_entry(target_t *target)
        buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGRQ, 1, 0);
        buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_INTDIS, 1, 1);
        embeddedice_store_reg(dbg_ctrl);
-       
+
        arm7_9_clear_halt(target);
-       
+
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
                return retval;
@@ -1047,7 +1039,7 @@ int arm7_9_debug_entry(target_t *target)
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        /* if the target is in Thumb state, change to ARM state */
        if (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_ITBIT, 1))
        {
@@ -1063,27 +1055,27 @@ int arm7_9_debug_entry(target_t *target)
                /* Entered debug from ARM mode */
                armv4_5->core_state = ARMV4_5_STATE_ARM;
        }
-       
+
        for (i = 0; i < 16; i++)
                context_p[i] = &context[i];
        /* save core registers (r0 - r15 of current core mode) */
        arm7_9->read_core_regs(target, 0xffff, context_p);
 
        arm7_9->read_xpsr(target, &cpsr, 0);
-       
+
        if ((retval = jtag_execute_queue()) != ERROR_OK)
                return retval;
-       
+
        /* if the core has been executing in Thumb state, set the T bit */
        if (armv4_5->core_state == ARMV4_5_STATE_THUMB)
-               cpsr |= 0x20;   
-       
+               cpsr |= 0x20;
+
        buf_set_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32, cpsr);
        armv4_5->core_cache->reg_list[ARMV4_5_CPSR].dirty = 0;
        armv4_5->core_cache->reg_list[ARMV4_5_CPSR].valid = 1;
-       
+
        armv4_5->core_mode = cpsr & 0x1f;
-       
+
        if (armv4_5_mode_to_number(armv4_5->core_mode) == -1)
        {
                target->state = TARGET_UNKNOWN;
@@ -1092,7 +1084,7 @@ int arm7_9_debug_entry(target_t *target)
        }
 
        LOG_DEBUG("target entered debug state in %s mode", armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)]);
-       
+
        if (armv4_5->core_state == ARMV4_5_STATE_THUMB)
        {
                LOG_DEBUG("thumb state, applying fixups");
@@ -1119,7 +1111,7 @@ int arm7_9_debug_entry(target_t *target)
 
        if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
                return ERROR_FAIL;
-       
+
        for (i=0; i<=15; i++)
        {
                LOG_DEBUG("r%i: 0x%8.8x", i, context[i]);
@@ -1127,9 +1119,9 @@ int arm7_9_debug_entry(target_t *target)
                ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, i).dirty = 0;
                ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, i).valid = 1;
        }
-       
+
        LOG_DEBUG("entered debug state at PC 0x%x", context[15]);
-       
+
        if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
                return ERROR_FAIL;
 
@@ -1165,13 +1157,13 @@ int arm7_9_full_context(target_t *target)
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
 
        LOG_DEBUG("-");
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
                return ERROR_FAIL;
 
@@ -1184,19 +1176,19 @@ int arm7_9_full_context(target_t *target)
                u32* reg_p[16];
                int j;
                int valid = 1;
-               
-               /* check if there are invalid registers in the current mode 
+
+               /* check if there are invalid registers in the current mode
                 */
                for (j = 0; j <= 16; j++)
                {
                        if (ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5_number_to_mode(i), j).valid == 0)
                                valid = 0;
                }
-               
+
                if (!valid)
                {
                        u32 tmp_cpsr;
-                       
+
                        /* change processor mode (and mask T bit) */
                        tmp_cpsr = buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 8) & 0xE0;
                        tmp_cpsr |= armv4_5_number_to_mode(i);
@@ -1206,18 +1198,18 @@ int arm7_9_full_context(target_t *target)
                        for (j = 0; j < 15; j++)
                        {
                                if (ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5_number_to_mode(i), j).valid == 0)
-                               {       
+                               {
                                        reg_p[j] = (u32*)ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5_number_to_mode(i), j).value;
                                        mask |= 1 << j;
                                        ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5_number_to_mode(i), j).valid = 1;
                                        ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5_number_to_mode(i), j).dirty = 0;
                                }
                        }
-                       
+
                        /* if only the PSR is invalid, mask is all zeroes */
                        if (mask)
                                arm7_9->read_core_regs(target, mask, reg_p);
-                       
+
                        /* check if the PSR has to be read */
                        if (ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5_number_to_mode(i), 16).valid == 0)
                        {
@@ -1230,7 +1222,7 @@ int arm7_9_full_context(target_t *target)
 
        /* restore processor mode (mask T bit) */
        arm7_9->write_xpsr_im8(target, buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 8) & ~0x20, 0, 0);
-       
+
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
                return retval;
@@ -1242,27 +1234,27 @@ int arm7_9_restore_context(target_t *target)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       reg_t *reg; 
+       reg_t *reg;
        armv4_5_core_reg_t *reg_arch_info;
        enum armv4_5_mode current_mode = armv4_5->core_mode;
        int i, j;
        int dirty;
        int mode_change;
-       
+
        LOG_DEBUG("-");
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        if (arm7_9->pre_restore_context)
                arm7_9->pre_restore_context(target);
-       
+
        if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
                return ERROR_FAIL;
-               
+
        /* iterate through processor modes (User, FIQ, IRQ, SVC, ABT, UND)
         * SYS shares registers with User, so we don't touch SYS
         */
@@ -1271,7 +1263,7 @@ int arm7_9_restore_context(target_t *target)
                LOG_DEBUG("examining %s mode", armv4_5_mode_strings[i]);
                dirty = 0;
                mode_change = 0;
-               /* check if there are dirty registers in the current mode 
+               /* check if there are dirty registers in the current mode
                */
                for (j = 0; j <= 16; j++)
                {
@@ -1285,7 +1277,7 @@ int arm7_9_restore_context(target_t *target)
                                        LOG_DEBUG("examining dirty reg: %s", reg->name);
                                        if ((reg_arch_info->mode != ARMV4_5_MODE_ANY)
                                                && (reg_arch_info->mode != current_mode)
-                                               && !((reg_arch_info->mode == ARMV4_5_MODE_USR) && (armv4_5->core_mode == ARMV4_5_MODE_SYS)) 
+                                               && !((reg_arch_info->mode == ARMV4_5_MODE_USR) && (armv4_5->core_mode == ARMV4_5_MODE_SYS))
                                                && !((reg_arch_info->mode == ARMV4_5_MODE_SYS) && (armv4_5->core_mode == ARMV4_5_MODE_USR)))
                                        {
                                                mode_change = 1;
@@ -1298,7 +1290,7 @@ int arm7_9_restore_context(target_t *target)
                                }
                        }
                }
-               
+
                if (dirty)
                {
                        u32 mask = 0x0;
@@ -1308,7 +1300,7 @@ int arm7_9_restore_context(target_t *target)
                        if (mode_change)
                        {
                                u32 tmp_cpsr;
-                       
+
                                /* change processor mode (mask T bit) */
                                tmp_cpsr = buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 8) & 0xE0;
                                tmp_cpsr |= armv4_5_number_to_mode(i);
@@ -1316,13 +1308,13 @@ int arm7_9_restore_context(target_t *target)
                                arm7_9->write_xpsr_im8(target, tmp_cpsr & 0xff, 0, 0);
                                current_mode = armv4_5_number_to_mode(i);
                        }
-                       
+
                        for (j = 0; j <= 14; j++)
                        {
                                reg = &ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5_number_to_mode(i), j);
                                reg_arch_info = reg->arch_info;
-                               
-                               
+
+
                                if (reg->dirty == 1)
                                {
                                        regs[j] = buf_get_u32(reg->value, 0, 32);
@@ -1333,12 +1325,12 @@ int arm7_9_restore_context(target_t *target)
                                        LOG_DEBUG("writing register %i of mode %s with value 0x%8.8x", j, armv4_5_mode_strings[i], regs[j]);
                                }
                        }
-                       
+
                        if (mask)
                        {
                                arm7_9->write_core_regs(target, mask, regs);
                        }
-                       
+
                        reg = &ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5_number_to_mode(i), 16);
                        reg_arch_info = reg->arch_info;
                        if ((reg->dirty) && (reg_arch_info->mode != ARMV4_5_MODE_ANY))
@@ -1348,12 +1340,12 @@ int arm7_9_restore_context(target_t *target)
                        }
                }
        }
-       
+
        if ((armv4_5->core_cache->reg_list[ARMV4_5_CPSR].dirty == 0) && (armv4_5->core_mode != current_mode))
        {
                /* restore processor mode (mask T bit) */
                u32 tmp_cpsr;
-                       
+
                tmp_cpsr = buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 8) & 0xE0;
                tmp_cpsr |= armv4_5_number_to_mode(i);
                tmp_cpsr &= ~0x20;
@@ -1368,12 +1360,12 @@ int arm7_9_restore_context(target_t *target)
                armv4_5->core_cache->reg_list[ARMV4_5_CPSR].dirty = 0;
                armv4_5->core_cache->reg_list[ARMV4_5_CPSR].valid = 1;
        }
-       
+
        /* restore PC */
        LOG_DEBUG("writing PC with value 0x%8.8x", buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32));
        arm7_9->write_pc(target, buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32));
        armv4_5->core_cache->reg_list[15].dirty = 0;
-                       
+
        if (arm7_9->post_restore_context)
                arm7_9->post_restore_context(target);
 
@@ -1385,11 +1377,15 @@ int arm7_9_restart_core(struct target_s *target)
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
        arm_jtag_t *jtag_info = &arm7_9->jtag_info;
-       
+
        /* set RESTART instruction */
        jtag_add_end_state(TAP_RTI);
+       if (arm7_9->need_bypass_before_restart) {
+               arm7_9->need_bypass_before_restart = 0;
+               arm_jtag_set_instr(jtag_info, 0xf, NULL);
+       }
        arm_jtag_set_instr(jtag_info, 0x4, NULL);
-       
+
        jtag_add_runtest(1, TAP_RTI);
        return jtag_execute_queue();
 }
@@ -1397,7 +1393,7 @@ int arm7_9_restart_core(struct target_s *target)
 void arm7_9_enable_watchpoints(struct target_s *target)
 {
        watchpoint_t *watchpoint = target->watchpoints;
-       
+
        while (watchpoint)
        {
                if (watchpoint->set == 0)
@@ -1409,37 +1405,16 @@ void arm7_9_enable_watchpoints(struct target_s *target)
 void arm7_9_enable_breakpoints(struct target_s *target)
 {
        breakpoint_t *breakpoint = target->breakpoints;
-       
-       /* set any pending breakpoints */
-       while (breakpoint)
-       {
-               if (breakpoint->set == 0)
-                       arm7_9_set_breakpoint(target, breakpoint);
-               breakpoint = breakpoint->next;
-       }
-}
-
-void arm7_9_disable_bkpts_and_wpts(struct target_s *target)
-{
-       breakpoint_t *breakpoint = target->breakpoints;
-       watchpoint_t *watchpoint = target->watchpoints;
 
        /* set any pending breakpoints */
        while (breakpoint)
        {
-               if (breakpoint->set != 0)
-                       arm7_9_unset_breakpoint(target, breakpoint);
+               arm7_9_set_breakpoint(target, breakpoint);
                breakpoint = breakpoint->next;
        }
-       
-       while (watchpoint)
-       {
-               if (watchpoint->set != 0)
-                       arm7_9_unset_watchpoint(target, watchpoint);
-               watchpoint = watchpoint->next;
-       }
 }
 
+
 int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
@@ -1447,24 +1422,24 @@ int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_
        breakpoint_t *breakpoint = target->breakpoints;
        reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
        int err;
-       
+
        LOG_DEBUG("-");
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        if (!debug_execution)
        {
                target_free_all_working_areas(target);
        }
-       
+
        /* current = 1: continue on current pc, otherwise continue at <address> */
        if (!current)
                buf_set_u32(armv4_5->core_cache->reg_list[15].value, 0, 32, address);
-       
+
        /* the front-end may request us not to handle breakpoints */
        if (handle_breakpoints)
        {
@@ -1472,14 +1447,14 @@ int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_
                {
                        LOG_DEBUG("unset breakpoint at 0x%8.8x", breakpoint->address);
                        arm7_9_unset_breakpoint(target, breakpoint);
-                       
+
                        LOG_DEBUG("enable single-step");
                        arm7_9->enable_single_step(target);
-                       
+
                        target->debug_reason = DBG_REASON_SINGLESTEP;
 
                        arm7_9_restore_context(target);
-                       
+
                        if (armv4_5->core_state == ARMV4_5_STATE_ARM)
                                arm7_9->branch_resume(target);
                        else if (armv4_5->core_state == ARMV4_5_STATE_THUMB)
@@ -1491,11 +1466,11 @@ int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_
                                LOG_ERROR("unhandled core state");
                                return ERROR_FAIL;
                        }
-                               
+
                        buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGACK, 1, 0);
                        embeddedice_write_reg(dbg_ctrl, buf_get_u32(dbg_ctrl->value, 0, dbg_ctrl->size));
                        err = arm7_9_execute_sys_speed(target);
-                       
+
                        LOG_DEBUG("disable single-step");
                        arm7_9->disable_single_step(target);
 
@@ -1513,13 +1488,13 @@ int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_
                        arm7_9_set_breakpoint(target, breakpoint);
                }
        }
-       
+
        /* enable any pending breakpoints and watchpoints */
        arm7_9_enable_breakpoints(target);
        arm7_9_enable_watchpoints(target);
-       
+
        arm7_9_restore_context(target);
-       
+
        if (armv4_5->core_state == ARMV4_5_STATE_ARM)
        {
                arm7_9->branch_resume(target);
@@ -1533,18 +1508,18 @@ int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_
                LOG_ERROR("unhandled core state");
                return ERROR_FAIL;
        }
-       
+
        /* deassert DBGACK and INTDIS */
        buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGACK, 1, 0);
        /* INTDIS only when we really resume, not during debug execution */
        if (!debug_execution)
                buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_INTDIS, 1, 0);
        embeddedice_write_reg(dbg_ctrl, buf_get_u32(dbg_ctrl->value, 0, dbg_ctrl->size));
-       
+
        arm7_9_restart_core(target);
-       
+
        target->debug_reason = DBG_REASON_NOTHALTED;
-       
+
        if (!debug_execution)
        {
                /* registers are now invalid */
@@ -1557,9 +1532,9 @@ int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_
                target->state = TARGET_DEBUG_RUNNING;
                target_call_event_callbacks(target, TARGET_EVENT_DEBUG_RESUMED);
        }
-       
+
        LOG_DEBUG("target resumed");
-       
+
        return ERROR_OK;
 }
 
@@ -1567,20 +1542,20 @@ void arm7_9_enable_eice_step(target_t *target)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
+
        /* setup an inverse breakpoint on the current PC
        * - comparator 1 matches the current address
        * - rangeout from comparator 1 is connected to comparator 0 rangein
        * - comparator 0 matches any address, as long as rangein is low */
        embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK], 0xffffffff);
        embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK], 0xffffffff);
-       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], 0x100);
-       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], 0x77);
+       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], EICE_W_CTRL_ENABLE);
+       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], ~(EICE_W_CTRL_RANGE|EICE_W_CTRL_nOPC) & 0xff);
        embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W1_ADDR_VALUE], buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32));
        embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W1_ADDR_MASK], 0);
        embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W1_DATA_MASK], 0xffffffff);
        embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE], 0x0);
-       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_MASK], 0xf7);
+       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_MASK], ~EICE_W_CTRL_nOPC & 0xff);
 }
 
 void arm7_9_disable_eice_step(target_t *target)
@@ -1611,22 +1586,22 @@ int arm7_9_step(struct target_s *target, int current, u32 address, int handle_br
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        /* current = 1: continue on current pc, otherwise continue at <address> */
        if (!current)
                buf_set_u32(armv4_5->core_cache->reg_list[15].value, 0, 32, address);
-       
+
        /* the front-end may request us not to handle breakpoints */
        if (handle_breakpoints)
                if ((breakpoint = breakpoint_find(target, buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32))))
                        arm7_9_unset_breakpoint(target, breakpoint);
-       
+
        target->debug_reason = DBG_REASON_SINGLESTEP;
 
        arm7_9_restore_context(target);
-       
+
        arm7_9->enable_single_step(target);
-       
+
        if (armv4_5->core_state == ARMV4_5_STATE_ARM)
        {
                arm7_9->branch_resume(target);
@@ -1640,15 +1615,15 @@ int arm7_9_step(struct target_s *target, int current, u32 address, int handle_br
                LOG_ERROR("unhandled core state");
                return ERROR_FAIL;
        }
-       
+
        target_call_event_callbacks(target, TARGET_EVENT_RESUMED);
 
        err = arm7_9_execute_sys_speed(target);
        arm7_9->disable_single_step(target);
-       
+
        /* registers are now invalid */
        armv4_5_invalidate_core_regs(target);
-       
+
        if (err != ERROR_OK)
        {
                target->state = TARGET_UNKNOWN;
@@ -1657,10 +1632,10 @@ int arm7_9_step(struct target_s *target, int current, u32 address, int handle_br
                target_call_event_callbacks(target, TARGET_EVENT_HALTED);
                LOG_DEBUG("target stepped");
        }
-       
+
        if (breakpoint)
                arm7_9_set_breakpoint(target, breakpoint);
-       
+
        return err;
 
 }
@@ -1672,33 +1647,33 @@ int arm7_9_read_core_reg(struct target_s *target, int num, enum armv4_5_mode mod
        int retval;
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
+
        if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
                return ERROR_FAIL;
-       
+
        enum armv4_5_mode reg_mode = ((armv4_5_core_reg_t*)ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, mode, num).arch_info)->mode;
-       
+
        if ((num < 0) || (num > 16))
                return ERROR_INVALID_ARGUMENTS;
-       
+
        if ((mode != ARMV4_5_MODE_ANY)
                        && (mode != armv4_5->core_mode)
                        && (reg_mode != ARMV4_5_MODE_ANY))
        {
                u32 tmp_cpsr;
-                       
+
                /* change processor mode (mask T bit) */
                tmp_cpsr = buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 8) & 0xE0;
                tmp_cpsr |= mode;
                tmp_cpsr &= ~0x20;
                arm7_9->write_xpsr_im8(target, tmp_cpsr & 0xff, 0, 0);
        }
-       
+
        if ((num >= 0) && (num <= 15))
        {
                /* read a normal core register */
                reg_p[num] = &value;
-               
+
                arm7_9->read_core_regs(target, 1 << num, reg_p);
        }
        else
@@ -1708,28 +1683,28 @@ int arm7_9_read_core_reg(struct target_s *target, int num, enum armv4_5_mode mod
                 */
                armv4_5_core_reg_t *arch_info = ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, mode, num).arch_info;
                int spsr = (arch_info->mode == ARMV4_5_MODE_ANY) ? 0 : 1;
-               
+
                arm7_9->read_xpsr(target, &value, spsr);
        }
-       
+
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
                return retval;
        }
-               
+
        ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, mode, num).valid = 1;
        ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, mode, num).dirty = 0;
        buf_set_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, mode, num).value, 0, 32, value);
-               
+
        if ((mode != ARMV4_5_MODE_ANY)
                        && (mode != armv4_5->core_mode)
                        && (reg_mode != ARMV4_5_MODE_ANY))      {
                /* restore processor mode (mask T bit) */
                arm7_9->write_xpsr_im8(target, buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 8) & ~0x20, 0, 0);
        }
-       
+
        return ERROR_OK;
-       
+
 }
 
 int arm7_9_write_core_reg(struct target_s *target, int num, enum armv4_5_mode mode, u32 value)
@@ -1737,32 +1712,32 @@ int arm7_9_write_core_reg(struct target_s *target, int num, enum armv4_5_mode mo
        u32 reg[16];
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
+
        if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
                return ERROR_FAIL;
-       
+
        enum armv4_5_mode reg_mode = ((armv4_5_core_reg_t*)ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, mode, num).arch_info)->mode;
 
        if ((num < 0) || (num > 16))
                return ERROR_INVALID_ARGUMENTS;
-       
+
        if ((mode != ARMV4_5_MODE_ANY)
                        && (mode != armv4_5->core_mode)
                        && (reg_mode != ARMV4_5_MODE_ANY))      {
                u32 tmp_cpsr;
-                       
+
                /* change processor mode (mask T bit) */
                tmp_cpsr = buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 8) & 0xE0;
                tmp_cpsr |= mode;
                tmp_cpsr &= ~0x20;
                arm7_9->write_xpsr_im8(target, tmp_cpsr & 0xff, 0, 0);
        }
-       
+
        if ((num >= 0) && (num <= 15))
        {
                /* write a normal core register */
                reg[num] = value;
-               
+
                arm7_9->write_core_regs(target, 1 << num, reg);
        }
        else
@@ -1772,24 +1747,24 @@ int arm7_9_write_core_reg(struct target_s *target, int num, enum armv4_5_mode mo
                */
                armv4_5_core_reg_t *arch_info = ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, mode, num).arch_info;
                int spsr = (arch_info->mode == ARMV4_5_MODE_ANY) ? 0 : 1;
-               
+
                /* if we're writing the CPSR, mask the T bit */
                if (!spsr)
                        value &= ~0x20;
-               
+
                arm7_9->write_xpsr(target, value, spsr);
        }
-       
+
        ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, mode, num).valid = 1;
        ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, mode, num).dirty = 0;
-               
+
        if ((mode != ARMV4_5_MODE_ANY)
                        && (mode != armv4_5->core_mode)
                        && (reg_mode != ARMV4_5_MODE_ANY))      {
                /* restore processor mode (mask T bit) */
                arm7_9->write_xpsr_im8(target, buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 8) & ~0x20, 0, 0);
        }
-       
+
        return jtag_execute_queue();
 }
 
@@ -1797,7 +1772,7 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       
+
        u32 reg[16];
        int num_accesses = 0;
        int thisrun_accesses;
@@ -1805,7 +1780,7 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
        u32 cpsr;
        int retval;
        int last_reg = 0;
-       
+
        LOG_DEBUG("address: 0x%8.8x, size: 0x%8.8x, count: 0x%8.8x", address, size, count);
 
        if (target->state != TARGET_HALTED)
@@ -1820,11 +1795,11 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
 
        if (((size == 4) && (address & 0x3u)) || ((size == 2) && (address & 0x1u)))
                return ERROR_TARGET_UNALIGNED_ACCESS;
-       
+
        /* load the base register with the address of the first word */
        reg[0] = address;
        arm7_9->write_core_regs(target, 0x1, reg);
-       
+
        switch (size)
        {
                case 4:
@@ -1833,12 +1808,12 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
                                u32 reg_list;
                                thisrun_accesses = ((count - num_accesses) >= 14) ? 14 : (count - num_accesses);
                                reg_list = (0xffff >> (15 - thisrun_accesses)) & 0xfffe;
-                               
+
                                if (last_reg <= thisrun_accesses)
                                        last_reg = thisrun_accesses;
-                               
+
                                arm7_9->load_word_regs(target, reg_list);
-                               
+
                                /* fast memory reads are only safe when the target is running
                                 * from a sufficiently high clock (32 kHz is usually too slow)
                                 */
@@ -1846,13 +1821,13 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
                                        arm7_9_execute_fast_sys_speed(target);
                                else
                                        arm7_9_execute_sys_speed(target);
-                                                                       
+
                                arm7_9->read_core_regs_target_buffer(target, reg_list, buffer, 4);
-                               
+
                                /* advance buffer, count number of accesses */
                                buffer += thisrun_accesses * 4;
                                num_accesses += thisrun_accesses;
-                       }       
+                       }
                        break;
                case 2:
                        while (num_accesses < count)
@@ -1860,7 +1835,7 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
                                u32 reg_list;
                                thisrun_accesses = ((count - num_accesses) >= 14) ? 14 : (count - num_accesses);
                                reg_list = (0xffff >> (15 - thisrun_accesses)) & 0xfffe;
-                               
+
                                for (i = 1; i <= thisrun_accesses; i++)
                                {
                                        if (i > last_reg)
@@ -1874,13 +1849,13 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
                                        else
                                                arm7_9_execute_sys_speed(target);
                                }
-                               
+
                                arm7_9->read_core_regs_target_buffer(target, reg_list, buffer, 2);
-                               
+
                                /* advance buffer, count number of accesses */
                                buffer += thisrun_accesses * 2;
                                num_accesses += thisrun_accesses;
-                       }       
+                       }
                        break;
                case 1:
                        while (num_accesses < count)
@@ -1888,7 +1863,7 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
                                u32 reg_list;
                                thisrun_accesses = ((count - num_accesses) >= 14) ? 14 : (count - num_accesses);
                                reg_list = (0xffff >> (15 - thisrun_accesses)) & 0xfffe;
-                               
+
                                for (i = 1; i <= thisrun_accesses; i++)
                                {
                                        if (i > last_reg)
@@ -1902,20 +1877,20 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
                                        else
                                                arm7_9_execute_sys_speed(target);
                                }
-                               
+
                                arm7_9->read_core_regs_target_buffer(target, reg_list, buffer, 1);
-                               
+
                                /* advance buffer, count number of accesses */
                                buffer += thisrun_accesses * 1;
                                num_accesses += thisrun_accesses;
-                       }       
+                       }
                        break;
                default:
                        LOG_ERROR("BUG: we shouldn't get here");
                        exit(-1);
                        break;
        }
-       
+
        if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
                return ERROR_FAIL;
 
@@ -1937,7 +1912,7 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
 
                return ERROR_TARGET_DATA_ABORT;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -1946,7 +1921,7 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
        reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
-       
+
        u32 reg[16];
        int num_accesses = 0;
        int thisrun_accesses;
@@ -1971,15 +1946,15 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
 
        if (((size == 4) && (address & 0x3u)) || ((size == 2) && (address & 0x1u)))
                return ERROR_TARGET_UNALIGNED_ACCESS;
-       
+
        /* load the base register with the address of the first word */
        reg[0] = address;
        arm7_9->write_core_regs(target, 0x1, reg);
-       
+
        /* Clear DBGACK, to make sure memory fetches work as expected */
        buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGACK, 1, 0);
        embeddedice_store_reg(dbg_ctrl);
-       
+
        switch (size)
        {
                case 4:
@@ -1988,7 +1963,7 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
                                u32 reg_list;
                                thisrun_accesses = ((count - num_accesses) >= 14) ? 14 : (count - num_accesses);
                                reg_list = (0xffff >> (15 - thisrun_accesses)) & 0xfffe;
-                               
+
                                for (i = 1; i <= thisrun_accesses; i++)
                                {
                                        if (i > last_reg)
@@ -1996,11 +1971,11 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
                                        reg[i] = target_buffer_get_u32(target, buffer);
                                        buffer += 4;
                                }
-                               
+
                                arm7_9->write_core_regs(target, reg_list, reg);
-                               
+
                                arm7_9->store_word_regs(target, reg_list);
-                               
+
                                /* fast memory writes are only safe when the target is running
                                 * from a sufficiently high clock (32 kHz is usually too slow)
                                 */
@@ -2008,9 +1983,9 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
                                        arm7_9_execute_fast_sys_speed(target);
                                else
                                        arm7_9_execute_sys_speed(target);
-                               
+
                                num_accesses += thisrun_accesses;
-                       }       
+                       }
                        break;
                case 2:
                        while (num_accesses < count)
@@ -2018,7 +1993,7 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
                                u32 reg_list;
                                thisrun_accesses = ((count - num_accesses) >= 14) ? 14 : (count - num_accesses);
                                reg_list = (0xffff >> (15 - thisrun_accesses)) & 0xfffe;
-                               
+
                                for (i = 1; i <= thisrun_accesses; i++)
                                {
                                        if (i > last_reg)
@@ -2026,13 +2001,13 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
                                        reg[i] = target_buffer_get_u16(target, buffer) & 0xffff;
                                        buffer += 2;
                                }
-                               
+
                                arm7_9->write_core_regs(target, reg_list, reg);
-                               
+
                                for (i = 1; i <= thisrun_accesses; i++)
                                {
                                        arm7_9->store_hword_reg(target, i);
-                                       
+
                                        /* fast memory writes are only safe when the target is running
                                         * from a sufficiently high clock (32 kHz is usually too slow)
                                         */
@@ -2041,9 +2016,9 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
                                        else
                                                arm7_9_execute_sys_speed(target);
                                }
-                               
+
                                num_accesses += thisrun_accesses;
-                       }       
+                       }
                        break;
                case 1:
                        while (num_accesses < count)
@@ -2051,16 +2026,16 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
                                u32 reg_list;
                                thisrun_accesses = ((count - num_accesses) >= 14) ? 14 : (count - num_accesses);
                                reg_list = (0xffff >> (15 - thisrun_accesses)) & 0xfffe;
-                               
+
                                for (i = 1; i <= thisrun_accesses; i++)
                                {
                                        if (i > last_reg)
                                                last_reg = i;
                                        reg[i] = *buffer++ & 0xff;
                                }
-                               
+
                                arm7_9->write_core_regs(target, reg_list, reg);
-                               
+
                                for (i = 1; i <= thisrun_accesses; i++)
                                {
                                        arm7_9->store_byte_reg(target, i);
@@ -2072,20 +2047,20 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
                                        else
                                                arm7_9_execute_sys_speed(target);
                                }
-                               
+
                                num_accesses += thisrun_accesses;
-                       }       
+                       }
                        break;
                default:
                        LOG_ERROR("BUG: we shouldn't get here");
                        exit(-1);
                        break;
        }
-       
+
        /* Re-Set DBGACK */
        buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGACK, 1, 1);
        embeddedice_store_reg(dbg_ctrl);
-       
+
        if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
                return ERROR_FAIL;
 
@@ -2107,11 +2082,11 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
 
                return ERROR_TARGET_DATA_ABORT;
        }
-       
+
        return ERROR_OK;
 }
 
-static const u32 dcc_code[] = 
+static const u32 dcc_code[] =
 {
        /* MRC      TST         BNE         MRC         STR         B */
        0xee101e10, 0xe3110001, 0x0afffffc, 0xee111e10, 0xe4801004, 0xeafffff9
@@ -2126,7 +2101,7 @@ int arm7_9_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffe
        u32 r1 = buf_get_u32(armv4_5->core_cache->reg_list[1].value, 0, 32);
        u32 pc = buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32);
        int i;
-       
+
        if (!arm7_9->dcc_downloads)
                return target->type->write_memory(target, address, 4, count, buffer);
 
@@ -2134,61 +2109,47 @@ int arm7_9_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffe
        if (!arm7_9->dcc_working_area)
        {
                u8 dcc_code_buf[6 * 4];
-               
+
                /* make sure we have a working area */
                if (target_alloc_working_area(target, 24, &arm7_9->dcc_working_area) != ERROR_OK)
                {
                        LOG_INFO("no working area available, falling back to memory writes");
                        return target->type->write_memory(target, address, 4, count, buffer);
                }
-               
+
                /* copy target instructions to target endianness */
                for (i = 0; i < 6; i++)
                {
                        target_buffer_set_u32(target, dcc_code_buf + i*4, dcc_code[i]);
                }
-               
+
                /* write DCC code to working area */
                target->type->write_memory(target, arm7_9->dcc_working_area->address, 4, 6, dcc_code_buf);
        }
-       
+
        buf_set_u32(armv4_5->core_cache->reg_list[0].value, 0, 32, address);
        armv4_5->core_cache->reg_list[0].valid = 1;
        armv4_5->core_cache->reg_list[0].dirty = 1;
        armv4_5->core_state = ARMV4_5_STATE_ARM;
 
        arm7_9_resume(target, 0, arm7_9->dcc_working_area->address, 1, 1);
-       
+
        int little=target->endianness==TARGET_LITTLE_ENDIAN;
        if (count>2)
        {
                /* Handle first & last using standard embeddedice_write_reg and the middle ones w/the
-                  core function repeated. 
+                  core function repeated.
                 */
                embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], fast_target_buffer_get_u32(buffer, little));
                buffer+=4;
-               
+
                embeddedice_reg_t *ice_reg = arm7_9->eice_cache->reg_list[EICE_COMMS_DATA].arch_info;
                u8 reg_addr = ice_reg->addr & 0x1f;
                int chain_pos = ice_reg->jtag_info->chain_pos;
-               /* we want the compiler to duplicate the code, which it does not
-                * do automatically.
-                */
-               if (little)
-               {
-                       for (i = 1; i < count - 1; i++)
-                       {
-                               embeddedice_write_reg_inner(chain_pos, reg_addr, fast_target_buffer_get_u32(buffer, little));
-                               buffer += 4;
-                       }
-               } else
-               {
-                       for (i = 1; i < count - 1; i++)
-                       {
-                               embeddedice_write_reg_inner(chain_pos, reg_addr, fast_target_buffer_get_u32(buffer, little));
-                               buffer += 4;
-                       }
-               }
+
+               embeddedice_write_dcc(chain_pos, reg_addr, buffer, little, count-2);
+               buffer += (count-2)*4;
+
                embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], fast_target_buffer_get_u32(buffer, little));
        } else
        {
@@ -2198,9 +2159,9 @@ int arm7_9_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffe
                        buffer += 4;
                }
        }
-       
+
        target_halt(target);
-       
+
        for (i=0; i<100; i++)
        {
                target_poll(target);
@@ -2213,7 +2174,7 @@ int arm7_9_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffe
                LOG_ERROR("bulk write timed out, target not halted");
                return ERROR_TARGET_TIMEOUT;
        }
-       
+
        /* restore target state */
        buf_set_u32(armv4_5->core_cache->reg_list[0].value, 0, 32, r0);
        armv4_5->core_cache->reg_list[0].valid = 1;
@@ -2225,7 +2186,7 @@ int arm7_9_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffe
        armv4_5->core_cache->reg_list[15].valid = 1;
        armv4_5->core_cache->reg_list[15].dirty = 1;
        armv4_5->core_state = core_state;
-       
+
        return ERROR_OK;
 }
 
@@ -2235,7 +2196,7 @@ int arm7_9_checksum_memory(struct target_s *target, u32 address, u32 count, u32*
        armv4_5_algorithm_t armv4_5_info;
        reg_param_t reg_params[2];
        int retval;
-       
+
        u32 arm7_9_crc_code[] = {
                0xE1A02000,                             /* mov          r2, r0 */
                0xE3E00000,                             /* mov          r0, #0xffffffff */
@@ -2263,28 +2224,28 @@ int arm7_9_checksum_memory(struct target_s *target, u32 address, u32 count, u32*
                0xEAFFFFFE,                             /* b            end */
                0x04C11DB7                              /* CRC32XOR:    .word 0x04C11DB7 */
        };
-       
+
        int i;
-       
+
        if (target_alloc_working_area(target, sizeof(arm7_9_crc_code), &crc_algorithm) != ERROR_OK)
        {
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
-       
+
        /* convert flash writing code into a buffer in target endianness */
        for (i = 0; i < (sizeof(arm7_9_crc_code)/sizeof(u32)); i++)
                target_write_u32(target, crc_algorithm->address + i*sizeof(u32), arm7_9_crc_code[i]);
-       
+
        armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
        armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
        armv4_5_info.core_state = ARMV4_5_STATE_ARM;
-       
+
        init_reg_param(&reg_params[0], "r0", 32, PARAM_IN_OUT);
        init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
-       
+
        buf_set_u32(reg_params[0].value, 0, 32, address);
        buf_set_u32(reg_params[1].value, 0, 32, count);
-               
+
        if ((retval = target->type->run_algorithm(target, 0, NULL, 2, reg_params,
                crc_algorithm->address, crc_algorithm->address + (sizeof(arm7_9_crc_code) - 8), 20000, &armv4_5_info)) != ERROR_OK)
        {
@@ -2294,14 +2255,14 @@ int arm7_9_checksum_memory(struct target_s *target, u32 address, u32 count, u32*
                target_free_working_area(target, crc_algorithm);
                return retval;
        }
-       
+
        *checksum = buf_get_u32(reg_params[0].value, 0, 32);
-       
+
        destroy_reg_param(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
-       
+
        target_free_working_area(target, crc_algorithm);
-       
+
        return ERROR_OK;
 }
 
@@ -2312,7 +2273,7 @@ int arm7_9_blank_check_memory(struct target_s *target, u32 address, u32 count, u
        armv4_5_algorithm_t armv4_5_info;
        int retval;
        int i;
-       
+
        u32 erase_check_code[] =
        {
                                                /* loop: */
@@ -2329,11 +2290,11 @@ int arm7_9_blank_check_memory(struct target_s *target, u32 address, u32 count, u
        {
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
-       
+
        /* convert flash writing code into a buffer in target endianness */
        for (i = 0; i < (sizeof(erase_check_code)/sizeof(u32)); i++)
                target_write_u32(target, erase_check_algorithm->address + i*sizeof(u32), erase_check_code[i]);
-       
+
        armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
        armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
        armv4_5_info.core_state = ARMV4_5_STATE_ARM;
@@ -2346,8 +2307,8 @@ int arm7_9_blank_check_memory(struct target_s *target, u32 address, u32 count, u
 
        init_reg_param(&reg_params[2], "r2", 32, PARAM_IN_OUT);
        buf_set_u32(reg_params[2].value, 0, 32, 0xff);
-       
-       if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params, 
+
+       if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params,
                        erase_check_algorithm->address, erase_check_algorithm->address + (sizeof(erase_check_code) - 4), 10000, &armv4_5_info)) != ERROR_OK)
        {
                destroy_reg_param(&reg_params[0]);
@@ -2356,31 +2317,29 @@ int arm7_9_blank_check_memory(struct target_s *target, u32 address, u32 count, u
                target_free_working_area(target, erase_check_algorithm);
                return 0;
        }
-       
+
        *blank = buf_get_u32(reg_params[2].value, 0, 32);
-       
+
        destroy_reg_param(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
        destroy_reg_param(&reg_params[2]);
-       
+
        target_free_working_area(target, erase_check_algorithm);
-       
+
        return ERROR_OK;
 }
 
 int arm7_9_register_commands(struct command_context_s *cmd_ctx)
 {
        command_t *arm7_9_cmd;
-       
+
        arm7_9_cmd = register_command(cmd_ctx, NULL, "arm7_9", NULL, COMMAND_ANY, "arm7/9 specific commands");
 
        register_command(cmd_ctx, arm7_9_cmd, "write_xpsr", handle_arm7_9_write_xpsr_command, COMMAND_EXEC, "write program status register <value> <not cpsr|spsr>");
        register_command(cmd_ctx, arm7_9_cmd, "write_xpsr_im8", handle_arm7_9_write_xpsr_im8_command, COMMAND_EXEC, "write program status register <8bit immediate> <rotate> <not cpsr|spsr>");
-       
-       register_command(cmd_ctx, arm7_9_cmd, "write_core_reg", handle_arm7_9_write_core_reg_command, COMMAND_EXEC, "write core register <num> <mode> <value>");        
-       
-       register_command(cmd_ctx, arm7_9_cmd, "sw_bkpts", handle_arm7_9_sw_bkpts_command, COMMAND_EXEC, "support for software breakpoints <enable|disable>");
-       register_command(cmd_ctx, arm7_9_cmd, "force_hw_bkpts", handle_arm7_9_force_hw_bkpts_command, COMMAND_EXEC, "use hardware breakpoints for all breakpoints (disables sw breakpoint support) <enable|disable>");
+
+       register_command(cmd_ctx, arm7_9_cmd, "write_core_reg", handle_arm7_9_write_core_reg_command, COMMAND_EXEC, "write core register <num> <mode> <value>");
+
        register_command(cmd_ctx, arm7_9_cmd, "dbgrq", handle_arm7_9_dbgrq_command,
                COMMAND_ANY, "use EmbeddedICE dbgrq instead of breakpoint for target halt requests <enable|disable>");
        register_command(cmd_ctx, arm7_9_cmd, "fast_writes", handle_arm7_9_fast_memory_access_command,
@@ -2391,9 +2350,9 @@ int arm7_9_register_commands(struct command_context_s *cmd_ctx)
                COMMAND_ANY, "use DCC downloads for larger memory writes <enable|disable>");
 
        armv4_5_register_commands(cmd_ctx);
-       
+
        etm_register_commands(cmd_ctx);
-       
+
        return ERROR_OK;
 }
 
@@ -2411,33 +2370,33 @@ int handle_arm7_9_write_xpsr_command(struct command_context_s *cmd_ctx, char *cm
                command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
                return ERROR_OK;
        }
-       
+
        if (target->state != TARGET_HALTED)
        {
                command_print(cmd_ctx, "can't write registers while running");
                return ERROR_OK;
        }
-       
+
        if (argc < 2)
        {
                command_print(cmd_ctx, "usage: write_xpsr <value> <not cpsr|spsr>");
                return ERROR_OK;
        }
-       
+
        value = strtoul(args[0], NULL, 0);
        spsr = strtol(args[1], NULL, 0);
-       
+
        /* if we're writing the CPSR, mask the T bit */
        if (!spsr)
                value &= ~0x20;
-       
+
        arm7_9->write_xpsr(target, value, spsr);
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
                LOG_ERROR("JTAG error while writing to xpsr");
                return retval;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -2456,30 +2415,30 @@ int handle_arm7_9_write_xpsr_im8_command(struct command_context_s *cmd_ctx, char
                command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
                return ERROR_OK;
        }
-       
+
        if (target->state != TARGET_HALTED)
        {
                command_print(cmd_ctx, "can't write registers while running");
                return ERROR_OK;
        }
-       
+
        if (argc < 3)
        {
                command_print(cmd_ctx, "usage: write_xpsr_im8 <im8> <rotate> <not cpsr|spsr>");
                return ERROR_OK;
        }
-       
+
        value = strtoul(args[0], NULL, 0);
        rotate = strtol(args[1], NULL, 0);
        spsr = strtol(args[2], NULL, 0);
-               
+
        arm7_9->write_xpsr_im8(target, value, rotate, spsr);
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
                LOG_ERROR("JTAG error while writing 8-bit immediate to xpsr");
                return retval;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -2491,136 +2450,47 @@ int handle_arm7_9_write_core_reg_command(struct command_context_s *cmd_ctx, char
        target_t *target = get_current_target(cmd_ctx);
        armv4_5_common_t *armv4_5;
        arm7_9_common_t *arm7_9;
-               
+
        if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
        {
                command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
                return ERROR_OK;
        }
-       
+
        if (target->state != TARGET_HALTED)
        {
                command_print(cmd_ctx, "can't write registers while running");
                return ERROR_OK;
        }
-       
+
        if (argc < 3)
        {
                command_print(cmd_ctx, "usage: write_core_reg <num> <mode> <value>");
                return ERROR_OK;
        }
-       
+
        num = strtol(args[0], NULL, 0);
        mode = strtoul(args[1], NULL, 0);
        value = strtoul(args[2], NULL, 0);
-       
+
        arm7_9_write_core_reg(target, num, mode, value);
-       
-       return ERROR_OK;
-}
 
-int handle_arm7_9_sw_bkpts_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       target_t *target = get_current_target(cmd_ctx);
-       armv4_5_common_t *armv4_5;
-       arm7_9_common_t *arm7_9;
-       
-       if (target->state != TARGET_HALTED)
-       {
-               LOG_ERROR("target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-       
-       if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
-       {
-               command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
-               return ERROR_OK;
-       }
-       
-       if (argc == 0)
-       {
-               command_print(cmd_ctx, "software breakpoints %s", (arm7_9->sw_bkpts_enabled) ? "enabled" : "disabled");
-               return ERROR_OK;
-       }
-       
-       if (strcmp("enable", args[0]) == 0)
-       {
-               if (arm7_9->sw_bkpts_use_wp)
-               {
-                       arm7_9_enable_sw_bkpts(target);
-               }
-               else
-               {
-                       arm7_9->sw_bkpts_enabled = 1;
-               }
-       }
-       else if (strcmp("disable", args[0]) == 0)
-       {
-               if (arm7_9->sw_bkpts_use_wp)
-               {
-                       arm7_9_disable_sw_bkpts(target);
-               }
-               else
-               {
-                       arm7_9->sw_bkpts_enabled = 0;
-               }
-       }
-       else
-       {
-               command_print(cmd_ctx, "usage: arm7_9 sw_bkpts <enable|disable>");
-       }
-       
-       command_print(cmd_ctx, "software breakpoints %s", (arm7_9->sw_bkpts_enabled) ? "enabled" : "disabled");
-       
        return ERROR_OK;
 }
 
-int handle_arm7_9_force_hw_bkpts_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       target_t *target = get_current_target(cmd_ctx);
-       armv4_5_common_t *armv4_5;
-       arm7_9_common_t *arm7_9;
-       
-       if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
-       {
-               command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
-               return ERROR_OK;
-       }
-       
-       if ((argc >= 1) && (strcmp("enable", args[0]) == 0))
-       {
-               arm7_9->force_hw_bkpts = 1;
-               if (arm7_9->sw_bkpts_use_wp)
-               {
-                       arm7_9_disable_sw_bkpts(target);
-               }
-       }
-       else if ((argc >= 1) && (strcmp("disable", args[0]) == 0))
-       {
-               arm7_9->force_hw_bkpts = 0;
-       }
-       else
-       {
-               command_print(cmd_ctx, "usage: arm7_9 force_hw_bkpts <enable|disable>");
-       }
-               
-       command_print(cmd_ctx, "force hardware breakpoints %s", (arm7_9->force_hw_bkpts) ? "enabled" : "disabled");
-
-       return ERROR_OK;
-}
 
 int handle_arm7_9_dbgrq_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        target_t *target = get_current_target(cmd_ctx);
        armv4_5_common_t *armv4_5;
        arm7_9_common_t *arm7_9;
-       
+
        if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
        {
                command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
                return ERROR_OK;
        }
-       
+
        if (argc > 0)
        {
                if (strcmp("enable", args[0]) == 0)
@@ -2636,7 +2506,7 @@ int handle_arm7_9_dbgrq_command(struct command_context_s *cmd_ctx, char *cmd, ch
                        command_print(cmd_ctx, "usage: arm7_9 dbgrq <enable|disable>");
                }
        }
-               
+
        command_print(cmd_ctx, "use of EmbeddedICE dbgrq instead of breakpoint for target halt %s", (arm7_9->use_dbgrq) ? "enabled" : "disabled");
 
        return ERROR_OK;
@@ -2647,13 +2517,13 @@ int handle_arm7_9_fast_memory_access_command(struct command_context_s *cmd_ctx,
        target_t *target = get_current_target(cmd_ctx);
        armv4_5_common_t *armv4_5;
        arm7_9_common_t *arm7_9;
-       
+
        if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
        {
                command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
                return ERROR_OK;
        }
-       
+
        if (argc > 0)
        {
                if (strcmp("enable", args[0]) == 0)
@@ -2669,7 +2539,7 @@ int handle_arm7_9_fast_memory_access_command(struct command_context_s *cmd_ctx,
                        command_print(cmd_ctx, "usage: arm7_9 fast_memory_access <enable|disable>");
                }
        }
-               
+
        command_print(cmd_ctx, "fast memory access is %s", (arm7_9->fast_memory_access) ? "enabled" : "disabled");
 
        return ERROR_OK;
@@ -2680,13 +2550,13 @@ int handle_arm7_9_dcc_downloads_command(struct command_context_s *cmd_ctx, char
        target_t *target = get_current_target(cmd_ctx);
        armv4_5_common_t *armv4_5;
        arm7_9_common_t *arm7_9;
-       
+
        if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
        {
                command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
                return ERROR_OK;
        }
-       
+
        if (argc > 0)
        {
                if (strcmp("enable", args[0]) == 0)
@@ -2702,7 +2572,7 @@ int handle_arm7_9_dcc_downloads_command(struct command_context_s *cmd_ctx, char
                        command_print(cmd_ctx, "usage: arm7_9 dcc_downloads <enable|disable>");
                }
        }
-               
+
        command_print(cmd_ctx, "dcc downloads are %s", (arm7_9->dcc_downloads) ? "enabled" : "disabled");
 
        return ERROR_OK;
@@ -2711,36 +2581,41 @@ int handle_arm7_9_dcc_downloads_command(struct command_context_s *cmd_ctx, char
 int arm7_9_init_arch_info(target_t *target, arm7_9_common_t *arm7_9)
 {
        armv4_5_common_t *armv4_5 = &arm7_9->armv4_5_common;
-       
+
        arm7_9->common_magic = ARM7_9_COMMON_MAGIC;
-       
+
        arm_jtag_setup_connection(&arm7_9->jtag_info);
-       arm7_9->wp_available = 2;
+       arm7_9->wp_available = 0; /* this is set up in arm7_9_clear_watchpoints() */
+       arm7_9->wp_available_max = 2;
+       arm7_9->sw_breakpoints_added = 0;
+       arm7_9->breakpoint_count = 0;
        arm7_9->wp0_used = 0;
        arm7_9->wp1_used = 0;
-       arm7_9->force_hw_bkpts = 0;
+       arm7_9->wp1_used_default = 0;
        arm7_9->use_dbgrq = 0;
-       
+
        arm7_9->etm_ctx = NULL;
        arm7_9->has_single_step = 0;
        arm7_9->has_monitor_mode = 0;
        arm7_9->has_vector_catch = 0;
-       
+
        arm7_9->debug_entry_from_reset = 0;
-       
+
        arm7_9->dcc_working_area = NULL;
-       
+
        arm7_9->fast_memory_access = fast_and_dangerous;
        arm7_9->dcc_downloads = fast_and_dangerous;
 
+       arm7_9->need_bypass_before_restart = 0;
+
        armv4_5->arch_info = arm7_9;
        armv4_5->read_core_reg = arm7_9_read_core_reg;
        armv4_5->write_core_reg = arm7_9_write_core_reg;
        armv4_5->full_context = arm7_9_full_context;
-       
+
        armv4_5_init_arch_info(target, armv4_5);
-       
+
        target_register_timer_callback(arm7_9_handle_target_request, 1, 1, target);
-       
+
        return ERROR_OK;
 }