const Jim_Nvp *n;
n = Jim_Nvp_value2name_simple( nvp_error_target, err );
- if( n->name == NULL ){
+ if ( n->name == NULL ){
return "unknown";
} else {
return n->name;
x = -1;
t = all_targets;
while( t ){
- if( x < t->target_number ){
+ if ( x < t->target_number ){
x = (t->target_number)+1;
}
t = t->next;
x = -1;
t = all_targets;
while(t){
- if( x < t->target_number ){
+ if ( x < t->target_number ){
x = t->target_number;
}
t = t->next;
target_t *target = all_targets;
while (target){
- if( target->target_number == num ){
+ if ( target->target_number == num ){
return target;
}
target = target->next;
int retval;
Jim_Nvp *n;
n = Jim_Nvp_value2name_simple( nvp_reset_modes, reset_mode );
- if( n->name == NULL ){
+ if ( n->name == NULL ){
LOG_ERROR("invalid reset mode");
return ERROR_FAIL;
}
target_continuous_poll = save_poll;
- if(retval != JIM_OK) {
+ if (retval != JIM_OK) {
Jim_PrintErrorMessage(interp);
return ERROR_FAIL;
}
if (all_targets)
{
- if((retval = target_register_user_commands(cmd_ctx)) != ERROR_OK)
+ if ((retval = target_register_user_commands(cmd_ctx)) != ERROR_OK)
return retval;
- if((retval = target_register_timer_callback(handle_target, 100, 1, NULL)) != ERROR_OK)
+ if ((retval = target_register_timer_callback(handle_target, 100, 1, NULL)) != ERROR_OK)
return retval;
}
/* only allocate multiples of 4 byte */
if (size % 4)
{
- LOG_ERROR("BUG: code tried to allocate unaligned number of bytes, padding");
- size = CEIL(size, 4);
+ LOG_ERROR("BUG: code tried to allocate unaligned number of bytes (0x%08x), padding", ((unsigned)(size)));
+ size = (size + 3) & (~3);
}
/* see if there's already a matching working area */
if (free_size < size)
{
- LOG_WARNING("not enough working area available(requested %d, free %d)", size, free_size);
+ LOG_WARNING("not enough working area available(requested %u, free %u)",
+ (unsigned)(size), (unsigned)(free_size));
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}
{
int retval;
new_wa->backup = malloc(new_wa->size);
- if((retval = target_read_memory(target, new_wa->address, 4, new_wa->size / 4, new_wa->backup)) != ERROR_OK)
+ if ((retval = target_read_memory(target, new_wa->address, 4, new_wa->size / 4, new_wa->backup)) != ERROR_OK)
{
free(new_wa->backup);
free(new_wa);
if (restore&&target->backup_working_area)
{
int retval;
- if((retval = target_write_memory(target, area->address, 4, area->size / 4, area->backup)) != ERROR_OK)
+ if ((retval = target_write_memory(target, area->address, 4, area->size / 4, area->backup)) != ERROR_OK)
return retval;
}
int target_write_buffer(struct target_s *target, uint32_t address, uint32_t size, uint8_t *buffer)
{
int retval;
- LOG_DEBUG("writing buffer of %i byte at 0x%8.8x", size, address);
+ LOG_DEBUG("writing buffer of %i byte at 0x%8.8x",
+ (int)size, (unsigned)address);
if (!target_was_examined(target))
{
if ((address + size - 1) < address)
{
/* GDB can request this when e.g. PC is 0xfffffffc*/
- LOG_ERROR("address+size wrapped(0x%08x, 0x%08x)", address, size);
+ LOG_ERROR("address+size wrapped(0x%08x, 0x%08x)",
+ (unsigned)address,
+ (unsigned)size);
return ERROR_FAIL;
}
int target_read_buffer(struct target_s *target, uint32_t address, uint32_t size, uint8_t *buffer)
{
int retval;
- LOG_DEBUG("reading buffer of %i byte at 0x%8.8x", size, address);
+ LOG_DEBUG("reading buffer of %i byte at 0x%8.8x",
+ (int)size, (unsigned)address);
if (!target_was_examined(target))
{
if ((address + size - 1) < address)
{
/* GDB can request this when e.g. PC is 0xfffffffc*/
- LOG_ERROR("address+size wrapped(0x%08x, 0x%08x)", address, size);
+ LOG_ERROR("address+size wrapped(0x%08" PRIx32 ", 0x%08" PRIx32 ")",
+ address,
+ size);
return ERROR_FAIL;
}
buffer = malloc(size);
if (buffer == NULL)
{
- LOG_ERROR("error allocating buffer for section (%d bytes)", size);
+ LOG_ERROR("error allocating buffer for section (%d bytes)", (int)size);
return ERROR_INVALID_ARGUMENTS;
}
retval = target_read_buffer(target, address, size, buffer);
if (retval == ERROR_OK)
{
*value = target_buffer_get_u32(target, value_buf);
- LOG_DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, *value);
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8" PRIx32 "",
+ address,
+ *value);
}
else
{
*value = 0x0;
- LOG_DEBUG("address: 0x%8.8x failed", address);
+ LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
+ address);
}
return retval;
if (retval == ERROR_OK)
{
*value = target_buffer_get_u16(target, value_buf);
- LOG_DEBUG("address: 0x%8.8x, value: 0x%4.4x", address, *value);
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%4.4x",
+ address,
+ *value);
}
else
{
*value = 0x0;
- LOG_DEBUG("address: 0x%8.8x failed", address);
+ LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
+ address);
}
return retval;
if (retval == ERROR_OK)
{
- LOG_DEBUG("address: 0x%8.8x, value: 0x%2.2x", address, *value);
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%2.2x",
+ address,
+ *value);
}
else
{
*value = 0x0;
- LOG_DEBUG("address: 0x%8.8x failed", address);
+ LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
+ address);
}
return retval;
return ERROR_FAIL;
}
- LOG_DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, value);
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8" PRIx32 "",
+ address,
+ value);
target_buffer_set_u32(target, value_buf, value);
if ((retval = target_write_memory(target, address, 4, 1, value_buf)) != ERROR_OK)
return ERROR_FAIL;
}
- LOG_DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, value);
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8x",
+ address,
+ value);
target_buffer_set_u16(target, value_buf, value);
if ((retval = target_write_memory(target, address, 2, 1, value_buf)) != ERROR_OK)
return ERROR_FAIL;
}
- LOG_DEBUG("address: 0x%8.8x, value: 0x%2.2x", address, value);
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%2.2x",
+ address, value);
if ((retval = target_write_memory(target, address, 1, 1, &value)) != ERROR_OK)
{
register_command(cmd_ctx, NULL, "verify_image", handle_verify_image_command, COMMAND_EXEC, "verify_image <file> [offset] [type]");
register_command(cmd_ctx, NULL, "test_image", handle_test_image_command, COMMAND_EXEC, "test_image <file> [offset] [type]");
- if((retval = target_request_register_commands(cmd_ctx)) != ERROR_OK)
+ if ((retval = target_request_register_commands(cmd_ctx)) != ERROR_OK)
return retval;
- if((retval = trace_register_commands(cmd_ctx)) != ERROR_OK)
+ if ((retval = trace_register_commands(cmd_ctx)) != ERROR_OK)
return retval;
return retval;
if (!powerDropout && !srstAsserted)
{
/* polling may fail silently until the target has been examined */
- if((retval = target_poll(target)) != ERROR_OK)
+ if ((retval = target_poll(target)) != ERROR_OK)
return retval;
}
}
for (i = 0; i < cache->num_regs; i++)
{
value = buf_to_str(cache->reg_list[i].value, cache->reg_list[i].size, 16);
- command_print(cmd_ctx, "(%i) %s (/%i): 0x%s (dirty: %i, valid: %i)", count++, cache->reg_list[i].name, cache->reg_list[i].size, value, cache->reg_list[i].dirty, cache->reg_list[i].valid);
+ command_print(cmd_ctx, "(%i) %s (/%i): 0x%s (dirty: %i, valid: %i)",
+ count++,
+ cache->reg_list[i].name,
+ (int)(cache->reg_list[i].size),
+ value,
+ cache->reg_list[i].dirty,
+ cache->reg_list[i].valid);
free(value);
}
cache = cache->next;
arch_type->get(reg);
}
value = buf_to_str(reg->value, reg->size, 16);
- command_print(cmd_ctx, "%s (/%i): 0x%s", reg->name, reg->size, value);
+ command_print(cmd_ctx, "%s (/%i): 0x%s", reg->name, (int)(reg->size), value);
free(value);
return ERROR_OK;
}
arch_type->set(reg, buf);
value = buf_to_str(reg->value, reg->size, 16);
- command_print(cmd_ctx, "%s (/%i): 0x%s", reg->name, reg->size, value);
+ command_print(cmd_ctx, "%s (/%i): 0x%s", reg->name, (int)(reg->size), value);
free(value);
free(buf);
{
const Jim_Nvp *n;
n = Jim_Nvp_name2value_simple( nvp_reset_modes, args[0] );
- if( (n->name == NULL) || (n->value == RESET_UNKNOWN) ){
+ if ( (n->name == NULL) || (n->value == RESET_UNKNOWN) ){
return ERROR_COMMAND_SYNTAX_ERROR;
}
reset_mode = n->value;
static int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
+ int current = 1;
if (argc > 1)
return ERROR_COMMAND_SYNTAX_ERROR;
int retval = parse_u32(args[0], &addr);
if (ERROR_OK != retval)
return retval;
+ current = 0;
}
- return target_resume(target, 0, addr, 1, 0);
+ return target_resume(target, current, addr, 1, 0);
}
static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
output_len += snprintf(output + output_len,
sizeof(output) - output_len,
- "0x%8.8x: ", address + (i*size));
+ "0x%8.8x: ",
+ (unsigned)(address + (i*size)));
}
uint32_t value=0;
buffer = malloc(image.sections[i].size);
if (buffer == NULL)
{
- command_print(cmd_ctx, "error allocating buffer for section (%d bytes)", image.sections[i].size);
+ 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 byte written at address 0x%8.8x", length, image.sections[i].base_address+offset);
+ command_print(cmd_ctx, "%u byte written at address 0x%8.8" PRIx32 "",
+ (unsigned int)length,
+ image.sections[i].base_address+offset);
}
free(buffer);
}
- if((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+ if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
{
image_close(&image);
return retvaltemp;
if (retval==ERROR_OK)
{
- command_print(cmd_ctx, "downloaded %u byte in %s", image_size, duration_text);
+ command_print(cmd_ctx, "downloaded %u byte in %s",
+ (unsigned int)image_size,
+ duration_text);
}
free(duration_text);
address += this_run_size;
}
- if((retvaltemp = fileio_close(&fileio)) != ERROR_OK)
+ if ((retvaltemp = fileio_close(&fileio)) != ERROR_OK)
return retvaltemp;
- if((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+ if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
return retvaltemp;
if (retval==ERROR_OK)
buffer = malloc(image.sections[i].size);
if (buffer == NULL)
{
- command_print(cmd_ctx, "error allocating buffer for section (%d bytes)", image.sections[i].size);
+ command_print(cmd_ctx,
+ "error allocating buffer for section (%d bytes)",
+ (int)(image.sections[i].size));
break;
}
if ((retval = image_read_section(&image, i, 0x0, image.sections[i].size, buffer, &buf_cnt)) != ERROR_OK)
image_calculate_checksum( buffer, buf_cnt, &checksum );
retval = target_checksum_memory(target, image.sections[i].base_address, buf_cnt, &mem_checksum);
- if( retval != ERROR_OK )
+ if ( retval != ERROR_OK )
{
free(buffer);
break;
}
- if( checksum != mem_checksum )
+ if ( checksum != mem_checksum )
{
/* failed crc checksum, fall back to a binary compare */
uint8_t *data;
{
if (data[t] != buffer[t])
{
- command_print(cmd_ctx, "Verify operation failed address 0x%08x. Was 0x%02x instead of 0x%02x\n", t + image.sections[i].base_address, data[t], buffer[t]);
+ command_print(cmd_ctx,
+ "Verify operation failed address 0x%08x. Was 0x%02x instead of 0x%02x\n",
+ (unsigned)(t + image.sections[i].base_address),
+ data[t],
+ buffer[t]);
free(data);
free(buffer);
retval=ERROR_FAIL;
}
} else
{
- command_print(cmd_ctx, "address 0x%08x length 0x%08x", image.sections[i].base_address, buf_cnt);
+ command_print(cmd_ctx, "address 0x%08" PRIx32 " length 0x%08" PRIx32 "",
+ image.sections[i].base_address,
+ buf_cnt);
}
free(buffer);
}
done:
- if((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+ if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
{
image_close(&image);
return retvaltemp;
if (retval==ERROR_OK)
{
- command_print(cmd_ctx, "verified %u bytes in %s", image_size, duration_text);
+ command_print(cmd_ctx, "verified %u bytes in %s",
+ (unsigned int)image_size,
+ duration_text);
}
free(duration_text);
{
char* buf = buf_to_str(breakpoint->orig_instr,
breakpoint->length, 16);
- command_print(cmd_ctx, "0x%8.8x, 0x%x, %i, 0x%s",
- breakpoint->address, breakpoint->length,
+ command_print(cmd_ctx, "0x%8.8" PRIx32 ", 0x%x, %i, 0x%s",
+ breakpoint->address,
+ breakpoint->length,
breakpoint->set, buf);
free(buf);
}
else
{
- command_print(cmd_ctx, "0x%8.8x, 0x%x, %i",
- breakpoint->address, breakpoint->length, breakpoint->set);
+ command_print(cmd_ctx, "0x%8.8" PRIx32 ", 0x%x, %i",
+ breakpoint->address,
+ breakpoint->length, breakpoint->set);
}
breakpoint = breakpoint->next;
target_t *target = get_current_target(cmd_ctx);
int retval = breakpoint_add(target, addr, length, hw);
if (ERROR_OK == retval)
- command_print(cmd_ctx, "breakpoint set at 0x%8.8x", addr);
+ command_print(cmd_ctx, "breakpoint set at 0x%8.8" PRIx32 "", addr);
else
LOG_ERROR("Failure setting breakpoint");
return retval;
while (watchpoint)
{
- 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);
+ command_print(cmd_ctx,
+ "address: 0x%8.8" PRIx32 ", len: 0x%8.8x, r/w/a: %i, value: 0x%8.8" PRIx32 ", mask: 0x%8.8" PRIx32 "",
+ watchpoint->address,
+ watchpoint->length,
+ (int)(watchpoint->rw),
+ watchpoint->value,
+ watchpoint->mask);
watchpoint = watchpoint->next;
}
return ERROR_OK;
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);
+ command_print(cmd_ctx, "Physical address 0x%08" PRIx32 "", pa);
return retval;
}
} else if (target->state == TARGET_RUNNING)
{
/* We want to quickly sample the PC. */
- if((retval = target_halt(target)) != ERROR_OK)
+ if ((retval = target_halt(target)) != ERROR_OK)
{
free(samples);
return retval;
if ((numSamples>=maxSample) || ((now.tv_sec >= timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec)))
{
command_print(cmd_ctx, "Profiling completed. %d samples.", numSamples);
- if((retval = target_poll(target)) != ERROR_OK)
+ if ((retval = target_poll(target)) != ERROR_OK)
{
free(samples);
return retval;
{
target_resume(target, 1, 0, 0, 0); /* current pc, addr = 0, do not handle breakpoints, not debugging */
}
- if((retval = target_poll(target)) != ERROR_OK)
+ if ((retval = target_poll(target)) != ERROR_OK)
{
free(samples);
return retval;
} else {
char buf[100];
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
- sprintf(buf, "mem2array address: 0x%08x is not aligned for %d byte reads", addr, width);
+ sprintf(buf, "mem2array address: 0x%08" PRIx32 " is not aligned for %" PRId32 " byte reads",
+ addr,
+ width);
Jim_AppendStrings(interp, Jim_GetResult(interp), buf , NULL);
return JIM_ERR;
}
retval = target_read_memory( target, addr, width, count, buffer );
if (retval != ERROR_OK) {
/* BOO !*/
- LOG_ERROR("mem2array: Read @ 0x%08x, w=%d, cnt=%d, failed", addr, width, count);
+ LOG_ERROR("mem2array: Read @ 0x%08x, w=%d, cnt=%d, failed",
+ (unsigned int)addr,
+ (int)width,
+ (int)count);
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
Jim_AppendStrings(interp, Jim_GetResult(interp), "mem2array: cannot read memory", NULL);
e = JIM_ERR;
} else {
char buf[100];
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
- sprintf(buf, "array2mem address: 0x%08x is not aligned for %d byte reads", addr, width);
+ sprintf(buf, "array2mem address: 0x%08x is not aligned for %d byte reads",
+ (unsigned int)addr,
+ (int)width);
Jim_AppendStrings(interp, Jim_GetResult(interp), buf , NULL);
return JIM_ERR;
}
retval = target_write_memory(target, addr, width, count, buffer);
if (retval != ERROR_OK) {
/* BOO !*/
- LOG_ERROR("array2mem: Write @ 0x%08x, w=%d, cnt=%d, failed", addr, width, count);
+ LOG_ERROR("array2mem: Write @ 0x%08x, w=%d, cnt=%d, failed",
+ (unsigned int)addr,
+ (int)width,
+ (int)count);
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
Jim_AppendStrings(interp, Jim_GetResult(interp), "array2mem: cannot read memory", NULL);
e = JIM_ERR;
target_t *target;
LOG_DEBUG( "**all*targets: event: %d, %s",
- e,
- Jim_Nvp_value2name_simple( nvp_target_event, e )->name );
+ (int)e,
+ Jim_Nvp_value2name_simple( nvp_target_event, e )->name );
target = all_targets;
while (target){
done = 0;
while( teap ){
- if( teap->event == e ){
+ if ( teap->event == e ){
done = 1;
LOG_DEBUG( "target: (%d) %s (%s) event: %d (%s) action: %s\n",
target->target_number,
}
teap = teap->next;
}
- if( !done ){
+ if ( !done ){
LOG_DEBUG( "event: %d %s - no action",
e,
Jim_Nvp_value2name_simple( nvp_target_event, e )->name );
Jim_SetEmptyResult( goi->interp );
/* Jim_GetOpt_Debug( goi ); */
- if( target->type->target_jim_configure ){
+ if ( target->type->target_jim_configure ){
/* target defines a configure function */
/* target gets first dibs on parameters */
e = (*(target->type->target_jim_configure))( target, goi );
- if( e == JIM_OK ){
+ if ( e == JIM_OK ){
/* more? */
continue;
}
- if( e == JIM_ERR ){
+ if ( e == JIM_ERR ){
/* An error */
return e;
}
/* otherwise we 'continue' below */
}
e = Jim_GetOpt_Nvp( goi, nvp_config_opts, &n );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
Jim_GetOpt_NvpUnknown( goi, nvp_config_opts, 0 );
return e;
}
switch( n->value ){
case TCFG_TYPE:
/* not setable */
- if( goi->isconfigure ){
+ if ( goi->isconfigure ){
Jim_SetResult_sprintf( goi->interp, "not setable: %s", n->name );
return JIM_ERR;
} else {
no_params:
- if( goi->argc != 0 ){
+ if ( goi->argc != 0 ){
Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "NO PARAMS");
return JIM_ERR;
}
/* loop for more */
break;
case TCFG_EVENT:
- if( goi->argc == 0 ){
+ if ( goi->argc == 0 ){
Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ...");
return JIM_ERR;
}
e = Jim_GetOpt_Nvp( goi, nvp_target_event, &n );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
Jim_GetOpt_NvpUnknown( goi, nvp_target_event, 1 );
return e;
}
- if( goi->isconfigure ){
- if( goi->argc != 1 ){
+ if ( goi->isconfigure ){
+ if ( goi->argc != 1 ){
Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ?EVENT-BODY?");
return JIM_ERR;
}
} else {
- if( goi->argc != 0 ){
+ if ( goi->argc != 0 ){
Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name?");
return JIM_ERR;
}
teap = target->event_action;
/* replace existing? */
while( teap ){
- if( teap->event == (enum target_event)n->value ){
+ if ( teap->event == (enum target_event)n->value ){
break;
}
teap = teap->next;
}
- if( goi->isconfigure ){
- if( teap == NULL ){
+ if ( goi->isconfigure ){
+ if ( teap == NULL ){
/* create new */
teap = calloc( 1, sizeof(*teap) );
}
teap->event = n->value;
Jim_GetOpt_Obj( goi, &o );
- if( teap->body ){
+ if ( teap->body ){
Jim_DecrRefCount( interp, teap->body );
}
teap->body = Jim_DuplicateObj( goi->interp, o );
Jim_SetEmptyResult(goi->interp);
} else {
/* get */
- if( teap == NULL ){
+ if ( teap == NULL ){
Jim_SetEmptyResult( goi->interp );
} else {
Jim_SetResult( goi->interp, Jim_DuplicateObj( goi->interp, teap->body ) );
break;
case TCFG_WORK_AREA_VIRT:
- if( goi->isconfigure ){
+ if ( goi->isconfigure ){
target_free_all_working_areas(target);
e = Jim_GetOpt_Wide( goi, &w );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
return e;
}
target->working_area_virt = w;
} else {
- if( goi->argc != 0 ){
+ if ( goi->argc != 0 ){
goto no_params;
}
}
break;
case TCFG_WORK_AREA_PHYS:
- if( goi->isconfigure ){
+ if ( goi->isconfigure ){
target_free_all_working_areas(target);
e = Jim_GetOpt_Wide( goi, &w );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
return e;
}
target->working_area_phys = w;
} else {
- if( goi->argc != 0 ){
+ if ( goi->argc != 0 ){
goto no_params;
}
}
break;
case TCFG_WORK_AREA_SIZE:
- if( goi->isconfigure ){
+ if ( goi->isconfigure ){
target_free_all_working_areas(target);
e = Jim_GetOpt_Wide( goi, &w );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
return e;
}
target->working_area_size = w;
} else {
- if( goi->argc != 0 ){
+ if ( goi->argc != 0 ){
goto no_params;
}
}
break;
case TCFG_WORK_AREA_BACKUP:
- if( goi->isconfigure ){
+ if ( goi->isconfigure ){
target_free_all_working_areas(target);
e = Jim_GetOpt_Wide( goi, &w );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
return e;
}
/* make this exactly 1 or 0 */
target->backup_working_area = (!!w);
} else {
- if( goi->argc != 0 ){
+ if ( goi->argc != 0 ){
goto no_params;
}
}
break;
case TCFG_ENDIAN:
- if( goi->isconfigure ){
+ if ( goi->isconfigure ){
e = Jim_GetOpt_Nvp( goi, nvp_target_endian, &n );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
Jim_GetOpt_NvpUnknown( goi, nvp_target_endian, 1 );
return e;
}
target->endianness = n->value;
} else {
- if( goi->argc != 0 ){
+ if ( goi->argc != 0 ){
goto no_params;
}
}
n = Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness );
- if( n->name == NULL ){
+ if ( n->name == NULL ){
target->endianness = TARGET_LITTLE_ENDIAN;
n = Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness );
}
break;
case TCFG_VARIANT:
- if( goi->isconfigure ){
- if( goi->argc < 1 ){
+ if ( goi->isconfigure ){
+ if ( goi->argc < 1 ){
Jim_SetResult_sprintf( goi->interp,
"%s ?STRING?",
n->name );
return JIM_ERR;
}
- if( target->variant ){
+ if ( target->variant ){
free((void *)(target->variant));
}
e = Jim_GetOpt_String( goi, &cp, NULL );
target->variant = strdup(cp);
} else {
- if( goi->argc != 0 ){
+ if ( goi->argc != 0 ){
goto no_params;
}
}
/* loop for more */
break;
case TCFG_CHAIN_POSITION:
- if( goi->isconfigure ){
+ if ( goi->isconfigure ){
Jim_Obj *o;
jtag_tap_t *tap;
target_free_all_working_areas(target);
e = Jim_GetOpt_Obj( goi, &o );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
return e;
}
tap = jtag_tap_by_jim_obj( goi->interp, o );
- if( tap == NULL ){
+ if ( tap == NULL ){
return JIM_ERR;
}
/* make this exactly 1 or 0 */
target->tap = tap;
} else {
- if( goi->argc != 0 ){
+ if ( goi->argc != 0 ){
goto no_params;
}
}
/* commands here are in an NVP table */
e = Jim_GetOpt_Nvp( &goi, target_options, &n );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
Jim_GetOpt_NvpUnknown( &goi, target_options, 0 );
return e;
}
switch( n->value ){
case TS_CMD_CONFIGURE:
- if( goi.argc < 2 ){
+ if ( goi.argc < 2 ){
Jim_WrongNumArgs( goi.interp, goi.argc, goi.argv, "missing: -option VALUE ...");
return JIM_ERR;
}
return target_configure( &goi, target );
case TS_CMD_CGET:
// some things take params
- if( goi.argc < 1 ){
+ if ( goi.argc < 1 ){
Jim_WrongNumArgs( goi.interp, 0, goi.argv, "missing: ?-option?");
return JIM_ERR;
}
* argv[3] = optional count.
*/
- if( (goi.argc == 2) || (goi.argc == 3) ){
+ if ( (goi.argc == 2) || (goi.argc == 3) ){
/* all is well */
} else {
mwx_error:
}
e = Jim_GetOpt_Wide( &goi, &a );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
goto mwx_error;
}
e = Jim_GetOpt_Wide( &goi, &b );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
goto mwx_error;
}
if (goi.argc == 3) {
e = Jim_GetOpt_Wide( &goi, &c );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
goto mwx_error;
}
} else {
}
for( x = 0 ; x < c ; x++ ){
e = target_write_memory( target, a, b, 1, target_buf );
- if( e != ERROR_OK ){
+ if ( e != ERROR_OK ){
Jim_SetResult_sprintf( interp, "Error writing @ 0x%08x: %d\n", (int)(a), e );
return JIM_ERR;
}
* argv[1] = address
* argv[2] = optional count
*/
- if( (goi.argc == 2) || (goi.argc == 3) ){
+ if ( (goi.argc == 2) || (goi.argc == 3) ){
Jim_SetResult_sprintf( goi.interp, "expected: %s ADDR [COUNT]", n->name );
return JIM_ERR;
}
e = Jim_GetOpt_Wide( &goi, &a );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
return JIM_ERR;
}
- if( goi.argc ){
+ if ( goi.argc ){
e = Jim_GetOpt_Wide( &goi, &c );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
return JIM_ERR;
}
} else {
/* count is now in 'BYTES' */
while( c > 0 ){
y = c;
- if( y > 16 ){
+ if ( y > 16 ){
y = 16;
}
e = target_read_memory( target, a, b, y / b, target_buf );
- if( e != ERROR_OK ){
+ if ( e != ERROR_OK ){
Jim_SetResult_sprintf( interp, "error reading target @ 0x%08lx", (int)(a) );
return JIM_ERR;
}
}
/* ascii-ify the bytes */
for( x = 0 ; x < y ; x++ ){
- if( (target_buf[x] >= 0x20) &&
+ if ( (target_buf[x] >= 0x20) &&
(target_buf[x] <= 0x7e) ){
/* good */
} else {
return target_array2mem( goi.interp, target, goi.argc, goi.argv );
break;
case TS_CMD_EXAMINE:
- if( goi.argc ){
+ 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 ){
+ 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 ){
+ 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)) ){
+ if ( !(target_was_examined(target)) ){
e = ERROR_TARGET_NOT_EXAMINED;
} else {
e = target->type->poll( target );
}
- if( e != ERROR_OK ){
+ if ( e != ERROR_OK ){
Jim_SetResult_sprintf( interp, "poll-fails: %d", e );
return JIM_ERR;
} else {
}
break;
case TS_CMD_RESET:
- if( goi.argc != 2 ){
+ if ( goi.argc != 2 ){
Jim_WrongNumArgs( interp, 2, argv, "t|f|assert|deassert BOOL");
return JIM_ERR;
}
e = Jim_GetOpt_Nvp( &goi, nvp_assert, &n );
- if( e != JIM_OK ){
+ 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 ){
+ if ( e != JIM_OK ){
return e;
}
if (!target->tap->enabled)
target_free_all_working_areas_restore(target, 0);
/* do the assert */
- if( n->value == NVP_ASSERT ){
+ if ( n->value == NVP_ASSERT ){
target->type->assert_reset( target );
} else {
target->type->deassert_reset( target );
}
return JIM_OK;
case TS_CMD_HALT:
- if( goi.argc ){
+ if ( goi.argc ){
Jim_WrongNumArgs( goi.interp, 0, argv, "halt [no parameters]");
return JIM_ERR;
}
return JIM_OK;
case TS_CMD_WAITSTATE:
/* params: <name> statename timeoutmsecs */
- if( goi.argc != 2 ){
+ 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 ){
+ if ( e != JIM_OK ){
Jim_GetOpt_NvpUnknown( &goi, nvp_target_state,1 );
return e;
}
e = Jim_GetOpt_Wide( &goi, &a );
- if( e != JIM_OK ){
+ 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 ){
+ if ( e != ERROR_OK ){
Jim_SetResult_sprintf( goi.interp,
"target: %s wait %s fails (%d) %s",
target->cmd_name,
return JIM_OK;
}
case TS_CMD_CURSTATE:
- if( goi.argc != 0 ){
+ if ( goi.argc != 0 ){
Jim_WrongNumArgs( goi.interp, 0, argv, "[no parameters]");
return JIM_ERR;
}
Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name,-1);
return JIM_OK;
case TS_CMD_INVOKE_EVENT:
- if( goi.argc != 1 ){
+ if ( goi.argc != 1 ){
Jim_SetResult_sprintf( goi.interp, "%s ?EVENTNAME?",n->name);
return JIM_ERR;
}
e = Jim_GetOpt_Nvp( &goi, nvp_target_event, &n );
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
Jim_GetOpt_NvpUnknown( &goi, nvp_target_event, 1 );
return e;
}
struct command_context_s *cmd_ctx;
cmd_ctx = Jim_GetAssocData(goi->interp, "context");
- if( goi->argc < 3 ){
+ if ( goi->argc < 3 ){
Jim_WrongNumArgs( goi->interp, 1, goi->argv, "?name? ?type? ..options...");
return JIM_ERR;
}
Jim_GetOpt_Obj( goi, &new_cmd );
/* does this command exist? */
cmd = Jim_GetCommand( goi->interp, new_cmd, JIM_ERRMSG );
- if( cmd ){
+ if ( cmd ){
cp = Jim_GetString( new_cmd, NULL );
Jim_SetResult_sprintf(goi->interp, "Command/target: %s Exists", cp);
return JIM_ERR;
cp = cp2;
/* now does target type exist */
for( x = 0 ; target_types[x] ; x++ ){
- if( 0 == strcmp( cp, target_types[x]->name ) ){
+ if ( 0 == strcmp( cp, target_types[x]->name ) ){
/* found */
break;
}
}
- if( target_types[x] == NULL ){
+ if ( target_types[x] == NULL ){
Jim_SetResult_sprintf( goi->interp, "Unknown target type %s, try one of ", cp );
for( x = 0 ; target_types[x] ; x++ ){
- if( target_types[x+1] ){
+ if ( target_types[x+1] ){
Jim_AppendStrings( goi->interp,
Jim_GetResult(goi->interp),
target_types[x]->name,
e=JIM_ERR;
}
- if( e != JIM_OK ){
+ if ( e != JIM_OK ){
free( target->type );
free( target );
return e;
}
- if( target->endianness == TARGET_ENDIAN_UNKNOWN ){
+ if ( target->endianness == TARGET_ENDIAN_UNKNOWN ){
/* default endian to little if not specified */
target->endianness = TARGET_LITTLE_ENDIAN;
}
target->variant = strdup("");
/* create the target specific commands */
- if( target->type->register_commands ){
+ if ( target->type->register_commands ){
(*(target->type->register_commands))( cmd_ctx );
}
- if( target->type->target_create ){
+ if ( target->type->target_create ){
(*(target->type->target_create))( target, goi->interp );
}
Jim_GetOpt_Setup( &goi, interp, argc-1, argv+1 );
- if( goi.argc == 0 ){
+ if ( goi.argc == 0 ){
Jim_WrongNumArgs(interp, 1, argv, "missing: command ...");
return JIM_ERR;
}
/* Jim_GetOpt_Debug( &goi ); */
r = Jim_GetOpt_Enum( &goi, target_cmds, &x );
- if( r != JIM_OK ){
+ if ( r != JIM_OK ){
return r;
}
Jim_Panic(goi.interp,"Why am I here?");
return JIM_ERR;
case TG_CMD_CURRENT:
- if( goi.argc != 0 ){
+ 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 ){
+ if ( goi.argc != 0 ){
Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters" );
return JIM_ERR;
}
}
return JIM_OK;
case TG_CMD_NAMES:
- if( goi.argc != 0 ){
+ if ( goi.argc != 0 ){
Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters" );
return JIM_ERR;
}
}
return JIM_OK;
case TG_CMD_CREATE:
- if( goi.argc < 3 ){
+ if ( goi.argc < 3 ){
Jim_WrongNumArgs( goi.interp, goi.argc, goi.argv, "?name ... config options ...");
return JIM_ERR;
}
return target_create( &goi );
break;
case TG_CMD_NUMBER:
- if( goi.argc != 1 ){
+ 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 ){
+ if ( e != JIM_OK ){
return JIM_ERR;
}
{
target_t *t;
t = get_target_by_num(w);
- if( t == NULL ){
+ if ( t == NULL ){
Jim_SetResult_sprintf( goi.interp,"Target: number %d does not exist", (int)(w));
return JIM_ERR;
}
return JIM_OK;
}
case TG_CMD_COUNT:
- if( goi.argc != 0 ){
+ if ( goi.argc != 0 ){
Jim_WrongNumArgs( goi.interp, 0, goi.argv, "<no parameters>");
return JIM_ERR;
}
buffer = malloc(image.sections[i].size);
if (buffer == NULL)
{
- command_print(cmd_ctx, "error allocating buffer for section (%d bytes)", image.sections[i].size);
+ 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 byte written at address 0x%8.8x", length, image.sections[i].base_address+offset);
+ command_print(cmd_ctx, "%u byte written at address 0x%8.8x",
+ (unsigned int)length,
+ ((unsigned int)(image.sections[i].base_address+offset)));
}
free(buffer);
duration_stop_measure(&duration, &duration_text);
if (retval==ERROR_OK)
{
- command_print(cmd_ctx, "Loaded %u bytes in %s", image_size, duration_text);
+ command_print(cmd_ctx, "Loaded %u bytes in %s", (unsigned int)image_size, duration_text);
command_print(cmd_ctx, "NB!!! image has not been loaded to target, issue a subsequent 'fast_load' to do so.");
}
free(duration_text);
for (i=0; i<fastload_num;i++)
{
target_t *target = get_current_target(cmd_ctx);
- command_print(cmd_ctx, "Write to 0x%08x, length 0x%08x", fastload[i].address, fastload[i].length);
+ 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)
{
retval = target_write_buffer(target, fastload[i].address, fastload[i].length, fastload[i].data);
command_print(cmd_ctx, "Loaded image %f kBytes/s", (float)(size/1024.0)/((float)(after-ms)/1000.0));
return retval;
}
+
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */
projects / fw / openocd / blobdiff