* 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., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "openocd.h"
#include <jtag/driver.h>
#include <jtag/jtag.h>
-#include <jtag/transport.h>
+#include <transport/transport.h>
#include <helper/ioutil.h>
#include <helper/util.h>
#include <helper/configuration.h>
#include <flash/nand/core.h>
#include <pld/pld.h>
#include <flash/mflash.h>
+#include <target/arm_cti.h>
+#include <target/arm_adi_v5.h>
#include <server/server.h>
#include <server/gdb_server.h>
#include <strings.h>
#endif
+#ifdef PKGBLDDATE
+#define OPENOCD_VERSION \
+ "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
+#else
+#define OPENOCD_VERSION \
+ "Open On-Chip Debugger " VERSION RELSTR
+#endif
-#define OPENOCD_VERSION \
- "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
+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,
- Jim_Obj * const *argv)
+ Jim_Obj * const *argv)
{
if (argc > 2)
- {
return JIM_ERR;
- }
const char *str = "";
- char * version_str;
+ char *version_str;
version_str = OPENOCD_VERSION;
-
+
if (argc == 2)
str = Jim_GetString(argv[1], NULL);
if (strcmp("git", str) == 0)
- {
version_str = GITVERSION;
- }
-
+
Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
return JIM_OK;
}
-static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
+static int log_target_callback_event_handler(struct target *target,
+ enum target_event event,
+ void *priv)
{
- switch (event)
- {
+ 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);
}
return ERROR_COMMAND_SYNTAX_ERROR;
int retval;
- static int initialized = 0;
+ static int initialized;
if (initialized)
return ERROR_OK;
if (ERROR_OK != retval)
return ERROR_FAIL;
- if ((retval = adapter_init(CMD_CTX)) != ERROR_OK)
- {
+ retval = adapter_init(CMD_CTX);
+ if (retval != ERROR_OK) {
/* we must be able to set up the debug adapter */
return retval;
}
if (ERROR_OK != retval)
return ERROR_FAIL;
+ retval = command_run_line(CMD_CTX, "dap init");
+ if (ERROR_OK != retval)
+ return ERROR_FAIL;
+
LOG_DEBUG("Examining targets...");
if (target_examine() != ERROR_OK)
LOG_DEBUG("target examination failed");
return ERROR_OK;
}
-
-static int jim_stacktrace_command(Jim_Interp *interp, int argc,
- Jim_Obj * const *argv)
-{
- if (argc != 1)
- {
- return JIM_ERR;
- }
- Jim_Obj * stacktrace = Jim_DuplicateObj(interp, interp->stackTrace);
-
- /* insert actual error site at beginning of list*/
- Jim_Obj *procname = Jim_NewStringObj(interp, "", -1); /* Uhhh... don't know this one. */
- Jim_ListInsertElements(interp, stacktrace, 0, 1, &procname);
- Jim_Obj *filename = Jim_NewStringObj(interp, interp->errorFileName, -1);
- Jim_ListInsertElements(interp, stacktrace, 1, 1, &filename);
- Jim_Obj *line = Jim_NewIntObj(interp, interp->errorLine);
- Jim_ListInsertElements(interp, stacktrace, 2, 1, &line);
-
- Jim_SetResult(interp, stacktrace);
-
- return JIM_OK;
-}
-
static const struct command_registration openocd_command_handlers[] = {
{
.name = "version",
.handler = &handle_noinit_command,
.mode = COMMAND_CONFIG,
.help = "Prevent 'init' from being called at startup.",
+ .usage = ""
},
{
.name = "init",
"Changes command mode from CONFIG to EXEC. "
"Unless 'noinit' is called, this command is "
"called automatically at the end of startup.",
-
+ .usage = ""
},
{
.name = "add_script_search_dir",
.handler = &handle_add_script_search_dir_command,
.mode = COMMAND_ANY,
.help = "dir to search for config files and scripts",
-
- },
- {
- .name = "stacktrace",
- .jim_handler = jim_stacktrace_command,
- .mode = COMMAND_ANY,
- .help = "returns the stacktrace as a list of triples: proc, file, line."
- "The stack trace is reset when a new stack trace is being built after "
- "a new failure has occurred.",
+ .usage = "<directory>"
},
COMMAND_REGISTRATION_DONE
};
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);
&nand_register_commands,
&pld_register_commands,
&mflash_register_commands,
+ &cti_register_commands,
+ &dap_register_commands,
NULL
};
- for (unsigned i = 0; NULL != command_registrants[i]; i++)
- {
+ for (unsigned i = 0; NULL != command_registrants[i]; i++) {
int retval = (*command_registrants[i])(cmd_ctx);
- if (ERROR_OK != retval)
- {
+ if (ERROR_OK != retval) {
command_done(cmd_ctx);
return NULL;
}
LOG_DEBUG("command registration: complete");
LOG_OUTPUT(OPENOCD_VERSION "\n"
- "Licensed under GNU GPL v2\n");
+ "Licensed under GNU GPL v2\n");
global_cmd_ctx = cmd_ctx;
return cmd_ctx;
}
-static int main2(int argc, char *argv[], struct command_context *cmd_ctx)
+/** OpenOCD runtime meat that can become single-thread in future. It parse
+ * commandline, reads configuration, sets up the target and starts server loop.
+ * Commandline arguments are passed into this function from openocd_main().
+ */
+static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ctx)
{
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;
-
- ret = command_run_line(cmd_ctx, "init_targets");
- if (ERROR_OK != ret)
- ret = EXIT_FAILURE;
+ return ERROR_FAIL;
- if (init_at_startup)
- {
+ if (init_at_startup) {
ret = command_run_line(cmd_ctx, "init");
- if (ERROR_OK != ret)
- return EXIT_FAILURE;
+ if (ERROR_OK != ret) {
+ 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
return EXIT_FAILURE;
LOG_OUTPUT("For bug reports, read\n\t"
- "http://openocd.berlios.de/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);
- ret = main2(argc, argv, cmd_ctx);
+ /* 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();
+ server_free();
unregister_all_commands(cmd_ctx, NULL);
- /* free commandline interface */
- command_done(cmd_ctx);
+ /* free all DAP and CTI objects */
+ dap_cleanup_all();
+ arm_cti_cleanup_all();
adapter_quit();
+ /* Shutdown commandline interface */
+ command_exit(cmd_ctx);
+
+ free_config();
+
+ if (ERROR_FAIL == ret)
+ return EXIT_FAILURE;
+ else if (ERROR_OK != ret)
+ exit_on_signal(ret);
+
return ret;
}
Code Review / openocd.git / blobdiff