jim tests: use installed
[openocd.git] / src / target / target.c
index 67bbcfc..d200ebc 100644 (file)
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007-2010 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008, Duane Ellis                                       *
 #include "config.h"
 #endif
 
+#include <helper/time_support.h>
+#include <jtag/jtag.h>
+#include <flash/nor/core.h>
+
 #include "target.h"
 #include "target_type.h"
 #include "target_request.h"
-#include "time_support.h"
+#include "breakpoints.h"
 #include "register.h"
 #include "trace.h"
 #include "image.h"
-#include "jtag.h"
-
-
-static int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
-static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_soft_reset_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_test_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_bp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_rbp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_rwp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_virt2phys_command(command_context_t *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_fast_load_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
-static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
-static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
-static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
-
-static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv);
-static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv);
+
+
+static int target_array2mem(Jim_Interp *interp, struct target *target,
+               int argc, Jim_Obj *const *argv);
+static int target_mem2array(Jim_Interp *interp, struct target *target,
+               int argc, Jim_Obj *const *argv);
+static int target_register_user_commands(struct command_context *cmd_ctx);
 
 /* targets */
-extern target_type_t arm7tdmi_target;
-extern target_type_t arm720t_target;
-extern target_type_t arm9tdmi_target;
-extern target_type_t arm920t_target;
-extern target_type_t arm966e_target;
-extern target_type_t arm926ejs_target;
-extern target_type_t fa526_target;
-extern target_type_t feroceon_target;
-extern target_type_t xscale_target;
-extern target_type_t cortexm3_target;
-extern target_type_t cortexa8_target;
-extern target_type_t arm11_target;
-extern target_type_t mips_m4k_target;
-extern target_type_t avr_target;
-
-target_type_t *target_types[] =
+extern struct target_type arm7tdmi_target;
+extern struct target_type arm720t_target;
+extern struct target_type arm9tdmi_target;
+extern struct target_type arm920t_target;
+extern struct target_type arm966e_target;
+extern struct target_type arm926ejs_target;
+extern struct target_type fa526_target;
+extern struct target_type feroceon_target;
+extern struct target_type dragonite_target;
+extern struct target_type xscale_target;
+extern struct target_type cortexm3_target;
+extern struct target_type cortexa8_target;
+extern struct target_type arm11_target;
+extern struct target_type mips_m4k_target;
+extern struct target_type avr_target;
+extern struct target_type dsp563xx_target;
+extern struct target_type testee_target;
+extern struct target_type avr32_ap7k_target;
+
+static struct target_type *target_types[] =
 {
        &arm7tdmi_target,
        &arm9tdmi_target,
@@ -101,20 +82,25 @@ target_type_t *target_types[] =
        &arm926ejs_target,
        &fa526_target,
        &feroceon_target,
+       &dragonite_target,
        &xscale_target,
        &cortexm3_target,
        &cortexa8_target,
        &arm11_target,
        &mips_m4k_target,
        &avr_target,
+       &dsp563xx_target,
+       &testee_target,
+       &avr32_ap7k_target,
        NULL,
 };
 
-target_t *all_targets = NULL;
-target_event_callback_t *target_event_callbacks = NULL;
-target_timer_callback_t *target_timer_callbacks = NULL;
+struct target *all_targets = NULL;
+static struct target_event_callback *target_event_callbacks = NULL;
+static struct target_timer_callback *target_timer_callbacks = NULL;
+static const int polling_interval = 100;
 
