/* access a single register by its ordinal number */
if ((args[0][0] >= '0') && (args[0][0] <= '9'))
{
- int num = strtoul(args[0], NULL, 0);
- reg_cache_t *cache = target->reg_cache;
+ unsigned num;
+ int retval = parse_uint(args[0], &num);
+ if (ERROR_OK != retval)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ reg_cache_t *cache = target->reg_cache;
count = 0;
while(cache)
{
int i;
for (i = 0; i < cache->num_regs; i++)
{
- if (count++ == num)
+ if (count++ == (int)num)
{
reg = &cache->reg_list[i];
break;
static int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
- int ms = 5000;
+ if (argc > 1)
+ return ERROR_COMMAND_SYNTAX_ERROR;
- if (argc > 0)
+ unsigned ms = 5000;
+ if (1 == argc)
{
- char *end;
-
- ms = strtoul(args[0], &end, 0) * 1000;
- if (*end)
+ int retval = parse_uint(args[0], &ms);
+ if (ERROR_OK != retval)
{
command_print(cmd_ctx, "usage: %s [seconds]", cmd);
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
+ // convert seconds (given) to milliseconds (needed)
+ ms *= 1000;
}
- target_t *target = get_current_target(cmd_ctx);
+ target_t *target = get_current_target(cmd_ctx);
return target_wait_state(target, TARGET_HALTED, ms);
}
static int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
- int retval;
- target_t *target = get_current_target(cmd_ctx);
-
LOG_DEBUG("-");
- if ((retval = target_halt(target)) != ERROR_OK)
- {
+ target_t *target = get_current_target(cmd_ctx);
+ int retval = target_halt(target);
+ if (ERROR_OK != retval)
return retval;
- }
if (argc == 1)
{
- int wait;
- char *end;
-
- wait = strtoul(args[0], &end, 0);
- if (!*end && !wait)
+ unsigned wait;
+ retval = parse_uint(args[0], &wait);
+ if (ERROR_OK != retval)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ if (!wait)
return ERROR_OK;
}
* handle breakpoints, not debugging */
u32 addr = 0;
if (argc == 1)
- addr = strtoul(args[0], NULL, 0);
+ {
+ int retval = parse_u32(args[0], &addr);
+ if (ERROR_OK != retval)
+ return retval;
+ }
return target_resume(target, 0, addr, 1, 0);
}
* handle breakpoints, debugging */
u32 addr = 0;
if (argc == 1)
- addr = strtoul(args[0], NULL, 0);
+ {
+ int retval = parse_u32(args[0], &addr);
+ if (ERROR_OK != retval)
+ return retval;
+ }
target_t *target = get_current_target(cmd_ctx);
return target->type->step(target, 0, addr, 1);
default: return ERROR_COMMAND_SYNTAX_ERROR;
}
- u32 address = strtoul(args[0], NULL, 0);
+ u32 address;
+ int retval = parse_u32(args[0], &address);
+ if (ERROR_OK != retval)
+ return retval;
unsigned count = 1;
if (argc == 2)
- count = strtoul(args[1], NULL, 0);
+ {
+ retval = parse_uint(args[1], &count);
+ if (ERROR_OK != retval)
+ return retval;
+ }
u8 *buffer = calloc(count, size);
target_t *target = get_current_target(cmd_ctx);
- int retval = target_read_memory(target,
+ retval = target_read_memory(target,
address, size, count, buffer);
if (ERROR_OK == retval)
handle_md_output(cmd_ctx, target, address, size, count, buffer);
static int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
- u32 address = 0;
- u32 value = 0;
- int count = 1;
- int i;
- int wordsize;
- target_t *target = get_current_target(cmd_ctx);
- u8 value_buf[4];
-
if ((argc < 2) || (argc > 3))
return ERROR_COMMAND_SYNTAX_ERROR;
- address = strtoul(args[0], NULL, 0);
- value = strtoul(args[1], NULL, 0);
+ u32 address;
+ int retval = parse_u32(args[0], &address);
+ if (ERROR_OK != retval)
+ return retval;
+
+ u32 value;
+ retval = parse_u32(args[1], &value);
+ if (ERROR_OK != retval)
+ return retval;
+
+ unsigned count = 1;
if (argc == 3)
- count = strtoul(args[2], NULL, 0);
+ {
+ retval = parse_uint(args[2], &count);
+ if (ERROR_OK != retval)
+ return retval;
+ }
+ target_t *target = get_current_target(cmd_ctx);
+ unsigned wordsize;
+ u8 value_buf[4];
switch (cmd[2])
{
case 'w':
default:
return ERROR_COMMAND_SYNTAX_ERROR;
}
- for (i=0; i<count; i++)
+ for (unsigned i = 0; i < count; i++)
{
- int retval = target_write_memory(target,
+ retval = target_write_memory(target,
address + i * wordsize, wordsize, 1, value_buf);
if (ERROR_OK != retval)
return retval;
}
-static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int parse_load_image_command_args(char **args, int argc,
+ image_t *image, u32 *min_address, u32 *max_address)
{
- u8 *buffer;
- u32 buf_cnt;
- u32 image_size;
- u32 min_address=0;
- u32 max_address=0xffffffff;
- int i;
- int retval, retvaltemp;
-
- image_t image;
-
- duration_t duration;
- char *duration_text;
-
- target_t *target = get_current_target(cmd_ctx);
-
- if ((argc < 1)||(argc > 5))
- {
+ if (argc < 1 || argc > 5)
return ERROR_COMMAND_SYNTAX_ERROR;
- }
- /* a base address isn't always necessary, default to 0x0 (i.e. don't relocate) */
+ /* a base address isn't always necessary,
+ * default to 0x0 (i.e. don't relocate) */
if (argc >= 2)
{
- image.base_address_set = 1;
- image.base_address = strtoul(args[1], NULL, 0);
+ u32 addr;
+ int retval = parse_u32(args[1], &addr);
+ if (ERROR_OK != retval)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ image->base_address = addr;
+ image->base_address_set = 1;
}
else
- {
- image.base_address_set = 0;
- }
-
+ image->base_address_set = 0;
- image.start_address_set = 0;
+ image->start_address_set = 0;
- if (argc>=4)
+ if (argc >= 4)
{
- min_address=strtoul(args[3], NULL, 0);
+ int retval = parse_u32(args[3], min_address);
+ if (ERROR_OK != retval)
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
- if (argc>=5)
+ if (argc == 5)
{
- max_address=strtoul(args[4], NULL, 0)+min_address;
+ int retval = parse_u32(args[4], max_address);
+ if (ERROR_OK != retval)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ // use size (given) to find max (required)
+ *max_address += *min_address;
}
- if (min_address>max_address)
- {
+ if (*min_address > *max_address)
return ERROR_COMMAND_SYNTAX_ERROR;
- }
+ return ERROR_OK;
+}
+
+static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+ u8 *buffer;
+ u32 buf_cnt;
+ u32 image_size;
+ u32 min_address = 0;
+ u32 max_address = 0xffffffff;
+ int i;
+ int retvaltemp;
+
+ image_t image;
+
+ duration_t duration;
+ char *duration_text;
+
+ int retval = parse_load_image_command_args(args, argc,
+ &image, &min_address, &max_address);
+ if (ERROR_OK != retval)
+ return retval;
+
+ target_t *target = get_current_target(cmd_ctx);
duration_start_measure(&duration);
if (image_open(&image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK)
{
fileio_t fileio;
- u32 address;
- u32 size;
u8 buffer[560];
- int retval=ERROR_OK, retvaltemp;
+ int retvaltemp;
duration_t duration;
char *duration_text;
return ERROR_OK;
}
- address = strtoul(args[1], NULL, 0);
- size = strtoul(args[2], NULL, 0);
+ u32 address;
+ int retval = parse_u32(args[1], &address);
+ if (ERROR_OK != retval)
+ return retval;
+
+ u32 size;
+ retval = parse_u32(args[2], &size);
+ if (ERROR_OK != retval)
+ return retval;
if (fileio_open(&fileio, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
{
if (argc >= 2)
{
+ u32 addr;
+ retval = parse_u32(args[1], &addr);
+ if (ERROR_OK != retval)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ image.base_address = addr;
image.base_address_set = 1;
- image.base_address = strtoul(args[1], NULL, 0);
}
else
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
- u32 addr = strtoul(args[0], NULL, 0);
- u32 length = strtoul(args[1], NULL, 0);
+ u32 addr;
+ int retval = parse_u32(args[0], &addr);
+ if (ERROR_OK != retval)
+ return retval;
+
+ u32 length;
+ retval = parse_u32(args[1], &length);
+ if (ERROR_OK != retval)
+ return retval;
int hw = BKPT_SOFT;
if (argc == 3)
static int handle_rbp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
- target_t *target = get_current_target(cmd_ctx);
+ if (argc != 1)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
+ u32 addr;
+ int retval = parse_u32(args[0], &addr);
+ if (ERROR_OK != retval)
+ return retval;
- if (argc > 0)
- breakpoint_remove(target, strtoul(args[0], NULL, 0));
+ target_t *target = get_current_target(cmd_ctx);
+ breakpoint_remove(target, addr);
return ERROR_OK;
}
static int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
target_t *target = get_current_target(cmd_ctx);
- int retval;
if (argc == 0)
{
command_print(cmd_ctx, "address: 0x%8.8x, len: 0x%8.8x, r/w/a: %i, value: 0x%8.8x, mask: 0x%8.8x", watchpoint->address, watchpoint->length, watchpoint->rw, watchpoint->value, watchpoint->mask);
watchpoint = watchpoint->next;
}
+ return ERROR_OK;
}
- else if (argc >= 2)
- {
- enum watchpoint_rw type = WPT_ACCESS;
- u32 data_value = 0x0;
- u32 data_mask = 0xffffffff;
- if (argc >= 3)
- {
- switch(args[2][0])
- {
- case 'r':
- type = WPT_READ;
- break;
- case 'w':
- type = WPT_WRITE;
- break;
- case 'a':
- type = WPT_ACCESS;
- break;
- default:
- command_print(cmd_ctx, "usage: wp <address> <length> [r/w/a] [value] [mask]");
- return ERROR_OK;
- }
- }
- if (argc >= 4)
- {
- data_value = strtoul(args[3], NULL, 0);
- }
- if (argc >= 5)
- {
- data_mask = strtoul(args[4], NULL, 0);
- }
+ enum watchpoint_rw type = WPT_ACCESS;
+ u32 addr = 0;
+ u32 length = 0;
+ u32 data_value = 0x0;
+ u32 data_mask = 0xffffffff;
+ int retval;
- if ((retval = watchpoint_add(target, strtoul(args[0], NULL, 0),
- strtoul(args[1], NULL, 0), type, data_value, data_mask)) != ERROR_OK)
+ switch (argc)
+ {
+ case 5:
+ retval = parse_u32(args[4], &data_mask);
+ if (ERROR_OK != retval)
+ return retval;
+ // fall through
+ case 4:
+ retval = parse_u32(args[3], &data_value);
+ if (ERROR_OK != retval)
+ return retval;
+ // fall through
+ case 3:
+ switch(args[2][0])
{
- LOG_ERROR("Failure setting breakpoints");
+ case 'r':
+ type = WPT_READ;
+ break;
+ case 'w':
+ type = WPT_WRITE;
+ break;
+ case 'a':
+ type = WPT_ACCESS;
+ break;
+ default:
+ LOG_ERROR("invalid watchpoint mode ('%c')", args[2][0]);
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
- }
- else
- {
+ // fall through
+ case 2:
+ retval = parse_u32(args[1], &length);
+ if (ERROR_OK != retval)
+ return retval;
+ retval = parse_u32(args[0], &addr);
+ if (ERROR_OK != retval)
+ return retval;
+ break;
+
+ default:
command_print(cmd_ctx, "usage: wp <address> <length> [r/w/a] [value] [mask]");
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
- return ERROR_OK;
+ retval = watchpoint_add(target, addr, length, type,
+ data_value, data_mask);
+ if (ERROR_OK != retval)
+ LOG_ERROR("Failure setting watchpoints");
+
+ return retval;
}
static int handle_rwp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
if (argc != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
+ u32 addr;
+ int retval = parse_u32(args[0], &addr);
+ if (ERROR_OK != retval)
+ return retval;
+
target_t *target = get_current_target(cmd_ctx);
- watchpoint_remove(target, strtoul(args[0], NULL, 0));
+ watchpoint_remove(target, addr);
return ERROR_OK;
}
if (argc != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
- target_t *target = get_current_target(cmd_ctx);
- u32 va = strtoul(args[0], NULL, 0);
+ u32 va;
+ int retval = parse_u32(args[0], &va);
+ if (ERROR_OK != retval)
+ return retval;
u32 pa;
- int retval = target->type->virt2phys(target, va, &pa);
+ target_t *target = get_current_target(cmd_ctx);
+ retval = target->type->virt2phys(target, va, &pa);
if (retval == ERROR_OK)
command_print(cmd_ctx, "Physical address 0x%08x", pa);
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
- char *end;
- timeval_add_time(&timeout, strtoul(args[0], &end, 0), 0);
- if (*end)
- {
- return ERROR_OK;
- }
+ unsigned offset;
+ int retval = parse_uint(args[0], &offset);
+ if (ERROR_OK != retval)
+ return retval;
+
+ timeval_add_time(&timeout, offset, 0);
command_print(cmd_ctx, "Starting profiling. Halting and resuming the target as often as we can...");
return ERROR_OK;
int numSamples=0;
- int retval=ERROR_OK;
/* hopefully it is safe to cache! We want to stop/restart as quickly as possible. */
reg_t *reg = register_get_by_name(target->reg_cache, "pc", 1);
u32 min_address=0;
u32 max_address=0xffffffff;
int i;
- int retval;
image_t image;
duration_t duration;
char *duration_text;
- if ((argc < 1)||(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)
- {
- image.base_address_set = 1;
- image.base_address = strtoul(args[1], NULL, 0);
- }
- else
- {
- image.base_address_set = 0;
- }
-
-
- image.start_address_set = 0;
-
- if (argc>=4)
- {
- min_address=strtoul(args[3], NULL, 0);
- }
- if (argc>=5)
- {
- max_address=strtoul(args[4], NULL, 0)+min_address;
- }
-
- if (min_address>max_address)
- {
- return ERROR_COMMAND_SYNTAX_ERROR;
- }
+ int retval = parse_load_image_command_args(args, argc,
+ &image, &min_address, &max_address);
+ if (ERROR_OK != retval)
+ return retval;
duration_start_measure(&duration);