explode tcl_target_func into many handlers
[openocd.git] / src / target / target.c
index e999e68c198a0b314387a36dcf2683db38df2689..3a84040c3bbd629c4be47f55d7b7490aa738cdb5 100644 (file)
@@ -65,6 +65,7 @@ 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 testee_target;
 
 struct target_type *target_types[] =
 {
@@ -83,6 +84,7 @@ struct target_type *target_types[] =
        &arm11_target,
        &mips_m4k_target,
        &avr_target,
+       &testee_target,
        NULL,
 };
 
@@ -145,6 +147,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" },
@@ -152,8 +155,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" },
@@ -520,7 +523,7 @@ int target_examine(void)
        }
        return retval;
 }
-const char *target_get_name(struct target *target)
+const char *target_type_name(struct target *target)
 {
        return target->type->name;
 }
@@ -554,7 +557,7 @@ static int target_soft_reset_halt_imp(struct target *target)
        }
        if (!target->type->soft_reset_halt_imp) {
                LOG_ERROR("Target %s does not support soft_reset_halt",
-                               target->cmd_name);
+                               target_name(target));
                return ERROR_FAIL;
        }
        return target->type->soft_reset_halt_imp(target);
@@ -603,6 +606,10 @@ int target_bulk_write_memory(struct target *target,
 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 *target,
@@ -614,6 +621,10 @@ int target_remove_breakpoint(struct target *target,
 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 *target,
@@ -764,7 +775,7 @@ int target_init(struct command_context *cmd_ctx)
 
                if ((retval = target->type->init_target(cmd_ctx, target)) != ERROR_OK)
                {
-                       LOG_ERROR("target '%s' init failed", target_get_name(target));
+                       LOG_ERROR("target '%s' init failed", target_name(target));
                        return retval;
                }
 
@@ -777,12 +788,14 @@ int target_init(struct command_context *cmd_ctx)
                        target->type->mcr = default_mcr;
                } else
                {
-                       /* FIX! multiple targets will generally register global commands
-                        * multiple times. Only register this one if *one* of the
-                        * targets need the command. Hmm... make it a command on the
-                        * Jim Tcl target object?
-                        */
-                       register_jim(cmd_ctx, "mcr", jim_mcrmrc, "write coprocessor <cpnum> <op1> <op2> <CRn> <CRm> <value>");
+                       const struct command_registration mcr_cmd = {
+                               .name = "mcr",
+                               .mode = COMMAND_EXEC,
+                               .jim_handler = &jim_mcrmrc,
+                               .help = "write coprocessor",
+                               .usage = "<cpnum> <op1> <op2> <CRn> <CRm> <value>",
+                       };
+                       register_command(cmd_ctx, NULL, &mcr_cmd);
                }
 
                if (target->type->mrc == NULL)
@@ -790,7 +803,13 @@ int target_init(struct command_context *cmd_ctx)
                        target->type->mrc = default_mrc;
                } else
                {
-                       register_jim(cmd_ctx, "mrc", jim_mcrmrc, "read coprocessor <cpnum> <op1> <op2> <CRn> <CRm>");
+                       const struct command_registration mrc_cmd = {
+                               .name = "mrc",
+                               .jim_handler = &jim_mcrmrc,
+                               .help = "read coprocessor",
+                               .usage = "<cpnum> <op1> <op2> <CRn> <CRm>",
+                       };
+                       register_command(cmd_ctx, NULL, &mrc_cmd);
                }
 
 
@@ -1687,8 +1706,8 @@ DumpTargets:
                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,
@@ -3347,7 +3366,7 @@ static int target_array2mem(Jim_Interp *interp, struct target *target, int argc,
         * 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);
@@ -3500,8 +3519,8 @@ void target_handle_event(struct target *target, enum target_event e)
                if (teap->event == e) {
                        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));
@@ -3513,6 +3532,20 @@ void target_handle_event(struct target *target, enum target_event e)
        }
 }
 
