X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=377bb0dc07dbd9f9c9ea4dd19cdc8787778fd46d;hp=ce2d08564307bee2d72b4ba2472f231c943aeb48;hb=02bbe4147d5fd460d6134d9d1d7b0cc279d68625;hpb=3c58540e0283a452a7606ba22e693df10d746d54 diff --git a/src/target/target.c b/src/target/target.c index ce2d085643..377bb0dc07 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -49,6 +49,7 @@ 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_daemon_startup_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); @@ -87,6 +88,7 @@ extern target_type_t arm926ejs_target; extern target_type_t feroceon_target; extern target_type_t xscale_target; extern target_type_t cortexm3_target; +extern target_type_t arm11_target; target_type_t *target_types[] = { @@ -99,6 +101,7 @@ target_type_t *target_types[] = &feroceon_target, &xscale_target, &cortexm3_target, + &arm11_target, NULL, }; @@ -226,7 +229,7 @@ int target_init_handler(struct target_s *target, enum target_event event, void * { target_unregister_event_callback(target_init_handler, priv); - script = open_file_from_path(cmd_ctx, target->reset_script, "r"); + script = open_file_from_path(target->reset_script, "r"); if (!script) { ERROR("couldn't open script file %s", target->reset_script); @@ -267,11 +270,11 @@ int target_process_reset(struct command_context_s *cmd_ctx) switch (target->reset_mode) { case RESET_HALT: - command_print(cmd_ctx, "nSRST pulls nTRST, falling back to RESET_RUN_AND_HALT"); + command_print(cmd_ctx, "nSRST pulls nTRST, falling back to \"reset run_and_halt\""); target->reset_mode = RESET_RUN_AND_HALT; break; case RESET_INIT: - command_print(cmd_ctx, "nSRST pulls nTRST, falling back to RESET_RUN_AND_INIT"); + command_print(cmd_ctx, "nSRST pulls nTRST, falling back to \"reset run_and_init\""); target->reset_mode = RESET_RUN_AND_INIT; break; default: @@ -387,7 +390,6 @@ static int default_virt2phys(struct target_s *target, u32 virtual, u32 *physical static int default_mmu(struct target_s *target, int *enabled) { - USER("No MMU present"); *enabled = 0; return ERROR_OK; } @@ -752,6 +754,24 @@ int target_register_commands(struct command_context_s *cmd_ctx) return ERROR_OK; } +int target_arch_state(struct target_s *target) +{ + int retval; + if (target==NULL) + { + USER("No target has been configured"); + return ERROR_OK; + } + + USER("target state: %s", target_state_strings[target->state]); + + if (target->state!=TARGET_HALTED) + return ERROR_OK; + + retval=target->type->arch_state(target); + return retval; +} + /* Single aligned words are guaranteed to use 16 or 32 bit access * mode respectively, otherwise data is handled as quickly as * possible @@ -1325,9 +1345,9 @@ int handle_target(void *priv) if (target->state != TARGET_HALTED) { if (target_continous_poll) - if ((retval = target->type->poll(target)) < 0) + if ((retval = target->type->poll(target)) != ERROR_OK) { - ERROR("couldn't poll target. It's due for a reset."); + ERROR("couldn't poll target(%d). It's due for a reset.", retval); } } @@ -1464,17 +1484,11 @@ static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_ int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { target_t *target = get_current_target(cmd_ctx); - char buffer[512]; if (argc == 0) { - command_print(cmd_ctx, "target state: %s", target_state_strings[target->type->poll(target)]); - if (target->state == TARGET_HALTED) - { - target->type->arch_state(target, buffer, 512); - buffer[511] = 0; - command_print(cmd_ctx, "%s", buffer); - } + target->type->poll(target); + target_arch_state(target); } else { @@ -1524,26 +1538,31 @@ static void target_process_events(struct command_context_s *cmd_ctx) static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_state state, int ms) { + int retval; struct timeval timeout, now; - + int once=1; gettimeofday(&timeout, NULL); timeval_add_time(&timeout, 0, ms * 1000); - command_print(cmd_ctx, "waiting for target %s...", target_state_strings[state]); target_t *target = get_current_target(cmd_ctx); - while (target->type->poll(target)) + for (;;) { + if ((retval=target->type->poll(target))!=ERROR_OK) + return retval; target_call_timer_callbacks(); if (target->state == state) { - command_print(cmd_ctx, "target %s", target_state_strings[state]); break; } + if (once) + { + once=0; + command_print(cmd_ctx, "waiting for target %s...", target_state_strings[state]); + } gettimeofday(&now, NULL); if ((now.tv_sec > timeout.tv_sec) || ((now.tv_sec == timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec))) { - command_print(cmd_ctx, "timed out while waiting for target %s", target_state_strings[state]); ERROR("timed out while waiting for target %s", target_state_strings[state]); break; } @@ -1558,24 +1577,11 @@ int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **arg target_t *target = get_current_target(cmd_ctx); DEBUG("-"); - - command_print(cmd_ctx, "requesting target halt..."); if ((retval = target->type->halt(target)) != ERROR_OK) - { - switch (retval) { - case ERROR_TARGET_ALREADY_HALTED: - command_print(cmd_ctx, "target already halted"); - break; - case ERROR_TARGET_TIMEOUT: - command_print(cmd_ctx, "target timed out... shutting down"); - return retval; - default: - command_print(cmd_ctx, "unknown error... shutting down"); return retval; } - } return handle_wait_halt_command(cmd_ctx, cmd, args, argc); } @@ -1681,34 +1687,20 @@ int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **a int retval; target_t *target = get_current_target(cmd_ctx); - DEBUG("-"); - if (argc == 0) retval = target->type->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 */ else { - command_print(cmd_ctx, "usage: resume [address]"); - return ERROR_OK; - } - - if (retval != ERROR_OK) - { - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - command_print(cmd_ctx, "target not halted"); - break; - default: - command_print(cmd_ctx, "unknown error... shutting down"); - exit(-1); - } + return ERROR_COMMAND_SYNTAX_ERROR; } target_process_events(cmd_ctx); - return ERROR_OK; + target_arch_state(target); + + return retval; } int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) @@ -1913,7 +1905,6 @@ int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char if (image_open(&image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK) { - command_print(cmd_ctx, "load_image error: %s", image.error_str); return ERROR_OK; } @@ -1983,7 +1974,6 @@ int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cmd, char if (fileio_open(&fileio, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK) { - command_print(cmd_ctx, "dump_image error: %s", fileio.error_str); return ERROR_OK; } @@ -2062,7 +2052,6 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch if (image_open(&image, args[0], (argc == 3) ? args[2] : NULL) != ERROR_OK) { - command_print(cmd_ctx, "verify_image error: %s", image.error_str); return ERROR_OK; }