-const Jim_Nvp nvp_assert[] = {
+static const Jim_Nvp nvp_assert[] = {
        { .name = "assert", NVP_ASSERT },
        { .name = "deassert", NVP_DEASSERT },
        { .name = "T", NVP_ASSERT },
@@ -124,7 +110,7 @@ const Jim_Nvp nvp_assert[] = {
        { .name = NULL, .value = -1 }
 };
 
-const Jim_Nvp nvp_error_target[] = {
+static const Jim_Nvp nvp_error_target[] = {
        { .value = ERROR_TARGET_INVALID, .name = "err-invalid" },
        { .value = ERROR_TARGET_INIT_FAILED, .name = "err-init-failed" },
        { .value = ERROR_TARGET_TIMEOUT, .name = "err-timeout" },
@@ -139,7 +125,7 @@ const Jim_Nvp nvp_error_target[] = {
        { .value = -1, .name = NULL }
 };
 
-const char *target_strerror_safe(int err)
+static const char *target_strerror_safe(int err)
 {
        const Jim_Nvp *n;
 
@@ -155,7 +141,7 @@ static const Jim_Nvp nvp_target_event[] = {
        { .value = TARGET_EVENT_OLD_gdb_program_config , .name = "old-gdb_program_config" },
        { .value = TARGET_EVENT_OLD_pre_resume         , .name = "old-pre_resume" },
 
-       { .value = TARGET_EVENT_EARLY_HALTED, .name = "early-halted" },
+       { .value = TARGET_EVENT_GDB_HALT, .name = "gdb-halt" },
        { .value = TARGET_EVENT_HALTED, .name = "halted" },
        { .value = TARGET_EVENT_RESUMED, .name = "resumed" },
        { .value = TARGET_EVENT_RESUME_START, .name = "resume-start" },
@@ -169,6 +155,7 @@ static const Jim_Nvp nvp_target_event[] = {
        { .value = TARGET_EVENT_RESET_START, .name = "reset-start" },
 
        { .value = TARGET_EVENT_RESET_ASSERT_PRE,    .name = "reset-assert-pre" },
+       { .value = TARGET_EVENT_RESET_ASSERT,        .name = "reset-assert" },
        { .value = TARGET_EVENT_RESET_ASSERT_POST,   .name = "reset-assert-post" },
        { .value = TARGET_EVENT_RESET_DEASSERT_PRE,  .name = "reset-deassert-pre" },
        { .value = TARGET_EVENT_RESET_DEASSERT_POST, .name = "reset-deassert-post" },
@@ -176,8 +163,8 @@ static const Jim_Nvp nvp_target_event[] = {
        { .value = TARGET_EVENT_RESET_HALT_POST,     .name = "reset-halt-post" },
        { .value = TARGET_EVENT_RESET_WAIT_PRE,      .name = "reset-wait-pre" },
        { .value = TARGET_EVENT_RESET_WAIT_POST,     .name = "reset-wait-post" },
-       { .value = TARGET_EVENT_RESET_INIT , .name = "reset-init" },
-       { .value = TARGET_EVENT_RESET_END, .name = "reset-end" },
+       { .value = TARGET_EVENT_RESET_INIT,          .name = "reset-init" },
+       { .value = TARGET_EVENT_RESET_END,           .name = "reset-end" },
 
        { .value = TARGET_EVENT_EXAMINE_START, .name = "examine-start" },
        { .value = TARGET_EVENT_EXAMINE_END, .name = "examine-end" },
@@ -201,7 +188,7 @@ static const Jim_Nvp nvp_target_event[] = {
        { .name = NULL, .value = -1 }
 };
 
-const Jim_Nvp nvp_target_state[] = {
+static const Jim_Nvp nvp_target_state[] = {
        { .name = "unknown", .value = TARGET_UNKNOWN },
        { .name = "running", .value = TARGET_RUNNING },
        { .name = "halted",  .value = TARGET_HALTED },
@@ -210,7 +197,7 @@ const Jim_Nvp nvp_target_state[] = {
        { .name = NULL, .value = -1 },
 };
 
-const Jim_Nvp nvp_target_debug_reason [] = {
+static const Jim_Nvp nvp_target_debug_reason [] = {
        { .name = "debug-request"            , .value = DBG_REASON_DBGRQ },
        { .name = "breakpoint"               , .value = DBG_REASON_BREAKPOINT },
        { .name = "watchpoint"               , .value = DBG_REASON_WATCHPOINT },
@@ -221,7 +208,7 @@ const Jim_Nvp nvp_target_debug_reason [] = {
        { .name = NULL, .value = -1 },
 };
 
-const Jim_Nvp nvp_target_endian[] = {
+static const Jim_Nvp nvp_target_endian[] = {
        { .name = "big",    .value = TARGET_BIG_ENDIAN },
        { .name = "little", .value = TARGET_LITTLE_ENDIAN },
        { .name = "be",     .value = TARGET_BIG_ENDIAN },
@@ -229,7 +216,7 @@ const Jim_Nvp nvp_target_endian[] = {
        { .name = NULL,     .value = -1 },
 };
 
-const Jim_Nvp nvp_reset_modes[] = {
+static const Jim_Nvp nvp_reset_modes[] = {
        { .name = "unknown", .value = RESET_UNKNOWN },
        { .name = "run"    , .value = RESET_RUN },
        { .name = "halt"   , .value = RESET_HALT },
@@ -237,26 +224,35 @@ const Jim_Nvp nvp_reset_modes[] = {
        { .name = NULL     , .value = -1 },
 };
 
-static int max_target_number(void)
+const char *debug_reason_name(struct target *t)
 {
-       target_t *t;
-       int x;
+       const char *cp;
 
-       x = -1;
-       t = all_targets;
-       while (t) {
-               if (x < t->target_number) {
-                       x = (t->target_number) + 1;
-               }
-               t = t->next;
+       cp = Jim_Nvp_value2name_simple(nvp_target_debug_reason,
+                       t->debug_reason)->name;
+       if (!cp) {
+               LOG_ERROR("Invalid debug reason: %d", (int)(t->debug_reason));
+               cp = "(*BUG*unknown*BUG*)";
+       }
+       return cp;
+}
+
+const char *
+target_state_name( struct target *t )
+{
+       const char *cp;
+       cp = Jim_Nvp_value2name_simple(nvp_target_state, t->state)->name;
+       if( !cp ){
+               LOG_ERROR("Invalid target state: %d", (int)(t->state));
+               cp = "(*BUG*unknown*BUG*)";
        }
-       return x;
+       return cp;
 }
 
 /* determine the number of the new target */
 static int new_target_number(void)
 {
-       target_t *t;
+       struct target *t;
        int x;
 
        /* number is 0 based */
@@ -271,10 +267,8 @@ static int new_target_number(void)
        return x + 1;
 }
 
-static int target_continuous_poll = 1;
-
 /* read a uint32_t from a buffer in target memory endianness */
-uint32_t target_buffer_get_u32(target_t *target, const uint8_t *buffer)
+uint32_t target_buffer_get_u32(struct target *target, const uint8_t *buffer)
 {
        if (target->endianness == TARGET_LITTLE_ENDIAN)
                return le_to_h_u32(buffer);
@@ -283,7 +277,7 @@ uint32_t target_buffer_get_u32(target_t *target, const uint8_t *buffer)
 }
 
 /* read a uint16_t from a buffer in target memory endianness */
-uint16_t target_buffer_get_u16(target_t *target, const uint8_t *buffer)
+uint16_t target_buffer_get_u16(struct target *target, const uint8_t *buffer)
 {
        if (target->endianness == TARGET_LITTLE_ENDIAN)
                return le_to_h_u16(buffer);
@@ -292,13 +286,13 @@ uint16_t target_buffer_get_u16(target_t *target, const uint8_t *buffer)
 }
 
 /* read a uint8_t from a buffer in target memory endianness */
-uint8_t target_buffer_get_u8(target_t *target, const uint8_t *buffer)
+static uint8_t target_buffer_get_u8(struct target *target, const uint8_t *buffer)
 {
        return *buffer & 0x0ff;
 }
 
 /* write a uint32_t to a buffer in target memory endianness */
-void target_buffer_set_u32(target_t *target, uint8_t *buffer, uint32_t value)
+void target_buffer_set_u32(struct target *target, uint8_t *buffer, uint32_t value)
 {
        if (target->endianness == TARGET_LITTLE_ENDIAN)
                h_u32_to_le(buffer, value);
@@ -307,7 +301,7 @@ void target_buffer_set_u32(target_t *target, uint8_t *buffer, uint32_t value)
 }
 
 /* write a uint16_t to a buffer in target memory endianness */
-void target_buffer_set_u16(target_t *target, uint8_t *buffer, uint16_t value)
+void target_buffer_set_u16(struct target *target, uint8_t *buffer, uint16_t value)
 {
        if (target->endianness == TARGET_LITTLE_ENDIAN)
                h_u16_to_le(buffer, value);
@@ -316,15 +310,15 @@ void target_buffer_set_u16(target_t *target, uint8_t *buffer, uint16_t value)
 }
 
 /* write a uint8_t to a buffer in target memory endianness */
-void target_buffer_set_u8(target_t *target, uint8_t *buffer, uint8_t value)
+static void target_buffer_set_u8(struct target *target, uint8_t *buffer, uint8_t value)
 {
        *buffer = value;
 }
 
 /* return a pointer to a configured target; id is name or number */
-target_t *get_target(const char *id)
+struct target *get_target(const char *id)
 {
-       target_t *target;
+       struct target *target;
 
        /* try as tcltarget name */
        for (target = all_targets; target; target = target->next) {
@@ -334,23 +328,28 @@ target_t *get_target(const char *id)
                        return target;
        }
 
+       /* It's OK to remove this fallback sometime after August 2010 or so */
+
        /* no match, try as number */
        unsigned num;
        if (parse_uint(id, &num) != ERROR_OK)
                return NULL;
 
        for (target = all_targets; target; target = target->next) {
-               if (target->target_number == (int)num)
+               if (target->target_number == (int)num) {
+                       LOG_WARNING("use '%s' as target identifier, not '%u'",
+                                       target->cmd_name, num);
                        return target;
+               }
        }
 
        return NULL;
 }
 
 /* returns a pointer to the n-th configured target */
-static target_t *get_target_by_num(int num)
+static struct target *get_target_by_num(int num)
 {
-       target_t *target = all_targets;
+       struct target *target = all_targets;
 
        while (target) {
                if (target->target_number == num) {
@@ -362,14 +361,9 @@ static target_t *get_target_by_num(int num)
        return NULL;
 }
 
-int get_num_by_target(target_t *query_target)
-{
-       return query_target->target_number;
-}
-
-target_t* get_current_target(command_context_t *cmd_ctx)
+struct target* get_current_target(struct command_context *cmd_ctx)
 {
-       target_t *target = get_target_by_num(cmd_ctx->current_target);
+       struct target *target = get_target_by_num(cmd_ctx->current_target);
 
        if (target == NULL)
        {
@@ -380,29 +374,92 @@ target_t* get_current_target(command_context_t *cmd_ctx)
        return target;
 }
 
-int target_poll(struct target_s *target)
+int target_poll(struct target *target)
 {
+       int retval;
+
        /* We can't poll until after examine */
        if (!target_was_examined(target))
        {
                /* Fail silently lest we pollute the log */
                return ERROR_FAIL;
        }
-       return target->type->poll(target);
+
+       retval = target->type->poll(target);
+       if (retval != ERROR_OK)
+               return retval;
+
+       if (target->halt_issued)
+       {
+               if (target->state == TARGET_HALTED)
+               {
+                       target->halt_issued = false;
+               } else
+               {
+                       long long t = timeval_ms() - target->halt_issued_time;
+                       if (t>1000)
+                       {
+                               target->halt_issued = false;
+                               LOG_INFO("Halt timed out, wake up GDB.");
+                               target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT);
+                       }
+               }
+       }
+
+       return ERROR_OK;
 }
 
-int target_halt(struct target_s *target)
+int target_halt(struct target *target)
 {
+       int retval;
        /* We can't poll until after examine */
        if (!target_was_examined(target))
        {
                LOG_ERROR("Target not examined yet");
                return ERROR_FAIL;
        }
-       return target->type->halt(target);
+
+       retval = target->type->halt(target);
+       if (retval != ERROR_OK)
+               return retval;
+
+       target->halt_issued = true;
+       target->halt_issued_time = timeval_ms();
+
+       return ERROR_OK;
 }
 
-int target_resume(struct target_s *target, int current, uint32_t address, int handle_breakpoints, int debug_execution)
+/**
+ * Make the target (re)start executing using its saved execution
+ * context (possibly with some modifications).
+ *
+ * @param target Which target should start executing.
+ * @param current True to use the target's saved program counter instead
+ *     of the address parameter
+ * @param address Optionally used as the program counter.
+ * @param handle_breakpoints True iff breakpoints at the resumption PC
+ *     should be skipped.  (For example, maybe execution was stopped by
+ *     such a breakpoint, in which case it would be counterprodutive to
+ *     let it re-trigger.
+ * @param debug_execution False if all working areas allocated by OpenOCD
+ *     should be released and/or restored to their original contents.
+ *     (This would for example be true to run some downloaded "helper"
+ *     algorithm code, which resides in one such working buffer and uses
+ *     another for data storage.)
+ *
+ * @todo Resolve the ambiguity about what the "debug_execution" flag
+ * signifies.  For example, Target implementations don't agree on how
+ * it relates to invalidation of the register cache, or to whether
+ * breakpoints and watchpoints should be enabled.  (It would seem wrong
+ * to enable breakpoints when running downloaded "helper" algorithms
+ * (debug_execution true), since the breakpoints would be set to match
+ * target firmware being debugged, not the helper algorithm.... and
+ * enabling them could cause such helpers to malfunction (for example,
+ * by overwriting data with a breakpoint instruction.  On the other
+ * hand the infrastructure for running such helpers might use this
+ * procedure but rely on hardware breakpoint to detect termination.)
+ */
+int target_resume(struct target *target, int current, uint32_t address, int handle_breakpoints, int debug_execution)
 {
        int retval;
 
@@ -413,9 +470,9 @@ int target_resume(struct target_s *target, int current, uint32_t address, int ha
                return ERROR_FAIL;
        }
 
-       /* note that resume *must* be asynchronous. The CPU can halt before we poll. The CPU can
-        * even halt at the current PC as a result of a software breakpoint being inserted by (a bug?)
-        * the application.
+       /* note that resume *must* be asynchronous. The CPU can halt before
+        * we poll. The CPU can even halt at the current PC as a result of
+        * a software breakpoint being inserted by (a bug?) the application.
         */
        if ((retval = target->type->resume(target, current, address, handle_breakpoints, debug_execution)) != ERROR_OK)
                return retval;
@@ -423,7 +480,7 @@ int target_resume(struct target_s *target, int current, uint32_t address, int ha
        return retval;
 }
 
-int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mode reset_mode)
+static int target_process_reset(struct command_context *cmd_ctx, enum target_reset_mode reset_mode)
 {
        char buf[100];
        int retval;
@@ -438,51 +495,65 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
         * more predictable, i.e. dr/irscan & pathmove in events will
         * not have JTAG operations injected into the middle of a sequence.
         */
-       int save_poll = target_continuous_poll;
-       target_continuous_poll = 0;
+       bool save_poll = jtag_poll_get_enabled();
+
+       jtag_poll_set_enabled(false);
 
        sprintf(buf, "ocd_process_reset %s", n->name);
-       retval = Jim_Eval(interp, buf);
+       retval = Jim_Eval(cmd_ctx->interp, buf);
 
-       target_continuous_poll = save_poll;
+       jtag_poll_set_enabled(save_poll);
 
        if (retval != JIM_OK) {
-               Jim_PrintErrorMessage(interp);
+               Jim_MakeErrorMessage(cmd_ctx->interp);
+               command_print(NULL,"%s\n", Jim_GetString(Jim_GetResult(cmd_ctx->interp), NULL));
                return ERROR_FAIL;
        }
 
        /* We want any events to be processed before the prompt */
        retval = target_call_timer_callbacks_now();
 
+       struct target *target;
+       for (target = all_targets; target; target = target->next) {
+               target->type->check_reset(target);
+       }
+
        return retval;
 }
 
-static int default_virt2phys(struct target_s *target, uint32_t virtual, uint32_t *physical)
+static int identity_virt2phys(struct target *target,
+               uint32_t virtual, uint32_t *physical)
 {
        *physical = virtual;
        return ERROR_OK;
 }
 
-static int default_mmu(struct target_s *target, int *enabled)
+static int no_mmu(struct target *target, int *enabled)
 {
        *enabled = 0;
        return ERROR_OK;
 }
 
-static int default_examine(struct target_s *target)
+static int default_examine(struct target *target)
 {
        target_set_examined(target);
        return ERROR_OK;
 }
 
-int target_examine_one(struct target_s *target)
+/* no check by default */
+static int default_check_reset(struct target *target)
+{
+       return ERROR_OK;
+}
+
+int target_examine_one(struct target *target)
 {
        return target->type->examine(target);
 }
 
 static int jtag_enable_callback(enum jtag_event event, void *priv)
 {
-       target_t *target = priv;
+       struct target *target = priv;
 
        if (event != JTAG_TAP_EVENT_ENABLE || !target->tap->enabled)
                return ERROR_OK;
@@ -500,7 +571,7 @@ static int jtag_enable_callback(enum jtag_event event, void *priv)
 int target_examine(void)
 {
        int retval = ERROR_OK;
-       target_t *target;
+       struct target *target;
 
        for (target = all_targets; target; target = target->next)
        {
@@ -515,12 +586,12 @@ int target_examine(void)
        }
        return retval;
 }
-const char *target_get_name(struct target_s *target)
+const char *target_type_name(struct target *target)
 {
        return target->type->name;
 }
 
-static int target_write_memory_imp(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
+static int target_write_memory_imp(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
        if (!target_was_examined(target))
        {
@@ -530,7 +601,7 @@ static int target_write_memory_imp(struct target_s *target, uint32_t address, ui
        return target->type->write_memory_imp(target, address, size, count, buffer);
 }
 
-static int target_read_memory_imp(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
+static int target_read_memory_imp(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
        if (!target_was_examined(target))
        {
@@ -540,163 +611,288 @@ static int target_read_memory_imp(struct target_s *target, uint32_t address, uin
        return target->type->read_memory_imp(target, address, size, count, buffer);
 }
 
-static int target_soft_reset_halt_imp(struct target_s *target)
+static int target_soft_reset_halt_imp(struct target *target)
 {
        if (!target_was_examined(target))
        {
                LOG_ERROR("Target not examined yet");
                return ERROR_FAIL;
        }
+       if (!target->type->soft_reset_halt_imp) {
+               LOG_ERROR("Target %s does not support soft_reset_halt",
+                               target_name(target));
+               return ERROR_FAIL;
+       }
        return target->type->soft_reset_halt_imp(target);
 }
 
-static int target_run_algorithm_imp(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info)
+/**
+ * Downloads a target-specific native code algorithm to the target,
+ * and executes it.  * Note that some targets may need to set up, enable,
+ * and tear down a breakpoint (hard or * soft) to detect algorithm
+ * termination, while others may support  lower overhead schemes where
+ * soft breakpoints embedded in the algorithm automatically terminate the
+ * algorithm.
+ *
+ * @param target used to run the algorithm
+ * @param arch_info target-specific description of the algorithm.
+ */
+int target_run_algorithm(struct target *target,
+               int num_mem_params, struct mem_param *mem_params,
+               int num_reg_params, struct reg_param *reg_param,
+               uint32_t entry_point, uint32_t exit_point,
+               int timeout_ms, void *arch_info)
 {
+       int retval = ERROR_FAIL;
+
        if (!target_was_examined(target))
        {
                LOG_ERROR("Target not examined yet");
-               return ERROR_FAIL;
+               goto done;
+       }
+       if (!target->type->run_algorithm) {
+               LOG_ERROR("Target type '%s' does not support %s",
+                               target_type_name(target), __func__);
+               goto done;
        }
-       return target->type->run_algorithm_imp(target, num_mem_params, mem_params, num_reg_params, reg_param, entry_point, exit_point, timeout_ms, arch_info);
+
+       target->running_alg = true;
+       retval = target->type->run_algorithm(target,
+                       num_mem_params, mem_params,
+                       num_reg_params, reg_param,
+                       entry_point, exit_point, timeout_ms, arch_info);
+       target->running_alg = false;
+
+done:
+       return retval;
 }
 
-int target_read_memory(struct target_s *target,
+
+int target_read_memory(struct target *target,
                uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
        return target->type->read_memory(target, address, size, count, buffer);
 }
 
-int target_write_memory(struct target_s *target,
+static int target_read_phys_memory(struct target *target,
+               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
+{
+       return target->type->read_phys_memory(target, address, size, count, buffer);
+}
+
+int target_write_memory(struct target *target,
                uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
        return target->type->write_memory(target, address, size, count, buffer);
 }
-int target_bulk_write_memory(struct target_s *target,
+
+static int target_write_phys_memory(struct target *target,
+               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
+{
+       return target->type->write_phys_memory(target, address, size, count, buffer);
+}
+
+int target_bulk_write_memory(struct target *target,
                uint32_t address, uint32_t count, uint8_t *buffer)
 {
        return target->type->bulk_write_memory(target, address, count, buffer);
 }
 
-int target_add_breakpoint(struct target_s *target,
-               struct breakpoint_s *breakpoint)
+int target_add_breakpoint(struct target *target,
+               struct breakpoint *breakpoint)
 {
+       if (target->state != TARGET_HALTED) {
+               LOG_WARNING("target %s is not halted", target->cmd_name);
+               return ERROR_TARGET_NOT_HALTED;
+       }
        return target->type->add_breakpoint(target, breakpoint);
 }
-int target_remove_breakpoint(struct target_s *target,
-               struct breakpoint_s *breakpoint)
+int target_remove_breakpoint(struct target *target,
+               struct breakpoint *breakpoint)
 {
        return target->type->remove_breakpoint(target, breakpoint);
 }
 
-int target_add_watchpoint(struct target_s *target,
-               struct watchpoint_s *watchpoint)
+int target_add_watchpoint(struct target *target,
+               struct watchpoint *watchpoint)
 {
+       if (target->state != TARGET_HALTED) {
+               LOG_WARNING("target %s is not halted", target->cmd_name);
+               return ERROR_TARGET_NOT_HALTED;
+       }
        return target->type->add_watchpoint(target, watchpoint);
 }
-int target_remove_watchpoint(struct target_s *target,
-               struct watchpoint_s *watchpoint)
+int target_remove_watchpoint(struct target *target,
+               struct watchpoint *watchpoint)
 {
        return target->type->remove_watchpoint(target, watchpoint);
 }
 
-int target_get_gdb_reg_list(struct target_s *target,
-               struct reg_s **reg_list[], int *reg_list_size)
+int target_get_gdb_reg_list(struct target *target,
+               struct reg **reg_list[], int *reg_list_size)
 {
        return target->type->get_gdb_reg_list(target, reg_list, reg_list_size);
 }
-int target_step(struct target_s *target,
+int target_step(struct target *target,
                int current, uint32_t address, int handle_breakpoints)
 {
        return target->type->step(target, current, address, handle_breakpoints);
 }
 
 
-int target_run_algorithm(struct target_s *target,
-               int num_mem_params, mem_param_t *mem_params,
-               int num_reg_params, reg_param_t *reg_param,
-               uint32_t entry_point, uint32_t exit_point,
-               int timeout_ms, void *arch_info)
+/**
+ * Reset the @c examined flag for the given target.
+ * Pure paranoia -- targets are zeroed on allocation.
+ */
+static void target_reset_examined(struct target *target)
 {
-       return target->type->run_algorithm(target,
-                       num_mem_params, mem_params, num_reg_params, reg_param,
-                       entry_point, exit_point, timeout_ms, arch_info);
+       target->examined = false;
 }
 
-/// @returns @c true if the target has been examined.
-bool target_was_examined(struct target_s *target)
-{
-       return target->type->examined;
-}
-/// Sets the @c examined flag for the given target.
-void target_set_examined(struct target_s *target)
+static int
+err_read_phys_memory(struct target *target, uint32_t address,
+               uint32_t size, uint32_t count, uint8_t *buffer)
 {
-       target->type->examined = true;
+       LOG_ERROR("Not implemented: %s", __func__);
+       return ERROR_FAIL;
 }
-// Reset the @c examined flag for the given target.
-void target_reset_examined(struct target_s *target)
+
+static int
+err_write_phys_memory(struct target *target, uint32_t address,
+               uint32_t size, uint32_t count, uint8_t *buffer)
 {
-       target->type->examined = false;
+       LOG_ERROR("Not implemented: %s", __func__);
+       return ERROR_FAIL;
 }
 
+static int handle_target(void *priv);
 
-int target_init(struct command_context_s *cmd_ctx)
+static int target_init_one(struct command_context *cmd_ctx,
+               struct target *target)
 {
-       target_t *target = all_targets;
-       int retval;
+       target_reset_examined(target);
 
-       while (target)
+       struct target_type *type = target->type;
+       if (type->examine == NULL)
+               type->examine = default_examine;
+
+       if (type->check_reset== NULL)
+               type->check_reset = default_check_reset;
+
+       int retval = type->init_target(cmd_ctx, target);
+       if (ERROR_OK != retval)
+       {
+               LOG_ERROR("target '%s' init failed", target_name(target));
+               return retval;
+       }
+
+       /**
+        * @todo get rid of those *memory_imp() methods, now that all
+        * callers are using target_*_memory() accessors ... and make
+        * sure the "physical" paths handle the same issues.
+        */
+       /* a non-invasive way(in terms of patches) to add some code that
+        * runs before the type->write/read_memory implementation
+        */
+       type->write_memory_imp = target->type->write_memory;
+       type->write_memory = target_write_memory_imp;
+
+       type->read_memory_imp = target->type->read_memory;
+       type->read_memory = target_read_memory_imp;
+
+       type->soft_reset_halt_imp = target->type->soft_reset_halt;
+       type->soft_reset_halt = target_soft_reset_halt_imp;
+
+       /* Sanity-check MMU support ... stub in what we must, to help
+        * implement it in stages, but warn if we need to do so.
+        */
+       if (type->mmu)
        {
-               target_reset_examined(target);
-               if (target->type->examine == NULL)
+               if (type->write_phys_memory == NULL)
                {
-                       target->type->examine = default_examine;
+                       LOG_ERROR("type '%s' is missing write_phys_memory",
+                                       type->name);
+                       type->write_phys_memory = err_write_phys_memory;
                }
-
-               if ((retval = target->type->init_target(cmd_ctx, target)) != ERROR_OK)
+               if (type->read_phys_memory == NULL)
                {
-                       LOG_ERROR("target '%s' init failed", target_get_name(target));
-                       return retval;
+                       LOG_ERROR("type '%s' is missing read_phys_memory",
+                                       type->name);
+                       type->read_phys_memory = err_read_phys_memory;
                }
-
-               /* Set up default functions if none are provided by target */
-               if (target->type->virt2phys == NULL)
+               if (type->virt2phys == NULL)
                {
-                       target->type->virt2phys = default_virt2phys;
+                       LOG_ERROR("type '%s' is missing virt2phys", type->name);
+                       type->virt2phys = identity_virt2phys;
                }
-               target->type->virt2phys = default_virt2phys;
-               /* a non-invasive way(in terms of patches) to add some code that
-                * runs before the type->write/read_memory implementation
+       }
+       else
+       {
+               /* Make sure no-MMU targets all behave the same:  make no
+                * distinction between physical and virtual addresses, and
+                * ensure that virt2phys() is always an identity mapping.
                 */
-               target->type->write_memory_imp = target->type->write_memory;
-               target->type->write_memory = target_write_memory_imp;
-               target->type->read_memory_imp = target->type->read_memory;
-               target->type->read_memory = target_read_memory_imp;
-               target->type->soft_reset_halt_imp = target->type->soft_reset_halt;
-               target->type->soft_reset_halt = target_soft_reset_halt_imp;
-               target->type->run_algorithm_imp = target->type->run_algorithm;
-               target->type->run_algorithm = target_run_algorithm_imp;
-
-               if (target->type->mmu == NULL)
+               if (type->write_phys_memory || type->read_phys_memory
+                               || type->virt2phys)
                {
-                       target->type->mmu = default_mmu;
+                       LOG_WARNING("type '%s' has bad MMU hooks", type->name);
                }
-               target = target->next;
+
+               type->mmu = no_mmu;
+               type->write_phys_memory = type->write_memory;
+               type->read_phys_memory = type->read_memory;
+               type->virt2phys = identity_virt2phys;
        }
+       return ERROR_OK;
+}
+
+static int target_init(struct command_context *cmd_ctx)
+{
+       struct target *target;
+       int retval;
 
-       if (all_targets)
+       for (target = all_targets; target; target = target->next)
        {
-               if ((retval = target_register_user_commands(cmd_ctx)) != ERROR_OK)
-                       return retval;
-               if ((retval = target_register_timer_callback(handle_target, 100, 1, NULL)) != ERROR_OK)
+               retval = target_init_one(cmd_ctx, target);
+               if (ERROR_OK != retval)
                        return retval;
        }
 
+       if (!all_targets)
+               return ERROR_OK;
+
+       retval = target_register_user_commands(cmd_ctx);
+       if (ERROR_OK != retval)
+               return retval;
+
+       retval = target_register_timer_callback(&handle_target,
+                       polling_interval, 1, cmd_ctx->interp);
+       if (ERROR_OK != retval)
+               return retval;
+
        return ERROR_OK;
 }
 
-int target_register_event_callback(int (*callback)(struct target_s *target, enum target_event event, void *priv), void *priv)
+COMMAND_HANDLER(handle_target_init_command)
+{
+       if (CMD_ARGC != 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       static bool target_initialized = false;
+       if (target_initialized)
+       {
+               LOG_INFO("'target init' has already been called");
+               return ERROR_OK;
+       }
+       target_initialized = true;
+
+       LOG_DEBUG("Initializing targets...");
+       return target_init(CMD_CTX);
+}
+
+int target_register_event_callback(int (*callback)(struct target *target, enum target_event event, void *priv), void *priv)
 {
-       target_event_callback_t **callbacks_p = &target_event_callbacks;
+       struct target_event_callback **callbacks_p = &target_event_callbacks;
 
        if (callback == NULL)
        {
@@ -710,7 +906,7 @@ int target_register_event_callback(int (*callback)(struct target_s *target, enum
                callbacks_p = &((*callbacks_p)->next);
        }
 
-       (*callbacks_p) = malloc(sizeof(target_event_callback_t));
+       (*callbacks_p) = malloc(sizeof(struct target_event_callback));
        (*callbacks_p)->callback = callback;
        (*callbacks_p)->priv = priv;
        (*callbacks_p)->next = NULL;
@@ -720,7 +916,7 @@ int target_register_event_callback(int (*callback)(struct target_s *target, enum
 
 int target_register_timer_callback(int (*callback)(void *priv), int time_ms, int periodic, void *priv)
 {
-       target_timer_callback_t **callbacks_p = &target_timer_callbacks;
+       struct target_timer_callback **callbacks_p = &target_timer_callbacks;
        struct timeval now;
 
        if (callback == NULL)
@@ -735,7 +931,7 @@ int target_register_timer_callback(int (*callback)(void *priv), int time_ms, int
                callbacks_p = &((*callbacks_p)->next);
        }
 
-       (*callbacks_p) = malloc(sizeof(target_timer_callback_t));
+       (*callbacks_p) = malloc(sizeof(struct target_timer_callback));
        (*callbacks_p)->callback = callback;
        (*callbacks_p)->periodic = periodic;
        (*callbacks_p)->time_ms = time_ms;
@@ -756,10 +952,10 @@ int target_register_timer_callback(int (*callback)(void *priv), int time_ms, int
        return ERROR_OK;
 }
 
-int target_unregister_event_callback(int (*callback)(struct target_s *target, enum target_event event, void *priv), void *priv)
+int target_unregister_event_callback(int (*callback)(struct target *target, enum target_event event, void *priv), void *priv)
 {
-       target_event_callback_t **p = &target_event_callbacks;
-       target_event_callback_t *c = target_event_callbacks;
+       struct target_event_callback **p = &target_event_callbacks;
+       struct target_event_callback *c = target_event_callbacks;
 
        if (callback == NULL)
        {
@@ -768,7 +964,7 @@ int target_unregister_event_callback(int (*callback)(struct target_s *target, en
 
        while (c)
        {
-               target_event_callback_t *next = c->next;
+               struct target_event_callback *next = c->next;
                if ((c->callback == callback) && (c->priv == priv))
                {
                        *p = next;
@@ -783,10 +979,10 @@ int target_unregister_event_callback(int (*callback)(struct target_s *target, en
        return ERROR_OK;
 }
 
-int target_unregister_timer_callback(int (*callback)(void *priv), void *priv)
+static int target_unregister_timer_callback(int (*callback)(void *priv), void *priv)
 {
-       target_timer_callback_t **p = &target_timer_callbacks;
-       target_timer_callback_t *c = target_timer_callbacks;
+       struct target_timer_callback **p = &target_timer_callbacks;
+       struct target_timer_callback *c = target_timer_callbacks;
 
        if (callback == NULL)
        {
@@ -795,7 +991,7 @@ int target_unregister_timer_callback(int (*callback)(void *priv), void *priv)
 
        while (c)
        {
-               target_timer_callback_t *next = c->next;
+               struct target_timer_callback *next = c->next;
                if ((c->callback == callback) && (c->priv == priv))
                {
                        *p = next;
@@ -810,15 +1006,15 @@ int target_unregister_timer_callback(int (*callback)(void *priv), void *priv)
        return ERROR_OK;
 }
 
-int target_call_event_callbacks(target_t *target, enum target_event event)
+int target_call_event_callbacks(struct target *target, enum target_event event)
 {
-       target_event_callback_t *callback = target_event_callbacks;
-       target_event_callback_t *next_callback;
+       struct target_event_callback *callback = target_event_callbacks;
+       struct target_event_callback *next_callback;
 
        if (event == TARGET_EVENT_HALTED)
        {
                /* execute early halted first */
-               target_call_event_callbacks(target, TARGET_EVENT_EARLY_HALTED);
+               target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT);
        }
 
        LOG_DEBUG("target event %i (%s)",
@@ -838,7 +1034,7 @@ int target_call_event_callbacks(target_t *target, enum target_event event)
 }
 
 static int target_timer_callback_periodic_restart(
-               target_timer_callback_t *cb, struct timeval *now)
+               struct target_timer_callback *cb, struct timeval *now)
 {
        int time_ms = cb->time_ms;
        cb->when.tv_usec = now->tv_usec + (time_ms % 1000) * 1000;
@@ -852,7 +1048,7 @@ static int target_timer_callback_periodic_restart(
        return ERROR_OK;
 }
 
-static int target_call_timer_callback(target_timer_callback_t *cb,
+static int target_call_timer_callback(struct target_timer_callback *cb,
                struct timeval *now)
 {
        cb->callback(cb->priv);
@@ -870,11 +1066,11 @@ static int target_call_timer_callbacks_check_time(int checktime)
        struct timeval now;
        gettimeofday(&now, NULL);
 
-       target_timer_callback_t *callback = target_timer_callbacks;
+       struct target_timer_callback *callback = target_timer_callbacks;
        while (callback)
        {
                // cleaning up may unregister and free this callback
-               target_timer_callback_t *next_callback = callback->next;
+               struct target_timer_callback *next_callback = callback->next;
 
                bool call_it = callback->callback &&
                        ((!checktime && callback->periodic) ||
@@ -906,28 +1102,45 @@ int target_call_timer_callbacks_now(void)
        return target_call_timer_callbacks_check_time(0);
 }
 
-int target_alloc_working_area(struct target_s *target, uint32_t size, working_area_t **area)
+int target_alloc_working_area_try(struct target *target, uint32_t size, struct working_area **area)
 {
-       working_area_t *c = target->working_areas;
-       working_area_t *new_wa = NULL;
+       struct working_area *c = target->working_areas;
+       struct working_area *new_wa = NULL;
 
        /* Reevaluate working area address based on MMU state*/
        if (target->working_areas == NULL)
        {
                int retval;
                int enabled;
+
                retval = target->type->mmu(target, &enabled);
                if (retval != ERROR_OK)
                {
                        return retval;
                }
-               if (enabled)
-               {
-                       target->working_area = target->working_area_virt;
-               }
-               else
-               {
-                       target->working_area = target->working_area_phys;
+
+               if (!enabled) {
+                       if (target->working_area_phys_spec) {
+                               LOG_DEBUG("MMU disabled, using physical "
+                                       "address for working memory 0x%08x",
+                                       (unsigned)target->working_area_phys);
+                               target->working_area = target->working_area_phys;
+                       } else {
+                               LOG_ERROR("No working memory available. "
+                                       "Specify -work-area-phys to target.");
+                               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+                       }
+               } else {
+                       if (target->working_area_virt_spec) {
+                               LOG_DEBUG("MMU enabled, using virtual "
+                                       "address for working memory 0x%08x",
+                                       (unsigned)target->working_area_virt);
+                               target->working_area = target->working_area_virt;
+                       } else {
+                               LOG_ERROR("No working memory available. "
+                                       "Specify -work-area-virt to target.");
+                               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+                       }
                }
        }
 
@@ -952,12 +1165,10 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar
        /* if not, allocate a new one */
        if (!new_wa)
        {
-               working_area_t **p = &target->working_areas;
+               struct working_area **p = &target->working_areas;
                uint32_t first_free = target->working_area;
                uint32_t free_size = target->working_area_size;
 
-               LOG_DEBUG("allocating new working area");
-
                c = target->working_areas;
                while (c)
                {
@@ -969,12 +1180,12 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar
 
                if (free_size < size)
                {
-                       LOG_WARNING("not enough working area available(requested %u, free %u)", 
-                                   (unsigned)(size), (unsigned)(free_size));
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
                }
 
-               new_wa = malloc(sizeof(working_area_t));
+               LOG_DEBUG("allocated new working area at address 0x%08x", (unsigned)first_free);
+
+               new_wa = malloc(sizeof(struct working_area));
                new_wa->next = NULL;
                new_wa->size = size;
                new_wa->address = first_free;
@@ -1009,7 +1220,20 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar
        return ERROR_OK;
 }
 
-int target_free_working_area_restore(struct target_s *target, working_area_t *area, int restore)
+int target_alloc_working_area(struct target *target, uint32_t size, struct working_area **area)
+{
+       int retval;
+
+       retval = target_alloc_working_area_try(target, size, area);
+       if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
+       {
+               LOG_WARNING("not enough working area available(requested %u)", (unsigned)(size));
+       }
+       return retval;
+
+}
+
+static int target_free_working_area_restore(struct target *target, struct working_area *area, int restore)
 {
        if (area->free)
                return ERROR_OK;
@@ -1030,7 +1254,7 @@ int target_free_working_area_restore(struct target_s *target, working_area_t *ar
        return ERROR_OK;
 }
 
-int target_free_working_area(struct target_s *target, working_area_t *area)
+int target_free_working_area(struct target *target, struct working_area *area)
 {
        return target_free_working_area_restore(target, area, 1);
 }
@@ -1038,13 +1262,13 @@ int target_free_working_area(struct target_s *target, working_area_t *area)
 /* free resources and restore memory, if restoring memory fails,
  * free up resources anyway
  */
-void target_free_all_working_areas_restore(struct target_s *target, int restore)
+static void target_free_all_working_areas_restore(struct target *target, int restore)
 {
-       working_area_t *c = target->working_areas;
+       struct working_area *c = target->working_areas;
 
        while (c)
        {
-               working_area_t *next = c->next;
+               struct working_area *next = c->next;
                target_free_working_area_restore(target, c, restore);
 
                if (c->backup)
@@ -1058,25 +1282,12 @@ void target_free_all_working_areas_restore(struct target_s *target, int restore)
        target->working_areas = NULL;
 }
 
-void target_free_all_working_areas(struct target_s *target)
+void target_free_all_working_areas(struct target *target)
 {
        target_free_all_working_areas_restore(target, 1);
 }
 
-int target_register_commands(struct command_context_s *cmd_ctx)
-{
-
-       register_command(cmd_ctx, NULL, "targets", handle_targets_command, COMMAND_EXEC, "change the current command line target (one parameter) or lists targets (with no parameter)");
-
-
-
-
-       register_jim(cmd_ctx, "target", jim_target, "configure target");
-
-       return ERROR_OK;
-}
-
-int target_arch_state(struct target_s *target)
+int target_arch_state(struct target *target)
 {
        int retval;
        if (target == NULL)
@@ -1085,8 +1296,7 @@ int target_arch_state(struct target_s *target)
                return ERROR_OK;
        }
 
-       LOG_USER("target state: %s",
-                Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name);
+       LOG_USER("target state: %s", target_state_name( target ));
 
        if (target->state != TARGET_HALTED)
                return ERROR_OK;
@@ -1099,10 +1309,10 @@ int target_arch_state(struct target_s *target)
  * mode respectively, otherwise data is handled as quickly as
  * possible
  */
-int target_write_buffer(struct target_s *target, uint32_t address, uint32_t size, uint8_t *buffer)
+int target_write_buffer(struct target *target, uint32_t address, uint32_t size, uint8_t *buffer)
 {
        int retval;
-       LOG_DEBUG("writing buffer of %i byte at 0x%8.8x", 
+       LOG_DEBUG("writing buffer of %i byte at 0x%8.8x",
                  (int)size, (unsigned)address);
 
        if (!target_was_examined(target))
@@ -1118,8 +1328,8 @@ int target_write_buffer(struct target_s *target, uint32_t address, uint32_t size
        if ((address + size - 1) < address)
        {
                /* GDB can request this when e.g. PC is 0xfffffffc*/
-               LOG_ERROR("address + size wrapped(0x%08x, 0x%08x)", 
-                                 (unsigned)address, 
+               LOG_ERROR("address + size wrapped(0x%08x, 0x%08x)",
+                                 (unsigned)address,
                                  (unsigned)size);
                return ERROR_FAIL;
        }
@@ -1181,10 +1391,10 @@ int target_write_buffer(struct target_s *target, uint32_t address, uint32_t size
  * mode respectively, otherwise data is handled as quickly as
  * possible
  */
-int target_read_buffer(struct target_s *target, uint32_t address, uint32_t size, uint8_t *buffer)
+int target_read_buffer(struct target *target, uint32_t address, uint32_t size, uint8_t *buffer)
 {
        int retval;
-       LOG_DEBUG("reading buffer of %i byte at 0x%8.8x", 
+       LOG_DEBUG("reading buffer of %i byte at 0x%8.8x",
                          (int)size, (unsigned)address);
 
        if (!target_was_examined(target))
@@ -1200,8 +1410,8 @@ int target_read_buffer(struct target_s *target, uint32_t address, uint32_t size,
        if ((address + size - 1) < address)
        {
                /* GDB can request this when e.g. PC is 0xfffffffc*/
-               LOG_ERROR("address + size wrapped(0x%08" PRIx32 ", 0x%08" PRIx32 ")", 
-                                 address, 
+               LOG_ERROR("address + size wrapped(0x%08" PRIx32 ", 0x%08" PRIx32 ")",
+                                 address,
                                  size);
                return ERROR_FAIL;
        }
@@ -1240,6 +1450,18 @@ int target_read_buffer(struct target_s *target, uint32_t address, uint32_t size,
                size -= aligned;
        }
 
+       /*prevent byte access when possible (avoid AHB access limitations in some cases)*/
+       if(size >=2)
+       {
+               int aligned = size - (size%2);
+               retval = target_read_memory(target, address, 2, aligned / 2, buffer);
+               if (retval != ERROR_OK)
+                       return retval;
+
+               buffer += aligned;
+               address += aligned;
+               size -= aligned;
+       }
        /* handle tail writes of less than 4 bytes */
        if (size > 0)
        {
@@ -1250,7 +1472,7 @@ int target_read_buffer(struct target_s *target, uint32_t address, uint32_t size,
        return ERROR_OK;
 }
 
-int target_checksum_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t* crc)
+int target_checksum_memory(struct target *target, uint32_t address, uint32_t size, uint32_t* crc)
 {
        uint8_t *buffer;
        int retval;
@@ -1295,7 +1517,7 @@ int target_checksum_memory(struct target_s *target, uint32_t address, uint32_t s
        return retval;
 }
 
-int target_blank_check_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t* blank)
+int target_blank_check_memory(struct target *target, uint32_t address, uint32_t size, uint32_t* blank)
 {
        int retval;
        if (!target_was_examined(target))
@@ -1312,7 +1534,7 @@ int target_blank_check_memory(struct target_s *target, uint32_t address, uint32_
        return retval;
 }
 
-int target_read_u32(struct target_s *target, uint32_t address, uint32_t *value)
+int target_read_u32(struct target *target, uint32_t address, uint32_t *value)
 {
        uint8_t value_buf[4];
        if (!target_was_examined(target))
@@ -1326,21 +1548,21 @@ int target_read_u32(struct target_s *target, uint32_t address, uint32_t *value)
        if (retval == ERROR_OK)
        {
                *value = target_buffer_get_u32(target, value_buf);
-               LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8" PRIx32 "", 
-                                 address, 
+               LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8" PRIx32 "",
+                                 address,
                                  *value);
        }
        else
        {
                *value = 0x0;
-               LOG_DEBUG("address: 0x%8.8" PRIx32 " failed", 
+               LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
                                  address);
        }
 
        return retval;
 }
 
-int target_read_u16(struct target_s *target, uint32_t address, uint16_t *value)
+int target_read_u16(struct target *target, uint32_t address, uint16_t *value)
 {
        uint8_t value_buf[2];
        if (!target_was_examined(target))
@@ -1354,21 +1576,21 @@ int target_read_u16(struct target_s *target, uint32_t address, uint16_t *value)
        if (retval == ERROR_OK)
        {
                *value = target_buffer_get_u16(target, value_buf);
-               LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%4.4x", 
-                                 address, 
+               LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%4.4x",
+                                 address,
                                  *value);
        }
        else
        {
                *value = 0x0;
-               LOG_DEBUG("address: 0x%8.8" PRIx32 " failed", 
+               LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
                                  address);
        }
 
        return retval;
 }
 
-int target_read_u8(struct target_s *target, uint32_t address, uint8_t *value)
+int target_read_u8(struct target *target, uint32_t address, uint8_t *value)
 {
        int retval = target_read_memory(target, address, 1, 1, value);
        if (!target_was_examined(target))
@@ -1379,21 +1601,21 @@ int target_read_u8(struct target_s *target, uint32_t address, uint8_t *value)
 
        if (retval == ERROR_OK)
        {
-               LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%2.2x", 
-                                 address, 
+               LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%2.2x",
+                                 address,
                                  *value);
        }
        else
        {
                *value = 0x0;
-               LOG_DEBUG("address: 0x%8.8" PRIx32 " failed", 
+               LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
                                  address);
        }
 
        return retval;
 }
 
-int target_write_u32(struct target_s *target, uint32_t address, uint32_t value)
+int target_write_u32(struct target *target, uint32_t address, uint32_t value)
 {
        int retval;
        uint8_t value_buf[4];
@@ -1403,8 +1625,8 @@ int target_write_u32(struct target_s *target, uint32_t address, uint32_t value)
                return ERROR_FAIL;
        }
 
-       LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8" PRIx32 "", 
-                         address, 
+       LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8" PRIx32 "",
+                         address,
                          value);
 
        target_buffer_set_u32(target, value_buf, value);
@@ -1416,7 +1638,7 @@ int target_write_u32(struct target_s *target, uint32_t address, uint32_t value)
        return retval;
 }
 
-int target_write_u16(struct target_s *target, uint32_t address, uint16_t value)
+int target_write_u16(struct target *target, uint32_t address, uint16_t value)
 {
        int retval;
        uint8_t value_buf[2];
@@ -1426,8 +1648,8 @@ int target_write_u16(struct target_s *target, uint32_t address, uint16_t value)
                return ERROR_FAIL;
        }
 
-       LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8x", 
-                         address, 
+       LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8x",
+                         address,
                          value);
 
        target_buffer_set_u16(target, value_buf, value);
@@ -1439,7 +1661,7 @@ int target_write_u16(struct target_s *target, uint32_t address, uint16_t value)
        return retval;
 }
 
-int target_write_u8(struct target_s *target, uint32_t address, uint8_t value)
+int target_write_u8(struct target *target, uint32_t address, uint8_t value)
 {
        int retval;
        if (!target_was_examined(target))
@@ -1448,7 +1670,7 @@ int target_write_u8(struct target_s *target, uint32_t address, uint8_t value)
                return ERROR_FAIL;
        }
 
-       LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%2.2x", 
+       LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%2.2x",
                          address, value);
 
        if ((retval = target_write_memory(target, address, 1, 1, &value)) != ERROR_OK)
@@ -1459,105 +1681,51 @@ int target_write_u8(struct target_s *target, uint32_t address, uint8_t value)
        return retval;
 }
 
-int target_register_user_commands(struct command_context_s *cmd_ctx)
-{
-       int retval = ERROR_OK;
-
-
-       /* script procedures */
-       register_command(cmd_ctx, NULL, "profile", handle_profile_command, COMMAND_EXEC, "profiling samples the CPU PC");
-       register_jim(cmd_ctx, "ocd_mem2array", jim_mem2array, "read memory and return as a TCL array for script processing <ARRAYNAME> <WIDTH = 32/16/8> <ADDRESS> <COUNT>");
-       register_jim(cmd_ctx, "ocd_array2mem", jim_array2mem, "convert a TCL array to memory locations and write the values  <ARRAYNAME> <WIDTH = 32/16/8> <ADDRESS> <COUNT>");
-
-       register_command(cmd_ctx, NULL, "fast_load_image", handle_fast_load_image_command, COMMAND_ANY,
-                       "same args as load_image, image stored in memory - mainly for profiling purposes");
-
-       register_command(cmd_ctx, NULL, "fast_load", handle_fast_load_command, COMMAND_ANY,
-                       "loads active fast load image to current target - mainly for profiling purposes");
-
-
-       register_command(cmd_ctx, NULL, "virt2phys", handle_virt2phys_command, COMMAND_ANY, "translate a virtual address into a physical address");
-       register_command(cmd_ctx,  NULL, "reg", handle_reg_command, COMMAND_EXEC, "display or set a register");
-       register_command(cmd_ctx,  NULL, "poll", handle_poll_command, COMMAND_EXEC, "poll target state");
-       register_command(cmd_ctx,  NULL, "wait_halt", handle_wait_halt_command, COMMAND_EXEC, "wait for target halt [time (s)]");
-       register_command(cmd_ctx,  NULL, "halt", handle_halt_command, COMMAND_EXEC, "halt target");
-       register_command(cmd_ctx,  NULL, "resume", handle_resume_command, COMMAND_EXEC, "resume target [addr]");
-       register_command(cmd_ctx,  NULL, "step", handle_step_command, COMMAND_EXEC, "step one instruction from current PC or [addr]");
-       register_command(cmd_ctx,  NULL, "reset", handle_reset_command, COMMAND_EXEC, "reset target [run | halt | init] - default is run");
-       register_command(cmd_ctx,  NULL, "soft_reset_halt", handle_soft_reset_halt_command, COMMAND_EXEC, "halt the target and do a soft reset");
-
-       register_command(cmd_ctx,  NULL, "mdw", handle_md_command, COMMAND_EXEC, "display memory words <addr> [count]");
-       register_command(cmd_ctx,  NULL, "mdh", handle_md_command, COMMAND_EXEC, "display memory half-words <addr> [count]");
-       register_command(cmd_ctx,  NULL, "mdb", handle_md_command, COMMAND_EXEC, "display memory bytes <addr> [count]");
-
-       register_command(cmd_ctx,  NULL, "mww", handle_mw_command, COMMAND_EXEC, "write memory word <addr> <value> [count]");
-       register_command(cmd_ctx,  NULL, "mwh", handle_mw_command, COMMAND_EXEC, "write memory half-word <addr> <value> [count]");
-       register_command(cmd_ctx,  NULL, "mwb", handle_mw_command, COMMAND_EXEC, "write memory byte <addr> <value> [count]");
-
-       register_command(cmd_ctx,  NULL, "bp", handle_bp_command, COMMAND_EXEC, "set breakpoint <address> <length> [hw]");
-       register_command(cmd_ctx,  NULL, "rbp", handle_rbp_command, COMMAND_EXEC, "remove breakpoint <adress>");
-       register_command(cmd_ctx,  NULL, "wp", handle_wp_command, COMMAND_EXEC, "set watchpoint <address> <length> <r/w/a> [value] [mask]");
-       register_command(cmd_ctx,  NULL, "rwp", handle_rwp_command, COMMAND_EXEC, "remove watchpoint <adress>");
-
-       register_command(cmd_ctx,  NULL, "load_image", handle_load_image_command, COMMAND_EXEC, "load_image <file> <address> ['bin'|'ihex'|'elf'|'s19'] [min_address] [max_length]");
-       register_command(cmd_ctx,  NULL, "dump_image", handle_dump_image_command, COMMAND_EXEC, "dump_image <file> <address> <size>");
-       register_command(cmd_ctx,  NULL, "verify_image", handle_verify_image_command, COMMAND_EXEC, "verify_image <file> [offset] [type]");
-       register_command(cmd_ctx,  NULL, "test_image", handle_test_image_command, COMMAND_EXEC, "test_image <file> [offset] [type]");
-
-       if ((retval = target_request_register_commands(cmd_ctx)) != ERROR_OK)
-               return retval;
-       if ((retval = trace_register_commands(cmd_ctx)) != ERROR_OK)
-               return retval;
-
-       return retval;
-}
-
-static int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_targets_command)
 {
-       target_t *target = all_targets;
+       struct target *target = all_targets;
 
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
-               target = get_target(args[0]);
+               target = get_target(CMD_ARGV[0]);
                if (target == NULL) {
-                       command_print(cmd_ctx,"Target: %s is unknown, try one of:\n", args[0]);
+                       command_print(CMD_CTX,"Target: %s is unknown, try one of:\n", CMD_ARGV[0]);
                        goto DumpTargets;
                }
                if (!target->tap->enabled) {
-                       command_print(cmd_ctx,"Target: TAP %s is disabled, "
+                       command_print(CMD_CTX,"Target: TAP %s is disabled, "
                                        "can't be the current target\n",
                                        target->tap->dotted_name);
                        return ERROR_FAIL;
                }
 
-               cmd_ctx->current_target = target->target_number;
+               CMD_CTX->current_target = target->target_number;
                return ERROR_OK;
        }
 DumpTargets:
 
        target = all_targets;
-       command_print(cmd_ctx, "    TargetName         Type       Endian TapName            State       ");
-       command_print(cmd_ctx, "--  ------------------ ---------- ------ ------------------ ------------");
+       command_print(CMD_CTX, "    TargetName         Type       Endian TapName            State       ");
+       command_print(CMD_CTX, "--  ------------------ ---------- ------ ------------------ ------------");
        while (target)
        {
                const char *state;
                char marker = ' ';
 
                if (target->tap->enabled)
-                       state = Jim_Nvp_value2name_simple(nvp_target_state,
-                                       target->state)->name;
+                       state = target_state_name( target );
                else
                        state = "tap-disabled";
 
-               if (cmd_ctx->current_target == target->target_number)
+               if (CMD_CTX->current_target == target->target_number)
                        marker = '*';
 
                /* keep columns lined up to match the headers above */
-               command_print(cmd_ctx, "%2d%c %-18s %-10s %-6s %-18s %s",
+               command_print(CMD_CTX, "%2d%c %-18s %-10s %-6s %-18s %s",
                                          target->target_number,
                                          marker,
-                                         target->cmd_name,
-                                         target_get_name(target),
+                                         target_name(target),
+                                         target_type_name(target),
                                          Jim_Nvp_value2name_simple(nvp_target_endian,
                                                                target->endianness)->name,
                                          target->tap->dotted_name,
@@ -1636,11 +1804,21 @@ static int sense_handler(void)
        return ERROR_OK;
 }
 
+static int backoff_times = 0;
+static int backoff_count = 0;
+
 /* process target state changes */
-int handle_target(void *priv)
+static int handle_target(void *priv)
 {
+       Jim_Interp *interp = (Jim_Interp *)priv;
        int retval = ERROR_OK;
 
+       if (!is_jtag_poll_safe())
+       {
+               /* polling is disabled currently */
+               return ERROR_OK;
+       }
+
        /* we do not want to recurse here... */
        static int recursive = 0;
        if (! recursive)
@@ -1654,6 +1832,7 @@ int handle_target(void *priv)
                int did_something = 0;
                if (runSrstAsserted)
                {
+                       LOG_INFO("srst asserted detected, running srst_asserted proc.");
                        Jim_Eval(interp, "srst_asserted");
                        did_something = 1;
                }
@@ -1664,6 +1843,7 @@ int handle_target(void *priv)
                }
                if (runPowerDropout)
                {
+                       LOG_INFO("Power dropout detected, running power_dropout proc.");
                        Jim_Eval(interp, "power_dropout");
                        did_something = 1;
                }
@@ -1689,11 +1869,19 @@ int handle_target(void *priv)
                recursive = 0;
        }
 
+       if (backoff_times > backoff_count)
+       {
+               /* do not poll this time as we failed previously */
+               backoff_count++;
+               return ERROR_OK;
+       }
+       backoff_count = 0;
+
        /* Poll targets for state changes unless that's globally disabled.
         * Skip targets that are currently disabled.
         */
-       for (target_t *target = all_targets;
-                       target_continuous_poll && target;
+       for (struct target *target = all_targets;
+                       is_jtag_poll_safe() && target;
                        target = target->next)
        {
                if (!target->tap->enabled)
@@ -1704,44 +1892,77 @@ int handle_target(void *priv)
                {
                        /* polling may fail silently until the target has been examined */
                        if ((retval = target_poll(target)) != ERROR_OK)
+                       {
+                               /* 100ms polling interval. Increase interval between polling up to 5000ms */
+                               if (backoff_times * polling_interval < 5000)
+                               {
+                                       backoff_times *= 2;
+                                       backoff_times++;
+                               }
+                               LOG_USER("Polling target failed, GDB will be halted. Polling again in %dms", backoff_times * polling_interval);
+
+                               /* Tell GDB to halt the debugger. This allows the user to
+                                * run monitor commands to handle the situation.
+                                */
+                               target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT);
                                return retval;
+                       }
+                       /* Since we succeeded, we reset backoff count */
+                       if (backoff_times > 0)
+                       {
+                               LOG_USER("Polling succeeded again");
+                       }
+                       backoff_times = 0;
                }
        }
 
        return retval;
 }
 
-static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_reg_command)
 {
-       target_t *target;
-       reg_t *reg = NULL;
-       int count = 0;
+       struct target *target;
+       struct reg *reg = NULL;
+       unsigned count = 0;
        char *value;
 
        LOG_DEBUG("-");
 
-       target = get_current_target(cmd_ctx);
+       target = get_current_target(CMD_CTX);
 
        /* list all available registers for the current target */
-       if (argc == 0)
+       if (CMD_ARGC == 0)
        {
-               reg_cache_t *cache = target->reg_cache;
+               struct reg_cache *cache = target->reg_cache;
 
                count = 0;
                while (cache)
                {
-                       int i;
-                       for (i = 0; i < cache->num_regs; i++)
+                       unsigned i;
+
+                       command_print(CMD_CTX, "===== %s", cache->name);
+
+                       for (i = 0, reg = cache->reg_list;
+                                       i < cache->num_regs;
+                                       i++, reg++, count++)
                        {
-                               value = buf_to_str(cache->reg_list[i].value, cache->reg_list[i].size, 16);
-                               command_print(cmd_ctx, "(%i) %s (/%i): 0x%s (dirty: %i, valid: %i)", 
-                                                         count++, 
-                                                         cache->reg_list[i].name, 
-                                                         (int)(cache->reg_list[i].size),
-                                                         value, 
-                                                         cache->reg_list[i].dirty, 
-                                                         cache->reg_list[i].valid);
-                               free(value);
+                               /* only print cached values if they are valid */
+                               if (reg->valid) {
+                                       value = buf_to_str(reg->value,
+                                                       reg->size, 16);
+                                       command_print(CMD_CTX,
+                                                       "(%i) %s (/%" PRIu32 "): 0x%s%s",
+                                                       count, reg->name,
+                                                       reg->size, value,
+                                                       reg->dirty
+                                                               ? " (dirty)"
+                                                               : "");
+                                       free(value);
+                               } else {
+                                       command_print(CMD_CTX, "(%i) %s (/%" PRIu32 ")",
+                                                         count, reg->name,
+                                                         reg->size) ;
+                               }
                        }
                        cache = cache->next;
                }
@@ -1750,21 +1971,19 @@ static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char
        }
 
        /* access a single register by its ordinal number */
-       if ((args[0][0] >= '0') && (args[0][0] <= '9'))
+       if ((CMD_ARGV[0][0] >= '0') && (CMD_ARGV[0][0] <= '9'))
        {
                unsigned num;
-               int retval = parse_uint(args[0], &num);
-               if (ERROR_OK != retval)
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], num);
 
-               reg_cache_t *cache = target->reg_cache;
+               struct reg_cache *cache = target->reg_cache;
                count = 0;
                while (cache)
                {
-                       int i;
+                       unsigned i;
                        for (i = 0; i < cache->num_regs; i++)
                        {
-                               if (count++ == (int)num)
+                               if (count++ == num)
                                {
                                        reg = &cache->reg_list[i];
                                        break;
@@ -1777,48 +1996,46 @@ static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char
 
                if (!reg)
                {
-                       command_print(cmd_ctx, "%i is out of bounds, the current target has only %i registers (0 - %i)", num, count, count - 1);
+                       command_print(CMD_CTX, "%i is out of bounds, the current target has only %i registers (0 - %i)", num, count, count - 1);
                        return ERROR_OK;
                }
        } else /* access a single register by its name */
        {
-               reg = register_get_by_name(target->reg_cache, args[0], 1);
+               reg = register_get_by_name(target->reg_cache, CMD_ARGV[0], 1);
 
                if (!reg)
                {
-                       command_print(cmd_ctx, "register %s not found in current target", args[0]);
+                       command_print(CMD_CTX, "register %s not found in current target", CMD_ARGV[0]);
                        return ERROR_OK;
                }
        }
 
        /* display a register */
-       if ((argc == 1) || ((argc == 2) && !((args[1][0] >= '0') && (args[1][0] <= '9'))))
+       if ((CMD_ARGC == 1) || ((CMD_ARGC == 2) && !((CMD_ARGV[1][0] >= '0') && (CMD_ARGV[1][0] <= '9'))))
        {
-               if ((argc == 2) && (strcmp(args[1], "force") == 0))
+               if ((CMD_ARGC == 2) && (strcmp(CMD_ARGV[1], "force") == 0))
                        reg->valid = 0;
 
                if (reg->valid == 0)
                {
-                       reg_arch_type_t *arch_type = register_get_arch_type(reg->arch_type);
-                       arch_type->get(reg);
+                       reg->type->get(reg);
                }
                value = buf_to_str(reg->value, reg->size, 16);
-               command_print(cmd_ctx, "%s (/%i): 0x%s", reg->name, (int)(reg->size), value);
+               command_print(CMD_CTX, "%s (/%i): 0x%s", reg->name, (int)(reg->size), value);
                free(value);
                return ERROR_OK;
        }
 
        /* set register value */
-       if (argc == 2)
+       if (CMD_ARGC == 2)
        {
-               uint8_t *buf = malloc(CEIL(reg->size, 8));
-               str_to_buf(args[1], strlen(args[1]), buf, reg->size, 0);
+               uint8_t *buf = malloc(DIV_ROUND_UP(reg->size, 8));
+               str_to_buf(CMD_ARGV[1], strlen(CMD_ARGV[1]), buf, reg->size, 0);
 
-               reg_arch_type_t *arch_type = register_get_arch_type(reg->arch_type);
-               arch_type->set(reg, buf);
+               reg->type->set(reg, buf);
 
                value = buf_to_str(reg->value, reg->size, 16);
-               command_print(cmd_ctx, "%s (/%i): 0x%s", reg->name, (int)(reg->size), value);
+               command_print(CMD_CTX, "%s (/%i): 0x%s", reg->name, (int)(reg->size), value);
                free(value);
 
                free(buf);
@@ -1826,21 +2043,21 @@ static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char
                return ERROR_OK;
        }
 
-       command_print(cmd_ctx, "usage: reg <#|name> [value]");
+       command_print(CMD_CTX, "usage: reg <#|name> [value]");
 
        return ERROR_OK;
 }
 
-static int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_poll_command)
 {
        int retval = ERROR_OK;
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
 
-       if (argc == 0)
+       if (CMD_ARGC == 0)
        {
-               command_print(cmd_ctx, "background polling: %s",
-                               target_continuous_poll ?  "on" : "off");
-               command_print(cmd_ctx, "TAP: %s (%s)",
+               command_print(CMD_CTX, "background polling: %s",
+                               jtag_poll_get_enabled() ? "on" : "off");
+               command_print(CMD_CTX, "TAP: %s (%s)",
                                target->tap->dotted_name,
                                target->tap->enabled ? "enabled" : "disabled");
                if (!target->tap->enabled)
@@ -1849,23 +2066,14 @@ static int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, cha
                        return retval;
                if ((retval = target_arch_state(target)) != ERROR_OK)
                        return retval;
-
        }
-       else if (argc == 1)
+       else if (CMD_ARGC == 1)
        {
-               if (strcmp(args[0], "on") == 0)
-               {
-                       target_continuous_poll = 1;
-               }
-               else if (strcmp(args[0], "off") == 0)
-               {
-                       target_continuous_poll = 0;
-               }
-               else
-               {
-                       command_print(cmd_ctx, "arg is \"on\" or \"off\"");
-               }
-       } else
+               bool enable;
+               COMMAND_PARSE_ON_OFF(CMD_ARGV[0], enable);
+               jtag_poll_set_enabled(enable);
+       }
+       else
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -1873,25 +2081,25 @@ static int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, cha
        return retval;
 }
 
-static int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_wait_halt_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        unsigned ms = 5000;
-       if (1 == argc)
+       if (1 == CMD_ARGC)
        {
-               int retval = parse_uint(args[0], &ms);
+               int retval = parse_uint(CMD_ARGV[0], &ms);
                if (ERROR_OK != retval)
                {
-                       command_print(cmd_ctx, "usage: %s [seconds]", cmd);
+                       command_print(CMD_CTX, "usage: %s [seconds]", CMD_NAME);
                        return ERROR_COMMAND_SYNTAX_ERROR;
                }
                // convert seconds (given) to milliseconds (needed)
                ms *= 1000;
        }
 
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        return target_wait_state(target, TARGET_HALTED, ms);
 }
 
@@ -1901,7 +2109,7 @@ static int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd
  *
  * After 500ms, keep_alive() is invoked
  */
-int target_wait_state(target_t *target, enum target_state state, int ms)
+int target_wait_state(struct target *target, enum target_state state, int ms)
 {
        int retval;
        long long then = 0, cur;
@@ -1940,31 +2148,31 @@ int target_wait_state(target_t *target, enum target_state state, int ms)
        return ERROR_OK;
 }
 
-static int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_halt_command)
 {
        LOG_DEBUG("-");
 
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        int retval = target_halt(target);
        if (ERROR_OK != retval)
                return retval;
 
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
-               unsigned wait;
-               retval = parse_uint(args[0], &wait);
+               unsigned wait_local;
+               retval = parse_uint(CMD_ARGV[0], &wait_local);
                if (ERROR_OK != retval)
                        return ERROR_COMMAND_SYNTAX_ERROR;
-               if (!wait)
+               if (!wait_local)
                        return ERROR_OK;
        }
 
-       return handle_wait_halt_command(cmd_ctx, cmd, args, argc);
+       return CALL_COMMAND_HANDLER(handle_wait_halt_command);
 }
 
-static int handle_soft_reset_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_soft_reset_halt_command)
 {
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
 
        LOG_USER("requesting target halt and executing a soft reset");
 
@@ -1973,16 +2181,16 @@ static int handle_soft_reset_halt_command(struct command_context_s *cmd_ctx, cha
        return ERROR_OK;
 }
 
-static int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_reset_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        enum target_reset_mode reset_mode = RESET_RUN;
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
                const Jim_Nvp *n;
-               n = Jim_Nvp_name2value_simple(nvp_reset_modes, args[0]);
+               n = Jim_Nvp_name2value_simple(nvp_reset_modes, CMD_ARGV[0]);
                if ((n->name == NULL) || (n->value == RESET_UNKNOWN)) {
                        return ERROR_COMMAND_SYNTAX_ERROR;
                }
@@ -1990,58 +2198,57 @@ static int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, ch
        }
 
        /* reset *all* targets */
-       return target_process_reset(cmd_ctx, reset_mode);
+       return target_process_reset(CMD_CTX, reset_mode);
 }
 
 
-static int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_resume_command)
 {
        int current = 1;
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        target_handle_event(target, TARGET_EVENT_OLD_pre_resume);
 
-       /* with no args, resume from current pc, addr = 0,
-        * with one arguments, addr = args[0],
+       /* with no CMD_ARGV, resume from current pc, addr = 0,
+        * with one arguments, addr = CMD_ARGV[0],
         * handle breakpoints, not debugging */
        uint32_t addr = 0;
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
-               int retval = parse_u32(args[0], &addr);
-               if (ERROR_OK != retval)
-                       return retval;
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
                current = 0;
        }
 
        return target_resume(target, current, addr, 1, 0);
 }
 
-static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_step_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        LOG_DEBUG("-");
 
-       /* with no args, step from current pc, addr = 0,
-        * with one argument addr = args[0],
+       /* with no CMD_ARGV, step from current pc, addr = 0,
+        * with one argument addr = CMD_ARGV[0],
         * handle breakpoints, debugging */
        uint32_t addr = 0;
-       if (argc == 1)
+       int current_pc = 1;
+       if (CMD_ARGC == 1)
        {
-               int retval = parse_u32(args[0], &addr);
-               if (ERROR_OK != retval)
-                       return retval;
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
+               current_pc = 0;
        }
 
-       target_t *target = get_current_target(cmd_ctx);
-       return target->type->step(target, 0, addr, 1);
+       struct target *target = get_current_target(CMD_CTX);
+
+       return target->type->step(target, current_pc, addr, 1);
 }
 
-static void handle_md_output(struct command_context_s *cmd_ctx,
-               struct target_s *target, uint32_t address, unsigned size,
+static void handle_md_output(struct command_context *cmd_ctx,
+               struct target *target, uint32_t address, unsigned size,
                unsigned count, const uint8_t *buffer)
 {
        const unsigned line_bytecnt = 32;
@@ -2053,11 +2260,12 @@ static void handle_md_output(struct command_context_s *cmd_ctx,
        const char *value_fmt;
        switch (size) {
        case 4: value_fmt = "%8.8x "; break;
-       case 2: value_fmt = "%4.2x "; break;
+       case 2: value_fmt = "%4.4x "; break;
        case 1: value_fmt = "%2.2x "; break;
        default:
+               /* "can't happen", caller checked */
                LOG_ERROR("invalid memory read size: %u", size);
-               exit(-1);
+               return;
        }
 
        for (unsigned i = 0; i < count; i++)
@@ -2066,7 +2274,7 @@ static void handle_md_output(struct command_context_s *cmd_ctx,
                {
                        output_len += snprintf(output + output_len,
                                        sizeof(output) - output_len,
-                                       "0x%8.8x: ", 
+                                       "0x%8.8x: ",
                                        (unsigned)(address + (i*size)));
                }
 
@@ -2089,115 +2297,187 @@ static void handle_md_output(struct command_context_s *cmd_ctx,
        }
 }
 
-static int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_md_command)
 {
-       if (argc < 1)
+       if (CMD_ARGC < 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        unsigned size = 0;
-       switch (cmd[2]) {
+       switch (CMD_NAME[2]) {
        case 'w': size = 4; break;
        case 'h': size = 2; break;
        case 'b': size = 1; break;
        default: return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       uint32_t address;
-       int retval = parse_u32(args[0], &address);
-       if (ERROR_OK != retval)
-               return retval;
-
-       unsigned count = 1;
-       if (argc == 2)
+       bool physical=strcmp(CMD_ARGV[0], "phys")==0;
+       int (*fn)(struct target *target,
+                       uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+       if (physical)
        {
-               retval = parse_uint(args[1], &count);
-               if (ERROR_OK != retval)
-                       return retval;
+               CMD_ARGC--;
+               CMD_ARGV++;
+               fn=target_read_phys_memory;
+       } else
+       {
+               fn=target_read_memory;
+       }
+       if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
+       {
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       uint8_t *buffer = calloc(count, size);
+       uint32_t address;
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
+
+       unsigned count = 1;
+       if (CMD_ARGC == 2)
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[1], count);
+
+       uint8_t *buffer = calloc(count, size);
 
-       target_t *target = get_current_target(cmd_ctx);
-       retval = target_read_memory(target,
-                               address, size, count, buffer);
+       struct target *target = get_current_target(CMD_CTX);
+       int retval = fn(target, address, size, count, buffer);
        if (ERROR_OK == retval)
-               handle_md_output(cmd_ctx, target, address, size, count, buffer);
+               handle_md_output(CMD_CTX, target, address, size, count, buffer);
 
        free(buffer);
 
        return retval;
 }
 
-static int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+typedef int (*target_write_fn)(struct target *target,
+               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+
+static int target_write_memory_fast(struct target *target,
+               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
+{
+       return target_write_buffer(target, address, size * count, buffer);
+}
+
+static int target_fill_mem(struct target *target,
+               uint32_t address,
+               target_write_fn fn,
+               unsigned data_size,
+               /* value */
+               uint32_t b,
+               /* count */
+               unsigned c)
+{
+       /* We have to write in reasonably large chunks to be able
+        * to fill large memory areas with any sane speed */
+       const unsigned chunk_size = 16384;
+       uint8_t *target_buf = malloc(chunk_size * data_size);
+       if (target_buf == NULL)
+       {
+               LOG_ERROR("Out of memory");
+               return ERROR_FAIL;
+       }
+
+       for (unsigned i = 0; i < chunk_size; i ++)
+       {
+               switch (data_size)
+               {
+               case 4:
+                       target_buffer_set_u32(target, target_buf + i*data_size, b);
+                       break;
+               case 2:
+                       target_buffer_set_u16(target, target_buf + i*data_size, b);
+                       break;
+               case 1:
+                       target_buffer_set_u8(target, target_buf + i*data_size, b);
+                       break;
+               default:
+                       exit(-1);
+               }
+       }
+
+       int retval = ERROR_OK;
+
+       for (unsigned x = 0; x < c; x += chunk_size)
+       {
+               unsigned current;
+               current = c - x;
+               if (current > chunk_size)
+               {
+                       current = chunk_size;
+               }
+               retval = fn(target, address + x * data_size, data_size, current, target_buf);
+               if (retval != ERROR_OK)
+               {
+                       break;
+               }
+               /* avoid GDB timeouts */
+               keep_alive();
+       }
+       free(target_buf);
+
+       return retval;
+}
+
+
+COMMAND_HANDLER(handle_mw_command)
 {
-        if ((argc < 2) || (argc > 3))
+       if (CMD_ARGC < 2)
+       {
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
+       bool physical=strcmp(CMD_ARGV[0], "phys")==0;
+       target_write_fn fn;
+       if (physical)
+       {
+               CMD_ARGC--;
+               CMD_ARGV++;
+               fn=target_write_phys_memory;
+       } else
+       {
+               fn = target_write_memory_fast;
+       }
+       if ((CMD_ARGC < 2) || (CMD_ARGC > 3))
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        uint32_t address;
-       int retval = parse_u32(args[0], &address);
-       if (ERROR_OK != retval)
-               return retval;
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
 
        uint32_t value;
-       retval = parse_u32(args[1], &value);
-       if (ERROR_OK != retval)
-               return retval;
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
 
        unsigned count = 1;
-       if (argc == 3)
-       {
-               retval = parse_uint(args[2], &count);
-               if (ERROR_OK != retval)
-                       return retval;
-       }
+       if (CMD_ARGC == 3)
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[2], count);
 
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        unsigned wordsize;
-       uint8_t value_buf[4];
-       switch (cmd[2])
+       switch (CMD_NAME[2])
        {
                case 'w':
                        wordsize = 4;
-                       target_buffer_set_u32(target, value_buf, value);
                        break;
                case 'h':
                        wordsize = 2;
-                       target_buffer_set_u16(target, value_buf, value);
                        break;
                case 'b':
                        wordsize = 1;
-                       value_buf[0] = value;
                        break;
                default:
                        return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       for (unsigned i = 0; i < count; i++)
-       {
-               retval = target_write_memory(target,
-                               address + i * wordsize, wordsize, 1, value_buf);
-               if (ERROR_OK != retval)
-                       return retval;
-               keep_alive();
-       }
-
-       return ERROR_OK;
 
+       return target_fill_mem(target, address, fn, wordsize, value, count);
 }
 
-static int parse_load_image_command_args(char **args, int argc,
-               image_t *image, uint32_t *min_address, uint32_t *max_address)
+static COMMAND_HELPER(parse_load_image_command_CMD_ARGV, struct image *image,
+               uint32_t *min_address, uint32_t *max_address)
 {
-       if (argc < 1 || argc > 5)
+       if (CMD_ARGC < 1 || CMD_ARGC > 5)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        /* a base address isn't always necessary,
         * default to 0x0 (i.e. don't relocate) */
-       if (argc >= 2)
+       if (CMD_ARGC >= 2)
        {
                uint32_t addr;
-               int retval = parse_u32(args[1], &addr);
-               if (ERROR_OK != retval)
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], addr);
                image->base_address = addr;
                image->base_address_set = 1;
        }
@@ -2206,17 +2486,13 @@ static int parse_load_image_command_args(char **args, int argc,
 
        image->start_address_set = 0;
 
-       if (argc >= 4)
+       if (CMD_ARGC >= 4)
        {
-               int retval = parse_u32(args[3], min_address);
-               if (ERROR_OK != retval)
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], *min_address);
        }
-       if (argc == 5)
+       if (CMD_ARGC == 5)
        {
-               int retval = parse_u32(args[4], max_address);
-               if (ERROR_OK != retval)
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[4], *max_address);
                // use size (given) to find max (required)
                *max_address += *min_address;
        }
@@ -2227,30 +2503,27 @@ static int parse_load_image_command_args(char **args, int argc,
        return ERROR_OK;
 }
 
-static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_load_image_command)
 {
        uint8_t *buffer;
-       uint32_t buf_cnt;
+       size_t buf_cnt;
        uint32_t image_size;
        uint32_t min_address = 0;
        uint32_t max_address = 0xffffffff;
        int i;
-       int retvaltemp;
+       struct image image;
 
-       image_t image;
-
-       duration_t duration;
-       char *duration_text;
-       
-       int retval = parse_load_image_command_args(args, argc,
+       int retval = CALL_COMMAND_HANDLER(parse_load_image_command_CMD_ARGV,
                        &image, &min_address, &max_address);
        if (ERROR_OK != retval)
                return retval;
 
-       target_t *target = get_current_target(cmd_ctx);
-       duration_start_measure(&duration);
+       struct target *target = get_current_target(CMD_CTX);
+
+       struct duration bench;
+       duration_start(&bench);
 
-       if (image_open(&image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK)
+       if (image_open(&image, CMD_ARGV[0], (CMD_ARGC >= 3) ? CMD_ARGV[2] : NULL) != ERROR_OK)
        {
                return ERROR_OK;
        }
@@ -2262,8 +2535,8 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm
                buffer = malloc(image.sections[i].size);
                if (buffer == NULL)
                {
-                       command_print(cmd_ctx, 
-                                                 "error allocating buffer for section (%d bytes)", 
+                       command_print(CMD_CTX,
+                                                 "error allocating buffer for section (%d bytes)",
                                                  (int)(image.sections[i].size));
                        break;
                }
@@ -2300,27 +2573,20 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm
                                break;
                        }
                        image_size += length;
-                       command_print(cmd_ctx, "%u byte written at address 0x%8.8" PRIx32 "", 
-                                                 (unsigned int)length, 
+                       command_print(CMD_CTX, "%u bytes written at address 0x%8.8" PRIx32 "",
+                                                 (unsigned int)length,
                                                  image.sections[i].base_address + offset);
                }
 
                free(buffer);
        }
 
-       if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+       if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
        {
-               image_close(&image);
-               return retvaltemp;
-       }
-
-       if (retval == ERROR_OK)
-       {
-               command_print(cmd_ctx, "downloaded %u byte in %s", 
-                                         (unsigned int)image_size, 
-                                         duration_text);
+               command_print(CMD_CTX, "downloaded %" PRIu32 " bytes "
+                               "in %fs (%0.3f KiB/s)", image_size,
+                               duration_elapsed(&bench), duration_kbps(&bench, image_size));
        }
-       free(duration_text);
 
        image_close(&image);
 
@@ -2328,46 +2594,32 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm
 
 }
 
-static int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_dump_image_command)
 {
-       fileio_t fileio;
-
+       struct fileio fileio;
        uint8_t buffer[560];
-       int retvaltemp;
-
-       duration_t duration;
-       char *duration_text;
-
-       target_t *target = get_current_target(cmd_ctx);
+       int retval, retvaltemp;
+       uint32_t address, size;
+       struct duration bench;
+       struct target *target = get_current_target(CMD_CTX);
 
-       if (argc != 3)
-       {
-               command_print(cmd_ctx, "usage: dump_image <filename> <address> <size>");
-               return ERROR_OK;
-       }
+       if (CMD_ARGC != 3)
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
-       uint32_t address;
-       int retval = parse_u32(args[1], &address);
-       if (ERROR_OK != retval)
-               return retval;
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], address);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], size);
 
-       uint32_t size;
-       retval = parse_u32(args[2], &size);
-       if (ERROR_OK != retval)
+       retval = fileio_open(&fileio, CMD_ARGV[0], FILEIO_WRITE, FILEIO_BINARY);
+       if (retval != ERROR_OK)
                return retval;
 
-       if (fileio_open(&fileio, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
-       {
-               return ERROR_OK;
-       }
-
-       duration_start_measure(&duration);
+       duration_start(&bench);
 
+       retval = ERROR_OK;
        while (size > 0)
        {
-               uint32_t size_written;
+               size_t size_written;
                uint32_t this_run_size = (size > 560) ? 560 : size;
-
                retval = target_read_buffer(target, address, this_run_size, buffer);
                if (retval != ERROR_OK)
                {
@@ -2384,40 +2636,38 @@ static int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cm
                address += this_run_size;
        }
 
-       if ((retvaltemp = fileio_close(&fileio)) != ERROR_OK)
-               return retvaltemp;
-
-       if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
-               return retvaltemp;
-
-       if (retval == ERROR_OK)
+       if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
        {
-               command_print(cmd_ctx, "dumped %lld byte in %s",
-                               fileio.size, duration_text);
-               free(duration_text);
+               int filesize;
+               retval = fileio_size(&fileio, &filesize);
+               if (retval != ERROR_OK)
+                       return retval;
+               command_print(CMD_CTX,
+                               "dumped %ld bytes in %fs (%0.3f KiB/s)", (long)filesize,
+                               duration_elapsed(&bench), duration_kbps(&bench, filesize));
        }
 
+       if ((retvaltemp = fileio_close(&fileio)) != ERROR_OK)
+               return retvaltemp;
+
        return retval;
 }
 
-static int handle_verify_image_command_internal(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, int verify)
+static COMMAND_HELPER(handle_verify_image_command_internal, int verify)
 {
        uint8_t *buffer;
-       uint32_t buf_cnt;
+       size_t buf_cnt;
        uint32_t image_size;
        int i;
-       int retval, retvaltemp;
+       int retval;
        uint32_t checksum = 0;
        uint32_t mem_checksum = 0;
 
-       image_t image;
+       struct image image;
 
-       duration_t duration;
-       char *duration_text;
+       struct target *target = get_current_target(CMD_CTX);
 
-       target_t *target = get_current_target(cmd_ctx);
-
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -2428,14 +2678,13 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
                return ERROR_FAIL;
        }
 
-       duration_start_measure(&duration);
+       struct duration bench;
+       duration_start(&bench);
 
-       if (argc >= 2)
+       if (CMD_ARGC >= 2)
        {
                uint32_t addr;
-               retval = parse_u32(args[1], &addr);
-               if (ERROR_OK != retval)
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], addr);
                image.base_address = addr;
                image.base_address_set = 1;
        }
@@ -2447,20 +2696,21 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
 
        image.start_address_set = 0;
 
-       if ((retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL)) != ERROR_OK)
+       if ((retval = image_open(&image, CMD_ARGV[0], (CMD_ARGC == 3) ? CMD_ARGV[2] : NULL)) != ERROR_OK)
        {
                return retval;
        }
 
        image_size = 0x0;
+       int diffs = 0;
        retval = ERROR_OK;
        for (i = 0; i < image.num_sections; i++)
        {
                buffer = malloc(image.sections[i].size);
                if (buffer == NULL)
                {
-                       command_print(cmd_ctx, 
-                                                 "error allocating buffer for section (%d bytes)", 
+                       command_print(CMD_CTX,
+                                                 "error allocating buffer for section (%d bytes)",
                                                  (int)(image.sections[i].size));
                        break;
                }
@@ -2473,7 +2723,12 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
                if (verify)
                {
                        /* calculate checksum of image */
-                       image_calculate_checksum(buffer, buf_cnt, &checksum);
+                       retval = image_calculate_checksum(buffer, buf_cnt, &checksum);
+                       if (retval != ERROR_OK)
+                       {
+                               free(buffer);
+                               break;
+                       }
 
                        retval = target_checksum_memory(target, image.sections[i].base_address, buf_cnt, &mem_checksum);
                        if (retval != ERROR_OK)
@@ -2487,7 +2742,10 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
                                /* failed crc checksum, fall back to a binary compare */
                                uint8_t *data;
 
-                               command_print(cmd_ctx, "checksum mismatch - attempting binary compare");
+                               if (diffs == 0)
+                               {
+                                       LOG_ERROR("checksum mismatch - attempting binary compare");
+                               }
 
                                data = (uint8_t*)malloc(buf_cnt);
 
@@ -2507,70 +2765,70 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
                                        {
                                                if (data[t] != buffer[t])
                                                {
-                                                       command_print(cmd_ctx, 
-                                                                                 "Verify operation failed address 0x%08x. Was 0x%02x instead of 0x%02x\n", 
-                                                                                 (unsigned)(t + image.sections[i].base_address), 
-                                                                                 data[t], 
+                                                       command_print(CMD_CTX,
+                                                                                 "diff %d address 0x%08x. Was 0x%02x instead of 0x%02x",
+                                                                                 diffs,
+                                                                                 (unsigned)(t + image.sections[i].base_address),
+                                                                                 data[t],
                                                                                  buffer[t]);
-                                                       free(data);
-                                                       free(buffer);
-                                                       retval = ERROR_FAIL;
-                                                       goto done;
-                                               }
-                                               if ((t%16384) == 0)
-                                               {
-                                                       keep_alive();
+                                                       if (diffs++ >= 127)
+                                                       {
+                                                               command_print(CMD_CTX, "More than 128 errors, the rest are not printed.");
+                                                               free(data);
+                                                               free(buffer);
+                                                               goto done;
+                                                       }
                                                }
+                                               keep_alive();
                                        }
                                }
-
                                free(data);
                        }
                } else
                {
-                       command_print(cmd_ctx, "address 0x%08" PRIx32 " length 0x%08" PRIx32 "", 
-                                                 image.sections[i].base_address, 
+                       command_print(CMD_CTX, "address 0x%08" PRIx32 " length 0x%08zx",
+                                                 image.sections[i].base_address,
                                                  buf_cnt);
                }
 
                free(buffer);
                image_size += buf_cnt;
        }
+       if (diffs > 0)
+       {
+               command_print(CMD_CTX, "No more differences found.");
+       }
 done:
-
-       if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+       if (diffs > 0)
        {
-               image_close(&image);
-               return retvaltemp;
+               retval = ERROR_FAIL;
        }
-
-       if (retval == ERROR_OK)
+       if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
        {
-               command_print(cmd_ctx, "verified %u bytes in %s", 
-                                         (unsigned int)image_size, 
-                                         duration_text);
+               command_print(CMD_CTX, "verified %" PRIu32 " bytes "
+                               "in %fs (%0.3f KiB/s)", image_size,
+                               duration_elapsed(&bench), duration_kbps(&bench, image_size));
        }
-       free(duration_text);
 
        image_close(&image);
 
        return retval;
 }
 
-static int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_verify_image_command)
 {
-       return handle_verify_image_command_internal(cmd_ctx, cmd, args, argc, 1);
+       return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, 1);
 }
 
-static int handle_test_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_test_image_command)
 {
-       return handle_verify_image_command_internal(cmd_ctx, cmd, args, argc, 0);
+       return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, 0);
 }
 
-static int handle_bp_command_list(struct command_context_s *cmd_ctx)
+static int handle_bp_command_list(struct command_context *cmd_ctx)
 {
-       target_t *target = get_current_target(cmd_ctx);
-       breakpoint_t *breakpoint = target->breakpoints;
+       struct target *target = get_current_target(cmd_ctx);
+       struct breakpoint *breakpoint = target->breakpoints;
        while (breakpoint)
        {
                if (breakpoint->type == BKPT_SOFT)
@@ -2578,7 +2836,7 @@ static int handle_bp_command_list(struct command_context_s *cmd_ctx)
                        char* buf = buf_to_str(breakpoint->orig_instr,
                                        breakpoint->length, 16);
                        command_print(cmd_ctx, "0x%8.8" PRIx32 ", 0x%x, %i, 0x%s",
-                                       breakpoint->address, 
+                                       breakpoint->address,
                                        breakpoint->length,
                                        breakpoint->set, buf);
                        free(buf);
@@ -2586,7 +2844,7 @@ static int handle_bp_command_list(struct command_context_s *cmd_ctx)
                else
                {
                        command_print(cmd_ctx, "0x%8.8" PRIx32 ", 0x%x, %i",
-                                                 breakpoint->address, 
+                                                 breakpoint->address,
                                                  breakpoint->length, breakpoint->set);
                }
 
@@ -2595,10 +2853,10 @@ static int handle_bp_command_list(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-static int handle_bp_command_set(struct command_context_s *cmd_ctx,
+static int handle_bp_command_set(struct command_context *cmd_ctx,
                uint32_t addr, uint32_t length, int hw)
 {
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(cmd_ctx);
        int retval = breakpoint_add(target, addr, length, hw);
        if (ERROR_OK == retval)
                command_print(cmd_ctx, "breakpoint set at 0x%8.8" PRIx32 "", addr);
@@ -2607,73 +2865,67 @@ static int handle_bp_command_set(struct command_context_s *cmd_ctx,
        return retval;
 }
 
-static int handle_bp_command(struct command_context_s *cmd_ctx,
-               char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_bp_command)
 {
-       if (argc == 0)
-               return handle_bp_command_list(cmd_ctx);
+       if (CMD_ARGC == 0)
+               return handle_bp_command_list(CMD_CTX);
 
-       if (argc < 2 || argc > 3)
+       if (CMD_ARGC < 2 || CMD_ARGC > 3)
        {
-               command_print(cmd_ctx, "usage: bp <address> <length> ['hw']");
+               command_print(CMD_CTX, "usage: bp <address> <length> ['hw']");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        uint32_t addr;
-       int retval = parse_u32(args[0], &addr);
-       if (ERROR_OK != retval)
-               return retval;
-
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
        uint32_t length;
-       retval = parse_u32(args[1], &length);
-       if (ERROR_OK != retval)
-               return retval;
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], length);
 
        int hw = BKPT_SOFT;
-       if (argc == 3)
+       if (CMD_ARGC == 3)
        {
-               if (strcmp(args[2], "hw") == 0)
+               if (strcmp(CMD_ARGV[2], "hw") == 0)
                        hw = BKPT_HARD;
                else
                        return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       return handle_bp_command_set(cmd_ctx, addr, length, hw);
+       return handle_bp_command_set(CMD_CTX, addr, length, hw);
 }
 
-static int handle_rbp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_rbp_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        uint32_t addr;
-       int retval = parse_u32(args[0], &addr);
-       if (ERROR_OK != retval)
-               return retval;
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
 
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        breakpoint_remove(target, addr);
 
        return ERROR_OK;
 }
 
-static int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_wp_command)
 {
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
 
-       if (argc == 0)
+       if (CMD_ARGC == 0)
        {
-               watchpoint_t *watchpoint = target->watchpoints;
+               struct watchpoint *watchpoint = target->watchpoints;
 
                while (watchpoint)
                {
-                       command_print(cmd_ctx, 
-                                                 "address: 0x%8.8" PRIx32 ", len: 0x%8.8x, r/w/a: %i, value: 0x%8.8" PRIx32 ", mask: 0x%8.8" PRIx32 "", 
-                                                 watchpoint->address, 
-                                                 watchpoint->length,
-                                                 (int)(watchpoint->rw),
-                                                 watchpoint->value,
-                                                 watchpoint->mask);
+                       command_print(CMD_CTX, "address: 0x%8.8" PRIx32
+                                       ", len: 0x%8.8" PRIx32
+                                       ", r/w/a: %i, value: 0x%8.8" PRIx32
+                                       ", mask: 0x%8.8" PRIx32,
+                                       watchpoint->address,
+                                       watchpoint->length,
+                                       (int)watchpoint->rw,
+                                       watchpoint->value,
+                                       watchpoint->mask);
                        watchpoint = watchpoint->next;
                }
                return ERROR_OK;
@@ -2684,22 +2936,17 @@ static int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char
        uint32_t length = 0;
        uint32_t data_value = 0x0;
        uint32_t data_mask = 0xffffffff;
-       int retval;
 
-       switch (argc)
+       switch (CMD_ARGC)
        {
        case 5:
-               retval = parse_u32(args[4], &data_mask);
-               if (ERROR_OK != retval)
-                       return retval;
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[4], data_mask);
                // fall through
        case 4:
-               retval = parse_u32(args[3], &data_value);
-               if (ERROR_OK != retval)
-                       return retval;
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], data_value);
                // fall through
        case 3:
-               switch (args[2][0])
+               switch (CMD_ARGV[2][0])
                {
                case 'r':
                        type = WPT_READ;
@@ -2711,25 +2958,22 @@ static int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char
                        type = WPT_ACCESS;
                        break;
                default:
-                       LOG_ERROR("invalid watchpoint mode ('%c')", args[2][0]);
+                       LOG_ERROR("invalid watchpoint mode ('%c')", CMD_ARGV[2][0]);
                        return ERROR_COMMAND_SYNTAX_ERROR;
                }
                // fall through
        case 2:
-               retval = parse_u32(args[1], &length);
-               if (ERROR_OK != retval)
-                       return retval;
-               retval = parse_u32(args[0], &addr);
-               if (ERROR_OK != retval)
-                       return retval;
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], length);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
                break;
 
        default:
-               command_print(cmd_ctx, "usage: wp <address> <length> [r/w/a] [value] [mask]");
+               command_print(CMD_CTX, "usage: wp [address length "
+                               "[(r|w|a) [value [mask]]]]");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       retval = watchpoint_add(target, addr, length, type,
+       int retval = watchpoint_add(target, addr, length, type,
                        data_value, data_mask);
        if (ERROR_OK != retval)
                LOG_ERROR("Failure setting watchpoints");
@@ -2737,17 +2981,15 @@ static int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char
        return retval;
 }
 
-static int handle_rwp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_rwp_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        uint32_t addr;
-       int retval = parse_u32(args[0], &addr);
-       if (ERROR_OK != retval)
-               return retval;
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
 
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        watchpoint_remove(target, addr);
 
        return ERROR_OK;
@@ -2760,22 +3002,19 @@ static int handle_rwp_command(struct command_context_s *cmd_ctx, char *cmd, char
  * The low-level target implementation must have logged a detailed error
  * which is forwarded to telnet/GDB session.
  */
-static int handle_virt2phys_command(command_context_t *cmd_ctx,
-               char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_virt2phys_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        uint32_t va;
-       int retval = parse_u32(args[0], &va);
-       if (ERROR_OK != retval)
-               return retval;
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], va);
        uint32_t pa;
 
-       target_t *target = get_current_target(cmd_ctx);
-       retval = target->type->virt2phys(target, va, &pa);
+       struct target *target = get_current_target(CMD_CTX);
+       int retval = target->type->virt2phys(target, va, &pa);
        if (retval == ERROR_OK)
-               command_print(cmd_ctx, "Physical address 0x%08" PRIx32 "", pa);
+               command_print(CMD_CTX, "Physical address 0x%08" PRIx32 "", pa);
 
        return retval;
 }
@@ -2804,7 +3043,7 @@ static void writeString(FILE *f, char *s)
 }
 
 /* Dump a gmon.out histogram file. */
-static void writeGmon(uint32_t *samples, uint32_t sampleNum, char *filename)
+static void writeGmon(uint32_t *samples, uint32_t sampleNum, const char *filename)
 {
        uint32_t i;
        FILE *f = fopen(filename, "w");
@@ -2855,8 +3094,8 @@ static void writeGmon(uint32_t *samples, uint32_t sampleNum, char *filename)
                long long a = address-min;
                long long b = length-1;
                long long c = addressSpace-1;
-               int index = (a*b)/c; /* danger!!!! int32 overflows */
-               buckets[index]++;
+               int index_t = (a*b)/c; /* danger!!!! int32 overflows */
+               buckets[index_t]++;
        }
 
        /* append binary memory gmon.out &profile_hist_hdr ((char*)&profile_hist_hdr + sizeof(struct gmon_hist_hdr)) */
@@ -2896,25 +3135,30 @@ static void writeGmon(uint32_t *samples, uint32_t sampleNum, char *filename)
        fclose(f);
 }
 
-/* profiling samples the CPU PC as quickly as OpenOCD is able, which will be used as a random sampling of PC */
-static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+/* profiling samples the CPU PC as quickly as OpenOCD is able,
+ * which will be used as a random sampling of PC */
+COMMAND_HANDLER(handle_profile_command)
 {
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        struct timeval timeout, now;
 
        gettimeofday(&timeout, NULL);
-       if (argc != 2)
+       if (CMD_ARGC != 2)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
        unsigned offset;
-       int retval = parse_uint(args[0], &offset);
-       if (ERROR_OK != retval)
-               return retval;
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], offset);
 
        timeval_add_time(&timeout, offset, 0);
 
-       command_print(cmd_ctx, "Starting profiling. Halting and resuming the target as often as we can...");
+       /**
+        * @todo: Some cores let us sample the PC without the
+        * annoying halt/resume step; for example, ARMv7 PCSR.
+        * Provide a way to use that more efficient mechanism.
+        */
+
+       command_print(CMD_CTX, "Starting profiling. Halting and resuming the target as often as we can...");
 
        static const int maxSample = 10000;
        uint32_t *samples = malloc(sizeof(uint32_t)*maxSample);
@@ -2923,10 +3167,11 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
 
        int numSamples = 0;
        /* hopefully it is safe to cache! We want to stop/restart as quickly as possible. */
-       reg_t *reg = register_get_by_name(target->reg_cache, "pc", 1);
+       struct reg *reg = register_get_by_name(target->reg_cache, "pc", 1);
 
        for (;;)
        {
+               int retval;
                target_poll(target);
                if (target->state == TARGET_HALTED)
                {
@@ -2945,7 +3190,7 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
                        }
                } else
                {
-                       command_print(cmd_ctx, "Target not halted or running");
+                       command_print(CMD_CTX, "Target not halted or running");
                        retval = ERROR_OK;
                        break;
                }
@@ -2957,7 +3202,7 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
                gettimeofday(&now, NULL);
                if ((numSamples >= maxSample) || ((now.tv_sec >= timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec)))
                {
-                       command_print(cmd_ctx, "Profiling completed. %d samples.", numSamples);
+                       command_print(CMD_CTX, "Profiling completed. %d samples.", numSamples);
                        if ((retval = target_poll(target)) != ERROR_OK)
                        {
                                free(samples);
@@ -2972,8 +3217,8 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
                                free(samples);
                                return retval;
                        }
-                       writeGmon(samples, numSamples, args[1]);
-                       command_print(cmd_ctx, "Wrote %s", args[1]);
+                       writeGmon(samples, numSamples, CMD_ARGV[1]);
+                       command_print(CMD_CTX, "Wrote %s", CMD_ARGV[1]);
                        break;
                }
        }
@@ -3012,15 +3257,12 @@ static int new_int_array_element(Jim_Interp * interp, const char *varname, int i
 
 static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-       command_context_t *context;
-       target_t *target;
+       struct command_context *context;
+       struct target *target;
+
+       context = current_command_context(interp);
+       assert (context != NULL);
 
-       context = Jim_GetAssocData(interp, "context");
-       if (context == NULL)
-       {
-               LOG_ERROR("mem2array: no command context");
-               return JIM_ERR;
-       }
        target = get_current_target(context);
        if (target == NULL)
        {
@@ -3031,7 +3273,7 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        return  target_mem2array(interp, target, argc-1, argv + 1);
 }
 
-static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv)
+static int target_mem2array(Jim_Interp *interp, struct target *target, int argc, Jim_Obj *const *argv)
 {
        long l;
        uint32_t width;
@@ -3040,7 +3282,6 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_
        uint32_t count;
        uint32_t v;
        const char *varname;
-       uint8_t buffer[4096];
        int  n, e, retval;
        uint32_t i;
 
@@ -3111,8 +3352,8 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_
        } else {
                char buf[100];
                Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
-               sprintf(buf, "mem2array address: 0x%08" PRIx32 " is not aligned for %" PRId32 " byte reads", 
-                               addr, 
+               sprintf(buf, "mem2array address: 0x%08" PRIx32 " is not aligned for %" PRId32 " byte reads",
+                               addr,
                                width);
                Jim_AppendStrings(interp, Jim_GetResult(interp), buf , NULL);
                return JIM_ERR;
@@ -3122,22 +3363,28 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_
 
        /* index counter */
        n = 0;
+
+       size_t buffersize = 4096;
+       uint8_t *buffer = malloc(buffersize);
+       if (buffer == NULL)
+               return JIM_ERR;
+
        /* assume ok */
        e = JIM_OK;
        while (len) {
                /* Slurp... in buffer size chunks */
 
                count = len; /* in objects.. */
-               if (count > (sizeof(buffer)/width)) {
-                       count = (sizeof(buffer)/width);
+               if (count > (buffersize/width)) {
+                       count = (buffersize/width);
                }
 
                retval = target_read_memory(target, addr, width, count, buffer);
                if (retval != ERROR_OK) {
                        /* BOO !*/
-                       LOG_ERROR("mem2array: Read @ 0x%08x, w=%d, cnt=%d, failed", 
-                                         (unsigned int)addr, 
-                                         (int)width, 
+                       LOG_ERROR("mem2array: Read @ 0x%08x, w=%d, cnt=%d, failed",
+                                         (unsigned int)addr,
+                                         (int)width,
                                          (int)count);
                        Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
                        Jim_AppendStrings(interp, Jim_GetResult(interp), "mem2array: cannot read memory", NULL);
@@ -3163,6 +3410,8 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_
                }
        }
 
+       free(buffer);
+
        Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
 
        return JIM_OK;
@@ -3201,14 +3450,12 @@ static int get_int_array_element(Jim_Interp * interp, const char *varname, int i
 
 static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-       command_context_t *context;
-       target_t *target;
+       struct command_context *context;
+       struct target *target;
+
+       context = current_command_context(interp);
+       assert (context != NULL);
 
-       context = Jim_GetAssocData(interp, "context");
-       if (context == NULL) {
-               LOG_ERROR("array2mem: no command context");
-               return JIM_ERR;
-       }
        target = get_current_target(context);
        if (target == NULL) {
                LOG_ERROR("array2mem: no current target");
@@ -3218,7 +3465,8 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        return target_array2mem(interp,target, argc-1, argv + 1);
 }
 
-static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv)
+static int target_array2mem(Jim_Interp *interp, struct target *target,
+               int argc, Jim_Obj *const *argv)
 {
        long l;
        uint32_t width;
@@ -3227,7 +3475,6 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
        uint32_t count;
        uint32_t v;
        const char *varname;
-       uint8_t buffer[4096];
        int  n, e, retval;
        uint32_t i;
 
@@ -3237,7 +3484,7 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
         * argv[4] = count to write
         */
        if (argc != 4) {
-               Jim_WrongNumArgs(interp, 1, argv, "varname width addr nelems");
+               Jim_WrongNumArgs(interp, 0, argv, "varname width addr nelems");
                return JIM_ERR;
        }
        varname = Jim_GetString(argv[0], &len);
@@ -3298,8 +3545,8 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
        } else {
                char buf[100];
                Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
-               sprintf(buf, "array2mem address: 0x%08x is not aligned for %d byte reads", 
-                               (unsigned int)addr, 
+               sprintf(buf, "array2mem address: 0x%08x is not aligned for %d byte reads",
+                               (unsigned int)addr,
                                (int)width);
                Jim_AppendStrings(interp, Jim_GetResult(interp), buf , NULL);
                return JIM_ERR;
@@ -3311,12 +3558,18 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
        n = 0;
        /* assume ok */
        e = JIM_OK;
+
+       size_t buffersize = 4096;
+       uint8_t *buffer = malloc(buffersize);
+       if (buffer == NULL)
+               return JIM_ERR;
+
        while (len) {
                /* Slurp... in buffer size chunks */
 
                count = len; /* in objects.. */
-               if (count > (sizeof(buffer)/width)) {
-                       count = (sizeof(buffer)/width);
+               if (count > (buffersize/width)) {
+                       count = (buffersize/width);
                }
 
                v = 0; /* shut up gcc */
@@ -3339,9 +3592,9 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
                retval = target_write_memory(target, addr, width, count, buffer);
                if (retval != ERROR_OK) {
                        /* BOO !*/
-                       LOG_ERROR("array2mem: Write @ 0x%08x, w=%d, cnt=%d, failed", 
-                                         (unsigned int)addr, 
-                                         (int)width, 
+                       LOG_ERROR("array2mem: Write @ 0x%08x, w=%d, cnt=%d, failed",
+                                         (unsigned int)addr,
+                                         (int)width,
                                          (int)count);
                        Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
                        Jim_AppendStrings(interp, Jim_GetResult(interp), "array2mem: cannot read memory", NULL);
@@ -3350,56 +3603,50 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
                }
        }
 
+       free(buffer);
+
        Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
 
        return JIM_OK;
 }
 
-void target_all_handle_event(enum target_event e)
-{
-       target_t *target;
-
-       LOG_DEBUG("**all*targets: event: %d, %s",
-                          (int)e,
-                          Jim_Nvp_value2name_simple(nvp_target_event, e)->name);
-
-       target = all_targets;
-       while (target) {
-               target_handle_event(target, e);
-               target = target->next;
-       }
-}
-
-void target_handle_event(target_t *target, enum target_event e)
+/* FIX? should we propagate errors here rather than printing them
+ * and continuing?
+ */
+void target_handle_event(struct target *target, enum target_event e)
 {
-       target_event_action_t *teap;
-       int done;
+       struct target_event_action *teap;
 
-       teap = target->event_action;
-
-       done = 0;
-       while (teap) {
+       for (teap = target->event_action; teap != NULL; teap = teap->next) {
                if (teap->event == e) {
-                       done = 1;
-                       LOG_DEBUG("target: (%d) %s (%s) event: %d (%s) action: %s\n",
+                       LOG_DEBUG("target: (%d) %s (%s) event: %d (%s) action: %s",
                                           target->target_number,
-                                          target->cmd_name,
-                                          target_get_name(target),
+                                          target_name(target),
+                                          target_type_name(target),
                                           e,
                                           Jim_Nvp_value2name_simple(nvp_target_event, e)->name,
                                           Jim_GetString(teap->body, NULL));
-                       if (Jim_EvalObj(interp, teap->body) != JIM_OK)
+                       if (Jim_EvalObj(teap->interp, teap->body) != JIM_OK)
                        {
-                               Jim_PrintErrorMessage(interp);
+                               Jim_MakeErrorMessage(teap->interp);
+                               command_print(NULL,"%s\n", Jim_GetString(Jim_GetResult(teap->interp), NULL));
                        }
                }
-               teap = teap->next;
        }
-       if (!done) {
-               LOG_DEBUG("event: %d %s - no action",
-                                  e,
-                                  Jim_Nvp_value2name_simple(nvp_target_event, e)->name);
+}
+
+/**
+ * Returns true only if the target has a handler for the specified event.
+ */
+bool target_has_event_action(struct target *target, enum target_event event)
+{
+       struct target_event_action *teap;
+
+       for (teap = target->event_action; teap != NULL; teap = teap->next) {
+               if (teap->event == event)
+                       return true;
        }
+       return false;
 }
 
 enum target_cfg_param {
@@ -3428,7 +3675,7 @@ static Jim_Nvp nvp_config_opts[] = {
        { .name = NULL, .value = -1 }
 };
 
-static int target_configure(Jim_GetOptInfo *goi, target_t *target)
+static int target_configure(Jim_GetOptInfo *goi, struct target *target)
 {
        Jim_Nvp *n;
        Jim_Obj *o;
@@ -3464,16 +3711,20 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                case TCFG_TYPE:
                        /* not setable */
                        if (goi->isconfigure) {
-                               Jim_SetResult_sprintf(goi->interp, "not setable: %s", n->name);
+                               Jim_SetResultFormatted(goi->interp,
+                                               "not settable: %s", n->name);
                                return JIM_ERR;
                        } else {
                        no_params:
                                if (goi->argc != 0) {
-                                       Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "NO PARAMS");
+                                       Jim_WrongNumArgs(goi->interp,
+                                                       goi->argc, goi->argv,
+                                                       "NO PARAMS");
                                        return JIM_ERR;
                                }
                        }
-                       Jim_SetResultString(goi->interp, target_get_name(target), -1);
+                       Jim_SetResultString(goi->interp,
+                                       target_type_name(target), -1);
                        /* loop for more */
                        break;
                case TCFG_EVENT:
@@ -3501,7 +3752,7 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                        }
 
                        {
-                               target_event_action_t *teap;
+                               struct target_event_action *teap;
 
                                teap = target->event_action;
                                /* replace existing? */
@@ -3513,14 +3764,17 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                                }
 
                                if (goi->isconfigure) {
+                                       bool replace = true;
                                        if (teap == NULL) {
                                                /* create new */
                                                teap = calloc(1, sizeof(*teap));
+                                               replace = false;
                                        }
                                        teap->event = n->value;
+                                       teap->interp = goi->interp;
                                        Jim_GetOpt_Obj(goi, &o);
                                        if (teap->body) {
-                                               Jim_DecrRefCount(interp, teap->body);
+                                               Jim_DecrRefCount(teap->interp, teap->body);
                                        }
                                        teap->body  = Jim_DuplicateObj(goi->interp, o);
                                        /*
@@ -3535,9 +3789,12 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                                         */
                                        Jim_IncrRefCount(teap->body);
 
-                                       /* add to head of event list */
-                                       teap->next = target->event_action;
-                                       target->event_action = teap;
+                                       if (!replace)
+                                       {
+                                               /* add to head of event list */
+                                               teap->next = target->event_action;
+                                               target->event_action = teap;
+                                       }
                                        Jim_SetEmptyResult(goi->interp);
                                } else {
                                        /* get */
@@ -3559,12 +3816,13 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                                        return e;
                                }
                                target->working_area_virt = w;
+                               target->working_area_virt_spec = true;
                        } else {
                                if (goi->argc != 0) {
                                        goto no_params;
                                }
                        }
-                       Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_virt));
+                       Jim_SetResult(goi->interp, Jim_NewIntObj(goi->interp, target->working_area_virt));
                        /* loop for more */
                        break;
 
@@ -3576,12 +3834,13 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                                        return e;
                                }
                                target->working_area_phys = w;
+                               target->working_area_phys_spec = true;
                        } else {
                                if (goi->argc != 0) {
                                        goto no_params;
                                }
                        }
-                       Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_phys));
+                       Jim_SetResult(goi->interp, Jim_NewIntObj(goi->interp, target->working_area_phys));
                        /* loop for more */
                        break;
 
@@ -3598,7 +3857,7 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                                        goto no_params;
                                }
                        }
-                       Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_size));
+                       Jim_SetResult(goi->interp, Jim_NewIntObj(goi->interp, target->working_area_size));
                        /* loop for more */
                        break;
 
@@ -3616,7 +3875,7 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                                        goto no_params;
                                }
                        }
-                       Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->backup_working_area));
+                       Jim_SetResult(goi->interp, Jim_NewIntObj(goi->interp, target->backup_working_area));
                        /* loop for more e*/
                        break;
 
@@ -3645,7 +3904,7 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                case TCFG_VARIANT:
                        if (goi->isconfigure) {
                                if (goi->argc < 1) {
-                                       Jim_SetResult_sprintf(goi->interp,
+                                       Jim_SetResultFormatted(goi->interp,
                                                                                   "%s ?STRING?",
                                                                                   n->name);
                                        return JIM_ERR;
@@ -3665,14 +3924,14 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                        break;
                case TCFG_CHAIN_POSITION:
                        if (goi->isconfigure) {
-                               Jim_Obj *o;
-                               jtag_tap_t *tap;
+                               Jim_Obj *o_t;
+                               struct jtag_tap *tap;
                                target_free_all_working_areas(target);
-                               e = Jim_GetOpt_Obj(goi, &o);
+                               e = Jim_GetOpt_Obj(goi, &o_t);
                                if (e != JIM_OK) {
                                        return e;
                                }
-                               tap = jtag_tap_by_jim_obj(goi->interp, o);
+                               tap = jtag_tap_by_jim_obj(goi->interp, o_t);
                                if (tap == NULL) {
                                        return JIM_ERR;
                                }
@@ -3683,7 +3942,7 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                                        goto no_params;
                                }
                        }
-                       Jim_SetResultString(interp, target->tap->dotted_name, -1);
+                       Jim_SetResultString(goi->interp, target->tap->dotted_name, -1);
                        /* loop for more e*/
                        break;
                }
@@ -3694,413 +3953,621 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
        return JIM_OK;
 }
 
-/** this is the 'tcl' handler for the target specific command */
-static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+static int
+jim_target_configure(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
        Jim_GetOptInfo goi;
-       jim_wide a,b,c;
-       int x,y,z;
-       uint8_t  target_buf[32];
-       Jim_Nvp *n;
-       target_t *target;
-       struct command_context_s *cmd_ctx;
-       int e;
 
-       enum {
-               TS_CMD_CONFIGURE,
-               TS_CMD_CGET,
-
-               TS_CMD_MWW, TS_CMD_MWH, TS_CMD_MWB,
-               TS_CMD_MDW, TS_CMD_MDH, TS_CMD_MDB,
-               TS_CMD_MRW, TS_CMD_MRH, TS_CMD_MRB,
-               TS_CMD_MEM2ARRAY, TS_CMD_ARRAY2MEM,
-               TS_CMD_EXAMINE,
-               TS_CMD_POLL,
-               TS_CMD_RESET,
-               TS_CMD_HALT,
-               TS_CMD_WAITSTATE,
-               TS_CMD_EVENTLIST,
-               TS_CMD_CURSTATE,
-               TS_CMD_INVOKE_EVENT,
-       };
+       Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
+       goi.isconfigure = !strcmp(Jim_GetString(argv[0], NULL), "configure");
+       int need_args = 1 + goi.isconfigure;
+       if (goi.argc < need_args)
+       {
+               Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv,
+                       goi.isconfigure
+                               ? "missing: -option VALUE ..."
+                               : "missing: -option ...");
+               return JIM_ERR;
+       }
+       struct target *target = Jim_CmdPrivData(goi.interp);
+       return target_configure(&goi, target);
+}
 
-       static const Jim_Nvp target_options[] = {
-               { .name = "configure", .value = TS_CMD_CONFIGURE },
-               { .name = "cget", .value = TS_CMD_CGET },
-               { .name = "mww", .value = TS_CMD_MWW },
-               { .name = "mwh", .value = TS_CMD_MWH },
-               { .name = "mwb", .value = TS_CMD_MWB },
-               { .name = "mdw", .value = TS_CMD_MDW },
-               { .name = "mdh", .value = TS_CMD_MDH },
-               { .name = "mdb", .value = TS_CMD_MDB },
-               { .name = "mem2array", .value = TS_CMD_MEM2ARRAY },
-               { .name = "array2mem", .value = TS_CMD_ARRAY2MEM },
-               { .name = "eventlist", .value = TS_CMD_EVENTLIST },
-               { .name = "curstate",  .value = TS_CMD_CURSTATE },
-
-               { .name = "arp_examine", .value = TS_CMD_EXAMINE },
-               { .name = "arp_poll", .value = TS_CMD_POLL },
-               { .name = "arp_reset", .value = TS_CMD_RESET },
-               { .name = "arp_halt", .value = TS_CMD_HALT },
-               { .name = "arp_waitstate", .value = TS_CMD_WAITSTATE },
-               { .name = "invoke-event", .value = TS_CMD_INVOKE_EVENT },
-
-               { .name = NULL, .value = -1 },
-       };
+static int jim_target_mw(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       const char *cmd_name = Jim_GetString(argv[0], NULL);
+
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
 
-       /* go past the "command" */
-       Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
+       if (goi.argc < 2 || goi.argc > 4)
+       {
+               Jim_SetResultFormatted(goi.interp,
+                               "usage: %s [phys] <address> <data> [<count>]", cmd_name);
+               return JIM_ERR;
+       }
 
-       target = Jim_CmdPrivData(goi.interp);
-       cmd_ctx = Jim_GetAssocData(goi.interp, "context");
+       target_write_fn fn;
+       fn = target_write_memory_fast;
 
-       /* commands here are in an NVP table */
-       e = Jim_GetOpt_Nvp(&goi, target_options, &n);
-       if (e != JIM_OK) {
-               Jim_GetOpt_NvpUnknown(&goi, target_options, 0);
+       int e;
+       if (strcmp(Jim_GetString(argv[1], NULL), "phys") == 0)
+       {
+               /* consume it */
+               struct Jim_Obj *obj;
+               e = Jim_GetOpt_Obj(&goi, &obj);
+               if (e != JIM_OK)
+                       return e;
+
+               fn = target_write_phys_memory;
+       }
+
+       jim_wide a;
+       e = Jim_GetOpt_Wide(&goi, &a);
+       if (e != JIM_OK)
+               return e;
+
+       jim_wide b;
+       e = Jim_GetOpt_Wide(&goi, &b);
+       if (e != JIM_OK)
                return e;
+
+       jim_wide c = 1;
+       if (goi.argc == 1)
+       {
+               e = Jim_GetOpt_Wide(&goi, &c);
+               if (e != JIM_OK)
+                       return e;
        }
-       /* Assume blank result */
-       Jim_SetEmptyResult(goi.interp);
 
-       switch (n->value) {
-       case TS_CMD_CONFIGURE:
-               if (goi.argc < 2) {
-                       Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv, "missing: -option VALUE ...");
-                       return JIM_ERR;
-               }
-               goi.isconfigure = 1;
-               return target_configure(&goi, target);
-       case TS_CMD_CGET:
-               // some things take params
-               if (goi.argc < 1) {
-                       Jim_WrongNumArgs(goi.interp, 0, goi.argv, "missing: ?-option?");
-                       return JIM_ERR;
-               }
-               goi.isconfigure = 0;
-               return target_configure(&goi, target);
-               break;
-       case TS_CMD_MWW:
-       case TS_CMD_MWH:
-       case TS_CMD_MWB:
-               /* argv[0] = cmd
-                * argv[1] = address
-                * argv[2] = data
-                * argv[3] = optional count.
-                */
+       /* all args must be consumed */
+       if (goi.argc != 0)
+       {
+               return JIM_ERR;
+       }
 
-               if ((goi.argc == 2) || (goi.argc == 3)) {
-                       /* all is well */
-               } else {
-               mwx_error:
-                       Jim_SetResult_sprintf(goi.interp, "expected: %s ADDR DATA [COUNT]", n->name);
-                       return JIM_ERR;
-               }
+       struct target *target = Jim_CmdPrivData(goi.interp);
+       unsigned data_size;
+       if (strcasecmp(cmd_name, "mww") == 0) {
+               data_size = 4;
+       }
+       else if (strcasecmp(cmd_name, "mwh") == 0) {
+               data_size = 2;
+       }
+       else if (strcasecmp(cmd_name, "mwb") == 0) {
+               data_size = 1;
+       } else {
+               LOG_ERROR("command '%s' unknown: ", cmd_name);
+               return JIM_ERR;
+       }
 
-               e = Jim_GetOpt_Wide(&goi, &a);
-               if (e != JIM_OK) {
-                       goto mwx_error;
-               }
+       return (target_fill_mem(target, a, fn, data_size, b, c) == ERROR_OK) ? JIM_OK : JIM_ERR;
+}
 
-               e = Jim_GetOpt_Wide(&goi, &b);
-               if (e != JIM_OK) {
-                       goto mwx_error;
-               }
-               if (goi.argc == 3) {
-                       e = Jim_GetOpt_Wide(&goi, &c);
-                       if (e != JIM_OK) {
-                               goto mwx_error;
-                       }
-               } else {
-                       c = 1;
-               }
+static int jim_target_md(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       const char *cmd_name = Jim_GetString(argv[0], NULL);
 
-               switch (n->value) {
-               case TS_CMD_MWW:
-                       target_buffer_set_u32(target, target_buf, b);
-                       b = 4;
-                       break;
-               case TS_CMD_MWH:
-                       target_buffer_set_u16(target, target_buf, b);
-                       b = 2;
-                       break;
-               case TS_CMD_MWB:
-                       target_buffer_set_u8(target, target_buf, b);
-                       b = 1;
-                       break;
-               }
-               for (x = 0 ; x < c ; x++) {
-                       e = target_write_memory(target, a, b, 1, target_buf);
-                       if (e != ERROR_OK) {
-                               Jim_SetResult_sprintf(interp, "Error writing @ 0x%08x: %d\n", (int)(a), e);
-                               return JIM_ERR;
-                       }
-                       /* b = width */
-                       a = a + b;
-               }
-               return JIM_OK;
-               break;
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
 
-               /* display */
-       case TS_CMD_MDW:
-       case TS_CMD_MDH:
-       case TS_CMD_MDB:
-               /* argv[0] = command
-                * argv[1] = address
-                * argv[2] = optional count
-                */
-               if ((goi.argc == 2) || (goi.argc == 3)) {
-                       Jim_SetResult_sprintf(goi.interp, "expected: %s ADDR [COUNT]", n->name);
-                       return JIM_ERR;
-               }
-               e = Jim_GetOpt_Wide(&goi, &a);
+       if ((goi.argc < 1) || (goi.argc > 3))
+       {
+               Jim_SetResultFormatted(goi.interp,
+                               "usage: %s [phys] <address> [<count>]", cmd_name);
+               return JIM_ERR;
+       }
+
+       int (*fn)(struct target *target,
+                       uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+       fn=target_read_memory;
+
+       int e;
+       if (strcmp(Jim_GetString(argv[1], NULL), "phys") == 0)
+       {
+               /* consume it */
+               struct Jim_Obj *obj;
+               e = Jim_GetOpt_Obj(&goi, &obj);
+               if (e != JIM_OK)
+                       return e;
+
+               fn=target_read_phys_memory;
+       }
+
+       jim_wide a;
+       e = Jim_GetOpt_Wide(&goi, &a);
+       if (e != JIM_OK) {
+               return JIM_ERR;
+       }
+       jim_wide c;
+       if (goi.argc == 1) {
+               e = Jim_GetOpt_Wide(&goi, &c);
                if (e != JIM_OK) {
                        return JIM_ERR;
                }
-               if (goi.argc) {
-                       e = Jim_GetOpt_Wide(&goi, &c);
-                       if (e != JIM_OK) {
-                               return JIM_ERR;
-                       }
-               } else {
-                       c = 1;
+       } else {
+               c = 1;
+       }
+
+       /* all args must be consumed */
+       if (goi.argc != 0)
+       {
+               return JIM_ERR;
+       }
+
+       jim_wide b = 1; /* shut up gcc */
+       if (strcasecmp(cmd_name, "mdw") == 0)
+               b = 4;
+       else if (strcasecmp(cmd_name, "mdh") == 0)
+               b = 2;
+       else if (strcasecmp(cmd_name, "mdb") == 0)
+               b = 1;
+       else {
+               LOG_ERROR("command '%s' unknown: ", cmd_name);
+               return JIM_ERR;
+       }
+
+       /* convert count to "bytes" */
+       c = c * b;
+
+       struct target *target = Jim_CmdPrivData(goi.interp);
+       uint8_t  target_buf[32];
+       jim_wide x, y, z;
+       while (c > 0) {
+               y = c;
+               if (y > 16) {
+                       y = 16;
                }
-               b = 1; /* shut up gcc */
-               switch (n->value) {
-               case TS_CMD_MDW:
-                       b =  4;
-                       break;
-               case TS_CMD_MDH:
-                       b = 2;
-                       break;
-               case TS_CMD_MDB:
-                       b = 1;
-                       break;
+               e = fn(target, a, b, y / b, target_buf);
+               if (e != ERROR_OK) {
+                       char tmp[10];
+                       snprintf(tmp, sizeof(tmp), "%08lx", (long)a);
+                       Jim_SetResultFormatted(interp, "error reading target @ 0x%s", tmp);
+                       return JIM_ERR;
                }
 
-               /* convert to "bytes" */
-               c = c * b;
-               /* count is now in 'BYTES' */
-               while (c > 0) {
-                       y = c;
-                       if (y > 16) {
-                               y = 16;
+               command_print(NULL, "0x%08x ", (int)(a));
+               switch (b) {
+               case 4:
+                       for (x = 0; x < 16 && x < y; x += 4)
+                       {
+                               z = target_buffer_get_u32(target, &(target_buf[ x ]));
+                               command_print(NULL, "%08x ", (int)(z));
                        }
-                       e = target_read_memory(target, a, b, y / b, target_buf);
-                       if (e != ERROR_OK) {
-                               Jim_SetResult_sprintf(interp, "error reading target @ 0x%08lx", (int)(a));
-                               return JIM_ERR;
+                       for (; (x < 16) ; x += 4) {
+                               command_print(NULL, "         ");
                        }
-
-                       Jim_fprintf(interp, interp->cookie_stdout, "0x%08x ", (int)(a));
-                       switch (b) {
-                       case 4:
-                               for (x = 0 ; (x < 16) && (x < y) ; x += 4) {
-                                       z = target_buffer_get_u32(target, &(target_buf[ x * 4 ]));
-                                       Jim_fprintf(interp, interp->cookie_stdout, "%08x ", (int)(z));
-                               }
-                               for (; (x < 16) ; x += 4) {
-                                       Jim_fprintf(interp, interp->cookie_stdout, "         ");
-                               }
-                               break;
-                       case 2:
-                               for (x = 0 ; (x < 16) && (x < y) ; x += 2) {
-                                       z = target_buffer_get_u16(target, &(target_buf[ x * 2 ]));
-                                       Jim_fprintf(interp, interp->cookie_stdout, "%04x ", (int)(z));
-                               }
-                               for (; (x < 16) ; x += 2) {
-                                       Jim_fprintf(interp, interp->cookie_stdout, "     ");
-                               }
-                               break;
-                       case 1:
-                       default:
-                               for (x = 0 ; (x < 16) && (x < y) ; x += 1) {
-                                       z = target_buffer_get_u8(target, &(target_buf[ x * 4 ]));
-                                       Jim_fprintf(interp, interp->cookie_stdout, "%02x ", (int)(z));
-                               }
-                               for (; (x < 16) ; x += 1) {
-                                       Jim_fprintf(interp, interp->cookie_stdout, "   ");
-                               }
-                               break;
+                       break;
+               case 2:
+                       for (x = 0; x < 16 && x < y; x += 2)
+                       {
+                               z = target_buffer_get_u16(target, &(target_buf[ x ]));
+                               command_print(NULL, "%04x ", (int)(z));
                        }
-                       /* ascii-ify the bytes */
-                       for (x = 0 ; x < y ; x++) {
-                               if ((target_buf[x] >= 0x20) &&
-                                       (target_buf[x] <= 0x7e)) {
-                                       /* good */
-                               } else {
-                                       /* smack it */
-                                       target_buf[x] = '.';
-                               }
+                       for (; (x < 16) ; x += 2) {
+                               command_print(NULL, "     ");
                        }
-                       /* space pad  */
-                       while (x < 16) {
-                               target_buf[x] = ' ';
-                               x++;
+                       break;
+               case 1:
+               default:
+                       for (x = 0 ; (x < 16) && (x < y) ; x += 1) {
+                               z = target_buffer_get_u8(target, &(target_buf[ x ]));
+                               command_print(NULL, "%02x ", (int)(z));
                        }
-                       /* terminate */
-                       target_buf[16] = 0;
-                       /* print - with a newline */
-                       Jim_fprintf(interp, interp->cookie_stdout, "%s\n", target_buf);
-                       /* NEXT... */
-                       c -= 16;
-                       a += 16;
-               }
-               return JIM_OK;
-       case TS_CMD_MEM2ARRAY:
-               return target_mem2array(goi.interp, target, goi.argc, goi.argv);
-               break;
-       case TS_CMD_ARRAY2MEM:
-               return target_array2mem(goi.interp, target, goi.argc, goi.argv);
-               break;
-       case TS_CMD_EXAMINE:
-               if (goi.argc) {
-                       Jim_WrongNumArgs(goi.interp, 2, argv, "[no parameters]");
-                       return JIM_ERR;
-               }
-               if (!target->tap->enabled)
-                       goto err_tap_disabled;
-               e = target->type->examine(target);
-               if (e != ERROR_OK) {
-                       Jim_SetResult_sprintf(interp, "examine-fails: %d", e);
-                       return JIM_ERR;
-               }
-               return JIM_OK;
-       case TS_CMD_POLL:
-               if (goi.argc) {
-                       Jim_WrongNumArgs(goi.interp, 2, argv, "[no parameters]");
-                       return JIM_ERR;
-               }
-               if (!target->tap->enabled)
-                       goto err_tap_disabled;
-               if (!(target_was_examined(target))) {
-                       e = ERROR_TARGET_NOT_EXAMINED;
-               } else {
-                       e = target->type->poll(target);
-               }
-               if (e != ERROR_OK) {
-                       Jim_SetResult_sprintf(interp, "poll-fails: %d", e);
-                       return JIM_ERR;
-               } else {
-                       return JIM_OK;
-               }
-               break;
-       case TS_CMD_RESET:
-               if (goi.argc != 2) {
-                       Jim_WrongNumArgs(interp, 2, argv, "t | f|assert | deassert BOOL");
-                       return JIM_ERR;
-               }
-               e = Jim_GetOpt_Nvp(&goi, nvp_assert, &n);
-               if (e != JIM_OK) {
-                       Jim_GetOpt_NvpUnknown(&goi, nvp_assert, 1);
-                       return e;
-               }
-               /* the halt or not param */
-               e = Jim_GetOpt_Wide(&goi, &a);
-               if (e != JIM_OK) {
-                       return e;
-               }
-               if (!target->tap->enabled)
-                       goto err_tap_disabled;
-               /* determine if we should halt or not. */
-               target->reset_halt = !!a;
-               /* When this happens - all workareas are invalid. */
-               target_free_all_working_areas_restore(target, 0);
-
-               /* do the assert */
-               if (n->value == NVP_ASSERT) {
-                       target->type->assert_reset(target);
-               } else {
-                       target->type->deassert_reset(target);
-               }
-               return JIM_OK;
-       case TS_CMD_HALT:
-               if (goi.argc) {
-                       Jim_WrongNumArgs(goi.interp, 0, argv, "halt [no parameters]");
-                       return JIM_ERR;
-               }
-               if (!target->tap->enabled)
-                       goto err_tap_disabled;
-               target->type->halt(target);
-               return JIM_OK;
-       case TS_CMD_WAITSTATE:
-               /* params:  <name>  statename timeoutmsecs */
-               if (goi.argc != 2) {
-                       Jim_SetResult_sprintf(goi.interp, "%s STATENAME TIMEOUTMSECS", n->name);
-                       return JIM_ERR;
-               }
-               e = Jim_GetOpt_Nvp(&goi, nvp_target_state, &n);
-               if (e != JIM_OK) {
-                       Jim_GetOpt_NvpUnknown(&goi, nvp_target_state,1);
-                       return e;
-               }
-               e = Jim_GetOpt_Wide(&goi, &a);
-               if (e != JIM_OK) {
-                       return e;
-               }
-               if (!target->tap->enabled)
-                       goto err_tap_disabled;
-               e = target_wait_state(target, n->value, a);
-               if (e != ERROR_OK) {
-                       Jim_SetResult_sprintf(goi.interp,
-                                                                  "target: %s wait %s fails (%d) %s",
-                                                                  target->cmd_name,
-                                                                  n->name,
-                                                                  e, target_strerror_safe(e));
-                       return JIM_ERR;
-               } else {
-                       return JIM_OK;
-               }
-       case TS_CMD_EVENTLIST:
-               /* List for human, Events defined for this target.
-                * scripts/programs should use 'name cget -event NAME'
-                */
-               {
-                       target_event_action_t *teap;
-                       teap = target->event_action;
-                       command_print(cmd_ctx, "Event actions for target (%d) %s\n",
-                                                  target->target_number,
-                                                  target->cmd_name);
-                       command_print(cmd_ctx, "%-25s | Body", "Event");
-                       command_print(cmd_ctx, "------------------------- | ----------------------------------------");
-                       while (teap) {
-                               command_print(cmd_ctx,
-                                                          "%-25s | %s",
-                                                          Jim_Nvp_value2name_simple(nvp_target_event, teap->event)->name,
-                                                          Jim_GetString(teap->body, NULL));
-                               teap = teap->next;
+                       for (; (x < 16) ; x += 1) {
+                               command_print(NULL, "   ");
                        }
-                       command_print(cmd_ctx, "***END***");
-                       return JIM_OK;
-               }
-       case TS_CMD_CURSTATE:
-               if (goi.argc != 0) {
-                       Jim_WrongNumArgs(goi.interp, 0, argv, "[no parameters]");
-                       return JIM_ERR;
+                       break;
                }
-               Jim_SetResultString(goi.interp,
-                                                        Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name,-1);
-               return JIM_OK;
-       case TS_CMD_INVOKE_EVENT:
-               if (goi.argc != 1) {
-                       Jim_SetResult_sprintf(goi.interp, "%s ?EVENTNAME?",n->name);
-                       return JIM_ERR;
+               /* ascii-ify the bytes */
+               for (x = 0 ; x < y ; x++) {
+                       if ((target_buf[x] >= 0x20) &&
+                               (target_buf[x] <= 0x7e)) {
+                               /* good */
+                       } else {
+                               /* smack it */
+                               target_buf[x] = '.';
+                       }
                }
-               e = Jim_GetOpt_Nvp(&goi, nvp_target_event, &n);
-               if (e != JIM_OK) {
-                       Jim_GetOpt_NvpUnknown(&goi, nvp_target_event, 1);
-                       return e;
+               /* space pad  */
+               while (x < 16) {
+                       target_buf[x] = ' ';
+                       x++;
                }
-               target_handle_event(target, n->value);
-               return JIM_OK;
+               /* terminate */
+               target_buf[16] = 0;
+               /* print - with a newline */
+               command_print(NULL, "%s\n", target_buf);
+               /* NEXT... */
+               c -= 16;
+               a += 16;
        }
-       return JIM_ERR;
+       return JIM_OK;
+}
+
+static int jim_target_mem2array(Jim_Interp *interp,
+               int argc, Jim_Obj *const *argv)
+{
+       struct target *target = Jim_CmdPrivData(interp);
+       return target_mem2array(interp, target, argc - 1, argv + 1);
+}
+
+static int jim_target_array2mem(Jim_Interp *interp,
+               int argc, Jim_Obj *const *argv)
+{
+       struct target *target = Jim_CmdPrivData(interp);
+       return target_array2mem(interp, target, argc - 1, argv + 1);
+}
 
-err_tap_disabled:
-       Jim_SetResult_sprintf(interp, "[TAP is disabled]");
+static int jim_target_tap_disabled(Jim_Interp *interp)
+{
+       Jim_SetResultFormatted(interp, "[TAP is disabled]");
        return JIM_ERR;
 }
 
+static int jim_target_examine(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv, "[no parameters]");
+               return JIM_ERR;
+       }
+       struct target *target = Jim_CmdPrivData(interp);
+       if (!target->tap->enabled)
+               return jim_target_tap_disabled(interp);
+
+       int e = target->type->examine(target);
+       if (e != ERROR_OK)
+       {
+               Jim_Obj *eObj = Jim_NewIntObj(interp, e);
+               Jim_SetResultFormatted(interp, "examine-fails: %#s", eObj);
+               Jim_FreeNewObj(interp, eObj);
+               return JIM_ERR;
+       }
+       return JIM_OK;
+}
+
+static int jim_target_halt_gdb(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv, "[no parameters]");
+               return JIM_ERR;
+       }
+       struct target *target = Jim_CmdPrivData(interp);
+
+       if (target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT) != ERROR_OK)
+               return JIM_ERR;
+
+       return JIM_OK;
+}
+
+static int jim_target_poll(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv, "[no parameters]");
+               return JIM_ERR;
+       }
+       struct target *target = Jim_CmdPrivData(interp);
+       if (!target->tap->enabled)
+               return jim_target_tap_disabled(interp);
+
+       int e;
+       if (!(target_was_examined(target))) {
+               e = ERROR_TARGET_NOT_EXAMINED;
+       } else {
+               e = target->type->poll(target);
+       }
+       if (e != ERROR_OK)
+       {
+               Jim_Obj *eObj = Jim_NewIntObj(interp, e);
+               Jim_SetResultFormatted(interp, "poll-fails: %#s", eObj);
+               Jim_FreeNewObj(interp, eObj);
+               return JIM_ERR;
+       }
+       return JIM_OK;
+}
+
+static int jim_target_reset(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
+
+       if (goi.argc != 2)
+       {
+               Jim_WrongNumArgs(interp, 0, argv,
+                               "([tT]|[fF]|assert|deassert) BOOL");
+               return JIM_ERR;
+       }
+
+       Jim_Nvp *n;
+       int e = Jim_GetOpt_Nvp(&goi, nvp_assert, &n);
+       if (e != JIM_OK)
+       {
+               Jim_GetOpt_NvpUnknown(&goi, nvp_assert, 1);
+               return e;
+       }
+       /* the halt or not param */
+       jim_wide a;
+       e = Jim_GetOpt_Wide(&goi, &a);
+       if (e != JIM_OK)
+               return e;
+
+       struct target *target = Jim_CmdPrivData(goi.interp);
+       if (!target->tap->enabled)
+               return jim_target_tap_disabled(interp);
+       if (!(target_was_examined(target)))
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_TARGET_NOT_EXAMINED;
+       }
+       if (!target->type->assert_reset || !target->type->deassert_reset)
+       {
+               Jim_SetResultFormatted(interp,
+                               "No target-specific reset for %s",
+                               target_name(target));
+               return JIM_ERR;
+       }
+       /* determine if we should halt or not. */
+       target->reset_halt = !!a;
+       /* When this happens - all workareas are invalid. */
+       target_free_all_working_areas_restore(target, 0);
+
+       /* do the assert */
+       if (n->value == NVP_ASSERT) {
+               e = target->type->assert_reset(target);
+       } else {
+               e = target->type->deassert_reset(target);
+       }
+       return (e == ERROR_OK) ? JIM_OK : JIM_ERR;
+}
+
+static int jim_target_halt(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       if (argc != 1) {
+               Jim_WrongNumArgs(interp, 1, argv, "[no parameters]");
+               return JIM_ERR;
+       }
+       struct target *target = Jim_CmdPrivData(interp);
+       if (!target->tap->enabled)
+               return jim_target_tap_disabled(interp);
+       int e = target->type->halt(target);
+       return (e == ERROR_OK) ? JIM_OK : JIM_ERR;
+}
+
+static int jim_target_wait_state(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
+
+       /* params:  <name>  statename timeoutmsecs */
+       if (goi.argc != 2)
+       {
+               const char *cmd_name = Jim_GetString(argv[0], NULL);
+               Jim_SetResultFormatted(goi.interp,
+                               "%s <state_name> <timeout_in_msec>", cmd_name);
+               return JIM_ERR;
+       }
+
+       Jim_Nvp *n;
+       int e = Jim_GetOpt_Nvp(&goi, nvp_target_state, &n);
+       if (e != JIM_OK) {
+               Jim_GetOpt_NvpUnknown(&goi, nvp_target_state,1);
+               return e;
+       }
+       jim_wide a;
+       e = Jim_GetOpt_Wide(&goi, &a);
+       if (e != JIM_OK) {
+               return e;
+       }
+       struct target *target = Jim_CmdPrivData(interp);
+       if (!target->tap->enabled)
+               return jim_target_tap_disabled(interp);
+
+       e = target_wait_state(target, n->value, a);
+       if (e != ERROR_OK)
+       {
+               Jim_Obj *eObj = Jim_NewIntObj(interp, e);
+               Jim_SetResultFormatted(goi.interp,
+                               "target: %s wait %s fails (%#s) %s",
+                               target_name(target), n->name,
+                               eObj, target_strerror_safe(e));
+               Jim_FreeNewObj(interp, eObj);
+               return JIM_ERR;
+       }
+       return JIM_OK;
+}
+/* List for human, Events defined for this target.
+ * scripts/programs should use 'name cget -event NAME'
+ */
+static int jim_target_event_list(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       struct command_context *cmd_ctx = current_command_context(interp);
+       assert (cmd_ctx != NULL);
+
+       struct target *target = Jim_CmdPrivData(interp);
+       struct target_event_action *teap = target->event_action;
+       command_print(cmd_ctx, "Event actions for target (%d) %s\n",
+                                  target->target_number,
+                                  target_name(target));
+       command_print(cmd_ctx, "%-25s | Body", "Event");
+       command_print(cmd_ctx, "------------------------- | "
+                       "----------------------------------------");
+       while (teap)
+       {
+               Jim_Nvp *opt = Jim_Nvp_value2name_simple(nvp_target_event, teap->event);
+               command_print(cmd_ctx, "%-25s | %s",
+                               opt->name, Jim_GetString(teap->body, NULL));
+               teap = teap->next;
+       }
+       command_print(cmd_ctx, "***END***");
+       return JIM_OK;
+}
+static int jim_target_current_state(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv, "[no parameters]");
+               return JIM_ERR;
+       }
+       struct target *target = Jim_CmdPrivData(interp);
+       Jim_SetResultString(interp, target_state_name(target), -1);
+       return JIM_OK;
+}
+static int jim_target_invoke_event(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
+       if (goi.argc != 1)
+       {
+               const char *cmd_name = Jim_GetString(argv[0], NULL);
+               Jim_SetResultFormatted(goi.interp, "%s <eventname>", cmd_name);
+               return JIM_ERR;
+       }
+       Jim_Nvp *n;
+       int e = Jim_GetOpt_Nvp(&goi, nvp_target_event, &n);
+       if (e != JIM_OK)
+       {
+               Jim_GetOpt_NvpUnknown(&goi, nvp_target_event, 1);
+               return e;
+       }
+       struct target *target = Jim_CmdPrivData(interp);
+       target_handle_event(target, n->value);
+       return JIM_OK;
+}
+
+static const struct command_registration target_instance_command_handlers[] = {
+       {
+               .name = "configure",
+               .mode = COMMAND_CONFIG,
+               .jim_handler = jim_target_configure,
+               .help  = "configure a new target for use",
+               .usage = "[target_attribute ...]",
+       },
+       {
+               .name = "cget",
+               .mode = COMMAND_ANY,
+               .jim_handler = jim_target_configure,
+               .help  = "returns the specified target attribute",
+               .usage = "target_attribute",
+       },
+       {
+               .name = "mww",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_mw,
+               .help = "Write 32-bit word(s) to target memory",
+               .usage = "address data [count]",
+       },
+       {
+               .name = "mwh",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_mw,
+               .help = "Write 16-bit half-word(s) to target memory",
+               .usage = "address data [count]",
+       },
+       {
+               .name = "mwb",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_mw,
+               .help = "Write byte(s) to target memory",
+               .usage = "address data [count]",
+       },
+       {
+               .name = "mdw",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_md,
+               .help = "Display target memory as 32-bit words",
+               .usage = "address [count]",
+       },
+       {
+               .name = "mdh",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_md,
+               .help = "Display target memory as 16-bit half-words",
+               .usage = "address [count]",
+       },
+       {
+               .name = "mdb",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_md,
+               .help = "Display target memory as 8-bit bytes",
+               .usage = "address [count]",
+       },
+       {
+               .name = "array2mem",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_array2mem,
+               .help = "Writes Tcl array of 8/16/32 bit numbers "
+                       "to target memory",
+               .usage = "arrayname bitwidth address count",
+       },
+       {
+               .name = "mem2array",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_mem2array,
+               .help = "Loads Tcl array of 8/16/32 bit numbers "
+                       "from target memory",
+               .usage = "arrayname bitwidth address count",
+       },
+       {
+               .name = "eventlist",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_event_list,
+               .help = "displays a table of events defined for this target",
+       },
+       {
+               .name = "curstate",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_current_state,
+               .help = "displays the current state of this target",
+       },
+       {
+               .name = "arp_examine",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_examine,
+               .help = "used internally for reset processing",
+       },
+       {
+               .name = "arp_halt_gdb",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_halt_gdb,
+               .help = "used internally for reset processing to halt GDB",
+       },
+       {
+               .name = "arp_poll",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_poll,
+               .help = "used internally for reset processing",
+       },
+       {
+               .name = "arp_reset",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_reset,
+               .help = "used internally for reset processing",
+       },
+       {
+               .name = "arp_halt",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_halt,
+               .help = "used internally for reset processing",
+       },
+       {
+               .name = "arp_waitstate",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_wait_state,
+               .help = "used internally for reset processing",
+       },
+       {
+               .name = "invoke-event",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_target_invoke_event,
+               .help = "invoke handler for specified event",
+               .usage = "event_name",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 static int target_create(Jim_GetOptInfo *goi)
 {
        Jim_Obj *new_cmd;
@@ -4109,10 +4576,12 @@ static int target_create(Jim_GetOptInfo *goi)
        char *cp2;
        int e;
        int x;
-       target_t *target;
-       struct command_context_s *cmd_ctx;
+       struct target *target;
+       struct command_context *cmd_ctx;
+
+       cmd_ctx = current_command_context(goi->interp);
+       assert (cmd_ctx != NULL);
 
-       cmd_ctx = Jim_GetAssocData(goi->interp, "context");
        if (goi->argc < 3) {
                Jim_WrongNumArgs(goi->interp, 1, goi->argv, "?name? ?type? ..options...");
                return JIM_ERR;
@@ -4124,7 +4593,7 @@ static int target_create(Jim_GetOptInfo *goi)
        cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG);
        if (cmd) {
                cp = Jim_GetString(new_cmd, NULL);
-               Jim_SetResult_sprintf(goi->interp, "Command/target: %s Exists", cp);
+               Jim_SetResultFormatted(goi->interp, "Command/target: %s Exists", cp);
                return JIM_ERR;
        }
 
@@ -4139,7 +4608,7 @@ static int target_create(Jim_GetOptInfo *goi)
                }
        }
        if (target_types[x] == NULL) {
-               Jim_SetResult_sprintf(goi->interp, "Unknown target type %s, try one of ", cp);
+               Jim_SetResultFormatted(goi->interp, "Unknown target type %s, try one of ", cp);
                for (x = 0 ; target_types[x] ; x++) {
                        if (target_types[x + 1]) {
                                Jim_AppendStrings(goi->interp,
@@ -4157,14 +4626,14 @@ static int target_create(Jim_GetOptInfo *goi)
        }
 
        /* Create it */
-       target = calloc(1,sizeof(target_t));
+       target = calloc(1,sizeof(struct target));
        /* set target number */
        target->target_number = new_target_number();
 
        /* allocate memory for each unique target type */
-       target->type = (target_type_t*)calloc(1,sizeof(target_type_t));
+       target->type = (struct target_type*)calloc(1,sizeof(struct target_type));
 
-       memcpy(target->type, target_types[x], sizeof(target_type_t));
+       memcpy(target->type, target_types[x], sizeof(struct target_type));
 
        /* will be set by "-endian" */
        target->endianness = TARGET_ENDIAN_UNKNOWN;
@@ -4184,8 +4653,10 @@ static int target_create(Jim_GetOptInfo *goi)
 
        target->display             = 1;
 
+       target->halt_issued                     = false;
+
        /* initialize trace information */
-       target->trace_info = malloc(sizeof(trace_t));
+       target->trace_info = malloc(sizeof(struct trace));
        target->trace_info->num_trace_points         = 0;
        target->trace_info->trace_points_size        = 0;
        target->trace_info->trace_points             = NULL;
@@ -4205,7 +4676,7 @@ static int target_create(Jim_GetOptInfo *goi)
 
        if (target->tap == NULL)
        {
-               Jim_SetResultString(interp, "-chain-position required when creating target", -1);
+               Jim_SetResultString(goi->interp, "-chain-position required when creating target", -1);
                e = JIM_ERR;
        }
 
@@ -4224,9 +4695,14 @@ static int target_create(Jim_GetOptInfo *goi)
        if (!target->variant)
                target->variant = strdup("");
 
+       cp = Jim_GetString(new_cmd, NULL);
+       target->cmd_name = strdup(cp);
+
        /* create the target specific commands */
-       if (target->type->register_commands) {
-               (*(target->type->register_commands))(cmd_ctx);
+       if (target->type->commands) {
+               e = register_commands(cmd_ctx, NULL, target->type->commands);
+               if (ERROR_OK != e)
+                       LOG_ERROR("unable to register '%s' commands", cp);
        }
        if (target->type->target_create) {
                (*(target->type->target_create))(target, goi->interp);
@@ -4234,7 +4710,7 @@ static int target_create(Jim_GetOptInfo *goi)
 
        /* append to end of list */
        {
-               target_t **tpp;
+               struct target **tpp;
                tpp = &(all_targets);
                while (*tpp) {
                        tpp = &((*tpp)->next);
@@ -4242,136 +4718,201 @@ static int target_create(Jim_GetOptInfo *goi)
                *tpp = target;
        }
 
-       cp = Jim_GetString(new_cmd, NULL);
-       target->cmd_name = strdup(cp);
-
        /* now - create the new target name command */
-       e = Jim_CreateCommand(goi->interp,
-                                                  /* name */
-                                                  cp,
-                                                  tcl_target_func, /* C function */
-                                                  target, /* private data */
-                                                  NULL); /* no del proc */
+       const const struct command_registration target_subcommands[] = {
+               {
+                       .chain = target_instance_command_handlers,
+               },
+               {
+                       .chain = target->type->commands,
+               },
+               COMMAND_REGISTRATION_DONE
+       };
+       const const struct command_registration target_commands[] = {
+               {
+                       .name = cp,
+                       .mode = COMMAND_ANY,
+                       .help = "target command group",
+                       .chain = target_subcommands,
+               },
+               COMMAND_REGISTRATION_DONE
+       };
+       e = register_commands(cmd_ctx, NULL, target_commands);
+       if (ERROR_OK != e)
+               return JIM_ERR;
+
+       struct command *c = command_find_in_context(cmd_ctx, cp);
+       assert(c);
+       command_set_handler_data(c, target);
 
-       return e;
+       return (ERROR_OK == e) ? JIM_OK : JIM_ERR;
 }
 
-static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+static int jim_target_current(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-       int x,r,e;
-       jim_wide w;
-       struct command_context_s *cmd_ctx;
-       target_t *target;
-       Jim_GetOptInfo goi;
-       enum tcmd {
-               /* TG = target generic */
-               TG_CMD_CREATE,
-               TG_CMD_TYPES,
-               TG_CMD_NAMES,
-               TG_CMD_CURRENT,
-               TG_CMD_NUMBER,
-               TG_CMD_COUNT,
-       };
-       const char *target_cmds[] = {
-               "create", "types", "names", "current", "number",
-               "count",
-               NULL /* terminate */
-       };
-
-       LOG_DEBUG("Target command params:");
-       LOG_DEBUG("%s", Jim_Debug_ArgvString(interp, argc, argv));
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv, "Too many parameters");
+               return JIM_ERR;
+       }
+       struct command_context *cmd_ctx = current_command_context(interp);
+       assert (cmd_ctx != NULL);
 
-       cmd_ctx = Jim_GetAssocData(interp, "context");
+       Jim_SetResultString(interp, get_current_target(cmd_ctx)->cmd_name, -1);
+       return JIM_OK;
+}
 
-       Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
+static int jim_target_types(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv, "Too many parameters");
+               return JIM_ERR;
+       }
+       Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));
+       for (unsigned x = 0; NULL != target_types[x]; x++)
+       {
+               Jim_ListAppendElement(interp, Jim_GetResult(interp),
+                       Jim_NewStringObj(interp, target_types[x]->name, -1));
+       }
+       return JIM_OK;
+}
 
-       if (goi.argc == 0) {
-               Jim_WrongNumArgs(interp, 1, argv, "missing: command ...");
+static int jim_target_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv, "Too many parameters");
                return JIM_ERR;
        }
+       Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));
+       struct target *target = all_targets;
+       while (target)
+       {
+               Jim_ListAppendElement(interp, Jim_GetResult(interp),
+                       Jim_NewStringObj(interp, target_name(target), -1));
+               target = target->next;
+       }
+       return JIM_OK;
+}
 
-       /* Jim_GetOpt_Debug(&goi); */
-       r = Jim_GetOpt_Enum(&goi, target_cmds, &x);
-       if (r != JIM_OK) {
-               return r;
+static int jim_target_create(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
+       if (goi.argc < 3)
+       {
+               Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv,
+                       "<name> <target_type> [<target_options> ...]");
+               return JIM_ERR;
        }
+       return target_create(&goi);
+}
 
-       switch (x) {
-       default:
-               Jim_Panic(goi.interp,"Why am I here?");
+static int jim_target_number(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
+
+       /* It's OK to remove this mechanism sometime after August 2010 or so */
+       LOG_WARNING("don't use numbers as target identifiers; use names");
+       if (goi.argc != 1)
+       {
+               Jim_SetResultFormatted(goi.interp, "usage: target number <number>");
                return JIM_ERR;
-       case TG_CMD_CURRENT:
-               if (goi.argc != 0) {
-                       Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
-                       return JIM_ERR;
-               }
-               Jim_SetResultString(goi.interp, get_current_target(cmd_ctx)->cmd_name, -1);
-               return JIM_OK;
-       case TG_CMD_TYPES:
-               if (goi.argc != 0) {
-                       Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
-                       return JIM_ERR;
-               }
-               Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0));
-               for (x = 0 ; target_types[x] ; x++) {
-                       Jim_ListAppendElement(goi.interp,
-                                                                  Jim_GetResult(goi.interp),
-                                                                  Jim_NewStringObj(goi.interp, target_types[x]->name, -1));
-               }
-               return JIM_OK;
-       case TG_CMD_NAMES:
-               if (goi.argc != 0) {
-                       Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
-                       return JIM_ERR;
-               }
-               Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0));
-               target = all_targets;
-               while (target) {
-                       Jim_ListAppendElement(goi.interp,
-                                                                  Jim_GetResult(goi.interp),
-                                                                  Jim_NewStringObj(goi.interp, target->cmd_name, -1));
-                       target = target->next;
-               }
-               return JIM_OK;
-       case TG_CMD_CREATE:
-               if (goi.argc < 3) {
-                       Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv, "?name  ... config options ...");
-                       return JIM_ERR;
-               }
-               return target_create(&goi);
-               break;
-       case TG_CMD_NUMBER:
-               if (goi.argc != 1) {
-                       Jim_SetResult_sprintf(goi.interp, "expected: target number ?NUMBER?");
-                       return JIM_ERR;
-               }
-               e = Jim_GetOpt_Wide(&goi, &w);
-               if (e != JIM_OK) {
-                       return JIM_ERR;
-               }
-               {
-                       target_t *t;
-                       t = get_target_by_num(w);
-                       if (t == NULL) {
-                               Jim_SetResult_sprintf(goi.interp,"Target: number %d does not exist", (int)(w));
-                               return JIM_ERR;
-                       }
-                       Jim_SetResultString(goi.interp, t->cmd_name, -1);
-                       return JIM_OK;
-               }
-       case TG_CMD_COUNT:
-               if (goi.argc != 0) {
-                       Jim_WrongNumArgs(goi.interp, 0, goi.argv, "<no parameters>");
-                       return JIM_ERR;
-               }
-               Jim_SetResult(goi.interp,
-                                          Jim_NewIntObj(goi.interp, max_target_number()));
-               return JIM_OK;
        }
+       jim_wide w;
+       int e = Jim_GetOpt_Wide(&goi, &w);
+       if (e != JIM_OK)
+               return JIM_ERR;
 
+       struct target *target;
+       for (target = all_targets; NULL != target; target = target->next)
+       {
+               if (target->target_number != w)
+                       continue;
+
+               Jim_SetResultString(goi.interp, target_name(target), -1);
+               return JIM_OK;
+       }
+       {
+               Jim_Obj *wObj = Jim_NewIntObj(goi.interp, w);
+               Jim_SetResultFormatted(goi.interp,
+                       "Target: number %#s does not exist", wObj);
+               Jim_FreeNewObj(interp, wObj);
+       }
        return JIM_ERR;
 }
 
+static int jim_target_count(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv, "<no parameters>");
+               return JIM_ERR;
+       }
+       unsigned count = 0;
+       struct target *target = all_targets;
+       while (NULL != target)
+       {
+               target = target->next;
+               count++;
+       }
+       Jim_SetResult(interp, Jim_NewIntObj(interp, count));
+       return JIM_OK;
+}
+
+static const struct command_registration target_subcommand_handlers[] = {
+       {
+               .name = "init",
+               .mode = COMMAND_CONFIG,
+               .handler = handle_target_init_command,
+               .help = "initialize targets",
+       },
+       {
+               .name = "create",
+               /* REVISIT this should be COMMAND_CONFIG ... */
+               .mode = COMMAND_ANY,
+               .jim_handler = jim_target_create,
+               .usage = "name type '-chain-position' name [options ...]",
+               .help = "Creates and selects a new target",
+       },
+       {
+               .name = "current",
+               .mode = COMMAND_ANY,
+               .jim_handler = jim_target_current,
+               .help = "Returns the currently selected target",
+       },
+       {
+               .name = "types",
+               .mode = COMMAND_ANY,
+               .jim_handler = jim_target_types,
+               .help = "Returns the available target types as "
+                               "a list of strings",
+       },
+       {
+               .name = "names",
+               .mode = COMMAND_ANY,
+               .jim_handler = jim_target_names,
+               .help = "Returns the names of all targets as a list of strings",
+       },
+       {
+               .name = "number",
+               .mode = COMMAND_ANY,
+               .jim_handler = jim_target_number,
+               .usage = "number",
+               .help = "Returns the name of the numbered target "
+                       "(DEPRECATED)",
+       },
+       {
+               .name = "count",
+               .mode = COMMAND_ANY,
+               .jim_handler = jim_target_count,
+               .help = "Returns the number of targets as an integer "
+                       "(DEPRECATED)",
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
 struct FastLoad
 {
@@ -4402,28 +4943,26 @@ static void free_fastload(void)
 
 
 
-static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_fast_load_image_command)
 {
        uint8_t *buffer;
-       uint32_t buf_cnt;
+       size_t buf_cnt;
        uint32_t image_size;
        uint32_t min_address = 0;
        uint32_t max_address = 0xffffffff;
        int i;
 
-       image_t image;
+       struct image image;
 
-       duration_t duration;
-       char *duration_text;
-
-       int retval = parse_load_image_command_args(args, argc,
+       int retval = CALL_COMMAND_HANDLER(parse_load_image_command_CMD_ARGV,
                        &image, &min_address, &max_address);
        if (ERROR_OK != retval)
                return retval;
 
-       duration_start_measure(&duration);
+       struct duration bench;
+       duration_start(&bench);
 
-       if (image_open(&image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK)
+       if (image_open(&image, CMD_ARGV[0], (CMD_ARGC >= 3) ? CMD_ARGV[2] : NULL) != ERROR_OK)
        {
                return ERROR_OK;
        }
@@ -4443,7 +4982,7 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha
                buffer = malloc(image.sections[i].size);
                if (buffer == NULL)
                {
-                       command_print(cmd_ctx, "error allocating buffer for section (%d bytes)", 
+                       command_print(CMD_CTX, "error allocating buffer for section (%d bytes)",
                                                  (int)(image.sections[i].size));
                        break;
                }
@@ -4486,21 +5025,24 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha
                        fastload[i].length = length;
 
                        image_size += length;
-                       command_print(cmd_ctx, "%u byte written at address 0x%8.8x", 
-                                                 (unsigned int)length, 
+                       command_print(CMD_CTX, "%u bytes written at address 0x%8.8x",
+                                                 (unsigned int)length,
                                                  ((unsigned int)(image.sections[i].base_address + offset)));
                }
 
                free(buffer);
        }
 
-       duration_stop_measure(&duration, &duration_text);
-       if (retval == ERROR_OK)
+       if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
        {
-               command_print(cmd_ctx, "Loaded %u bytes in %s", (unsigned int)image_size, duration_text);
-               command_print(cmd_ctx, "NB!!! image has not been loaded to target, issue a subsequent 'fast_load' to do so.");
+               command_print(CMD_CTX, "Loaded %" PRIu32 " bytes "
+                               "in %fs (%0.3f KiB/s)", image_size,
+                               duration_elapsed(&bench), duration_kbps(&bench, image_size));
+
+               command_print(CMD_CTX,
+                               "WARNING: image has not been loaded to target!"
+                               "You can issue a 'fast_load' to finish loading.");
        }
-       free(duration_text);
 
        image_close(&image);
 
@@ -4512,9 +5054,9 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha
        return retval;
 }
 
-static int handle_fast_load_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_fast_load_command)
 {
-       if (argc > 0)
+       if (CMD_ARGC > 0)
                return ERROR_COMMAND_SYNTAX_ERROR;
        if (fastload == NULL)
        {
@@ -4527,9 +5069,9 @@ static int handle_fast_load_command(struct command_context_s *cmd_ctx, char *cmd
        int retval = ERROR_OK;
        for (i = 0; i < fastload_num;i++)
        {
-               target_t *target = get_current_target(cmd_ctx);
-               command_print(cmd_ctx, "Write to 0x%08x, length 0x%08x", 
-                                         (unsigned int)(fastload[i].address), 
+               struct target *target = get_current_target(CMD_CTX);
+               command_print(CMD_CTX, "Write to 0x%08x, length 0x%08x",
+                                         (unsigned int)(fastload[i].address),
                                          (unsigned int)(fastload[i].length));
                if (retval == ERROR_OK)
                {
@@ -4538,14 +5080,268 @@ static int handle_fast_load_command(struct command_context_s *cmd_ctx, char *cmd
                size += fastload[i].length;
        }
        int after = timeval_ms();
-       command_print(cmd_ctx, "Loaded image %f kBytes/s", (float)(size/1024.0)/((float)(after-ms)/1000.0));
+       command_print(CMD_CTX, "Loaded image %f kBytes/s", (float)(size/1024.0)/((float)(after-ms)/1000.0));
        return retval;
 }
 
+static const struct command_registration target_command_handlers[] = {
+       {
+               .name = "targets",
+               .handler = handle_targets_command,
+               .mode = COMMAND_ANY,
+               .help = "change current default target (one parameter) "
+                       "or prints table of all targets (no parameters)",
+               .usage = "[target]",
+       },
+       {
+               .name = "target",
+               .mode = COMMAND_CONFIG,
+               .help = "configure target",
 
-/*
- * Local Variables: 
- * c-basic-offset: 4
- * tab-width: 4
- * End:
- */
+               .chain = target_subcommand_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
+int target_register_commands(struct command_context *cmd_ctx)
+{
+       return register_commands(cmd_ctx, NULL, target_command_handlers);
+}
+
+static bool target_reset_nag = true;
+
+bool get_target_reset_nag(void)
+{
+       return target_reset_nag;
+}
+
+COMMAND_HANDLER(handle_target_reset_nag)
+{
+       return CALL_COMMAND_HANDLER(handle_command_parse_bool,
+                       &target_reset_nag, "Nag after each reset about options to improve "
+                       "performance");
+}
+
+static const struct command_registration target_exec_command_handlers[] = {
+       {
+               .name = "fast_load_image",
+               .handler = handle_fast_load_image_command,
+               .mode = COMMAND_ANY,
+               .help = "Load image into server memory for later use by "
+                       "fast_load; primarily for profiling",
+               .usage = "filename address ['bin'|'ihex'|'elf'|'s19'] "
+                       "[min_address [max_length]]",
+       },
+       {
+               .name = "fast_load",
+               .handler = handle_fast_load_command,
+               .mode = COMMAND_EXEC,
+               .help = "loads active fast load image to current target "
+                       "- mainly for profiling purposes",
+       },
+       {
+               .name = "profile",
+               .handler = handle_profile_command,
+               .mode = COMMAND_EXEC,
+               .help = "profiling samples the CPU PC",
+       },
+       /** @todo don't register virt2phys() unless target supports it */
+       {
+               .name = "virt2phys",
+               .handler = handle_virt2phys_command,
+               .mode = COMMAND_ANY,
+               .help = "translate a virtual address into a physical address",
+               .usage = "virtual_address",
+       },
+       {
+               .name = "reg",
+               .handler = handle_reg_command,
+               .mode = COMMAND_EXEC,
+               .help = "display or set a register; with no arguments, "
+                       "displays all registers and their values",
+               .usage = "[(register_name|register_number) [value]]",
+       },
+       {
+               .name = "poll",
+               .handler = handle_poll_command,
+               .mode = COMMAND_EXEC,
+               .help = "poll target state; or reconfigure background polling",
+               .usage = "['on'|'off']",
+       },
+       {
+               .name = "wait_halt",
+               .handler = handle_wait_halt_command,
+               .mode = COMMAND_EXEC,
+               .help = "wait up to the specified number of milliseconds "
+                       "(default 5) for a previously requested halt",
+               .usage = "[milliseconds]",
+       },
+       {
+               .name = "halt",
+               .handler = handle_halt_command,
+               .mode = COMMAND_EXEC,
+               .help = "request target to halt, then wait up to the specified"
+                       "number of milliseconds (default 5) for it to complete",
+               .usage = "[milliseconds]",
+       },
+       {
+               .name = "resume",
+               .handler = handle_resume_command,
+               .mode = COMMAND_EXEC,
+               .help = "resume target execution from current PC or address",
+               .usage = "[address]",
+       },
+       {
+               .name = "reset",
+               .handler = handle_reset_command,
+               .mode = COMMAND_EXEC,
+               .usage = "[run|halt|init]",
+               .help = "Reset all targets into the specified mode."
+                       "Default reset mode is run, if not given.",
+       },
+       {
+               .name = "soft_reset_halt",
+               .handler = handle_soft_reset_halt_command,
+               .mode = COMMAND_EXEC,
+               .help = "halt the target and do a soft reset",
+       },
+       {
+               .name = "step",
+               .handler = handle_step_command,
+               .mode = COMMAND_EXEC,
+               .help = "step one instruction from current PC or address",
+               .usage = "[address]",
+       },
+       {
+               .name = "mdw",
+               .handler = handle_md_command,
+               .mode = COMMAND_EXEC,
+               .help = "display memory words",
+               .usage = "['phys'] address [count]",
+       },
+       {
+               .name = "mdh",
+               .handler = handle_md_command,
+               .mode = COMMAND_EXEC,
+               .help = "display memory half-words",
+               .usage = "['phys'] address [count]",
+       },
+       {
+               .name = "mdb",
+               .handler = handle_md_command,
+               .mode = COMMAND_EXEC,
+               .help = "display memory bytes",
+               .usage = "['phys'] address [count]",
+       },
+       {
+               .name = "mww",
+               .handler = handle_mw_command,
+               .mode = COMMAND_EXEC,
+               .help = "write memory word",
+               .usage = "['phys'] address value [count]",
+       },
+       {
+               .name = "mwh",
+               .handler = handle_mw_command,
+               .mode = COMMAND_EXEC,
+               .help = "write memory half-word",
+               .usage = "['phys'] address value [count]",
+       },
+       {
+               .name = "mwb",
+               .handler = handle_mw_command,
+               .mode = COMMAND_EXEC,
+               .help = "write memory byte",
+               .usage = "['phys'] address value [count]",
+       },
+       {
+               .name = "bp",
+               .handler = handle_bp_command,
+               .mode = COMMAND_EXEC,
+               .help = "list or set hardware or software breakpoint",
+               .usage = "[address length ['hw']]",
+       },
+       {
+               .name = "rbp",
+               .handler = handle_rbp_command,
+               .mode = COMMAND_EXEC,
+               .help = "remove breakpoint",
+               .usage = "address",
+       },
+       {
+               .name = "wp",
+               .handler = handle_wp_command,
+               .mode = COMMAND_EXEC,
+               .help = "list (no params) or create watchpoints",
+               .usage = "[address length [('r'|'w'|'a') value [mask]]]",
+       },
+       {
+               .name = "rwp",
+               .handler = handle_rwp_command,
+               .mode = COMMAND_EXEC,
+               .help = "remove watchpoint",
+               .usage = "address",
+       },
+       {
+               .name = "load_image",
+               .handler = handle_load_image_command,
+               .mode = COMMAND_EXEC,
+               .usage = "filename address ['bin'|'ihex'|'elf'|'s19'] "
+                       "[min_address] [max_length]",
+       },
+       {
+               .name = "dump_image",
+               .handler = handle_dump_image_command,
+               .mode = COMMAND_EXEC,
+               .usage = "filename address size",
+       },
+       {
+               .name = "verify_image",
+               .handler = handle_verify_image_command,
+               .mode = COMMAND_EXEC,
+               .usage = "filename [offset [type]]",
+       },
+       {
+               .name = "test_image",
+               .handler = handle_test_image_command,
+               .mode = COMMAND_EXEC,
+               .usage = "filename [offset [type]]",
+       },
+       {
+               .name = "mem2array",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_mem2array,
+               .help = "read 8/16/32 bit memory and return as a TCL array "
+                       "for script processing",
+               .usage = "arrayname bitwidth address count",
+       },
+       {
+               .name = "array2mem",
+               .mode = COMMAND_EXEC,
+               .jim_handler = jim_array2mem,
+               .help = "convert a TCL array to memory locations "
+                       "and write the 8/16/32 bit values",
+               .usage = "arrayname bitwidth address count",
+       },
+       {
+               .name = "reset_nag",
+               .handler = handle_target_reset_nag,
+               .mode = COMMAND_ANY,
+               .help = "Nag after each reset about options that could have been "
+                               "enabled to improve performance. ",
+               .usage = "['enable'|'disable']",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static int target_register_user_commands(struct command_context *cmd_ctx)
+{
+       int retval = ERROR_OK;
+       if ((retval = target_request_register_commands(cmd_ctx)) != ERROR_OK)
+               return retval;
+
+       if ((retval = trace_register_commands(cmd_ctx)) != ERROR_OK)
+               return retval;
+
+
+       return register_commands(cmd_ctx, NULL, target_exec_command_handlers);
+}