int cli_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv);
-
int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
*/
int target_init_handler(struct target_s *target, enum target_event event, void *priv)
{
- FILE *script;
struct command_context_s *cmd_ctx = priv;
- if ((event == TARGET_EVENT_HALTED) && (target->reset_script))
+ if (event == TARGET_EVENT_HALTED)
{
target_unregister_event_callback(target_init_handler, priv);
-
- script = open_file_from_path(target->reset_script, "r");
- if (!script)
- {
- LOG_ERROR("couldn't open script file %s", target->reset_script);
- return ERROR_OK;
- }
-
- LOG_INFO("executing reset script '%s'", target->reset_script);
- command_run_file(cmd_ctx, script, COMMAND_EXEC);
- fclose(script);
-
+ target_invoke_script(cmd_ctx, target, "post_reset");
jtag_execute_queue();
}
{
target_t *target = priv;
- target->type->halt(target);
+ target_halt(target);
return ERROR_OK;
}
+int target_poll(struct target_s *target)
+{
+ /* We can't poll until after examine */
+ if (!target->type->examined)
+ {
+ /* Fail silently lest we pollute the log */
+ return ERROR_FAIL;
+ }
+ return target->type->poll(target);
+}
+
+int target_halt(struct target_s *target)
+{
+ /* We can't poll until after examine */
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+ return target->type->halt(target);
+}
+
+int target_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution)
+{
+ int retval;
+ int timeout_ms = 5000;
+
+ /* We can't poll until after examine */
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+
+ if ((retval = target->type->resume(target, current, address, handle_breakpoints, debug_execution)) != ERROR_OK)
+ return retval;
+
+ /* only check for resume event if normal resume */
+ if (!debug_execution)
+ {
+ /* wait for target to exit halted mode - not debug resume*/
+ target_poll(target);
+
+ while (target->state != TARGET_RUNNING)
+ {
+ usleep(10000);
+ target_poll(target);
+ if ((timeout_ms -= 10) <= 0)
+ {
+ LOG_ERROR("timeout waiting for target resume");
+ return ERROR_TARGET_TIMEOUT;
+ }
+ }
+ }
+
+ return retval;
+}
+
int target_process_reset(struct command_context_s *cmd_ctx)
{
int retval = ERROR_OK;
jtag->speed(jtag_speed);
+ target = targets;
+ while (target)
+ {
+ target_invoke_script(cmd_ctx, target, "pre_reset");
+ target = target->next;
+ }
+
if ((retval = jtag_init_reset(cmd_ctx)) != ERROR_OK)
return retval;
-
+ /* First time this is executed after launching OpenOCD, it will read out
+ * the type of CPU, etc. and init Embedded ICE registers in host
+ * memory.
+ *
+ * It will also set up ICE registers in the target.
+ *
+ * However, if we assert TRST later, we need to set up the registers again.
+ *
+ * For the "reset halt/init" case we must only set up the registers here.
+ */
+ if ((retval = target_examine(cmd_ctx)) != ERROR_OK)
+ return retval;
+
/* prepare reset_halt where necessary */
target = targets;
while (target)
target_register_event_callback(target_init_handler, cmd_ctx);
break;
case RESET_HALT:
- target->type->halt(target);
+ target_halt(target);
break;
case RESET_INIT:
- target->type->halt(target);
+ target_halt(target);
target_register_event_callback(target_init_handler, cmd_ctx);
break;
default:
LOG_WARNING("JTAG communication failed while deasserting reset.");
retval = ERROR_OK;
}
+
+ if (jtag_reset_config & RESET_SRST_PULLS_TRST)
+ {
+ /* If TRST was asserted we need to set up registers again */
+ if ((retval = target_examine(cmd_ctx)) != ERROR_OK)
+ return retval;
+ }
+
LOG_DEBUG("Waiting for halted stated as approperiate");
while (target)
{
LOG_DEBUG("Polling target");
- target->type->poll(target);
+ target_poll(target);
if ((target->reset_mode == RESET_RUN_AND_INIT) ||
(target->reset_mode == RESET_RUN_AND_HALT) ||
(target->reset_mode == RESET_HALT) ||
target = target->next;
}
target_unregister_event_callback(target_init_handler, cmd_ctx);
-
jtag->speed(jtag_speed_post_reset);
return ERROR_OK;
}
+static int default_examine(struct command_context_s *cmd_ctx, struct target_s *target)
+{
+ target->type->examined = 1;
+ return ERROR_OK;
+}
+
+
+/* Targets that correctly implement init+examine, i.e.
+ * no communication with target during init:
+ *
+ * XScale
+ */
+int target_examine(struct command_context_s *cmd_ctx)
+{
+ int retval = ERROR_OK;
+ target_t *target = targets;
+ while (target)
+ {
+ if ((retval = target->type->examine(cmd_ctx, target))!=ERROR_OK)
+ return retval;
+ target = target->next;
+ }
+ return retval;
+}
+
+static int target_write_memory_imp(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer)
+{
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+ return target->type->write_memory_imp(target, address, size, count, buffer);
+}
+
+static int target_read_memory_imp(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer)
+{
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+ return target->type->read_memory_imp(target, address, size, count, buffer);
+}
+
+static int target_soft_reset_halt_imp(struct target_s *target)
+{
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+ return target->type->soft_reset_halt_imp(target);
+}
+
+static int target_run_algorithm_imp(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_param, u32 entry_point, u32 exit_point, int timeout_ms, void *arch_info)
+{
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+ return target->type->run_algorithm_imp(target, num_mem_params, mem_params, num_reg_params, reg_param, entry_point, exit_point, timeout_ms, arch_info);
+}
+
int target_init(struct command_context_s *cmd_ctx)
{
target_t *target = targets;
while (target)
{
+ target->type->examined = 0;
+ if (target->type->examine == NULL)
+ {
+ target->type->examine = default_examine;
+ }
+
if (target->type->init_target(cmd_ctx, target) != ERROR_OK)
{
LOG_ERROR("target '%s' init failed", target->type->name);
{
target->type->virt2phys = default_virt2phys;
}
+ target->type->virt2phys = default_virt2phys;
+ /* a non-invasive way(in terms of patches) to add some code that
+ * runs before the type->write/read_memory implementation
+ */
+ target->type->write_memory_imp = target->type->write_memory;
+ target->type->write_memory = target_write_memory_imp;
+ target->type->read_memory_imp = target->type->read_memory;
+ target->type->read_memory = target_read_memory_imp;
+ target->type->soft_reset_halt_imp = target->type->soft_reset_halt;
+ target->type->soft_reset_halt = target_soft_reset_halt_imp;
+ target->type->run_algorithm_imp = target->type->run_algorithm;
+ target->type->run_algorithm = target_run_algorithm_imp;
+
+
if (target->type->mmu == NULL)
{
target->type->mmu = default_mmu;
(((now.tv_sec >= callback->when.tv_sec) && (now.tv_usec >= callback->when.tv_usec))
|| (now.tv_sec > callback->when.tv_sec)))
{
- callback->callback(callback->priv);
- if (callback->periodic)
+ if(callback->callback != NULL)
{
- int time_ms = callback->time_ms;
- callback->when.tv_usec = now.tv_usec + (time_ms % 1000) * 1000;
- time_ms -= (time_ms % 1000);
- callback->when.tv_sec = now.tv_sec + time_ms / 1000;
- if (callback->when.tv_usec > 1000000)
+ callback->callback(callback->priv);
+ if (callback->periodic)
{
- callback->when.tv_usec = callback->when.tv_usec - 1000000;
- callback->when.tv_sec += 1;
+ int time_ms = callback->time_ms;
+ callback->when.tv_usec = now.tv_usec + (time_ms % 1000) * 1000;
+ time_ms -= (time_ms % 1000);
+ callback->when.tv_sec = now.tv_sec + time_ms / 1000;
+ if (callback->when.tv_usec > 1000000)
+ {
+ callback->when.tv_usec = callback->when.tv_usec - 1000000;
+ callback->when.tv_sec += 1;
+ }
}
+ else
+ target_unregister_timer_callback(callback->callback, callback->priv);
}
- else
- target_unregister_timer_callback(callback->callback, callback->priv);
}
callback = next_callback;
return target_call_timer_callbacks(0);
}
-
int target_alloc_working_area(struct target_s *target, u32 size, working_area_t **area)
{
working_area_t *c = target->working_areas;
{
register_command(cmd_ctx, NULL, "target", handle_target_command, COMMAND_CONFIG, "target <cpu> [reset_init default - DEPRECATED] <chainpos> <endianness> <variant> [cpu type specifc args]");
register_command(cmd_ctx, NULL, "targets", handle_targets_command, COMMAND_EXEC, NULL);
- register_command(cmd_ctx, NULL, "target_script", handle_target_script_command, COMMAND_CONFIG, NULL);
+ register_command(cmd_ctx, NULL, "target_script", handle_target_script_command, COMMAND_CONFIG,
+ "target_script <target#> <event=reset/pre_reset/post_halt/pre_resume/gdb_program_config> <script_file>");
register_command(cmd_ctx, NULL, "run_and_halt_time", handle_run_and_halt_time_command, COMMAND_CONFIG, "<target> <run time ms>");
register_command(cmd_ctx, NULL, "working_area", handle_working_area_command, COMMAND_ANY, "working_area <target#> <address> <size> <'backup'|'nobackup'> [virtual address]");
register_command(cmd_ctx, NULL, "virt2phys", handle_virt2phys_command, COMMAND_ANY, "virt2phys <virtual address>");
int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer)
{
int retval;
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
LOG_DEBUG("writing buffer of %i byte at 0x%8.8x", size, address);
int target_read_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer)
{
int retval;
-
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+
LOG_DEBUG("reading buffer of %i byte at 0x%8.8x", size, address);
if (((address % 2) == 0) && (size == 2))
int retval;
int i;
u32 checksum = 0;
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
if ((retval = target->type->checksum_memory(target, address,
size, &checksum)) == ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
return retval;
}
+int target_blank_check_memory(struct target_s *target, u32 address, u32 size, u32* blank)
+{
+ int retval;
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+
+ if (target->type->blank_check_memory == 0)
+ return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+
+ retval = target->type->blank_check_memory(target, address, size, blank);
+
+ return retval;
+}
+
int target_read_u32(struct target_s *target, u32 address, u32 *value)
{
u8 value_buf[4];
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
int retval = target->type->read_memory(target, address, 4, 1, value_buf);
int target_read_u16(struct target_s *target, u32 address, u16 *value)
{
u8 value_buf[2];
-
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+
int retval = target->type->read_memory(target, address, 2, 1, value_buf);
if (retval == ERROR_OK)
int target_read_u8(struct target_s *target, u32 address, u8 *value)
{
int retval = target->type->read_memory(target, address, 1, 1, value);
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
if (retval == ERROR_OK)
{
{
int retval;
u8 value_buf[4];
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
LOG_DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, value);
{
int retval;
u8 value_buf[2];
-
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+
LOG_DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, value);
target_buffer_set_u16(target, value_buf, value);
int target_write_u8(struct target_s *target, u32 address, u8 value)
{
int retval;
-
+ if (!target->type->examined)
+ {
+ LOG_ERROR("Target not examined yet");
+ return ERROR_FAIL;
+ }
+
LOG_DEBUG("address: 0x%8.8x, value: 0x%2.2x", address, value);
if ((retval = target->type->read_memory(target, address, 1, 1, &value)) != ERROR_OK)
*last_target_p = malloc(sizeof(target_t));
- (*last_target_p)->type = target_types[i];
+ /* allocate memory for each unique target type */
+ (*last_target_p)->type = (target_type_t*)malloc(sizeof(target_type_t));
+ *((*last_target_p)->type) = *target_types[i];
if (strcmp(args[1], "big") == 0)
(*last_target_p)->endianness = TARGET_BIG_ENDIAN;
}
(*last_target_p)->run_and_halt_time = 1000; /* default 1s */
- (*last_target_p)->reset_script = NULL;
- (*last_target_p)->post_halt_script = NULL;
- (*last_target_p)->pre_resume_script = NULL;
- (*last_target_p)->gdb_program_script = NULL;
-
(*last_target_p)->working_area = 0x0;
(*last_target_p)->working_area_size = 0x0;
(*last_target_p)->working_areas = NULL;
return ERROR_OK;
}
-/* usage: target_script <target#> <event> <script_file> */
+int target_invoke_script(struct command_context_s *cmd_ctx, target_t *target, char *name)
+{
+ return command_run_linef(cmd_ctx, " if {[catch {info body target_%s_%d} t]==0} {target_%s_%d}",
+ name, get_num_by_target(target),
+ name, get_num_by_target(target));
+}
+
int handle_target_script_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
target_t *target = NULL;
return ERROR_COMMAND_SYNTAX_ERROR;
}
- if (strcmp(args[1], "reset") == 0)
- {
- if (target->reset_script)
- free(target->reset_script);
- target->reset_script = strdup(args[2]);
- }
- else if (strcmp(args[1], "post_halt") == 0)
- {
- if (target->post_halt_script)
- free(target->post_halt_script);
- target->post_halt_script = strdup(args[2]);
- }
- else if (strcmp(args[1], "pre_resume") == 0)
- {
- if (target->pre_resume_script)
- free(target->pre_resume_script);
- target->pre_resume_script = strdup(args[2]);
- }
- else if (strcmp(args[1], "gdb_program_config") == 0)
- {
- if (target->gdb_program_script)
- free(target->gdb_program_script);
- target->gdb_program_script = strdup(args[2]);
- }
- else
+ const char *event=args[1];
+ if (strcmp("reset", event)==0)
{
- LOG_ERROR("unknown event type: '%s", args[1]);
- return ERROR_COMMAND_SYNTAX_ERROR;
+ /* synonymous */
+ event="post_reset";
}
+
+ /* Define a tcl procedure which we'll invoke upon some event */
+ command_run_linef(cmd_ctx,
+ "proc target_%s_%d {} {"
+ "openocd {script %s} ; return \"\""
+ "}",
+ event,
+ get_num_by_target(target),
+ args[2]);
return ERROR_OK;
}
/* process target state changes */
int handle_target(void *priv)
{
- int retval;
target_t *target = targets;
while (target)
{
- /* only poll if target isn't already halted */
- if (target->state != TARGET_HALTED)
+ if (target_continous_poll)
{
- if (target_continous_poll)
- if ((retval = target->type->poll(target)) != ERROR_OK)
- {
- LOG_ERROR("couldn't poll target(%d). It's due for a reset.", retval);
- }
+ /* polling may fail silently until the target has been examined */
+ target_poll(target);
}
target = target->next;
if (argc == 0)
{
- target->type->poll(target);
+ target_poll(target);
target_arch_state(target);
}
else
return wait_state(cmd_ctx, cmd, TARGET_HALTED, ms);
}
-static void target_process_events(struct command_context_s *cmd_ctx)
-{
- target_t *target = get_current_target(cmd_ctx);
- target->type->poll(target);
- target_call_timer_callbacks_now();
-}
-
static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_state state, int ms)
{
int retval;
target_t *target = get_current_target(cmd_ctx);
for (;;)
{
- if ((retval=target->type->poll(target))!=ERROR_OK)
+ if ((retval=target_poll(target))!=ERROR_OK)
return retval;
target_call_timer_callbacks_now();
if (target->state == state)
LOG_DEBUG("-");
- if ((retval = target->type->halt(target)) != ERROR_OK)
+ if ((retval = target_halt(target)) != ERROR_OK)
{
return retval;
}
return handle_wait_halt_command(cmd_ctx, cmd, args, argc);
}
-
int handle_soft_reset_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
target_t *target = get_current_target(cmd_ctx);
int retval;
target_t *target = get_current_target(cmd_ctx);
+ target_invoke_script(cmd_ctx, target, "pre_resume");
+
if (argc == 0)
- retval = target->type->resume(target, 1, 0, 1, 0); /* current pc, addr = 0, handle breakpoints, not debugging */
+ retval = target_resume(target, 1, 0, 1, 0); /* current pc, addr = 0, handle breakpoints, not debugging */
else if (argc == 1)
- retval = target->type->resume(target, 0, strtoul(args[0], NULL, 0), 1, 0); /* addr = args[0], handle breakpoints, not debugging */
+ retval = target_resume(target, 0, strtoul(args[0], NULL, 0), 1, 0); /* addr = args[0], handle breakpoints, not debugging */
else
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
- target_process_events(cmd_ctx);
return retval;
}
output_len = 0;
}
}
- } else
- {
- LOG_ERROR("Failure examining memory");
}
free(buffer);
- return ERROR_OK;
+ return retval;
}
int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
value = strtoul(args[1], NULL, 0);
if (argc == 3)
count = strtoul(args[2], NULL, 0);
-
-
+
switch (cmd[2])
{
case 'w':
while (watchpoint)
{
- command_print(cmd_ctx, "address: 0x%8.8x, mask: 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.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;
}
}
for (;;)
{
- target->type->poll(target);
+ target_poll(target);
if (target->state == TARGET_HALTED)
{
u32 t=*((u32 *)reg->value);
samples[numSamples++]=t;
- retval = target->type->resume(target, 1, 0, 0, 0); /* current pc, addr = 0, do not handle breakpoints, not debugging */
- target->type->poll(target);
+ retval = target_resume(target, 1, 0, 0, 0); /* current pc, addr = 0, do not handle breakpoints, not debugging */
+ target_poll(target);
usleep(10*1000); // sleep 10ms, i.e. <100 samples/second.
} else if (target->state == TARGET_RUNNING)
{
// We want to quickly sample the PC.
- target->type->halt(target);
+ target_halt(target);
} 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->type->poll(target);
+ target_poll(target);
if (target->state == TARGET_HALTED)
{
- target->type->resume(target, 1, 0, 0, 0); /* current pc, addr = 0, do not handle breakpoints, not debugging */
+ target_resume(target, 1, 0, 0, 0); /* current pc, addr = 0, do not handle breakpoints, not debugging */
}
- target->type->poll(target);
+ target_poll(target);
writeGmon(samples, numSamples, args[1]);
command_print(cmd_ctx, "Wrote %s", args[1]);
break;
return ERROR_OK;
}
-
Code Review / openocd.git / blobdiff