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[] =
{
&arm11_target,
&mips_m4k_target,
&avr_target,
+ &testee_target,
NULL,
};
{ .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" },
{ .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" },
}
return retval;
}
-const char *target_get_name(struct target *target)
+const char *target_type_name(struct target *target)
{
return target->type->name;
}
}
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);
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,
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,
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;
}
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)
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);
}
{
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;
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,
{
struct target *target;
struct reg *reg = NULL;
- int count = 0;
+ 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)
{
struct reg_cache *cache = target->reg_cache;
count = 0;
while (cache)
{
- int i;
+ unsigned i;
- command_print(cmd_ctx, "===== %s", cache->name);
+ command_print(CMD_CTX, "===== %s", cache->name);
for (i = 0, reg = cache->reg_list;
i < cache->num_regs;
if (reg->valid) {
value = buf_to_str(reg->value,
reg->size, 16);
- command_print(cmd_ctx,
+ command_print(CMD_CTX,
"(%i) %s (/%" PRIu32 "): 0x%s%s",
count, reg->name,
reg->size, value,
: "");
free(value);
} else {
- command_print(cmd_ctx, "(%i) %s (/%" PRIu32 ")",
+ command_print(CMD_CTX, "(%i) %s (/%" PRIu32 ")",
count, reg->name,
reg->size) ;
}
}
/* 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;
- COMMAND_PARSE_NUMBER(uint, args[0], num);
+ COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], num);
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;
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->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(DIV_ROUND_UP(reg->size, 8));
- str_to_buf(args[1], strlen(args[1]), buf, reg->size, 0);
+ str_to_buf(CMD_ARGV[1], strlen(CMD_ARGV[1]), buf, reg->size, 0);
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);
return ERROR_OK;
}
- command_print(cmd_ctx, "usage: reg <#|name> [value]");
+ command_print(CMD_CTX, "usage: reg <#|name> [value]");
return ERROR_OK;
}
COMMAND_HANDLER(handle_poll_command)
{
int retval = ERROR_OK;
- struct target *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",
+ command_print(CMD_CTX, "background polling: %s",
jtag_poll_get_enabled() ? "on" : "off");
- command_print(cmd_ctx, "TAP: %s (%s)",
+ command_print(CMD_CTX, "TAP: %s (%s)",
target->tap->dotted_name,
target->tap->enabled ? "enabled" : "disabled");
if (!target->tap->enabled)
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)
- {
- jtag_poll_set_enabled(true);
- }
- else if (strcmp(args[0], "off") == 0)
- {
- jtag_poll_set_enabled(false);
- }
- 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;
}
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_NAME);
+ command_print(CMD_CTX, "usage: %s [seconds]", CMD_NAME);
return ERROR_COMMAND_SYNTAX_ERROR;
}
// convert seconds (given) to milliseconds (needed)
ms *= 1000;
}
- struct target *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
return target_wait_state(target, TARGET_HALTED, ms);
}
{
LOG_DEBUG("-");
- struct target *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);
+ retval = parse_uint(CMD_ARGV[0], &wait);
if (ERROR_OK != retval)
return ERROR_COMMAND_SYNTAX_ERROR;
if (!wait)
COMMAND_HANDLER(handle_soft_reset_halt_command)
{
- struct target *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
LOG_USER("requesting target halt and executing a soft reset");
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;
}
}
/* reset *all* targets */
- return target_process_reset(cmd_ctx, reset_mode);
+ return target_process_reset(CMD_CTX, reset_mode);
}
COMMAND_HANDLER(handle_resume_command)
{
int current = 1;
- if (argc > 1)
+ if (CMD_ARGC > 1)
return ERROR_COMMAND_SYNTAX_ERROR;
- struct target *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)
{
- COMMAND_PARSE_NUMBER(u32, args[0], addr);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
current = 0;
}
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;
int current_pc = 1;
- if (argc == 1)
+ if (CMD_ARGC == 1)
{
- COMMAND_PARSE_NUMBER(u32, args[0], addr);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
current_pc = 0;
}
- struct target *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
return target->type->step(target, current_pc, addr, 1);
}
COMMAND_HANDLER(handle_md_command)
{
- if (argc < 1)
+ if (CMD_ARGC < 1)
return ERROR_COMMAND_SYNTAX_ERROR;
unsigned size = 0;
- const char *cmd_name = CMD_NAME;
- switch (cmd_name[6]) {
+ 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;
}
- bool physical=strcmp(args[0], "phys")==0;
+ 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)
{
- argc--;
- args++;
+ CMD_ARGC--;
+ CMD_ARGV++;
fn=target_read_phys_memory;
} else
{
fn=target_read_memory;
}
- if ((argc < 1) || (argc > 2))
+ if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
uint32_t address;
- COMMAND_PARSE_NUMBER(u32, args[0], address);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
unsigned count = 1;
- if (argc == 2)
- COMMAND_PARSE_NUMBER(uint, args[1], count);
+ if (CMD_ARGC == 2)
+ COMMAND_PARSE_NUMBER(uint, CMD_ARGV[1], count);
uint8_t *buffer = calloc(count, size);
- struct target *target = get_current_target(cmd_ctx);
+ 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);
COMMAND_HANDLER(handle_mw_command)
{
- if (argc < 2)
+ if (CMD_ARGC < 2)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
- bool physical=strcmp(args[0], "phys")==0;
+ 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);
- const char *cmd_name = CMD_NAME;
if (physical)
{
- argc--;
- args++;
+ CMD_ARGC--;
+ CMD_ARGV++;
fn=target_write_phys_memory;
} else
{
fn=target_write_memory;
}
- if ((argc < 2) || (argc > 3))
+ if ((CMD_ARGC < 2) || (CMD_ARGC > 3))
return ERROR_COMMAND_SYNTAX_ERROR;
uint32_t address;
- COMMAND_PARSE_NUMBER(u32, args[0], address);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
uint32_t value;
- COMMAND_PARSE_NUMBER(u32, args[1], value);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
unsigned count = 1;
- if (argc == 3)
- COMMAND_PARSE_NUMBER(uint, args[2], count);
+ if (CMD_ARGC == 3)
+ COMMAND_PARSE_NUMBER(uint, CMD_ARGV[2], count);
- struct target *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
unsigned wordsize;
uint8_t value_buf[4];
- switch (cmd_name[6])
+ switch (CMD_NAME[2])
{
case 'w':
wordsize = 4;
}
-static COMMAND_HELPER(parse_load_image_command_args, struct image *image,
+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;
- COMMAND_PARSE_NUMBER(u32, args[1], addr);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], addr);
image->base_address = addr;
image->base_address_set = 1;
}
image->start_address_set = 0;
- if (argc >= 4)
+ if (CMD_ARGC >= 4)
{
- COMMAND_PARSE_NUMBER(u32, args[3], *min_address);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], *min_address);
}
- if (argc == 5)
+ if (CMD_ARGC == 5)
{
- COMMAND_PARSE_NUMBER(u32, args[4], *max_address);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[4], *max_address);
// use size (given) to find max (required)
*max_address += *min_address;
}
int i;
struct image image;
- int retval = CALL_COMMAND_HANDLER(parse_load_image_command_args,
+ int retval = CALL_COMMAND_HANDLER(parse_load_image_command_CMD_ARGV,
&image, &min_address, &max_address);
if (ERROR_OK != retval)
return retval;
- struct target *target = get_current_target(cmd_ctx);
+ 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;
}
buffer = malloc(image.sections[i].size);
if (buffer == NULL)
{
- command_print(cmd_ctx,
+ command_print(CMD_CTX,
"error allocating buffer for section (%d bytes)",
(int)(image.sections[i].size));
break;
break;
}
image_size += length;
- command_print(cmd_ctx, "%u bytes written at address 0x%8.8" PRIx32 "",
+ command_print(CMD_CTX, "%u bytes written at address 0x%8.8" PRIx32 "",
(unsigned int)length,
image.sections[i].base_address + offset);
}
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
- command_print(cmd_ctx, "downloaded %" PRIu32 " bytes "
+ command_print(CMD_CTX, "downloaded %" PRIu32 " bytes "
"in %fs (%0.3f kb/s)", image_size,
duration_elapsed(&bench), duration_kbps(&bench, image_size));
}
int retvaltemp;
- struct target *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
- if (argc != 3)
+ if (CMD_ARGC != 3)
{
- command_print(
cmd_ctx, "usage: dump_image <filename> <address> <size>");
+ command_print(
CMD_CTX, "usage: dump_image <filename> <address> <size>");
return ERROR_OK;
}
uint32_t address;
- COMMAND_PARSE_NUMBER(u32, args[1], address);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], address);
uint32_t size;
- COMMAND_PARSE_NUMBER(u32, args[2], size);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], size);
- if (fileio_open(&fileio, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
+ if (fileio_open(&fileio, CMD_ARGV[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
{
return ERROR_OK;
}
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
- command_print(cmd_ctx,
+ command_print(CMD_CTX,
"dumped %zu bytes in %fs (%0.3f kb/s)", fileio.size,
duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
}
struct image image;
- struct target *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
- if (argc < 1)
+ if (CMD_ARGC < 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
struct duration bench;
duration_start(&bench);
- if (argc >= 2)
+ if (CMD_ARGC >= 2)
{
uint32_t addr;
- COMMAND_PARSE_NUMBER(u32, args[1], addr);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], addr);
image.base_address = addr;
image.base_address_set = 1;
}
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;
}
buffer = malloc(image.sections[i].size);
if (buffer == NULL)
{
- command_print(cmd_ctx,
+ command_print(CMD_CTX,
"error allocating buffer for section (%d bytes)",
(int)(image.sections[i].size));
break;
/* failed crc checksum, fall back to a binary compare */
uint8_t *data;
- command_print(cmd_ctx, "checksum mismatch - attempting binary compare");
+ command_print(CMD_CTX, "checksum mismatch - attempting binary compare");
data = (uint8_t*)malloc(buf_cnt);
{
if (data[t] != buffer[t])
{
- command_print(cmd_ctx,
+ 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],
}
} else
{
- command_print(cmd_ctx, "address 0x%08" PRIx32 " length 0x%08zx",
+ command_print(CMD_CTX, "address 0x%08" PRIx32 " length 0x%08zx",
image.sections[i].base_address,
buf_cnt);
}
done:
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
- command_print(cmd_ctx, "verified %" PRIu32 " bytes "
+ command_print(CMD_CTX, "verified %" PRIu32 " bytes "
"in %fs (%0.3f kb/s)", image_size,
duration_elapsed(&bench), duration_kbps(&bench, image_size));
}
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;
- COMMAND_PARSE_NUMBER(u32, args[0], addr);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
uint32_t length;
- COMMAND_PARSE_NUMBER(u32, args[1], length);
+ 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);
}
COMMAND_HANDLER(handle_rbp_command)
{
- if (argc != 1)
+ if (CMD_ARGC != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
uint32_t addr;
- COMMAND_PARSE_NUMBER(u32, args[0], addr);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
- struct target *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
breakpoint_remove(target, addr);
return ERROR_OK;
COMMAND_HANDLER(handle_wp_command)
{
- struct target *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
- if (argc == 0)
+ if (CMD_ARGC == 0)
{
struct watchpoint *watchpoint = target->watchpoints;
while (watchpoint)
{
- command_print(cmd_ctx, "address: 0x%8.8" PRIx32
+ 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,
uint32_t data_value = 0x0;
uint32_t data_mask = 0xffffffff;
- switch (argc)
+ switch (CMD_ARGC)
{
case 5:
- COMMAND_PARSE_NUMBER(u32, args[4], data_mask);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[4], data_mask);
// fall through
case 4:
- COMMAND_PARSE_NUMBER(u32, args[3], data_value);
+ 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;
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:
- COMMAND_PARSE_NUMBER(u32, args[1], length);
- COMMAND_PARSE_NUMBER(u32, args[0], addr);
+ 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 "
+ command_print(CMD_CTX, "usage: wp [address length "
"[(r|w|a) [value [mask]]]]");
return ERROR_COMMAND_SYNTAX_ERROR;
}
COMMAND_HANDLER(handle_rwp_command)
{
- if (argc != 1)
+ if (CMD_ARGC != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
uint32_t addr;
- COMMAND_PARSE_NUMBER(u32, args[0], addr);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
- struct target *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
watchpoint_remove(target, addr);
return ERROR_OK;
*/
COMMAND_HANDLER(handle_virt2phys_command)
{
- if (argc != 1)
+ if (CMD_ARGC != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
uint32_t va;
- COMMAND_PARSE_NUMBER(u32, args[0], va);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], va);
uint32_t pa;
- struct target *target = get_current_target(cmd_ctx);
+ 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;
}
/* 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)
{
- struct target *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;
- COMMAND_PARSE_NUMBER(uint, args[0], offset);
+ 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...");
+ 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);
}
} else
{
- command_print(cmd_ctx, "Target not halted or running");
+ command_print(CMD_CTX, "Target not halted or running");
retval = ERROR_OK;
break;
}
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);
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;
}
}
uint32_t count;
uint32_t v;
const char *varname;
- uint8_t buffer[4096];
int n, e, retval;
uint32_t i;
/* 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);
}
}
+ free(buffer);
+
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
return JIM_OK;
uint32_t count;
uint32_t v;
const char *varname;
- uint8_t buffer[4096];
int n, e, retval;
uint32_t i;
* 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);
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 */
}
}
+ free(buffer);
+
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
return JIM_OK;
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));
}
}
+/**
+ * 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,
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:
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;
+}
+
+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:
+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;
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);
}
*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 */
-
- 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
{
struct image image;
- int retval = CALL_COMMAND_HANDLER(parse_load_image_command_args,
+ int retval = CALL_COMMAND_HANDLER(parse_load_image_command_CMD_ARGV,
&image, &min_address, &max_address);
if (ERROR_OK != retval)
return retval;
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;
}
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;
}
fastload[i].length = length;
image_size += length;
- command_print(cmd_ctx, "%u bytes written at address 0x%8.8x",
+ command_print(CMD_CTX, "%u bytes written at address 0x%8.8x",
(unsigned int)length,
((unsigned int)(image.sections[i].base_address + offset)));
}
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
- command_print(cmd_ctx, "Loaded %" PRIu32 " bytes "
+ command_print(CMD_CTX, "Loaded %" PRIu32 " bytes "
"in %fs (%0.3f kb/s)", image_size,
duration_elapsed(&bench), duration_kbps(&bench, image_size));
- command_print(cmd_ctx,
+ command_print(CMD_CTX,
"WARNING: image has not been loaded to target!"
"You can issue a 'fast_load' to finish loading.");
}
COMMAND_HANDLER(handle_fast_load_command)
{
- if (argc > 0)
+ if (CMD_ARGC > 0)
return ERROR_COMMAND_SYNTAX_ERROR;
if (fastload == NULL)
{
int retval = ERROR_OK;
for (i = 0; i < fastload_num;i++)
{
- struct target *target = get_current_target(cmd_ctx);
- command_print(cmd_ctx, "Write to 0x%08x, length 0x%08x",
+ 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)
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;
}
return JIM_OK;
}
-int target_register_commands(struct command_context *cmd_ctx)
-{
-
- register_command(cmd_ctx, NULL, "targets",
- handle_targets_command, COMMAND_EXEC,
- "change current command line target (one parameter) "
- "or list targets (no parameters)");
+static const struct command_registration target_command_handlers[] = {
+ {
+ .name = "targets",
+ .handler = &handle_targets_command,
+ .mode = COMMAND_ANY,
+ .help = "change current command line target (one parameter) "
+ "or list targets (no parameters)",
+ .usage = "[<new_current_target>]",
+ },
+ {
+ .name = "target",
+ .mode = COMMAND_CONFIG,
+ .help = "configure target",
- register_jim(cmd_ctx, "target", jim_target, "configure target");
+ .chain = target_subcommand_handlers,
+ },
+ COMMAND_REGISTRATION_DONE
+};
- return ERROR_OK;
+int target_register_commands(struct command_context *cmd_ctx)
+{
+ return register_commands(cmd_ctx, NULL, target_command_handlers);
}
+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 memory, mainly for profiling purposes",
+ .usage = "<file> <address> ['bin'|'ihex'|'elf'|'s19'] "
+ "[min_address] [max_length]",
+ },
+ {
+ .name = "fast_load",
+ .handler = &handle_fast_load_command,
+ .mode = COMMAND_ANY,
+ .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",
+ },
+
+ {
+ .name = "reg",
+ .handler = &handle_reg_command,
+ .mode = COMMAND_EXEC,
+ .help = "display or set a register",
+ },
+
+ {
+ .name = "poll",
+ .handler = &handle_poll_command,
+ .mode = COMMAND_EXEC,
+ .help = "poll target state",
+ },
+ {
+ .name = "wait_halt",
+ .handler = &handle_wait_halt_command,
+ .mode = COMMAND_EXEC,
+ .help = "wait for target halt",
+ .usage = "[time (s)]",
+ },
+ {
+ .name = "halt",
+ .handler = &handle_halt_command,
+ .mode = COMMAND_EXEC,
+ .help = "halt target",
+ },
+ {
+ .name = "resume",
+ .handler = &handle_resume_command,
+ .mode = COMMAND_EXEC,
+ .help = "resume target",
+ .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 [addr]",
+ .usage = "[<address>]",
+ },
+ {
+
+ .name = "mdw",
+ .handler = &handle_md_command,
+ .mode = COMMAND_EXEC,
+ .help = "display memory words",
+ .usage = "[phys] <addr> [count]",
+ },
+ {
+ .name = "mdh",
+ .handler = &handle_md_command,
+ .mode = COMMAND_EXEC,
+ .help = "display memory half-words",
+ .usage = "[phys] <addr> [count]",
+ },
+ {
+ .name = "mdb",
+ .handler = &handle_md_command,
+ .mode = COMMAND_EXEC,
+ .help = "display memory bytes",
+ .usage = "[phys] <addr> [count]",
+ },
+ {
+
+ .name = "mww",
+ .handler = &handle_mw_command,
+ .mode = COMMAND_EXEC,
+ .help = "write memory word",
+ .usage = "[phys] <addr> <value> [count]",
+ },
+ {
+ .name = "mwh",
+ .handler = &handle_mw_command,
+ .mode = COMMAND_EXEC,
+ .help = "write memory half-word",
+ .usage = "[phys] <addr> <value> [count]",
+ },
+ {
+ .name = "mwb",
+ .handler = &handle_mw_command,
+ .mode = COMMAND_EXEC,
+ .help = "write memory byte",
+ .usage = "[phys] <addr> <value> [count]",
+ },
+ {
+
+ .name = "bp",
+ .handler = &handle_bp_command,
+ .mode = COMMAND_EXEC,
+ .help = "list or set 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 or set watchpoint",
+ .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 = "<file> <address> ['bin'|'ihex'|'elf'|'s19'] "
+ "[min_address] [max_length]",
+ },
+ {
+ .name = "dump_image",
+ .handler = &handle_dump_image_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<file> <address> <size>",
+ },
+ {
+ .name = "verify_image",
+ .handler = &handle_verify_image_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<file> [offset] [type]",
+ },
+ {
+ .name = "test_image",
+ .handler = &handle_test_image_command,
+ .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)
{
int retval = ERROR_OK;
if ((retval = trace_register_commands(cmd_ctx)) != ERROR_OK)
return retval;
- 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");
-
- /** @todo don't register virt2phys() unless target supports it */
- 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, "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, "step",
- handle_step_command, COMMAND_EXEC,
- "step one instruction from current PC or [addr]");
-
- register_command(cmd_ctx, NULL, "mdw",
- handle_md_command, COMMAND_EXEC,
- "display memory words [phys] <addr> [count]");
- register_command(cmd_ctx, NULL, "mdh",
- handle_md_command, COMMAND_EXEC,
- "display memory half-words [phys] <addr> [count]");
- register_command(cmd_ctx, NULL, "mdb",
- handle_md_command, COMMAND_EXEC,
- "display memory bytes [phys] <addr> [count]");
-
- register_command(cmd_ctx, NULL, "mww",
- handle_mw_command, COMMAND_EXEC,
- "write memory word [phys] <addr> <value> [count]");
- register_command(cmd_ctx, NULL, "mwh",
- handle_mw_command, COMMAND_EXEC,
- "write memory half-word [phys] <addr> <value> [count]");
- register_command(cmd_ctx, NULL, "mwb",
- handle_mw_command, COMMAND_EXEC,
- "write memory byte [phys] <addr> <value> [count]");
-
- register_command(cmd_ctx, NULL, "bp",
- handle_bp_command, COMMAND_EXEC,
- "list or set breakpoint [<address> <length> [hw]]");
- register_command(cmd_ctx, NULL, "rbp",
- handle_rbp_command, COMMAND_EXEC,
- "remove breakpoint <address>");
-
- register_command(cmd_ctx, NULL, "wp",
- handle_wp_command, COMMAND_EXEC,
- "list or set watchpoint "
- "[<address> <length> <r/w/a> [value] [mask]]");
- register_command(cmd_ctx, NULL, "rwp",
- handle_rwp_command, COMMAND_EXEC,
- "remove watchpoint <address>");
-
- 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]");
-
- return ERROR_OK;
+ return register_commands(cmd_ctx, NULL, target_exec_command_handlers);
}
Code Review / openocd.git / blobdiff