aarch64: handle semihosting in aarch32 state

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 94fab3a94e891ab5e9596325e6437a46e068207f..fcefdbe70fae5eef42879c666e5749deeab77668 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -30,16 +30,19 @@
 #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 <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/rtt_server.h>
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -85,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);
                        }
@@ -150,6 +153,10 @@ COMMAND_HANDLER(handle_init_command)
        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");
@@ -159,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;
 
@@ -169,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);
 
@@ -228,10 +236,7 @@ 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");
@@ -245,13 +250,16 @@ 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++) {
@@ -286,10 +294,13 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
                return ERROR_FAIL;
 
        ret = parse_config_file(cmd_ctx);
-       if (ret == ERROR_COMMAND_CLOSE_CONNECTION)
+       if (ret == ERROR_COMMAND_CLOSE_CONNECTION) {
+               server_quit(); /* gdb server may be initialized by -c init */
                return ERROR_OK;
-       else if (ret != 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)
@@ -297,8 +308,10 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
 
        if (init_at_startup) {
                ret = command_run_line(cmd_ctx, "init");
-               if (ERROR_OK != ret)
+               if (ERROR_OK != ret) {
+                       server_quit();
                        return ERROR_FAIL;
+               }
        }
 
        ret = server_loop(cmd_ctx);
@@ -327,7 +340,7 @@ 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"
@@ -337,16 +350,32 @@ int openocd_main(int argc, char *argv[])
        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);
 
-       /* free commandline interface */
-       command_done(cmd_ctx);
+       /* free all DAP and CTI objects */
+       dap_cleanup_all();
+       arm_cti_cleanup_all();
 
        adapter_quit();
 
+       server_host_os_close();
+
+       /* Shutdown commandline interface */
+       command_exit(cmd_ctx);
+
+       rtt_exit();
+       free_config();
+
        if (ERROR_FAIL == ret)
                return EXIT_FAILURE;
        else if (ERROR_OK != ret)