X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm11.c;h=2e0fd2381129cd2ef510ae0589d414327e632fc9;hp=a5175af74144377889a696428aa0d17406b1ef42;hb=37299b2b5809fa9a3bd531ca3e2528085e095a0e;hpb=3efc99b34a934cb4d657ec27a164769c46c10f28

diff --git a/src/target/arm11.c b/src/target/arm11.c
index a5175af741..2e0fd23811 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -6,6 +6,8 @@
  *                                                                         *
  *   Copyright (C) 2008 Georg Acher <acher@in.tum.de>                      *
  *                                                                         *
+ *   Copyright (C) 2009 David Brownell                                     *
+ *                                                                         *
  *   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     *
@@ -30,180 +32,103 @@
 #include "breakpoints.h"
 #include "arm11_dbgtap.h"
 #include "arm_simulator.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include "target_type.h"
 #include "algorithm.h"
 #include "register.h"
-
+#include "arm_opcodes.h"
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif
 
-static bool arm11_config_memwrite_burst = true;
-static bool arm11_config_memwrite_error_fatal = true;
-static uint32_t arm11_vcr = 0;
-static bool arm11_config_step_irq_enable = false;
-static bool arm11_config_hardware_step = false;
-
-enum arm11_regtype
-{
-	/* debug regs */
-	ARM11_REGISTER_DSCR,
-	ARM11_REGISTER_WDTR,
-	ARM11_REGISTER_RDTR,
-};
-
 
-struct arm11_reg_defs
-{
-	char *					name;
-	uint32_t						num;
-	int						gdb_num;
-	enum arm11_regtype		type;
-};
-
-/* update arm11_regcache_ids when changing this */
-static const struct arm11_reg_defs arm11_reg_defs[] =
-{
-	/* Debug Registers */
-	{"dscr",	0,	-1,	ARM11_REGISTER_DSCR},
-	{"wdtr",	0,	-1,	ARM11_REGISTER_WDTR},
-	{"rdtr",	0,	-1,	ARM11_REGISTER_RDTR},
-};
-
-enum arm11_regcache_ids
-{
-	ARM11_RC_DSCR,
-	ARM11_RC_WDTR,
-	ARM11_RC_RDTR,
-
-	ARM11_RC_MAX,
-};
-
-static int arm11_on_enter_debug_state(struct arm11_common *arm11);
 static int arm11_step(struct target *target, int current,
 		uint32_t address, int handle_breakpoints);
-/* helpers */
-static int arm11_build_reg_cache(struct target *target);
-static int arm11_set_reg(struct reg *reg, uint8_t *buf);
-static int arm11_get_reg(struct reg *reg);
 
 
 /** Check and if necessary take control of the system
  *
  * \param arm11		Target state variable.
- * \param dscr		If the current DSCR content is
- *					available a pointer to a word holding the
- *					DSCR can be passed. Otherwise use NULL.
  */
