projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm_adi_v5: Added Cortex-A76 identifiers
[fw/openocd]
/
src
/
openocd.c
diff --git
a/src/openocd.c
b/src/openocd.c
index 758febb4df7533ddcede040ab007ca7a22af92e5..2c94666243d724e8961d30b4e5f6b711a1c23e13 100644
(file)
--- 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 *
* 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 <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@
-32,23
+30,31
@@
#include <jtag/driver.h>
#include <jtag/jtag.h>
#include <transport/transport.h>
#include <jtag/driver.h>
#include <jtag/jtag.h>
#include <transport/transport.h>
-#include <helper/ioutil.h>
#include <helper/util.h>
#include <helper/configuration.h>
#include <flash/nor/core.h>
#include <flash/nand/core.h>
#include <pld/pld.h>
#include <helper/util.h>
#include <helper/configuration.h>
#include <flash/nor/core.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 <target/arm_tpiu_swo.h>
+#include <rtt/rtt.h>
#include <server/server.h>
#include <server/gdb_server.h>
#include <server/server.h>
#include <server/gdb_server.h>
+#include <server/rtt_server.h>
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
+#ifdef PKGBLDDATE
#define OPENOCD_VERSION \
"Open On-Chip Debugger " VERSION RELSTR " (" 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"
static const char openocd_startup_tcl[] = {
#include "startup_tcl.inc"
@@
-82,13
+88,13
@@
static int log_target_callback_event_handler(struct target *target,
{
switch (event) {
case TARGET_EVENT_GDB_START:
{
switch (event) {
case TARGET_EVENT_GDB_START:
- target->
display = 0
;
+ target->
verbose_halt_msg = false
;
break;
case TARGET_EVENT_GDB_END:
break;
case TARGET_EVENT_GDB_END:
- target->
display = 1
;
+ target->
verbose_halt_msg = true
;
break;
case TARGET_EVENT_HALTED:
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);
}
/* do not display information when debugger caused the halt */
target_arch_state(target);
}
@@
-125,7
+131,7
@@
COMMAND_HANDLER(handle_init_command)
initialized = 1;
retval = command_run_line(CMD_CTX, "target init");
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);
return ERROR_FAIL;
retval = adapter_init(CMD_CTX);
@@
-144,7
+150,11
@@
COMMAND_HANDLER(handle_init_command)
command_context_mode(CMD_CTX, COMMAND_EXEC);
retval = command_run_line(CMD_CTX, "transport init");
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...");
return ERROR_FAIL;
LOG_DEBUG("Examining targets...");
@@
-156,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, "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;
if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
return ERROR_FAIL;
@@
-166,6
+173,10
@@
COMMAND_HANDLER(handle_init_command)
return ERROR_FAIL;
command_context_mode(CMD_CTX, COMMAND_EXEC);
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);
/* initialize telnet subsystem */
gdb_target_add_all(all_targets);
@@
-225,10
+236,7
@@
static int openocd_register_commands(struct command_context *cmd_ctx)
struct command_context *global_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");
{
log_init();
LOG_DEBUG("log_init: complete");
@@
-242,18
+250,21
@@
struct command_context *setup_command_handler(Jim_Interp *interp)
&server_register_commands,
&gdb_register_commands,
&log_register_commands,
&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,
&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
};
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);
int retval = (*command_registrants[i])(cmd_ctx);
- if (
ERROR_OK != retval
) {
+ if (
retval != ERROR_OK
) {
command_done(cmd_ctx);
return NULL;
}
command_done(cmd_ctx);
return NULL;
}
@@
-277,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)
int ret;
if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
- return E
XIT_FAILURE
;
+ return E
RROR_FAIL
;
if (server_preinit() != ERROR_OK)
if (server_preinit() != ERROR_OK)
- return E
XIT_FAILURE
;
+ return E
RROR_FAIL
;
ret = parse_config_file(cmd_ctx);
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);
ret = server_init(cmd_ctx);
- if (
ERROR_OK != ret
)
- return E
XIT_FAILURE
;
+ if (
ret != ERROR_OK
)
+ return E
RROR_FAIL
;
if (init_at_startup) {
ret = command_run_line(cmd_ctx, "init");
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
}
/* normally this is the main() function entry, but if OpenOCD is linked
@@
-318,25
+340,47
@@
int openocd_main(int argc, char *argv[])
if (util_init(cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;
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"
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);
"\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);
/* 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);
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 */
+ dap_cleanup_all();
+ arm_cti_cleanup_all();
adapter_quit();
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;
}
return ret;
}