+/**
+ * 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 {
        TCFG_TYPE,
        TCFG_EVENT,
@@ -3575,16 +3608,20 @@ static int target_configure(Jim_GetOptInfo *goi, struct target *target)
                case TCFG_TYPE:
                        /* not setable */
                        if (goi->isconfigure) {
-                               Jim_SetResult_sprintf(goi->interp, "not setable: %s", n->name);
+                               Jim_SetResult_sprintf(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:
@@ -3812,422 +3849,537 @@ static int target_configure(Jim_GetOptInfo *goi, struct target *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;
-       struct target *target;
-       struct command_context *cmd_ctx;
-       int e;
+       Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
+       goi.isconfigure = strcmp(Jim_GetString(argv[0], NULL), "configure") == 0;
+       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);
+}
 
-       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,
-       };
+static int jim_target_mw(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       const char *cmd_name = Jim_GetString(argv[0], NULL);
 
-       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 },
-       };
+       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 != 3)
+       {
+               Jim_SetResult_sprintf(goi.interp,
+                               "usage: %s <address> <data> [<count>]", cmd_name);
+               return JIM_ERR;
+       }
 
-       target = Jim_CmdPrivData(goi.interp);
-       cmd_ctx = Jim_GetAssocData(goi.interp, "context");
+       jim_wide a;
+       int e = Jim_GetOpt_Wide(&goi, &a);
+       if (e != JIM_OK)
+               return e;
 
-       /* 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);
+       jim_wide b;
+       e = Jim_GetOpt_Wide(&goi, &b);
+       if (e != JIM_OK)
                return e;
+
+       jim_wide c = 1;
+       if (goi.argc == 3)
+       {
+               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.
-                */
+       struct target *target = Jim_CmdPrivData(goi.interp);
+       uint8_t  target_buf[32];
+       if (strcasecmp(cmd_name, "mww") == 0) {
+               target_buffer_set_u32(target, target_buf, b);
+               b = 4;
+       }
+       else if (strcasecmp(cmd_name, "mwh") == 0) {
+               target_buffer_set_u16(target, target_buf, b);
+               b = 2;
+       }
+       else if (strcasecmp(cmd_name, "mwb") == 0) {
+               target_buffer_set_u8(target, target_buf, b);
+               b = 1;
+       } else {
+               LOG_ERROR("command '%s' unknown: ", cmd_name);
+               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);
+       for (jim_wide 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;
+}
 
-               e = Jim_GetOpt_Wide(&goi, &a);
-               if (e != JIM_OK) {
-                       goto mwx_error;
-               }
+static int jim_target_md(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       const char *cmd_name = Jim_GetString(argv[0], NULL);
 
-               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;
-               }
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
 
-               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;
+       if ((goi.argc == 2) || (goi.argc == 3))
+       {
+               Jim_SetResult_sprintf(goi.interp,
+                               "usage: %s <address> [<count>]", cmd_name);
+               return JIM_ERR;
+       }
 
-               /* 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);
+       jim_wide a;
+       int e = Jim_GetOpt_Wide(&goi, &a);
+       if (e != JIM_OK) {
+               return JIM_ERR;
+       }
+       jim_wide c;
+       if (goi.argc) {
+               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;
+       }
+       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 = 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;
                }
 
-               /* convert to "bytes" */
-               c = c * b;
-               /* count is now in 'BYTES' */
-               while (c > 0) {
-                       y = c;
-                       if (y > 16) {
-                               y = 16;
+               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));
                        }
-                       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) {
+                               Jim_fprintf(interp, interp->cookie_stdout, "         ");
                        }
-
-                       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 * 2 ]));
+                               Jim_fprintf(interp, interp->cookie_stdout, "%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) {
+                               Jim_fprintf(interp, interp->cookie_stdout, "     ");
                        }
-                       /* 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 * 4 ]));
+                               Jim_fprintf(interp, interp->cookie_stdout, "%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,
-                                       "([tT]|[fF]|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;
-               if (!target->type->assert_reset
-                               || !target->type->deassert_reset) {
-                       Jim_SetResult_sprintf(interp,
-                                       "No target-specific reset for %s",
-                                       target->cmd_name);
-                       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;
-       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;
-               e = target->type->halt(target);
-               return (e == ERROR_OK) ? JIM_OK : JIM_ERR;
-       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'
-                */
-               {
-                       struct target_event_action *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) {
+                               Jim_fprintf(interp, interp->cookie_stdout, "   ");
                        }