-static int arm11_check_init(struct arm11_common *arm11, uint32_t *dscr)
+static int arm11_check_init(struct arm11_common *arm11)
 {
-	uint32_t			dscr_local_tmp_copy;
+	CHECK_RETVAL(arm11_read_DSCR(arm11));
 
-	if (!dscr)
-	{
-		dscr = &dscr_local_tmp_copy;
-
-		CHECK_RETVAL(arm11_read_DSCR(arm11, dscr));
-	}
-
-	if (!(*dscr & ARM11_DSCR_MODE_SELECT))
-	{
+	if (!(arm11->dscr & DSCR_HALT_DBG_MODE)) {
+		LOG_DEBUG("DSCR %08x", (unsigned) arm11->dscr);
 		LOG_DEBUG("Bringing target into debug mode");
 
-		*dscr |= ARM11_DSCR_MODE_SELECT;		/* Halt debug-mode */
-		arm11_write_DSCR(arm11, *dscr);
+		arm11->dscr |= DSCR_HALT_DBG_MODE;
+		CHECK_RETVAL(arm11_write_DSCR(arm11, arm11->dscr));
 
 		/* add further reset initialization here */
 
 		arm11->simulate_reset_on_next_halt = true;
 
-		if (*dscr & ARM11_DSCR_CORE_HALTED)
-		{
+		if (arm11->dscr & DSCR_CORE_HALTED) {
 			/** \todo TODO: this needs further scrutiny because
-			  * arm11_on_enter_debug_state() never gets properly called.
+			  * arm11_debug_entry() never gets called.  (WHY NOT?)
 			  * As a result we don't read the actual register states from
 			  * the target.
 			  */
 
-			arm11->target->state	= TARGET_HALTED;
-			arm11->target->debug_reason	= arm11_get_DSCR_debug_reason(*dscr);
-		}
-		else
-		{
-			arm11->target->state	= TARGET_RUNNING;
-			arm11->target->debug_reason	= DBG_REASON_NOTHALTED;
+			arm11->arm.target->state = TARGET_HALTED;
+			arm_dpm_report_dscr(arm11->arm.dpm, arm11->dscr);
+		} else {
+			arm11->arm.target->state = TARGET_RUNNING;
+			arm11->arm.target->debug_reason = DBG_REASON_NOTHALTED;
 		}
 
-		arm11_sc7_clear_vbw(arm11);
+		CHECK_RETVAL(arm11_sc7_clear_vbw(arm11));
 	}
 
 	return ERROR_OK;
 }
 
-
-
-#define R(x) \
-	(arm11->reg_values[ARM11_RC_##x])
-
-/** Save processor state.
-  *
-  * This is called when the HALT instruction has succeeded
-  * or on other occasions that stop the processor.
-  *
-  */
-static int arm11_on_enter_debug_state(struct arm11_common *arm11)
+/**
+ * Save processor state.  This is called after a HALT instruction
+ * succeeds, and on other occasions the processor enters debug mode
+ * (breakpoint, watchpoint, etc).  Caller has updated arm11->dscr.
+ */
+static int arm11_debug_entry(struct arm11_common *arm11)
 {
 	int retval;
 
+	arm11->arm.target->state = TARGET_HALTED;
+	arm_dpm_report_dscr(arm11->arm.dpm, arm11->dscr);
+
 	/* REVISIT entire cache should already be invalid !!! */
 	register_cache_invalidate(arm11->arm.core_cache);
 
-	for (size_t i = 0; i < ARRAY_SIZE(arm11->reg_values); i++)
-	{
-		arm11->reg_list[i].valid	= 1;
-		arm11->reg_list[i].dirty	= 0;
-	}
-
 	/* See e.g. ARM1136 TRM, "14.8.4 Entering Debug state" */
 
-	/* Save DSCR */
-	CHECK_RETVAL(arm11_read_DSCR(arm11, &R(DSCR)));
-
-	/* Save wDTR */
-
-	if (R(DSCR) & ARM11_DSCR_WDTR_FULL)
-	{
+	/* maybe save wDTR (pending DCC write to debug SW, e.g. libdcc) */
+	arm11->is_wdtr_saved = !!(arm11->dscr & DSCR_DTR_TX_FULL);
+	if (arm11->is_wdtr_saved) {
 		arm11_add_debug_SCAN_N(arm11, 0x05, ARM11_TAP_DEFAULT);
 
 		arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
 
-		struct scan_field	chain5_fields[3];
+		struct scan_field chain5_fields[3];
 
-		arm11_setup_field(arm11, 32, NULL, &R(WDTR),	chain5_fields + 0);
-		arm11_setup_field(arm11,  1, NULL, NULL,		chain5_fields + 1);
-		arm11_setup_field(arm11,  1, NULL, NULL,		chain5_fields + 2);
+		arm11_setup_field(arm11, 32, NULL,
+			&arm11->saved_wdtr, chain5_fields + 0);
+		arm11_setup_field(arm11,  1, NULL, NULL, chain5_fields + 1);
+		arm11_setup_field(arm11,  1, NULL, NULL, chain5_fields + 2);
 
-		arm11_add_dr_scan_vc(ARRAY_SIZE(chain5_fields), chain5_fields, TAP_DRPAUSE);
-	}
-	else
-	{
-		arm11->reg_list[ARM11_RC_WDTR].valid	= 0;
-	}
+		arm11_add_dr_scan_vc(arm11->arm.target->tap, ARRAY_SIZE(
+				chain5_fields), chain5_fields, TAP_DRPAUSE);
 
+	}
 
-	/* DSCR: set ARM11_DSCR_EXECUTE_ARM_INSTRUCTION_ENABLE
+	/* DSCR: set the Execute ARM instruction enable bit.
 	 *
 	 * ARM1176 spec says this is needed only for wDTR/rDTR's "ITR mode",
-	 * but not to issue ITRs. ARM1136 seems to require this to issue
-	 * ITR's as well...
+	 * but not to issue ITRs(?).  The ARMv7 arch spec says it's required
+	 * for executing instructions via ITR.
 	 */
-	uint32_t new_dscr = R(DSCR) | ARM11_DSCR_EXECUTE_ARM_INSTRUCTION_ENABLE;
-
-	/* this executes JTAG queue: */
-
-	arm11_write_DSCR(arm11, new_dscr);
+	CHECK_RETVAL(arm11_write_DSCR(arm11, DSCR_ITR_EN | arm11->dscr));
 
 
 	/* From the spec:
@@ -213,10 +138,9 @@ static int arm11_on_enter_debug_state(struct arm11_common *arm11)
 	/** \todo TODO: Test drain write buffer. */
 
 #if 0
-	while (1)
-	{
+	while (1) {
 		/* MRC p14,0,R0,c5,c10,0 */
-		//	arm11_run_instr_no_data1(arm11, /*0xee150e1a*/0xe320f000);
+		/*	arm11_run_instr_no_data1(arm11, / *0xee150e1a* /0xe320f000); */
 
 		/* mcr	   15, 0, r0, cr7, cr10, {4} */
 		arm11_run_instr_no_data1(arm11, 0xee070f9a);
@@ -225,8 +149,7 @@ static int arm11_on_enter_debug_state(struct arm11_common *arm11)
 
 		LOG_DEBUG("DRAIN, DSCR %08x", dscr);
 
-		if (dscr & ARM11_DSCR_STICKY_IMPRECISE_DATA_ABORT)
-		{
+		if (dscr & ARM11_DSCR_STICKY_IMPRECISE_DATA_ABORT) {
 			arm11_run_instr_no_data1(arm11, 0xe320f000);
 
 			dscr = arm11_read_DSCR(arm11);
@@ -245,34 +168,27 @@ static int arm11_on_enter_debug_state(struct arm11_common *arm11)
 	 */
 	retval = arm_dpm_read_current_registers(&arm11->dpm);
 	if (retval != ERROR_OK)
-		LOG_ERROR("DPM REG READ -- fail %d", retval);
+		LOG_ERROR("DPM REG READ -- fail");
 
 	retval = arm11_run_instr_data_prepare(arm11);
 	if (retval != ERROR_OK)
 		return retval;
 
-	/* maybe save rDTR */
-
-	/* check rDTRfull in DSCR */
-
-	if (R(DSCR) & ARM11_DSCR_RDTR_FULL)
-	{
+	/* maybe save rDTR (pending DCC read from debug SW, e.g. libdcc) */
+	arm11->is_rdtr_saved = !!(arm11->dscr & DSCR_DTR_RX_FULL);
+	if (arm11->is_rdtr_saved) {
 		/* MRC p14,0,R0,c0,c5,0 (move rDTR -> r0 (-> wDTR -> local var)) */
-		retval = arm11_run_instr_data_from_core_via_r0(arm11, 0xEE100E15, &R(RDTR));
+		retval = arm11_run_instr_data_from_core_via_r0(arm11,
+				0xEE100E15, &arm11->saved_rdtr);
 		if (retval != ERROR_OK)
 			return retval;
 	}
-	else
-	{
-		arm11->reg_list[ARM11_RC_RDTR].valid	= 0;
-	}
 
 	/* REVISIT Now that we've saved core state, there's may also
 	 * be MMU and cache state to care about ...
 	 */
 
-	if (arm11->simulate_reset_on_next_halt)
-	{
+	if (arm11->simulate_reset_on_next_halt) {
 		arm11->simulate_reset_on_next_halt = false;
 
 		LOG_DEBUG("Reset c1 Control Register");
@@ -286,6 +202,19 @@ static int arm11_on_enter_debug_state(struct arm11_common *arm11)
 
 	}
 
+	if (arm11->arm.target->debug_reason == DBG_REASON_WATCHPOINT) {
+		uint32_t wfar;
+
+		/* MRC p15, 0, <Rd>, c6, c0, 1 ; Read WFAR */
+		retval = arm11_run_instr_data_from_core_via_r0(arm11,
+				ARMV4_5_MRC(15, 0, 0, 6, 0, 1),
+				&wfar);
+		if (retval != ERROR_OK)
+			return retval;
+		arm_dpm_report_wfar(arm11->arm.dpm, wfar);
+	}
+
+
 	retval = arm11_run_instr_data_finish(arm11);
 	if (retval != ERROR_OK)
 		return retval;
@@ -293,12 +222,11 @@ static int arm11_on_enter_debug_state(struct arm11_common *arm11)
 	return ERROR_OK;
 }
 
-/** Restore processor state
-  *
-  * This is called in preparation for the RESTART function.
-  *
-  */
-static int arm11_leave_debug_state(struct arm11_common *arm11)
+/**
+ * Restore processor state.  This is called in preparation for
+ * the RESTART function.
+ */
+static int arm11_leave_debug_state(struct arm11_common *arm11, bool bpwp)
 {
 	int retval;
 
@@ -316,12 +244,9 @@ static int arm11_leave_debug_state(struct arm11_common *arm11)
 	/* spec says clear wDTR and rDTR; we assume they are clear as
 	   otherwise our programming would be sloppy */
 	{
-		uint32_t DSCR;
-
-		CHECK_RETVAL(arm11_read_DSCR(arm11, &DSCR));
+		CHECK_RETVAL(arm11_read_DSCR(arm11));
 
-		if (DSCR & (ARM11_DSCR_RDTR_FULL | ARM11_DSCR_WDTR_FULL))
-		{
+		if (arm11->dscr & (DSCR_DTR_RX_FULL | DSCR_DTR_TX_FULL)) {
 			/*
 			The wDTR/rDTR two registers that are used to send/receive data to/from
 			the core in tandem with corresponding instruction codes that are
@@ -329,20 +254,21 @@ static int arm11_leave_debug_state(struct arm11_common *arm11)
 			registers hold data that was written by one side (CPU or JTAG) and not
 			read out by the other side.
 			*/
-			LOG_ERROR("wDTR/rDTR inconsistent (DSCR %08" PRIx32 ")", DSCR);
+			LOG_ERROR("wDTR/rDTR inconsistent (DSCR %08x)",
+				(unsigned) arm11->dscr);
 			return ERROR_FAIL;
 		}
 	}
 
 	/* maybe restore original wDTR */
-	if ((R(DSCR) & ARM11_DSCR_WDTR_FULL) || arm11->reg_list[ARM11_RC_WDTR].dirty)
-	{
+	if (arm11->is_wdtr_saved) {
 		retval = arm11_run_instr_data_prepare(arm11);
 		if (retval != ERROR_OK)
 			return retval;
 
 		/* MCR p14,0,R0,c0,c5,0 */
-		retval = arm11_run_instr_data_to_core_via_r0(arm11, 0xee000e15, R(WDTR));
+		retval = arm11_run_instr_data_to_core_via_r0(arm11,
+				0xee000e15, arm11->saved_wdtr);
 		if (retval != ERROR_OK)
 			return retval;
 
@@ -354,32 +280,33 @@ static int arm11_leave_debug_state(struct arm11_common *arm11)
 	/* restore CPSR, PC, and R0 ... after flushing any modified
 	 * registers.
 	 */
-	retval = arm_dpm_write_dirty_registers(&arm11->dpm);
+	CHECK_RETVAL(arm_dpm_write_dirty_registers(&arm11->dpm, bpwp));
+
+	CHECK_RETVAL(arm11_bpwp_flush(arm11));
 
 	register_cache_invalidate(arm11->arm.core_cache);
 
 	/* restore DSCR */
-
-	arm11_write_DSCR(arm11, R(DSCR));
+	CHECK_RETVAL(arm11_write_DSCR(arm11, arm11->dscr));
 
 	/* maybe restore rDTR */
-
-	if (R(DSCR) & ARM11_DSCR_RDTR_FULL || arm11->reg_list[ARM11_RC_RDTR].dirty)
-	{
+	if (arm11->is_rdtr_saved) {
 		arm11_add_debug_SCAN_N(arm11, 0x05, ARM11_TAP_DEFAULT);
 
 		arm11_add_IR(arm11, ARM11_EXTEST, ARM11_TAP_DEFAULT);
 
-		struct scan_field	chain5_fields[3];
+		struct scan_field chain5_fields[3];
 
-		uint8_t			Ready		= 0;	/* ignored */
-		uint8_t			Valid		= 0;	/* ignored */
+		uint8_t Ready           = 0;			/* ignored */
+		uint8_t Valid           = 0;			/* ignored */
 
-		arm11_setup_field(arm11, 32, &R(RDTR),	NULL, chain5_fields + 0);
-		arm11_setup_field(arm11,  1, &Ready,	NULL, chain5_fields + 1);
-		arm11_setup_field(arm11,  1, &Valid,	NULL, chain5_fields + 2);
+		arm11_setup_field(arm11, 32, &arm11->saved_rdtr,
+			NULL, chain5_fields + 0);
+		arm11_setup_field(arm11,  1, &Ready,    NULL, chain5_fields + 1);
+		arm11_setup_field(arm11,  1, &Valid,    NULL, chain5_fields + 2);
 
-		arm11_add_dr_scan_vc(ARRAY_SIZE(chain5_fields), chain5_fields, TAP_DRPAUSE);
+		arm11_add_dr_scan_vc(arm11->arm.target->tap, ARRAY_SIZE(
+				chain5_fields), chain5_fields, TAP_DRPAUSE);
 	}
 
 	/* now processor is ready to RESTART */
@@ -392,38 +319,28 @@ static int arm11_poll(struct target *target)
 {
 	int retval;
 	struct arm11_common *arm11 = target_to_arm11(target);
-	uint32_t	dscr;
-
-	CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
 
-	LOG_DEBUG("DSCR %08" PRIx32 "", dscr);
+	CHECK_RETVAL(arm11_check_init(arm11));
 
-	CHECK_RETVAL(arm11_check_init(arm11, &dscr));
-
-	if (dscr & ARM11_DSCR_CORE_HALTED)
-	{
-		if (target->state != TARGET_HALTED)
-		{
+	if (arm11->dscr & DSCR_CORE_HALTED) {
+		if (target->state != TARGET_HALTED) {
 			enum target_state old_state = target->state;
 
 			LOG_DEBUG("enter TARGET_HALTED");
-			target->state			= TARGET_HALTED;
-			target->debug_reason	= arm11_get_DSCR_debug_reason(dscr);
-			retval = arm11_on_enter_debug_state(arm11);
+			retval = arm11_debug_entry(arm11);
 			if (retval != ERROR_OK)
 				return retval;
 
 			target_call_event_callbacks(target,
-				old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED);
+				(old_state == TARGET_DEBUG_RUNNING)
+				? TARGET_EVENT_DEBUG_HALTED
+				: TARGET_EVENT_HALTED);
 		}
-	}
-	else
-	{
-		if (target->state != TARGET_RUNNING && target->state != TARGET_DEBUG_RUNNING)
-		{
+	} else {
+		if (target->state != TARGET_RUNNING && target->state != TARGET_DEBUG_RUNNING) {
 			LOG_DEBUG("enter TARGET_RUNNING");
-			target->state			= TARGET_RUNNING;
-			target->debug_reason	= DBG_REASON_NOTHALTED;
+			target->state                   = TARGET_RUNNING;
+			target->debug_reason    = DBG_REASON_NOTHALTED;
 		}
 	}
 
@@ -432,18 +349,23 @@ static int arm11_poll(struct target *target)
 /* architecture specific status reply */
 static int arm11_arch_state(struct target *target)
 {
+	struct arm11_common *arm11 = target_to_arm11(target);
 	int retval;
 
-	retval = armv4_5_arch_state(target);
+	retval = arm_arch_state(target);
 
 	/* REVISIT also display ARM11-specific MMU and cache status ... */
 
+	if (target->debug_reason == DBG_REASON_WATCHPOINT)
+		LOG_USER("Watchpoint triggered at PC %#08x",
+			(unsigned) arm11->dpm.wp_pc);
+
 	return retval;
 }
 
 /* target request support */
 static int arm11_target_request_data(struct target *target,
-		uint32_t size, uint8_t *buffer)
+	uint32_t size, uint8_t *buffer)
 {
 	LOG_WARNING("Not implemented: %s", __func__);
 
@@ -459,12 +381,9 @@ static int arm11_halt(struct target *target)
 		target_state_name(target));
 
 	if (target->state == TARGET_UNKNOWN)
-	{
 		arm11->simulate_reset_on_next_halt = true;
-	}
 
-	if (target->state == TARGET_HALTED)
-	{
+	if (target->state == TARGET_HALTED) {
 		LOG_DEBUG("target was already halted");
 		return ERROR_OK;
 	}
@@ -473,26 +392,20 @@ static int arm11_halt(struct target *target)
 
 	CHECK_RETVAL(jtag_execute_queue());
 
-	uint32_t dscr;
-
 	int i = 0;
-	while (1)
-	{
-		CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
 
-		if (dscr & ARM11_DSCR_CORE_HALTED)
+	while (1) {
+		CHECK_RETVAL(arm11_read_DSCR(arm11));
+
+		if (arm11->dscr & DSCR_CORE_HALTED)
 			break;
 
 
 		long long then = 0;
 		if (i == 1000)
-		{
 			then = timeval_ms();
-		}
-		if (i >= 1000)
-		{
-			if ((timeval_ms()-then) > 1000)
-			{
+		if (i >= 1000) {
+			if ((timeval_ms()-then) > 1000) {
 				LOG_WARNING("Timeout (1000ms) waiting for instructions to complete");
 				return ERROR_FAIL;
 			}
@@ -500,24 +413,21 @@ static int arm11_halt(struct target *target)
 		i++;
 	}
 
-	arm11_on_enter_debug_state(arm11);
+	enum target_state old_state     = target->state;
 
-	enum target_state old_state	= target->state;
-
-	target->state		= TARGET_HALTED;
-	target->debug_reason	= arm11_get_DSCR_debug_reason(dscr);
+	CHECK_RETVAL(arm11_debug_entry(arm11));
 
 	CHECK_RETVAL(
 		target_call_event_callbacks(target,
-			old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED));
+			old_state ==
+			TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED));
 
 	return ERROR_OK;
 }
 
-static uint32_t
-arm11_nextpc(struct arm11_common *arm11, int current, uint32_t address)
+static uint32_t arm11_nextpc(struct arm11_common *arm11, int current, uint32_t address)
 {
-	void *value = arm11->arm.core_cache->reg_list[15].value;
+	void *value = arm11->arm.pc->value;
 
 	if (!current)
 		buf_set_u32(value, 0, 32, address);
@@ -528,10 +438,10 @@ arm11_nextpc(struct arm11_common *arm11, int current, uint32_t address)
 }
 
 static int arm11_resume(struct target *target, int current,
-		uint32_t address, int handle_breakpoints, int debug_execution)
+	uint32_t address, int handle_breakpoints, int debug_execution)
 {
-	//	  LOG_DEBUG("current %d  address %08x  handle_breakpoints %d  debug_execution %d",
-	//	current, address, handle_breakpoints, debug_execution);
+	/*	  LOG_DEBUG("current %d  address %08x  handle_breakpoints %d  debug_execution %d", */
+	/*	current, address, handle_breakpoints, debug_execution); */
 
 	struct arm11_common *arm11 = target_to_arm11(target);
 
@@ -539,8 +449,7 @@ static int arm11_resume(struct target *target, int current,
 		target_state_name(target));
 
 
-	if (target->state != TARGET_HALTED)
-	{
+	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
@@ -550,82 +459,75 @@ static int arm11_resume(struct target *target, int current,
 	LOG_DEBUG("RESUME PC %08" PRIx32 "%s", address, !current ? "!" : "");
 
 	/* clear breakpoints/watchpoints and VCR*/
-	arm11_sc7_clear_vbw(arm11);
+	CHECK_RETVAL(arm11_sc7_clear_vbw(arm11));
 
 	if (!debug_execution)
 		target_free_all_working_areas(target);
 
-	/* Set up breakpoints */
-	if (handle_breakpoints)
-	{
-		/* check if one matches PC and step over it if necessary */
+	/* Should we skip over breakpoints matching the PC? */
+	if (handle_breakpoints) {
+		struct breakpoint *bp;
 
-		struct breakpoint *	bp;
-
-		for (bp = target->breakpoints; bp; bp = bp->next)
-		{
-			if (bp->address == address)
-			{
+		for (bp = target->breakpoints; bp; bp = bp->next) {
+			if (bp->address == address) {
 				LOG_DEBUG("must step over %08" PRIx32 "", bp->address);
 				arm11_step(target, 1, 0, 0);
 				break;
 			}
 		}
+	}
 
-		/* set all breakpoints */
-
+	/* activate all breakpoints */
+	if (true) {
+		struct breakpoint *bp;
 		unsigned brp_num = 0;
 
-		for (bp = target->breakpoints; bp; bp = bp->next)
-		{
-			struct arm11_sc7_action	brp[2];
+		for (bp = target->breakpoints; bp; bp = bp->next) {
+			struct arm11_sc7_action brp[2];
 
-			brp[0].write	= 1;
-			brp[0].address	= ARM11_SC7_BVR0 + brp_num;
-			brp[0].value	= bp->address;
-			brp[1].write	= 1;
-			brp[1].address	= ARM11_SC7_BCR0 + brp_num;
-			brp[1].value	= 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (0 << 21);
+			brp[0].write    = 1;
+			brp[0].address  = ARM11_SC7_BVR0 + brp_num;
+			brp[0].value    = bp->address;
+			brp[1].write    = 1;
+			brp[1].address  = ARM11_SC7_BCR0 + brp_num;
+			brp[1].value    = 0x1 |
+				(3 <<
+				 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (0 << 21);
 
-			arm11_sc7_run(arm11, brp, ARRAY_SIZE(brp));
+			CHECK_RETVAL(arm11_sc7_run(arm11, brp, ARRAY_SIZE(brp)));
 
 			LOG_DEBUG("Add BP %d at %08" PRIx32, brp_num,
-					bp->address);
+				bp->address);
 
 			brp_num++;
 		}
 
-		arm11_sc7_set_vcr(arm11, arm11_vcr);
+		if (arm11->vcr)
+			CHECK_RETVAL(arm11_sc7_set_vcr(arm11, arm11->vcr));
 	}
 
-	arm11_leave_debug_state(arm11);
+	/* activate all watchpoints and breakpoints */
+	CHECK_RETVAL(arm11_leave_debug_state(arm11, true));
 
 	arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
 
 	CHECK_RETVAL(jtag_execute_queue());
 
 	int i = 0;
-	while (1)
-	{
-		uint32_t dscr;
-
-		CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
+	while (1) {
+		CHECK_RETVAL(arm11_read_DSCR(arm11));
 
-		LOG_DEBUG("DSCR %08" PRIx32 "", dscr);
+		LOG_DEBUG("DSCR %08x", (unsigned) arm11->dscr);
 
-		if (dscr & ARM11_DSCR_CORE_RESTARTED)
+		if (arm11->dscr & DSCR_CORE_RESTARTED)
 			break;
 
 
 		long long then = 0;
 		if (i == 1000)
-		{
 			then = timeval_ms();
-		}
-		if (i >= 1000)
-		{
-			if ((timeval_ms()-then) > 1000)
-			{
+		if (i >= 1000) {
+			if ((timeval_ms()-then) > 1000) {
 				LOG_WARNING("Timeout (1000ms) waiting for instructions to complete");
 				return ERROR_FAIL;
 			}
@@ -633,32 +535,23 @@ static int arm11_resume(struct target *target, int current,
 		i++;
 	}
 
+	target->debug_reason = DBG_REASON_NOTHALTED;
 	if (!debug_execution)
-	{
-		target->state			= TARGET_RUNNING;
-		target->debug_reason	= DBG_REASON_NOTHALTED;
-
-		CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_RESUMED));
-	}
+		target->state = TARGET_RUNNING;
 	else
-	{
-		target->state			= TARGET_DEBUG_RUNNING;
-		target->debug_reason	= DBG_REASON_NOTHALTED;
-
-		CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_RESUMED));
-	}
+		target->state = TARGET_DEBUG_RUNNING;
+	CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_RESUMED));
 
 	return ERROR_OK;
 }
 
 static int arm11_step(struct target *target, int current,
-		uint32_t address, int handle_breakpoints)
+	uint32_t address, int handle_breakpoints)
 {
 	LOG_DEBUG("target->state: %s",
 		target_state_name(target));
 
-	if (target->state != TARGET_HALTED)
-	{
+	if (target->state != TARGET_HALTED) {
 		LOG_WARNING("target was not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
@@ -672,30 +565,25 @@ static int arm11_step(struct target *target, int current,
 
 	/** \todo TODO: Thumb not supported here */
 
-	uint32_t	next_instruction;
+	uint32_t next_instruction;
 
 	CHECK_RETVAL(arm11_read_memory_word(arm11, address, &next_instruction));
 
 	/* skip over BKPT */
-	if ((next_instruction & 0xFFF00070) == 0xe1200070)
-	{
+	if ((next_instruction & 0xFFF00070) == 0xe1200070) {
 		address = arm11_nextpc(arm11, 0, address + 4);
-		LOG_DEBUG("Skipping BKPT");
+		LOG_DEBUG("Skipping BKPT %08" PRIx32, address);
 	}
-	/* skip over Wait for interrupt / Standby */
-	/* mcr	15, 0, r?, cr7, cr0, {4} */
-	else if ((next_instruction & 0xFFFF0FFF) == 0xee070f90)
-	{
+	/* skip over Wait for interrupt / Standby
+	 * mcr	15, 0, r?, cr7, cr0, {4} */
+	else if ((next_instruction & 0xFFFF0FFF) == 0xee070f90) {
 		address = arm11_nextpc(arm11, 0, address + 4);
-		LOG_DEBUG("Skipping WFI");
+		LOG_DEBUG("Skipping WFI %08" PRIx32, address);
 	}
 	/* ignore B to self */
 	else if ((next_instruction & 0xFEFFFFFF) == 0xeafffffe)
-	{
 		LOG_DEBUG("Not stepping jump to self");
-	}
-	else
-	{
+	else {
 		/** \todo TODO: check if break-/watchpoints make any sense at all in combination
 		* with this. */
 
@@ -705,15 +593,14 @@ static int arm11_step(struct target *target, int current,
 
 		/* Set up breakpoint for stepping */
 
-		struct arm11_sc7_action	brp[2];
+		struct arm11_sc7_action brp[2];
 
-		brp[0].write	= 1;
-		brp[0].address	= ARM11_SC7_BVR0;
-		brp[1].write	= 1;
-		brp[1].address	= ARM11_SC7_BCR0;
+		brp[0].write    = 1;
+		brp[0].address  = ARM11_SC7_BVR0;
+		brp[1].write    = 1;
+		brp[1].address  = ARM11_SC7_BCR0;
 
-		if (arm11_config_hardware_step)
-		{
+		if (arm11->hardware_step) {
 			/* Hardware single stepping ("instruction address
 			 * mismatch") is used if enabled.  It's not quite
 			 * exactly "run one instruction"; "branch to here"
@@ -726,12 +613,11 @@ static int arm11_step(struct target *target, int current,
 			 * FIXME Thumb stepping likely needs to use 0x03
 			 * or 0xc0 byte masks, not 0x0f.
 			 */
-			 brp[0].value	= address;
-			 brp[1].value	= 0x1 | (3 << 1) | (0x0F << 5)
-					| (0 << 14) | (0 << 16) | (0 << 20)
-					| (2 << 21);
-		} else
-		{
+			brp[0].value   = address;
+			brp[1].value   = 0x1 | (3 << 1) | (0x0F << 5)
+				| (0 << 14) | (0 << 16) | (0 << 20)
+				| (2 << 21);
+		} else {
 			/* Sets a breakpoint on the next PC, as calculated
 			 * by instruction set simulation.
 			 *
@@ -745,10 +631,10 @@ static int arm11_step(struct target *target, int current,
 			if (retval != ERROR_OK)
 				return retval;
 
-			brp[0].value	= next_pc;
-			brp[1].value	= 0x1 | (3 << 1) | (0x0F << 5)
-					| (0 << 14) | (0 << 16) | (0 << 20)
-					| (0 << 21);
+			brp[0].value    = next_pc;
+			brp[1].value    = 0x1 | (3 << 1) | (0x0F << 5)
+				| (0 << 14) | (0 << 16) | (0 << 20)
+				| (0 << 21);
 		}
 
 		CHECK_RETVAL(arm11_sc7_run(arm11, brp, ARRAY_SIZE(brp)));
@@ -756,13 +642,14 @@ static int arm11_step(struct target *target, int current,
 		/* resume */
 
 
-		if (arm11_config_step_irq_enable)
-			R(DSCR) &= ~ARM11_DSCR_INTERRUPTS_DISABLE;		/* should be redundant */
+		if (arm11->step_irq_enable)
+			/* this disable should be redundant ... */
+			arm11->dscr &= ~DSCR_INT_DIS;
 		else
-			R(DSCR) |= ARM11_DSCR_INTERRUPTS_DISABLE;
+			arm11->dscr |= DSCR_INT_DIS;
 
 
-		CHECK_RETVAL(arm11_leave_debug_state(arm11));
+		CHECK_RETVAL(arm11_leave_debug_state(arm11, handle_breakpoints));
 
 		arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
 
@@ -770,28 +657,24 @@ static int arm11_step(struct target *target, int current,
 
 		/* wait for halt */
 		int i = 0;
-		while (1)
-		{
-			uint32_t dscr;
 
-			CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
+		while (1) {
+			const uint32_t mask = DSCR_CORE_RESTARTED
+				| DSCR_CORE_HALTED;
 
-			LOG_DEBUG("DSCR %08" PRIx32 "e", dscr);
+			CHECK_RETVAL(arm11_read_DSCR(arm11));
+			LOG_DEBUG("DSCR %08x e", (unsigned) arm11->dscr);
 
-			if ((dscr & (ARM11_DSCR_CORE_RESTARTED | ARM11_DSCR_CORE_HALTED)) ==
-				(ARM11_DSCR_CORE_RESTARTED | ARM11_DSCR_CORE_HALTED))
+			if ((arm11->dscr & mask) == mask)
 				break;
 
 			long long then = 0;
 			if (i == 1000)
-			{
 				then = timeval_ms();
-			}
-			if (i >= 1000)
-			{
-				if ((timeval_ms()-then) > 1000)
-				{
-					LOG_WARNING("Timeout (1000ms) waiting for instructions to complete");
+			if (i >= 1000) {
+				if ((timeval_ms()-then) > 1000) {
+					LOG_WARNING(
+						"Timeout (1000ms) waiting for instructions to complete");
 					return ERROR_FAIL;
 				}
 			}
@@ -799,18 +682,17 @@ static int arm11_step(struct target *target, int current,
 		}
 
 		/* clear breakpoint */
-		arm11_sc7_clear_vbw(arm11);
+		CHECK_RETVAL(arm11_sc7_clear_vbw(arm11));
 
 		/* save state */
-		CHECK_RETVAL(arm11_on_enter_debug_state(arm11));
+		CHECK_RETVAL(arm11_debug_entry(arm11));
 
-	    /* restore default state */
-		R(DSCR) &= ~ARM11_DSCR_INTERRUPTS_DISABLE;
+		/* restore default state */
+		arm11->dscr &= ~DSCR_INT_DIS;
 
 	}
 
-	//	  target->state		= TARGET_HALTED;
-	target->debug_reason	= DBG_REASON_SINGLESTEP;
+	target->debug_reason = DBG_REASON_SINGLESTEP;
 
 	CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_HALTED));
 
@@ -819,67 +701,73 @@ static int arm11_step(struct target *target, int current,
 
 static int arm11_assert_reset(struct target *target)
 {
-	int retval;
 	struct arm11_common *arm11 = target_to_arm11(target);
 
-	retval = arm11_check_init(arm11, NULL);
-	if (retval != ERROR_OK)
-		return retval;
-
-	target->state = TARGET_UNKNOWN;
+	/* optionally catch reset vector */
+	if (target->reset_halt && !(arm11->vcr & 1))
+		CHECK_RETVAL(arm11_sc7_set_vcr(arm11, arm11->vcr | 1));
 
-	/* we would very much like to reset into the halted, state,
-	 * but resetting and halting is second best... */
-	if (target->reset_halt)
-	{
-		CHECK_RETVAL(target_halt(target));
+	/* Issue some kind of warm reset. */
+	if (target_has_event_action(target, TARGET_EVENT_RESET_ASSERT))
+		target_handle_event(target, TARGET_EVENT_RESET_ASSERT);
+	else if (jtag_get_reset_config() & RESET_HAS_SRST) {
+		/* REVISIT handle "pulls" cases, if there's
+		 * hardware that needs them to work.
+		 */
+		jtag_add_reset(0, 1);
+	} else {
+		LOG_ERROR("%s: how to reset?", target_name(target));
+		return ERROR_FAIL;
 	}
 
+	/* registers are now invalid */
+	register_cache_invalidate(arm11->arm.core_cache);
+
+	target->state = TARGET_RESET;
 
-	/* srst is funny. We can not do *anything* else while it's asserted
-	 * and it has unkonwn side effects. Make sure no other code runs
-	 * meanwhile.
-	 *
-	 * Code below assumes srst:
-	 *
-	 * - Causes power-on-reset (but of what parts of the system?). Bug
-	 * in arm11?
-	 *
-	 * - Messes us TAP state without asserting trst.
-	 *
-	 * - There is another bug in the arm11 core. When you generate an access to
-	 * external logic (for example ddr controller via AHB bus) and that block
-	 * is not configured (perhaps it is still held in reset), that transaction
-	 * will never complete. This will hang arm11 core but it will also hang
-	 * JTAG controller. Nothing, short of srst assertion will bring it out of
-	 * this.
-	 *
-	 * Mysteries:
-	 *
-	 * - What should the PC be after an srst reset when starting in the halted
-	 * state?
-	 */
+	return ERROR_OK;
+}
 
-	jtag_add_reset(0, 1);
-	jtag_add_reset(0, 0);
+/*
+ * - There is another bug in the arm11 core.  (iMX31 specific again?)
+ *   When you generate an access to external logic (for example DDR
+ *   controller via AHB bus) and that block is not configured (perhaps
+ *   it is still held in reset), that transaction will never complete.
+ *   This will hang arm11 core but it will also hang JTAG controller.
+ *   Nothing short of srst assertion will bring it out of this.
+ */
+
+static int arm11_deassert_reset(struct target *target)
+{
+	struct arm11_common *arm11 = target_to_arm11(target);
+	int retval;
 
-	/* How long do we have to wait? */
-	jtag_add_sleep(5000);
+	/* be certain SRST is off */
+	jtag_add_reset(0, 0);
 
-	/* un-mess up TAP state */
+	/* WORKAROUND i.MX31 problems:  SRST goofs the TAP, and resets
+	 * at least DSCR.  OMAP24xx doesn't show that problem, though
+	 * SRST-only reset seems to be problematic for other reasons.
+	 * (Secure boot sequences being one likelihood!)
+	 */
 	jtag_add_tlr();
 
-	retval = jtag_execute_queue();
-	if (retval != ERROR_OK)
-	{
-		return retval;
+	CHECK_RETVAL(arm11_poll(target));
+
+	if (target->reset_halt) {
+		if (target->state != TARGET_HALTED) {
+			LOG_WARNING("%s: ran after reset and before halt ...",
+				target_name(target));
+			retval = target_halt(target);
+			if (retval != ERROR_OK)
+				return retval;
+		}
 	}
 
-	return ERROR_OK;
-}
+	/* maybe restore vector catch config */
+	if (target->reset_halt && !(arm11->vcr & 1))
+		CHECK_RETVAL(arm11_sc7_set_vcr(arm11, arm11->vcr));
 
-static int arm11_deassert_reset(struct target *target)
-{
 	return ERROR_OK;
 }
 
@@ -899,19 +787,22 @@ static int arm11_soft_reset_halt(struct target *target)
  * read memory address for some peripheral.
  */
 static int arm11_read_memory_inner(struct target *target,
-		uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer,
-		bool arm11_config_memrw_no_increment)
+	uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer,
+	bool arm11_config_memrw_no_increment)
 {
-	/** \todo TODO: check if buffer cast to uint32_t* and uint16_t* might cause alignment problems */
+	/** \todo TODO: check if buffer cast to uint32_t* and uint16_t* might cause alignment
+	 *problems */
 	int retval;
 
-	if (target->state != TARGET_HALTED)
-	{
+	if (target->state != TARGET_HALTED) {
 		LOG_WARNING("target was not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
-	LOG_DEBUG("ADDR %08" PRIx32 "  SIZE %08" PRIx32 "  COUNT %08" PRIx32 "", address, size, count);
+	LOG_DEBUG("ADDR %08" PRIx32 "  SIZE %08" PRIx32 "  COUNT %08" PRIx32 "",
+		address,
+		size,
+		count);
 
 	struct arm11_common *arm11 = target_to_arm11(target);
 
@@ -924,41 +815,38 @@ static int arm11_read_memory_inner(struct target *target,
 	if (retval != ERROR_OK)
 		return retval;
 
-	switch (size)
-	{
-	case 1:
-		arm11->arm.core_cache->reg_list[1].dirty = true;
+	switch (size) {
+		case 1:
+			arm11->arm.core_cache->reg_list[1].dirty = true;
 
-		for (size_t i = 0; i < count; i++)
-		{
-			/* ldrb    r1, [r0], #1 */
-			/* ldrb    r1, [r0] */
-			arm11_run_instr_no_data1(arm11,
-					!arm11_config_memrw_no_increment ? 0xe4d01001 : 0xe5d01000);
+			for (size_t i = 0; i < count; i++) {
+				/* ldrb    r1, [r0], #1 */
+				/* ldrb    r1, [r0] */
+				CHECK_RETVAL(arm11_run_instr_no_data1(arm11,
+						!arm11_config_memrw_no_increment ? 0xe4d01001 : 0xe5d01000));
 
-			uint32_t res;
-			/* MCR p14,0,R1,c0,c5,0 */
-			arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1);
+				uint32_t res;
+				/* MCR p14,0,R1,c0,c5,0 */
+				CHECK_RETVAL(arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1));
 
-			*buffer++ = res;
-		}
+				*buffer++ = res;
+			}
 
-		break;
+			break;
 
-	case 2:
+		case 2:
 		{
 			arm11->arm.core_cache->reg_list[1].dirty = true;
 
-			for (size_t i = 0; i < count; i++)
-			{
+			for (size_t i = 0; i < count; i++) {
 				/* ldrh    r1, [r0], #2 */
-				arm11_run_instr_no_data1(arm11,
-					!arm11_config_memrw_no_increment ? 0xe0d010b2 : 0xe1d010b0);
+				CHECK_RETVAL(arm11_run_instr_no_data1(arm11,
+						!arm11_config_memrw_no_increment ? 0xe0d010b2 : 0xe1d010b0));
 
 				uint32_t res;
 
 				/* MCR p14,0,R1,c0,c5,0 */
-				arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1);
+				CHECK_RETVAL(arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1));
 
 				uint16_t svalue = res;
 				memcpy(buffer + i * sizeof(uint16_t), &svalue, sizeof(uint16_t));
@@ -967,45 +855,52 @@ static int arm11_read_memory_inner(struct target *target,
 			break;
 		}
 
-	case 4:
+		case 4:
 		{
-		uint32_t instr = !arm11_config_memrw_no_increment ? 0xecb05e01 : 0xed905e00;
-		/** \todo TODO: buffer cast to uint32_t* causes alignment warnings */
-		uint32_t *words = (uint32_t *)buffer;
-
-		/* LDC p14,c5,[R0],#4 */
-		/* LDC p14,c5,[R0] */
-		arm11_run_instr_data_from_core(arm11, instr, words, count);
-		break;
+			uint32_t instr = !arm11_config_memrw_no_increment ? 0xecb05e01 : 0xed905e00;
+			/** \todo TODO: buffer cast to uint32_t* causes alignment warnings */
+			uint32_t *words = (uint32_t *)(void *)buffer;
+
+			/* LDC p14,c5,[R0],#4 */
+			/* LDC p14,c5,[R0] */
+			CHECK_RETVAL(arm11_run_instr_data_from_core(arm11, instr, words, count));
+			break;
 		}
 	}
 
 	return arm11_run_instr_data_finish(arm11);
 }
 
-static int arm11_read_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
+static int arm11_read_memory(struct target *target,
+	uint32_t address,
+	uint32_t size,
+	uint32_t count,
+	uint8_t *buffer)
 {
 	return arm11_read_memory_inner(target, address, size, count, buffer, false);
 }
 
 /*
-* arm11_config_memrw_no_increment - in the future we may want to be able
+* no_increment - in the future we may want to be able
 * to read/write a range of data to a "port". a "port" is an action on
 * read memory address for some peripheral.
 */
 static int arm11_write_memory_inner(struct target *target,
-		uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer,
-		bool arm11_config_memrw_no_increment)
+	uint32_t address, uint32_t size,
+	uint32_t count, const uint8_t *buffer,
+	bool no_increment)
 {
 	int retval;
 
-	if (target->state != TARGET_HALTED)
-	{
+	if (target->state != TARGET_HALTED) {
 		LOG_WARNING("target was not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
-	LOG_DEBUG("ADDR %08" PRIx32 "  SIZE %08" PRIx32 "  COUNT %08" PRIx32 "", address, size, count);
+	LOG_DEBUG("ADDR %08" PRIx32 "  SIZE %08" PRIx32 "  COUNT %08" PRIx32 "",
+		address,
+		size,
+		count);
 
 	struct arm11_common *arm11 = target_to_arm11(target);
 
@@ -1013,7 +908,8 @@ static int arm11_write_memory_inner(struct target *target,
 	if (retval != ERROR_OK)
 		return retval;
 
-	/* MRC p14,0,r0,c0,c5,0 */
+	/* load r0 with buffer address
+	 * MRC p14,0,r0,c0,c5,0 */
 	retval = arm11_run_instr_data_to_core1(arm11, 0xee100e15, address);
 	if (retval != ERROR_OK)
 		return retval;
@@ -1025,25 +921,25 @@ static int arm11_write_memory_inner(struct target *target,
 	 * now exercise both burst and non-burst code paths with the
 	 * default settings, increasing code coverage.
 	 */
-	bool burst = arm11_config_memwrite_burst && (count > 1);
+	bool burst = arm11->memwrite_burst && (count > 1);
 
-	switch (size)
-	{
-	case 1:
+	switch (size) {
+		case 1:
 		{
 			arm11->arm.core_cache->reg_list[1].dirty = true;
 
-			for (size_t i = 0; i < count; i++)
-			{
+			for (size_t i = 0; i < count; i++) {
+				/* load r1 from DCC with byte data */
 				/* MRC p14,0,r1,c0,c5,0 */
 				retval = arm11_run_instr_data_to_core1(arm11, 0xee101e15, *buffer++);
 				if (retval != ERROR_OK)
 					return retval;
 
+				/* write r1 to memory */
 				/* strb    r1, [r0], #1 */
 				/* strb    r1, [r0] */
 				retval = arm11_run_instr_no_data1(arm11,
-					!arm11_config_memrw_no_increment ? 0xe4c01001 : 0xe5c01000);
+						!no_increment ? 0xe4c01001 : 0xe5c01000);
 				if (retval != ERROR_OK)
 					return retval;
 			}
@@ -1051,24 +947,25 @@ static int arm11_write_memory_inner(struct target *target,
 			break;
 		}
 
-	case 2:
+		case 2:
 		{
 			arm11->arm.core_cache->reg_list[1].dirty = true;
 
-			for (size_t i = 0; i < count; i++)
-			{
+			for (size_t i = 0; i < count; i++) {
 				uint16_t value;
 				memcpy(&value, buffer + i * sizeof(uint16_t), sizeof(uint16_t));
 
+				/* load r1 from DCC with halfword data */
 				/* MRC p14,0,r1,c0,c5,0 */
 				retval = arm11_run_instr_data_to_core1(arm11, 0xee101e15, value);
 				if (retval != ERROR_OK)
 					return retval;
 
+				/* write r1 to memory */
 				/* strh    r1, [r0], #2 */
 				/* strh    r1, [r0] */
 				retval = arm11_run_instr_no_data1(arm11,
-					!arm11_config_memrw_no_increment ? 0xe0c010b2 : 0xe1c010b0);
+						!no_increment ? 0xe0c010b2 : 0xe1c010b0);
 				if (retval != ERROR_OK)
 					return retval;
 			}
@@ -1076,36 +973,34 @@ static int arm11_write_memory_inner(struct target *target,
 			break;
 		}
 
-	case 4: {
-		uint32_t instr = !arm11_config_memrw_no_increment ? 0xeca05e01 : 0xed805e00;
+		case 4: {
+			/* stream word data through DCC directly to memory */
+			/* increment:		STC p14,c5,[R0],#4 */
+			/* no increment:	STC p14,c5,[R0]*/
+			uint32_t instr = !no_increment ? 0xeca05e01 : 0xed805e00;
 
-		/** \todo TODO: buffer cast to uint32_t* causes alignment warnings */
-		uint32_t *words = (uint32_t*)buffer;
+			/** \todo TODO: buffer cast to uint32_t* causes alignment warnings */
+			uint32_t *words = (uint32_t *)(void *)buffer;
 
-		if (!burst)
-		{
-			/* STC p14,c5,[R0],#4 */
-			/* STC p14,c5,[R0]*/
-			retval = arm11_run_instr_data_to_core(arm11, instr, words, count);
-			if (retval != ERROR_OK)
-				return retval;
-		}
-		else
-		{
-			/* STC p14,c5,[R0],#4 */
-			/* STC p14,c5,[R0]*/
-			retval = arm11_run_instr_data_to_core_noack(arm11, instr, words, count);
+			/* "burst" here just means trusting each instruction executes
+			 * fully before we run the next one:  per-word roundtrips, to
+			 * check the Ready flag, are not used.
+			 */
+			if (!burst)
+				retval = arm11_run_instr_data_to_core(arm11,
+						instr, words, count);
+			else
+				retval = arm11_run_instr_data_to_core_noack(arm11,
+						instr, words, count);
 			if (retval != ERROR_OK)
 				return retval;
-		}
 
-		break;
-	}
+			break;
+		}
 	}
 
 	/* r0 verification */
-	if (!arm11_config_memrw_no_increment)
-	{
+	if (!no_increment) {
 		uint32_t r0;
 
 		/* MCR p14,0,R0,c0,c5,0 */
@@ -1113,17 +1008,18 @@ static int arm11_write_memory_inner(struct target *target,
 		if (retval != ERROR_OK)
 			return retval;
 
-		if (address + size * count != r0)
-		{
+		if (address + size * count != r0) {
 			LOG_ERROR("Data transfer failed. Expected end "
-					"address 0x%08x, got 0x%08x",
-					(unsigned) (address + size * count),
-					(unsigned) r0);
+				"address 0x%08x, got 0x%08x",
+				(unsigned) (address + size * count),
+				(unsigned) r0);
 
 			if (burst)
-				LOG_ERROR("use 'arm11 memwrite burst disable' to disable fast burst mode");
+				LOG_ERROR(
+					"use 'arm11 memwrite burst disable' to disable fast burst mode");
+
 
-			if (arm11_config_memwrite_error_fatal)
+			if (arm11->memwrite_error_fatal)
 				return ERROR_FAIL;
 		}
 	}
@@ -1132,48 +1028,37 @@ static int arm11_write_memory_inner(struct target *target,
 }
 
 static int arm11_write_memory(struct target *target,
-		uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
-{
-	return arm11_write_memory_inner(target, address, size, count, buffer, false);
-}
-
-/* write target memory in multiples of 4 byte, optimized for writing large quantities of data */
-static int arm11_bulk_write_memory(struct target *target,
-		uint32_t address, uint32_t count, uint8_t *buffer)
+	uint32_t address, uint32_t size,
+	uint32_t count, const uint8_t *buffer)
 {
-	if (target->state != TARGET_HALTED)
-	{
-		LOG_WARNING("target was not halted");
-		return ERROR_TARGET_NOT_HALTED;
-	}
-
-	return arm11_write_memory(target, address, 4, count, buffer);
+	/* pointer increment matters only for multi-unit writes ...
+	 * not e.g. to a "reset the chip" controller.
+	 */
+	return arm11_write_memory_inner(target, address, size,
+		count, buffer, count == 1);
 }
 
 /* target break-/watchpoint control
 * rw: 0 = write, 1 = read, 2 = access
 */
 static int arm11_add_breakpoint(struct target *target,
-		struct breakpoint *breakpoint)
+	struct breakpoint *breakpoint)
 {
 	struct arm11_common *arm11 = target_to_arm11(target);
 
 #if 0
-	if (breakpoint->type == BKPT_SOFT)
-	{
+	if (breakpoint->type == BKPT_SOFT) {
 		LOG_INFO("sw breakpoint requested, but software breakpoints not enabled");
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
 #endif
 
-	if (!arm11->free_brps)
-	{
+	if (!arm11->free_brps) {
 		LOG_DEBUG("no breakpoint unit available for hardware breakpoint");
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
 
-	if (breakpoint->length != 4)
-	{
+	if (breakpoint->length != 4) {
 		LOG_DEBUG("only breakpoints of four bytes length supported");
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
@@ -1184,7 +1069,7 @@ static int arm11_add_breakpoint(struct target *target,
 }
 
 static int arm11_remove_breakpoint(struct target *target,
-		struct breakpoint *breakpoint)
+	struct breakpoint *breakpoint)
 {
 	struct arm11_common *arm11 = target_to_arm11(target);
 
@@ -1193,22 +1078,6 @@ static int arm11_remove_breakpoint(struct target *target,
 	return ERROR_OK;
 }
 
-static int arm11_add_watchpoint(struct target *target,
-		struct watchpoint *watchpoint)
-{
-	LOG_WARNING("Not implemented: %s", __func__);
-
-	return ERROR_FAIL;
-}
-
-static int arm11_remove_watchpoint(struct target *target,
-		struct watchpoint *watchpoint)
-{
-	LOG_WARNING("Not implemented: %s", __func__);
-
-	return ERROR_FAIL;
-}
-
 static int arm11_target_create(struct target *target, Jim_Interp *interp)
 {
 	struct arm11_common *arm11;
@@ -1216,8 +1085,7 @@ static int arm11_target_create(struct target *target, Jim_Interp *interp)
 	if (target->tap == NULL)
 		return ERROR_FAIL;
 
-	if (target->tap->ir_length != 5)
-	{
+	if (target->tap->ir_length != 5) {
 		LOG_ERROR("'target arm11' expects IR LENGTH = 5");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
@@ -1226,29 +1094,26 @@ static int arm11_target_create(struct target *target, Jim_Interp *interp)
 	if (!arm11)
 		return ERROR_FAIL;
 
-	armv4_5_init_arch_info(target, &arm11->arm);
-
-	arm11->target = target;
+	arm11->arm.core_type = ARM_MODE_ANY;
+	arm_init_arch_info(target, &arm11->arm);
 
 	arm11->jtag_info.tap = target->tap;
 	arm11->jtag_info.scann_size = 5;
 	arm11->jtag_info.scann_instr = ARM11_SCAN_N;
-	/* cur_scan_chain == 0 */
+	arm11->jtag_info.cur_scan_chain = ~0;	/* invalid/unknown */
 	arm11->jtag_info.intest_instr = ARM11_INTEST;
 
+	arm11->memwrite_burst = true;
+	arm11->memwrite_error_fatal = true;
+
 	return ERROR_OK;
 }
 
 static int arm11_init_target(struct command_context *cmd_ctx,
-		struct target *target)
+	struct target *target)
 {
 	/* Initialize anything we can set up without talking to the target */
-
-	/* REVISIT do we really want such a debug-registers-only cache?
-	 * If we do, it should probably be handled purely by the DPM code,
-	 * so it works identically on the v7a/v7r cores.
-	 */
-	return arm11_build_reg_cache(target);
+	return ERROR_OK;
 }
 
 /* talk to the target and set things up */
@@ -1266,11 +1131,11 @@ static int arm11_examine(struct target *target)
 
 	arm11_add_IR(arm11, ARM11_IDCODE, ARM11_TAP_DEFAULT);
 
-	struct scan_field		idcode_field;
+	struct scan_field idcode_field;
 
 	arm11_setup_field(arm11, 32, NULL, &device_id, &idcode_field);
 
-	arm11_add_dr_scan_vc(1, &idcode_field, TAP_DRPAUSE);
+	arm11_add_dr_scan_vc(arm11->arm.target->tap, 1, &idcode_field, TAP_DRPAUSE);
 
 	/* check DIDR */
 
@@ -1278,76 +1143,77 @@ static int arm11_examine(struct target *target)
 
 	arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
 
-	struct scan_field		chain0_fields[2];
+	struct scan_field chain0_fields[2];
 
 	arm11_setup_field(arm11, 32, NULL, &didr, chain0_fields + 0);
 	arm11_setup_field(arm11,  8, NULL, &implementor, chain0_fields + 1);
 
-	arm11_add_dr_scan_vc(ARRAY_SIZE(chain0_fields), chain0_fields, TAP_IDLE);
+	arm11_add_dr_scan_vc(arm11->arm.target->tap, ARRAY_SIZE(
+			chain0_fields), chain0_fields, TAP_IDLE);
 
 	CHECK_RETVAL(jtag_execute_queue());
 
-	switch (device_id & 0x0FFFF000)
-	{
-	case 0x07B36000:
-		type = "ARM1136";
-		break;
-	case 0x07B56000:
-		type = "ARM1156";
-		break;
-	case 0x07B76000:
-		arm11->arm.core_type = ARM_MODE_MON;
-		type = "ARM1176";
-		break;
-	default:
-		LOG_ERROR("'target arm11' expects IDCODE 0x*7B*7****");
-		return ERROR_FAIL;
+	/* assume the manufacturer id is ok; check the part # */
+	switch ((device_id >> 12) & 0xFFFF) {
+		case 0x7B36:
+			type = "ARM1136";
+			break;
+		case 0x7B37:
+			type = "ARM11 MPCore";
+			break;
+		case 0x7B56:
+			type = "ARM1156";
+			break;
+		case 0x7B76:
+			arm11->arm.core_type = ARM_MODE_MON;
+			/* NOTE: could default arm11->hardware_step to true */
+			type = "ARM1176";
+			break;
+		default:
+			LOG_ERROR("unexpected ARM11 ID code");
+			return ERROR_FAIL;
 	}
 	LOG_INFO("found %s", type);
 
 	/* unlikely this could ever fail, but ... */
 	switch ((didr >> 16) & 0x0F) {
-	case ARM11_DEBUG_V6:
-	case ARM11_DEBUG_V61:		/* supports security extensions */
-		break;
-	default:
-		LOG_ERROR("Only ARM v6 and v6.1 debug supported.");
-		return ERROR_FAIL;
+		case ARM11_DEBUG_V6:
+		case ARM11_DEBUG_V61:	/* supports security extensions */
+			break;
+		default:
+			LOG_ERROR("Only ARM v6 and v6.1 debug supported.");
+			return ERROR_FAIL;
 	}
 
 	arm11->brp = ((didr >> 24) & 0x0F) + 1;
-	arm11->wrp = ((didr >> 28) & 0x0F) + 1;
 
 	/** \todo TODO: reserve one brp slot if we allow breakpoints during step */
 	arm11->free_brps = arm11->brp;
-	arm11->free_wrps = arm11->wrp;
 
 	LOG_DEBUG("IDCODE %08" PRIx32 " IMPLEMENTOR %02x DIDR %08" PRIx32,
-			device_id, implementor, didr);
+		device_id, implementor, didr);
 
 	/* as a side-effect this reads DSCR and thus
 	 * clears the ARM11_DSCR_STICKY_PRECISE_DATA_ABORT / Sticky Precise Data Abort Flag
 	 * as suggested by the spec.
 	 */
 
-	retval = arm11_check_init(arm11, NULL);
+	retval = arm11_check_init(arm11);
 	if (retval != ERROR_OK)
 		return retval;
 
 	/* Build register cache "late", after target_init(), since we
 	 * want to know if this core supports Secure Monitor mode.
 	 */
-	if (!target_was_examined(target)) {
-		arm11_dpm_init(arm11, didr);
-		retval = arm_dpm_setup(&arm11->dpm);
-	}
+	if (!target_was_examined(target))
+		CHECK_RETVAL(arm11_dpm_init(arm11, didr));
 
 	/* ETM on ARM11 still uses original scanchain 6 access mode */
 	if (arm11->arm.etm && !target_was_examined(target)) {
 		*register_get_last_cache_p(&target->reg_cache) =
 			etm_build_reg_cache(target, &arm11->jtag_info,
-					arm11->arm.etm);
-		retval = etm_setup(target);
+				arm11->arm.etm);
+		CHECK_RETVAL(etm_setup(target));
 	}
 
 	target_set_examined(target);
@@ -1355,295 +1221,150 @@ static int arm11_examine(struct target *target)
 	return ERROR_OK;
 }
 
-
-/** Load a register that is marked !valid in the register cache */
-static int arm11_get_reg(struct reg *reg)
-{
-	struct target * target = ((struct arm11_reg_state *)reg->arch_info)->target;
-
-	if (target->state != TARGET_HALTED)
-	{
-		LOG_WARNING("target was not halted");
-		return ERROR_TARGET_NOT_HALTED;
-	}
-
-	/** \todo TODO: Check this. We assume that all registers are fetched at debug entry. */
-
-#if 0
-	struct arm11_common *arm11 = target_to_arm11(target);
-	const struct arm11_reg_defs *arm11_reg_info = arm11_reg_defs + ((struct arm11_reg_state *)reg->arch_info)->def_index;
-#endif
-
-	return ERROR_OK;
-}
-
-/** Change a value in the register cache */
-static int arm11_set_reg(struct reg *reg, uint8_t *buf)
-{
-	struct target *target = ((struct arm11_reg_state *)reg->arch_info)->target;
-	struct arm11_common *arm11 = target_to_arm11(target);
-//	const struct arm11_reg_defs *arm11_reg_info = arm11_reg_defs + ((struct arm11_reg_state *)reg->arch_info)->def_index;
-
-	arm11->reg_values[((struct arm11_reg_state *)reg->arch_info)->def_index] = buf_get_u32(buf, 0, 32);
-	reg->valid	= 1;
-	reg->dirty	= 1;
-
-	return ERROR_OK;
-}
-
-static const struct reg_arch_type arm11_reg_type = {
-	.get = arm11_get_reg,
-	.set = arm11_set_reg,
-};
-
-static int arm11_build_reg_cache(struct target *target)
-{
-	struct arm11_common *arm11 = target_to_arm11(target);
-	struct reg_cache *cache;
-	struct reg *reg_list;
-	struct arm11_reg_state *arm11_reg_states;
-
-	cache = calloc(1, sizeof *cache);
-	reg_list = calloc(ARM11_REGCACHE_COUNT, sizeof *reg_list);
-	arm11_reg_states = calloc(ARM11_REGCACHE_COUNT,
-			sizeof *arm11_reg_states);
-	if (!cache || !reg_list || !arm11_reg_states) {
-		free(cache);
-		free(reg_list);
-		free(arm11_reg_states);
-		return ERROR_FAIL;
-	}
-
-	arm11->reg_list	= reg_list;
-
-	/* build cache for some of the debug registers */
-	cache->name = "arm11 debug registers";
-	cache->reg_list	= reg_list;
-	cache->num_regs	= ARM11_REGCACHE_COUNT;
-
-	struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache);
-	(*cache_p) = cache;
-
-	arm11->core_cache = cache;
-
-	size_t i;
-
-	/* Not very elegant assertion */
-	if (ARM11_REGCACHE_COUNT != ARRAY_SIZE(arm11->reg_values) ||
-		ARM11_REGCACHE_COUNT != ARRAY_SIZE(arm11_reg_defs) ||
-		ARM11_REGCACHE_COUNT != ARM11_RC_MAX)
-	{
-		LOG_ERROR("BUG: arm11->reg_values inconsistent (%d %u %u %d)",
-				ARM11_REGCACHE_COUNT,
-				(unsigned) ARRAY_SIZE(arm11->reg_values),
-				(unsigned) ARRAY_SIZE(arm11_reg_defs),
-				ARM11_RC_MAX);
-		/* FIXME minimally, use a build_bug_on(X) mechanism;
-		 * runtime exit() here is bad!
-		 */
-		exit(-1);
-	}
-
-	for (i = 0; i < ARM11_REGCACHE_COUNT; i++)
-	{
-		struct reg *						r	= reg_list			+ i;
-		const struct arm11_reg_defs *	rd	= arm11_reg_defs	+ i;
-		struct arm11_reg_state *			rs	= arm11_reg_states	+ i;
-
-		r->name				= rd->name;
-		r->size				= 32;
-		r->value			= (uint8_t *)(arm11->reg_values + i);
-		r->dirty			= 0;
-		r->valid			= 0;
-		r->type = &arm11_reg_type;
-		r->arch_info		= rs;
-
-		rs->def_index		= i;
-		rs->target			= target;
-	}
-
-	return ERROR_OK;
-}
-
-/* FIXME all these BOOL_WRAPPER things should be modifying
- * per-instance state, not shared state; ditto the vector
- * catch register support.  Scan chains with multiple cores
- * should be able to say "work with this core like this,
- * that core like that".  Example, ARM11 MPCore ...
- */
-
 #define ARM11_BOOL_WRAPPER(name, print_name)	\
-		COMMAND_HANDLER(arm11_handle_bool_##name) \
-		{ \
-			return CALL_COMMAND_HANDLER(handle_command_parse_bool, \
-					&arm11_config_##name, print_name); \
-		}
+	COMMAND_HANDLER(arm11_handle_bool_ ## name) \
+	{ \
+		struct target *target = get_current_target(CMD_CTX); \
+		struct arm11_common *arm11 = target_to_arm11(target); \
+		\
+		return CALL_COMMAND_HANDLER(handle_command_parse_bool, \
+			&arm11->name, print_name); \
+	}
 
 ARM11_BOOL_WRAPPER(memwrite_burst, "memory write burst mode")
 ARM11_BOOL_WRAPPER(memwrite_error_fatal, "fatal error mode for memory writes")
 ARM11_BOOL_WRAPPER(step_irq_enable, "IRQs while stepping")
 ARM11_BOOL_WRAPPER(hardware_step, "hardware single step")
 
+/* REVISIT handle the VCR bits like other ARMs:  use symbols for
+ * input and output values.
+ */
+
 COMMAND_HANDLER(arm11_handle_vcr)
 {
+	struct target *target = get_current_target(CMD_CTX);
+	struct arm11_common *arm11 = target_to_arm11(target);
+
 	switch (CMD_ARGC) {
-	case 0:
-		break;
-	case 1:
-		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], arm11_vcr);
-		break;
-	default:
-		return ERROR_COMMAND_SYNTAX_ERROR;
+		case 0:
+			break;
+		case 1:
+			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], arm11->vcr);
+			break;
+		default:
+			return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	LOG_INFO("VCR 0x%08" PRIx32 "", arm11_vcr);
+	LOG_INFO("VCR 0x%08" PRIx32 "", arm11->vcr);
 	return ERROR_OK;
 }
 
-static const uint32_t arm11_coproc_instruction_limits[] =
-{
-	15,				/* coprocessor */
-	7,				/* opcode 1 */
-	15,				/* CRn */
-	15,				/* CRm */
-	7,				/* opcode 2 */
-	0xFFFFFFFF,		/* value */
+static const struct command_registration arm11_mw_command_handlers[] = {
+	{
+		.name = "burst",
+		.handler = arm11_handle_bool_memwrite_burst,
+		.mode = COMMAND_ANY,
+		.help = "Display or modify flag controlling potentially "
+			"risky fast burst mode (default: enabled)",
+		.usage = "['enable'|'disable']",
+	},
+	{
+		.name = "error_fatal",
+		.handler = arm11_handle_bool_memwrite_error_fatal,
+		.mode = COMMAND_ANY,
+		.help = "Display or modify flag controlling transfer "
+			"termination on transfer errors"
+			" (default: enabled)",
+		.usage = "['enable'|'disable']",
+	},
+	COMMAND_REGISTRATION_DONE
 };
-
-static int arm11_mrc_inner(struct target *target, int cpnum,
-		uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm,
-		uint32_t *value, bool read)
-{
-	int retval;
-	struct arm11_common *arm11 = target_to_arm11(target);
-
-	if (target->state != TARGET_HALTED)
+static const struct command_registration arm11_any_command_handlers[] = {
 	{
-		LOG_ERROR("Target not halted");
-		return ERROR_FAIL;
-	}
-
-	uint32_t instr = 0xEE000010	|
-		(cpnum <<  8) |
-		(op1 << 21) |
-		(CRn << 16) |
-		(CRm <<  0) |
-		(op2 <<  5);
-
-	if (read)
-		instr |= 0x00100000;
-
-	retval = arm11_run_instr_data_prepare(arm11);
-	if (retval != ERROR_OK)
-		return retval;
-
-	if (read)
+		/* "hardware_step" is only here to check if the default
+		 * simulate + breakpoint implementation is broken.
+		 * TEMPORARY! NOT DOCUMENTED! */
+		.name = "hardware_step",
+		.handler = arm11_handle_bool_hardware_step,
+		.mode = COMMAND_ANY,
+		.help = "DEBUG ONLY - Hardware single stepping"
+			" (default: disabled)",
+		.usage = "['enable'|'disable']",
+	},
 	{
-		retval = arm11_run_instr_data_from_core_via_r0(arm11, instr, value);
-		if (retval != ERROR_OK)
-			return retval;
-	}
-	else
+		.name = "memwrite",
+		.mode = COMMAND_ANY,
+		.help = "memwrite command group",
+		.usage = "",
+		.chain = arm11_mw_command_handlers,
+	},
 	{
-		retval = arm11_run_instr_data_to_core_via_r0(arm11, instr, *value);
-		if (retval != ERROR_OK)
-			return retval;
-	}
-
-	return arm11_run_instr_data_finish(arm11);
-}
-
-static int arm11_mrc(struct target *target, int cpnum,
-		uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value)
-{
-	return arm11_mrc_inner(target, cpnum, op1, op2, CRn, CRm, value, true);
-}
-
-static int arm11_mcr(struct target *target, int cpnum,
-		uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value)
-{
-	return arm11_mrc_inner(target, cpnum, op1, op2, CRn, CRm, &value, false);
-}
-
-static int arm11_register_commands(struct command_context *cmd_ctx)
-{
-	struct command *top_cmd, *mw_cmd;
-
-	armv4_5_register_commands(cmd_ctx);
-
-	top_cmd = register_command(cmd_ctx, NULL, "arm11",
-			NULL, COMMAND_ANY, NULL);
+		.name = "step_irq_enable",
+		.handler = arm11_handle_bool_step_irq_enable,
+		.mode = COMMAND_ANY,
+		.help = "Display or modify flag controlling interrupt "
+			"enable while stepping (default: disabled)",
+		.usage = "['enable'|'disable']",
+	},
+	{
+		.name = "vcr",
+		.handler = arm11_handle_vcr,
+		.mode = COMMAND_ANY,
+		.help = "Display or modify Vector Catch Register",
+		.usage = "[value]",
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
-	/* "hardware_step" is only here to check if the default
-	 * simulate + breakpoint implementation is broken.
-	 * TEMPORARY! NOT DOCUMENTED!
-	 */
-	register_command(cmd_ctx, top_cmd, "hardware_step",
-			arm11_handle_bool_hardware_step, COMMAND_ANY,
-			"DEBUG ONLY - Hardware single stepping"
-				" (default: disabled)");
-
-	mw_cmd = register_command(cmd_ctx, top_cmd, "memwrite",
-			NULL, COMMAND_ANY, NULL);
-	register_command(cmd_ctx, mw_cmd, "burst",
-			arm11_handle_bool_memwrite_burst, COMMAND_ANY,
-			"Enable/Disable non-standard but fast burst mode"
-				" (default: enabled)");
-	register_command(cmd_ctx, mw_cmd, "error_fatal",
-			arm11_handle_bool_memwrite_error_fatal, COMMAND_ANY,
-			"Terminate program if transfer error was found"
-				" (default: enabled)");
-
-	register_command(cmd_ctx, top_cmd, "step_irq_enable",
-			arm11_handle_bool_step_irq_enable, COMMAND_ANY,
-			"Enable interrupts while stepping"
-				" (default: disabled)");
-	register_command(cmd_ctx, top_cmd, "vcr",
-			arm11_handle_vcr, COMMAND_ANY,
-			"Control (Interrupt) Vector Catch Register");
-
-	return etm_register_commands(cmd_ctx);
-}
+static const struct command_registration arm11_command_handlers[] = {
+	{
+		.chain = arm_command_handlers,
+	},
+	{
+		.chain = etm_command_handlers,
+	},
+	{
+		.name = "arm11",
+		.mode = COMMAND_ANY,
+		.help = "ARM11 command group",
+		.usage = "",
+		.chain = arm11_any_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
 /** Holds methods for ARM11xx targets. */
 struct target_type arm11_target = {
-	.name =			"arm11",
-
-	.poll =			arm11_poll,
-	.arch_state =		arm11_arch_state,
-
-	.target_request_data =	arm11_target_request_data,
+	.name = "arm11",
 
-	.halt =			arm11_halt,
-	.resume =		arm11_resume,
-	.step =			arm11_step,
+	.poll = arm11_poll,
+	.arch_state = arm11_arch_state,
 
-	.assert_reset =		arm11_assert_reset,
-	.deassert_reset =	arm11_deassert_reset,
-	.soft_reset_halt =	arm11_soft_reset_halt,
+	.target_request_data = arm11_target_request_data,
 
-	.get_gdb_reg_list =	armv4_5_get_gdb_reg_list,
+	.halt = arm11_halt,
+	.resume = arm11_resume,
+	.step = arm11_step,
 
-	.read_memory =		arm11_read_memory,
-	.write_memory =		arm11_write_memory,
+	.assert_reset = arm11_assert_reset,
+	.deassert_reset = arm11_deassert_reset,
+	.soft_reset_halt = arm11_soft_reset_halt,
 
-	.bulk_write_memory =	arm11_bulk_write_memory,
+	.get_gdb_reg_list = arm_get_gdb_reg_list,
 
-	.checksum_memory =	arm_checksum_memory,
-	.blank_check_memory =	arm_blank_check_memory,
+	.read_memory = arm11_read_memory,
+	.write_memory = arm11_write_memory,
 
-	.add_breakpoint =	arm11_add_breakpoint,
-	.remove_breakpoint =	arm11_remove_breakpoint,
-	.add_watchpoint =	arm11_add_watchpoint,
-	.remove_watchpoint =	arm11_remove_watchpoint,
+	.checksum_memory = arm_checksum_memory,
+	.blank_check_memory = arm_blank_check_memory,
 
-	.run_algorithm =	armv4_5_run_algorithm,
+	.add_breakpoint = arm11_add_breakpoint,
+	.remove_breakpoint = arm11_remove_breakpoint,
 
-	.register_commands =	arm11_register_commands,
-	.target_create =	arm11_target_create,
-	.init_target =		arm11_init_target,
-	.examine =		arm11_examine,
+	.run_algorithm = armv4_5_run_algorithm,
 
-	.mrc =			arm11_mrc,
-	.mcr =			arm11_mcr,
+	.commands = arm11_command_handlers,
+	.target_create = arm11_target_create,
+	.init_target = arm11_init_target,
+	.examine = arm11_examine,
 };