X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fopenocd.c;h=b4571b46499e9c6781c027be68c60c0221c7c81d;hb=efe944dfc9fa9041ec2e006b702e9830f60f04bc;hp=71e047f40e9705224f4f2d409ed8d8b308d89a11;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee;p=fw%2Fopenocd
diff --git a/src/openocd.c b/src/openocd.c
index 71e047f40..b4571b464 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -19,9 +19,7 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ * along with this program. If not, see . *
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@ -32,23 +30,36 @@
#include
#include
#include
-#include
#include
#include
#include
#include
#include
-#include
+#include
+#include
+#include
+#include
#include
#include
+#include
#ifdef HAVE_STRINGS_H
#include
#endif
+#ifdef PKGBLDDATE
#define OPENOCD_VERSION \
"Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
+#else
+#define OPENOCD_VERSION \
+ "Open On-Chip Debugger " VERSION RELSTR
+#endif
+
+static const char openocd_startup_tcl[] = {
+#include "startup_tcl.inc"
+0 /* Terminate with zero */
+};
/* Give scripts and TELNET a way to find out what version this is */
static int jim_version_command(Jim_Interp *interp, int argc,
@@ -77,13 +88,13 @@ static int log_target_callback_event_handler(struct target *target,
{
switch (event) {
case TARGET_EVENT_GDB_START:
- target->display = 0;
+ target->verbose_halt_msg = false;
break;
case TARGET_EVENT_GDB_END:
- target->display = 1;
+ target->verbose_halt_msg = true;
break;
case TARGET_EVENT_HALTED:
- if (target->display) {
+ if (target->verbose_halt_msg) {
/* do not display information when debugger caused the halt */
target_arch_state(target);
}
@@ -120,7 +131,7 @@ COMMAND_HANDLER(handle_init_command)
initialized = 1;
retval = command_run_line(CMD_CTX, "target init");
- if (ERROR_OK != retval)
+ if (retval != ERROR_OK)
return ERROR_FAIL;
retval = adapter_init(CMD_CTX);
@@ -139,7 +150,11 @@ COMMAND_HANDLER(handle_init_command)
command_context_mode(CMD_CTX, COMMAND_EXEC);
retval = command_run_line(CMD_CTX, "transport init");
- if (ERROR_OK != retval)
+ if (retval != ERROR_OK)
+ return ERROR_FAIL;
+
+ retval = command_run_line(CMD_CTX, "dap init");
+ if (retval != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("Examining targets...");
@@ -151,9 +166,6 @@ COMMAND_HANDLER(handle_init_command)
if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
return ERROR_FAIL;
- if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
- return ERROR_FAIL;
-
if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
return ERROR_FAIL;
@@ -161,6 +173,10 @@ COMMAND_HANDLER(handle_init_command)
return ERROR_FAIL;
command_context_mode(CMD_CTX, COMMAND_EXEC);
+ /* in COMMAND_EXEC, after target_examine(), only tpiu or only swo */
+ if (command_run_line(CMD_CTX, "tpiu init") != ERROR_OK)
+ return ERROR_FAIL;
+
/* initialize telnet subsystem */
gdb_target_add_all(all_targets);
@@ -220,16 +236,12 @@ static int openocd_register_commands(struct command_context *cmd_ctx)
struct command_context *global_cmd_ctx;
-/* NB! this fn can be invoked outside this file for non PC hosted builds
- * NB! do not change to 'static'!!!!
- */
-struct command_context *setup_command_handler(Jim_Interp *interp)
+static struct command_context *setup_command_handler(Jim_Interp *interp)
{
log_init();
LOG_DEBUG("log_init: complete");
- const char *startup = openocd_startup_tcl;
- struct command_context *cmd_ctx = command_init(startup, interp);
+ struct command_context *cmd_ctx = command_init(openocd_startup_tcl, interp);
/* register subsystem commands */
typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value);
@@ -238,18 +250,21 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
&server_register_commands,
&gdb_register_commands,
&log_register_commands,
+ &rtt_server_register_commands,
&transport_register_commands,
&interface_register_commands,
&target_register_commands,
&flash_register_commands,
&nand_register_commands,
&pld_register_commands,
- &mflash_register_commands,
+ &cti_register_commands,
+ &dap_register_commands,
+ &arm_tpiu_swo_register_commands,
NULL
};
- for (unsigned i = 0; NULL != command_registrants[i]; i++) {
+ for (unsigned i = 0; command_registrants[i]; i++) {
int retval = (*command_registrants[i])(cmd_ctx);
- if (ERROR_OK != retval) {
+ if (retval != ERROR_OK) {
command_done(cmd_ctx);
return NULL;
}
@@ -273,30 +288,41 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
int ret;
if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
- return EXIT_FAILURE;
+ return ERROR_FAIL;
if (server_preinit() != ERROR_OK)
- return EXIT_FAILURE;
+ return ERROR_FAIL;
ret = parse_config_file(cmd_ctx);
- if (ret != ERROR_OK)
- return EXIT_FAILURE;
+ if (ret == ERROR_COMMAND_CLOSE_CONNECTION) {
+ server_quit(); /* gdb server may be initialized by -c init */
+ return ERROR_OK;
+ } else if (ret != ERROR_OK) {
+ server_quit(); /* gdb server may be initialized by -c init */
+ return ERROR_FAIL;
+ }
ret = server_init(cmd_ctx);
- if (ERROR_OK != ret)
- return EXIT_FAILURE;
+ if (ret != ERROR_OK)
+ return ERROR_FAIL;
if (init_at_startup) {
ret = command_run_line(cmd_ctx, "init");
- if (ERROR_OK != ret)
- return EXIT_FAILURE;
+ if (ret != ERROR_OK) {
+ server_quit();
+ return ERROR_FAIL;
+ }
}
- server_loop(cmd_ctx);
+ ret = server_loop(cmd_ctx);
- server_quit();
+ int last_signal = server_quit();
+ if (last_signal != ERROR_OK)
+ return last_signal;
- return ret;
+ if (ret != ERROR_OK)
+ return ERROR_FAIL;
+ return ERROR_OK;
}
/* normally this is the main() function entry, but if OpenOCD is linked
@@ -314,25 +340,47 @@ int openocd_main(int argc, char *argv[])
if (util_init(cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;
- if (ioutil_init(cmd_ctx) != ERROR_OK)
+ if (rtt_init() != ERROR_OK)
return EXIT_FAILURE;
LOG_OUTPUT("For bug reports, read\n\t"
- "http://openocd.sourceforge.net/doc/doxygen/bugs.html"
+ "http://openocd.org/doc/doxygen/bugs.html"
"\n");
command_context_mode(cmd_ctx, COMMAND_CONFIG);
command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
+ server_host_os_entry();
+
/* Start the executable meat that can evolve into thread in future. */
ret = openocd_thread(argc, argv, cmd_ctx);
+ flash_free_all_banks();
+ gdb_service_free();
+ arm_tpiu_swo_cleanup_all();
+ server_free();
+
unregister_all_commands(cmd_ctx, NULL);
+ help_del_all_commands(cmd_ctx);
- /* free commandline interface */
- command_done(cmd_ctx);
+ /* free all DAP and CTI objects */
+ arm_cti_cleanup_all();
+ dap_cleanup_all();
adapter_quit();
+ server_host_os_close();
+
+ /* Shutdown commandline interface */
+ command_exit(cmd_ctx);
+
+ rtt_exit();
+ free_config();
+
+ if (ret == ERROR_FAIL)
+ return EXIT_FAILURE;
+ else if (ret != ERROR_OK)
+ exit_on_signal(ret);
+
return ret;
}