-                       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,
-                                                       target_state_name( target ),
-                                                       -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 */
+               Jim_fprintf(interp, interp->cookie_stdout, "%s\n", target_buf);
+               /* NEXT... */
+               c -= 16;
+               a += 16;
        }
-       return JIM_ERR;
+       return JIM_OK;
+}
 
-err_tap_disabled:
+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);
+}
+
+static int jim_target_tap_disabled(Jim_Interp *interp)
+{
        Jim_SetResult_sprintf(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_SetResult_sprintf(interp, "examine-fails: %d", e);
+               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_SetResult_sprintf(interp, "poll-fails: %d", e);
+               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->type->assert_reset || !target->type->deassert_reset)
+       {
+               Jim_SetResult_sprintf(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_SetResult_sprintf(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_SetResult_sprintf(goi.interp,
+                               "target: %s wait %s fails (%d) %s",
+                               target_name(target), n->name,
+                               e, target_strerror_safe(e));
+               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 = Jim_GetAssocData(interp, "context");
+       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_SetResult_sprintf(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,
+               .usage = "[<target_options> ...]",
+               .help  = "configure a new target for use",
+       },
+       {
+               .name = "cget",
+               .mode = COMMAND_ANY,
+               .jim_handler = &jim_target_configure,
+               .usage = "<target_type> [<target_options> ...]",
+               .help  = "configure a new target for use",
+       },
+       {
+               .name = "mww",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_mw,
+               .usage = "<address> <data> [<count>]",
+               .help = "Write 32-bit word(s) to target memory",
+       },
+       {
+               .name = "mwh",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_mw,
+               .usage = "<address> <data> [<count>]",
+               .help = "Write 16-bit half-word(s) to target memory",
+       },
+       {
+               .name = "mwb",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_mw,
+               .usage = "<address> <data> [<count>]",
+               .help = "Write byte(s) to target memory",
+       },
+       {
+               .name = "mdw",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_md,
+               .usage = "<address> [<count>]",
+               .help = "Display target memory as 32-bit words",
+       },
+       {
+               .name = "mdh",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_md,
+               .usage = "<address> [<count>]",
+               .help = "Display target memory as 16-bit half-words",
+       },
+       {
+               .name = "mdb",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_md,
+               .usage = "<address> [<count>]",
+               .help = "Display target memory as 8-bit bytes",
+       },
+       {
+               .name = "array2mem",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_array2mem,
+       },
+       {
+               .name = "mem2array",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_mem2array,
+       },
+       {
+               .name = "eventlist",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_event_list,
+       },
+       {
+               .name = "curstate",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_current_state,
+       },
+       {
+               .name = "arp_examine",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_examine,
+       },
+       {
+               .name = "arp_poll",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_poll,
+       },
+       {
+               .name = "arp_reset",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_reset,
+       },
+       {
+               .name = "arp_halt",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_halt,
+       },
+       {
+               .name = "arp_waitstate",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_wait_state,
+       },
+       {
+               .name = "invoke-event",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_target_invoke_event,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 static int target_create(Jim_GetOptInfo *goi)
 {
        Jim_Obj *new_cmd;
@@ -4375,138 +4527,187 @@ static int target_create(Jim_GetOptInfo *goi)
                }
                *tpp = target;
        }
-
+       
        /* 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 */
-
-       return e;
-}
-
-static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
-{
-       int x,r,e;
-       jim_wide w;
-       struct command_context *cmd_ctx;
-       struct target *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 const struct command_registration target_subcommands[] = {
+               {
+                       .chain = target_instance_command_handlers,
+               },
+               {
+                       .chain = target->type->commands,
+               },
+               COMMAND_REGISTRATION_DONE
        };
-       const char *target_cmds[] = {
-               "create", "types", "names", "current", "number",
-               "count",
-               NULL /* terminate */
+       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;
 
-       LOG_DEBUG("Target command params:");
-       LOG_DEBUG("%s", Jim_Debug_ArgvString(interp, argc, argv));
+       struct command *c = command_find_in_context(cmd_ctx, cp);
+       assert(c);
+       command_set_handler_data(c, target);
 
-       cmd_ctx = Jim_GetAssocData(interp, "context");
+       return (ERROR_OK == e) ? JIM_OK : JIM_ERR;
+}
 
-       Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
+static int jim_target_current(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv, "Too many parameters");
+               return JIM_ERR;
+       }
+       struct command_context *cmd_ctx = Jim_GetAssocData(interp, "context");
+       Jim_SetResultString(interp, get_current_target(cmd_ctx)->cmd_name, -1);
+       return JIM_OK;
+}
 
-       if (goi.argc == 0) {
-               Jim_WrongNumArgs(interp, 1, argv, "missing: command ...");
+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;
+}
 
-       /* Jim_GetOpt_Debug(&goi); */
-       r = Jim_GetOpt_Enum(&goi, target_cmds, &x);
-       if (r != JIM_OK) {
-               return r;
+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;
+}
 
-       switch (x) {
-       default:
-               Jim_Panic(goi.interp,"Why am I here?");
+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;
-       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:
-               /* 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_SetResult_sprintf(goi.interp, "expected: target number ?NUMBER?");
-                       return JIM_ERR;
-               }
-               e = Jim_GetOpt_Wide(&goi, &w);
-               if (e != JIM_OK) {
-                       return JIM_ERR;
-               }
-               for (x = 0, target = all_targets; target; target = target->next, x++) {
-                       if (target->target_number == w)
-                               break;
-               }
-               if (target == NULL) {
-                       Jim_SetResult_sprintf(goi.interp,
-                                       "Target: number %d does not exist", (int)(w));
-                       return JIM_ERR;
-               }
-               Jim_SetResultString(goi.interp, target->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;
-               }
-               for (x = 0, target = all_targets; target; target = target->next, x++)
+       }
+       return target_create(&goi);
+}
+
+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_SetResult_sprintf(goi.interp, "usage: target number <number>");
+               return JIM_ERR;
+       }
+       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_SetResult(goi.interp, Jim_NewIntObj(goi.interp, x));
+
+               Jim_SetResultString(goi.interp, target_name(target), -1);
                return JIM_OK;
        }
-
+       Jim_SetResult_sprintf(goi.interp,
+                       "Target: number %d does not exist", (int)(w));
        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 = "create",
+               .mode = COMMAND_ANY,
+               .jim_handler = &jim_target_create,
+               .usage = "<name> <type> ...",
+               .help = "Returns the currently selected 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 target <n>",
+       },
+       {
+               .name = "count",
+               .mode = COMMAND_ANY,
+               .jim_handler = &jim_target_count,
+               .help = "Returns the number of targets as an integer",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 
 struct FastLoad
 {
@@ -4773,12 +4974,18 @@ static const struct command_registration target_command_handlers[] = {
                        "or list targets (no parameters)",
                .usage = "[<new_current_target>]",
        },
+       {
+               .name = "target",
+               .mode = COMMAND_CONFIG,
+               .help = "configure target",
+
+               .chain = target_subcommand_handlers,
+       },
        COMMAND_REGISTRATION_DONE
 };
 
 int target_register_commands(struct command_context *cmd_ctx)
 {
-       register_jim(cmd_ctx, "target", jim_target, "configure target");
        return register_commands(cmd_ctx, NULL, target_command_handlers);
 }
 
@@ -4967,6 +5174,22 @@ static const struct command_registration target_exec_command_handlers[] = {
                .mode = COMMAND_EXEC,
                .usage = "<file> [offset] [type]",
        },
+       {
+               .name = "ocd_mem2array",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_mem2array,
+               .help = "read memory and return as a TCL array "
+                       "for script processing",
+               .usage = "<arrayname> <width=32|16|8> <address> <count>",
+       },
+       {
+               .name = "ocd_array2mem",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_array2mem,
+               .help = "convert a TCL array to memory locations "
+                       "and write the values",
+               .usage = "<arrayname> <width=32|16|8> <address> <count>",
+       },
        COMMAND_REGISTRATION_DONE
 };
 int target_register_user_commands(struct command_context *cmd_ctx)
@@ -4978,13 +5201,6 @@ int target_register_user_commands(struct command_context *cmd_ctx)
        if ((retval = trace_register_commands(cmd_ctx)) != ERROR_OK)
                return retval;
 
-       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>");
 
        return register_commands(cmd_ctx, NULL, target_exec_command_handlers);
 }

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)