* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
- * Copyright (C) 2007,2008 Øyvind Harboe *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
* oyvind.harboe@zylin.com *
* *
* Copyright (C) 2008, Duane Ellis *
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;
{ .name = NULL , .value = -1 },
};
+const char *
+target_state_name( target_t *t )
+{
+ const char *cp;
+ cp = Jim_Nvp_value2name_simple(nvp_target_state, t->state)->name;
+ if( !cp ){
+ LOG_ERROR("Invalid target state: %d", (int)(t->state));
+ cp = "(*BUG*unknown*BUG*)";
+ }
+ return cp;
+}
+
static int max_target_number(void)
{
target_t *t;
x = -1;
t = all_targets;
- while (t){
- if (x < t->target_number){
+ while (t) {
+ if (x < t->target_number) {
x = (t->target_number) + 1;
}
t = t->next;
/* number is 0 based */
x = -1;
t = all_targets;
- while (t){
- if (x < t->target_number){
+ while (t) {
+ if (x < t->target_number) {
x = t->target_number;
}
t = t->next;
{
target_t *target = all_targets;
- while (target){
- if (target->target_number == num){
+ while (target) {
+ 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;
}
if (free_size < size)
{
- LOG_WARNING("not enough working area available(requested %u, free %u)",
+ LOG_WARNING("not enough working area available(requested %u, free %u)",
(unsigned)(size), (unsigned)(free_size));
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}
return ERROR_OK;
}
- LOG_USER("target state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name);
+ LOG_USER("target state: %s", target_state_name( target ));
if (target->state != TARGET_HALTED)
return ERROR_OK;
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",
+ 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)",
- (unsigned)address,
+ 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",
+ 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%08" PRIx32 ", 0x%08" PRIx32 ")",
- address,
+ LOG_ERROR("address + size wrapped(0x%08" PRIx32 ", 0x%08" PRIx32 ")",
+ address,
size);
return ERROR_FAIL;
}
if (retval == ERROR_OK)
{
*value = target_buffer_get_u32(target, value_buf);
- LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8" PRIx32 "",
- address,
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8" PRIx32 "",
+ address,
*value);
}
else
{
*value = 0x0;
- LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
+ LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
address);
}
if (retval == ERROR_OK)
{
*value = target_buffer_get_u16(target, value_buf);
- LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%4.4x",
- address,
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%4.4x",
+ address,
*value);
}
else
{
*value = 0x0;
- LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
+ LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
address);
}
if (retval == ERROR_OK)
{
- LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%2.2x",
- address,
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%2.2x",
+ address,
*value);
}
else
{
*value = 0x0;
- LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
+ LOG_DEBUG("address: 0x%8.8" PRIx32 " failed",
address);
}
return ERROR_FAIL;
}
- LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8" PRIx32 "",
- address,
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8" PRIx32 "",
+ address,
value);
target_buffer_set_u32(target, value_buf, value);
return ERROR_FAIL;
}
- LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8x",
- address,
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%8.8x",
+ address,
value);
target_buffer_set_u16(target, value_buf, value);
return ERROR_FAIL;
}
- LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%2.2x",
+ LOG_DEBUG("address: 0x%8.8" PRIx32 ", value: 0x%2.2x",
address, value);
if ((retval = target_write_memory(target, address, 1, 1, &value)) != ERROR_OK)
char marker = ' ';
if (target->tap->enabled)
- state = Jim_Nvp_value2name_simple(nvp_target_state,
- target->state)->name;
+ state = target_state_name( target );
else
state = "tap-disabled";
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,
+ 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,
+ value,
+ cache->reg_list[i].dirty,
cache->reg_list[i].valid);
free(value);
}
{
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;
* with one argument addr = args[0],
* handle breakpoints, debugging */
uint32_t addr = 0;
+ int current_pc = 1;
if (argc == 1)
{
int retval = parse_u32(args[0], &addr);
if (ERROR_OK != retval)
return retval;
+ current_pc = 0;
}
target_t *target = get_current_target(cmd_ctx);
- return target->type->step(target, 0, addr, 1);
+
+ return target->type->step(target, current_pc, addr, 1);
}
static void handle_md_output(struct command_context_s *cmd_ctx,
{
output_len += snprintf(output + output_len,
sizeof(output) - output_len,
- "0x%8.8x: ",
+ "0x%8.8x: ",
(unsigned)(address + (i*size)));
}
duration_t duration;
char *duration_text;
-
+
int retval = parse_load_image_command_args(args, argc,
&image, &min_address, &max_address);
if (ERROR_OK != retval)
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;
}
break;
}
image_size += length;
- command_print(cmd_ctx, "%u byte written at address 0x%8.8" PRIx32 "",
- (unsigned int)length,
+ command_print(cmd_ctx, "%u byte written at address 0x%8.8" PRIx32 "",
+ (unsigned int)length,
image.sections[i].base_address + offset);
}
if (retval == ERROR_OK)
{
- command_print(cmd_ctx, "downloaded %u byte in %s",
- (unsigned int)image_size,
+ command_print(cmd_ctx, "downloaded %u byte in %s",
+ (unsigned int)image_size,
duration_text);
}
free(duration_text);
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;
}
{
if (data[t] != buffer[t])
{
- command_print(cmd_ctx,
- "Verify operation failed address 0x%08x. Was 0x%02x instead of 0x%02x\n",
- (unsigned)(t + image.sections[i].base_address),
- data[t],
+ command_print(cmd_ctx,
+ "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);
}
} else
{
- command_print(cmd_ctx, "address 0x%08" PRIx32 " length 0x%08" PRIx32 "",
- image.sections[i].base_address,
+ command_print(cmd_ctx, "address 0x%08" PRIx32 " length 0x%08" PRIx32 "",
+ image.sections[i].base_address,
buf_cnt);
}
if (retval == ERROR_OK)
{
- command_print(cmd_ctx, "verified %u bytes in %s",
- (unsigned int)image_size,
+ 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.8" PRIx32 ", 0x%x, %i, 0x%s",
- breakpoint->address,
+ breakpoint->address,
breakpoint->length,
breakpoint->set, buf);
free(buf);
else
{
command_print(cmd_ctx, "0x%8.8" PRIx32 ", 0x%x, %i",
- breakpoint->address,
+ breakpoint->address,
breakpoint->length, breakpoint->set);
}
while (watchpoint)
{
- command_print(cmd_ctx,
- "address: 0x%8.8" PRIx32 ", len: 0x%8.8x, r/w/a: %i, value: 0x%8.8" PRIx32 ", mask: 0x%8.8" PRIx32 "",
- watchpoint->address,
+ 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,
} else {
char buf[100];
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
- sprintf(buf, "mem2array address: 0x%08" PRIx32 " is not aligned for %" PRId32 " byte reads",
- addr,
+ sprintf(buf, "mem2array address: 0x%08" PRIx32 " is not aligned for %" PRId32 " byte reads",
+ addr,
width);
Jim_AppendStrings(interp, Jim_GetResult(interp), buf , NULL);
return JIM_ERR;
retval = target_read_memory(target, addr, width, count, buffer);
if (retval != ERROR_OK) {
/* BOO !*/
- LOG_ERROR("mem2array: Read @ 0x%08x, w=%d, cnt=%d, failed",
- (unsigned int)addr,
- (int)width,
+ LOG_ERROR("mem2array: Read @ 0x%08x, w=%d, cnt=%d, failed",
+ (unsigned int)addr,
+ (int)width,
(int)count);
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
Jim_AppendStrings(interp, Jim_GetResult(interp), "mem2array: cannot read memory", NULL);
target_t *target;
context = Jim_GetAssocData(interp, "context");
- if (context == NULL){
+ if (context == NULL) {
LOG_ERROR("array2mem: no command context");
return JIM_ERR;
}
target = get_current_target(context);
- if (target == NULL){
+ if (target == NULL) {
LOG_ERROR("array2mem: no current target");
return 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",
- (unsigned int)addr,
+ sprintf(buf, "array2mem address: 0x%08x is not aligned for %d byte reads",
+ (unsigned int)addr,
(int)width);
Jim_AppendStrings(interp, Jim_GetResult(interp), buf , NULL);
return JIM_ERR;
retval = target_write_memory(target, addr, width, count, buffer);
if (retval != ERROR_OK) {
/* BOO !*/
- LOG_ERROR("array2mem: Write @ 0x%08x, w=%d, cnt=%d, failed",
- (unsigned int)addr,
- (int)width,
+ LOG_ERROR("array2mem: Write @ 0x%08x, w=%d, cnt=%d, failed",
+ (unsigned int)addr,
+ (int)width,
(int)count);
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
Jim_AppendStrings(interp, Jim_GetResult(interp), "array2mem: cannot read memory", NULL);
Jim_Nvp_value2name_simple(nvp_target_event, e)->name);
target = all_targets;
- while (target){
+ while (target) {
target_handle_event(target, e);
target = target->next;
}
teap = target->event_action;
done = 0;
- while (teap){
- if (teap->event == e){
+ while (teap) {
+ if (teap->event == e) {
done = 1;
- LOG_DEBUG("target: (%d) %s (%s) event: %d (%s) action: %s\n",
+ LOG_DEBUG("target: (%d) %s (%s) event: %d (%s) action: %s",
target->target_number,
target->cmd_name,
target_get_name(target),
}
teap = teap->next;
}
- if (!done){
+ if (!done) {
LOG_DEBUG("event: %d %s - no action",
e,
Jim_Nvp_value2name_simple(nvp_target_event, e)->name);
int e;
/* parse config or cget options ... */
- while (goi->argc > 0){
+ while (goi->argc > 0) {
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){
+ 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){
+ while (teap) {
+ 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;
}
/* Assume blank result */
Jim_SetEmptyResult(goi.interp);
- switch (n->value){
+ 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 {
c = 1;
}
- switch (n->value){
+ switch (n->value) {
case TS_CMD_MWW:
target_buffer_set_u32(target, target_buf, b);
b = 4;
b = 1;
break;
}
- for (x = 0 ; x < c ; x++){
+ 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 {
c = 1;
}
b = 1; /* shut up gcc */
- switch (n->value){
+ switch (n->value) {
case TS_CMD_MDW:
b = 4;
break;
/* convert to "bytes" */
c = c * b;
/* count is now in 'BYTES' */
- while (c > 0){
+ 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;
}
Jim_fprintf(interp, interp->cookie_stdout, "0x%08x ", (int)(a));
- switch (b){
+ switch (b) {
case 4:
- for (x = 0 ; (x < 16) && (x < y) ; x += 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){
+ for (; (x < 16) ; x += 4) {
Jim_fprintf(interp, interp->cookie_stdout, " ");
}
break;
case 2:
- for (x = 0 ; (x < 16) && (x < y) ; x += 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){
+ for (; (x < 16) ; x += 2) {
Jim_fprintf(interp, interp->cookie_stdout, " ");
}
break;
case 1:
default:
- for (x = 0 ; (x < 16) && (x < y) ; x += 1){
+ 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){
+ for (; (x < 16) ; x += 1) {
Jim_fprintf(interp, interp->cookie_stdout, " ");
}
break;
}
/* ascii-ify the bytes */
- for (x = 0 ; x < y ; x++){
+ for (x = 0 ; x < y ; x++) {
if ((target_buf[x] >= 0x20) &&
- (target_buf[x] <= 0x7e)){
+ (target_buf[x] <= 0x7e)) {
/* good */
} else {
/* smack it */
}
}
/* space pad */
- while (x < 16){
+ while (x < 16) {
target_buf[x] = ' ';
x++;
}
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,
target->cmd_name);
command_print(cmd_ctx, "%-25s | Body", "Event");
command_print(cmd_ctx, "------------------------- | ----------------------------------------");
- while (teap){
+ while (teap) {
command_print(cmd_ctx,
"%-25s | %s",
Jim_Nvp_value2name_simple(nvp_target_event, teap->event)->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_SetResultString(goi.interp,
- Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name,-1);
+ target_state_name( target ),
+ -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;
e = Jim_GetOpt_String(goi, &cp2, NULL);
cp = cp2;
/* now does target type exist */
- for (x = 0 ; target_types[x] ; x++){
- if (0 == strcmp(cp, target_types[x]->name)){
+ for (x = 0 ; target_types[x] ; x++) {
+ 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]){
+ for (x = 0 ; target_types[x] ; x++) {
+ 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);
}
{
target_t **tpp;
tpp = &(all_targets);
- while (*tpp){
+ while (*tpp) {
tpp = &((*tpp)->next);
}
*tpp = target;
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;
}
- switch (x){
+ switch (x) {
default:
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;
}
Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0));
- for (x = 0 ; target_types[x] ; x++){
+ 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){
+ 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){
+ while (target) {
Jim_ListAppendElement(goi.interp,
Jim_GetResult(goi.interp),
Jim_NewStringObj(goi.interp, target->cmd_name, -1));
}
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)",
+ 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",
- (unsigned int)length,
+ command_print(cmd_ctx, "%u byte written at address 0x%8.8x",
+ (unsigned int)length,
((unsigned int)(image.sections[i].base_address + offset)));
}
for (i = 0; i < fastload_num;i++)
{
target_t *target = get_current_target(cmd_ctx);
- command_print(cmd_ctx, "Write to 0x%08x, length 0x%08x",
- (unsigned int)(fastload[i].address),
+ 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)
{
/*
- * Local Variables:
+ * Local Variables:
* c-basic-offset: 4
* tab-width: 4
* End:
Code Review / openocd.git / blobdiff