static int NEW_target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mode reset_mode)
{
char buf[100];
+ int retval;
Jim_Nvp *n;
n = Jim_Nvp_value2name_simple( nvp_reset_modes, reset_mode );
if( n->name == NULL ){
}
sprintf( buf, "ocd_process_reset %s", n->name );
- Jim_Eval( interp, buf );
+ retval = Jim_Eval( interp, buf );
+
+ if(retval != JIM_ERR){
+ return ERROR_FAIL;
+ }
/* We want any events to be processed before the prompt */
- target_call_timer_callbacks_now();
+ retval = target_call_timer_callbacks_now();
- return ERROR_OK;
+ return retval;
}
// Next patch - this turns into TCL...
if (target->reset_halt)
{
/* wait up to 1 second for halt. */
- target_wait_state(target, TARGET_HALTED, 1000);
+ if ((retval = target_wait_state(target, TARGET_HALTED, 1000)) != ERROR_OK)
+ return retval;
if (target->state != TARGET_HALTED)
{
LOG_WARNING("Failed to reset target into halted mode - issuing halt");
}
/* We want any events to be processed before the prompt */
- target_call_timer_callbacks_now();
+ if ((retval = target_call_timer_callbacks_now()) != ERROR_OK)
+ return retval;
return retval;
}
int target_init(struct command_context_s *cmd_ctx)
{
target_t *target = all_targets;
+ int retval;
while (target)
{
if (all_targets)
{
- target_register_user_commands(cmd_ctx);
- target_register_timer_callback(handle_target, 100, 1, NULL);
+ 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)
+ return retval;
}
return ERROR_OK;
}
}
else
- target_unregister_timer_callback(callback->callback, callback->priv);
+ {
+ int retval;
+ if((retval = target_unregister_timer_callback(callback->callback, callback->priv)) != ERROR_OK)
+ return retval;
+ }
}
}
if (target->backup_working_area)
{
+ int retval;
new_wa->backup = malloc(new_wa->size);
- target->type->read_memory(target, new_wa->address, 4, new_wa->size / 4, new_wa->backup);
+ if((retval = target->type->read_memory(target, new_wa->address, 4, new_wa->size / 4, new_wa->backup)) != ERROR_OK)
+ {
+ free(new_wa->backup);
+ free(new_wa);
+ return retval;
+ }
}
else
{
return ERROR_OK;
if (restore&&target->backup_working_area)
- target->type->write_memory(target, area->address, 4, area->size / 4, area->backup);
+ {
+ int retval;
+ if((retval = target->type->write_memory(target, area->address, 4, area->size / 4, area->backup)) != ERROR_OK)
+ return retval;
+ }
area->free = 1;
return target_free_working_area_restore(target, area, 1);
}
-int target_free_all_working_areas_restore(struct target_s *target, int restore)
+/* free resources and restore memory, if restoring memory fails,
+ * free up resources anyway
+ */
+void target_free_all_working_areas_restore(struct target_s *target, int restore)
{
working_area_t *c = target->working_areas;
}
target->working_areas = NULL;
-
- return ERROR_OK;
}
-int target_free_all_working_areas(struct target_s *target)
+void target_free_all_working_areas(struct target_s *target)
{
- return target_free_all_working_areas_restore(target, 1);
+ target_free_all_working_areas_restore(target, 1);
}
int target_register_commands(struct command_context_s *cmd_ctx)
int target_register_user_commands(struct command_context_s *cmd_ctx)
{
+ int retval = ERROR_OK;
register_command(cmd_ctx, NULL, "reg", handle_reg_command, COMMAND_EXEC, NULL);
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, "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]");
- target_request_register_commands(cmd_ctx);
- trace_register_commands(cmd_ctx);
+ if((retval = target_request_register_commands(cmd_ctx)) != ERROR_OK)
+ return retval;
+ if((retval = trace_register_commands(cmd_ctx)) != ERROR_OK)
+ return retval;
- return ERROR_OK;
+
+ return retval;
}
int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
int handle_working_area_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
+ int retval = ERROR_OK;
target_t *target = NULL;
if ((argc < 4) || (argc > 5))
return ERROR_COMMAND_SYNTAX_ERROR;
}
- return ERROR_OK;
+ return retval;
}
/* process target state changes */
int handle_target(void *priv)
{
+ int retval = ERROR_OK;
target_t *target = all_targets;
while (target)
if (target_continous_poll)
{
/* polling may fail silently until the target has been examined */
- target_poll(target);
+ if((retval = target_poll(target)) != ERROR_OK)
+ return retval;
}
target = target->next;
}
- return ERROR_OK;
+ return retval;
}
int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
+ int retval = ERROR_OK;
target_t *target = get_current_target(cmd_ctx);
if (argc == 0)
{
- target_poll(target);
- target_arch_state(target);
+ if((retval = target_poll(target)) != ERROR_OK)
+ return retval;
+ if((retval = target_arch_state(target)) != ERROR_OK)
+ return retval;
+
}
- else
+ else if (argc==1)
{
if (strcmp(args[0], "on") == 0)
{
{
command_print(cmd_ctx, "arg is \"on\" or \"off\"");
}
+ } else
+ {
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
- return ERROR_OK;
+ return retval;
}
int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
u32 min_address=0;
u32 max_address=0xffffffff;
int i;
- int retval;
+ int retval, retvaltemp;
image_t image;
free(buffer);
}
- duration_stop_measure(&duration, &duration_text);
+ 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);
u32 address;
u32 size;
u8 buffer[560];
- int retval=ERROR_OK;
+ int retval=ERROR_OK, retvaltemp;
duration_t duration;
char *duration_text;
address += this_run_size;
}
- fileio_close(&fileio);
+ if((retvaltemp = fileio_close(&fileio)) != ERROR_OK)
+ return retvaltemp;
+
+ if((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+ return retvaltemp;
- duration_stop_measure(&duration, &duration_text);
if (retval==ERROR_OK)
{
command_print(cmd_ctx, "dumped %"PRIi64" byte in %s", fileio.size, duration_text);
u32 buf_cnt;
u32 image_size;
int i;
- int retval;
+ int retval, retvaltemp;
u32 checksum = 0;
u32 mem_checksum = 0;
image_size += buf_cnt;
}
done:
- duration_stop_measure(&duration, &duration_text);
+
+ 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);
} else if (target->state == TARGET_RUNNING)
{
// We want to quickly sample the PC.
- target_halt(target);
+ if((retval = target_halt(target)) != ERROR_OK)
+ {
+ free(samples);
+ return retval;
+ }
} else
{
command_print(cmd_ctx, "Target not halted or running");
if ((numSamples>=maxSample) || ((now.tv_sec >= timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec)))
{
command_print(cmd_ctx, "Profiling completed. %d samples.", numSamples);
- target_poll(target);
+ if((retval = target_poll(target)) != ERROR_OK)
+ {
+ free(samples);
+ return retval;
+ }
if (target->state == TARGET_HALTED)
{
target_resume(target, 1, 0, 0, 0); /* current pc, addr = 0, do not handle breakpoints, not debugging */
}
- target_poll(target);
+ if((retval = target_poll(target)) != ERROR_OK)
+ {
+ free(samples);
+ return retval;
+ }
writeGmon(samples, numSamples, args[1]);
command_print(cmd_ctx, "Wrote %s", args[1]);
break;
Code Review / openocd.git / blobdiff