Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-621-gb9526f140
|
From: OpenOCD-Gerrit <ope...@us...> - 2022-03-19 09:11:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via b9526f1401271a00dd72cf7ec8bded32e77d41ff (commit)
from 4e5dbecd9b1ac780181e04f8b51a4cd133c4cdbe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b9526f1401271a00dd72cf7ec8bded32e77d41ff
Author: Tarek BOCHKATI <tar...@gm...>
Date: Mon Apr 6 13:30:26 2020 +0100
semihosting: permit redirection of semihosting I/O to TCP
This command permits the usage of a TCP port to perform debug and stdio
operations:
- debug : READC, WRITEC and WRITE0
- stdio : READ, WRITE
This will permit the separation of semihosting message from OpenOCD log,
and separate semihosting messages per core.
syntax: arm semihosting_redirect (disable | tcp <port> [debug|stdio|all])
this allows to select which operations to be performed via TCP (debug,
stdio or all (default)).
Note: for stdio operations, only I/O from/to ':tt' file descriptors are
redirected.
tested using netcat on ubuntu
Change-Id: I37053463667ba109d52429d4f98bc98d0ede298d
Signed-off-by: Tarek BOCHKATI <tar...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/5562
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 0cd9621ff..1b6d06302 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -9370,6 +9370,17 @@ requests by using a special SVC instruction that is trapped at the
Supervisor Call vector by OpenOCD.
@end deffn
+@deffn {Command} {arm semihosting_redirect} (@option{disable} | @option{tcp} <port>
+[@option{debug}|@option{stdio}|@option{all})
+@cindex ARM semihosting
+Redirect semihosting messages to a specified TCP port.
+
+This command redirects debug (READC, WRITEC and WRITE0) and stdio (READ, WRITE)
+semihosting operations to the specified TCP port.
+The command allows to select which type of operations to redirect (debug, stdio, all (default)).
+Note: for stdio operations, only I/O from/to ':tt' file descriptors are redirected.
+@end deffn
+
@deffn {Command} {arm semihosting_cmdline} [@option{enable}|@option{disable}]
@cindex ARM semihosting
Set the command line to be passed to the debugger.
diff --git a/src/target/semihosting_common.c b/src/target/semihosting_common.c
index 9e60de572..38035e493 100644
--- a/src/target/semihosting_common.c
+++ b/src/target/semihosting_common.c
@@ -129,6 +129,11 @@ int semihosting_common_init(struct target *target, void *setup,
}
semihosting->is_active = false;
+ semihosting->redirect_cfg = SEMIHOSTING_REDIRECT_CFG_NONE;
+ semihosting->tcp_connection = NULL;
+ semihosting->stdin_fd = -1;
+ semihosting->stdout_fd = -1;
+ semihosting->stderr_fd = -1;
semihosting->is_fileio = false;
semihosting->hit_fileio = false;
semihosting->is_resumable = false;
@@ -154,6 +159,141 @@ int semihosting_common_init(struct target *target, void *setup,
return ERROR_OK;
}
+struct semihosting_tcp_service {
+ struct semihosting *semihosting;
+ char *name;
+ int error;
+};
+
+static bool semihosting_is_redirected(struct semihosting *semihosting, int fd)
+{
+ if (semihosting->redirect_cfg == SEMIHOSTING_REDIRECT_CFG_NONE)
+ return false;
+
+ bool is_read_op = false;
+
+ switch (semihosting->op) {
+ /* check debug semihosting operations: READC, WRITEC and WRITE0 */
+ case SEMIHOSTING_SYS_READC:
+ is_read_op = true;
+ /* fall through */
+ case SEMIHOSTING_SYS_WRITEC:
+ case SEMIHOSTING_SYS_WRITE0:
+ /* debug operations are redirected when CFG is either DEBUG or ALL */
+ if (semihosting->redirect_cfg == SEMIHOSTING_REDIRECT_CFG_STDIO)
+ return false;
+ break;
+
+ /* check stdio semihosting operations: READ and WRITE */
+ case SEMIHOSTING_SYS_READ:
+ is_read_op = true;
+ /* fall through */
+ case SEMIHOSTING_SYS_WRITE:
+ /* stdio operations are redirected when CFG is either STDIO or ALL */
+ if (semihosting->redirect_cfg == SEMIHOSTING_REDIRECT_CFG_DEBUG)
+ return false;
+ break;
+
+ default:
+ return false;
+ }
+
+ if (is_read_op)
+ return fd == semihosting->stdin_fd;
+
+ /* write operation */
+ return fd == semihosting->stdout_fd || fd == semihosting->stderr_fd;
+}
+
+static ssize_t semihosting_redirect_write(struct semihosting *semihosting, void *buf, int size)
+{
+ if (!semihosting->tcp_connection) {
+ LOG_ERROR("No connected TCP client for semihosting");
+ semihosting->sys_errno = EBADF; /* Bad file number */
+ return -1;
+ }
+
+ struct semihosting_tcp_service *service = semihosting->tcp_connection->service->priv;
+
+ int retval = connection_write(semihosting->tcp_connection, buf, size);
+
+ if (retval < 0)
+ log_socket_error(service->name);
+
+ return retval;
+}
+
+static ssize_t semihosting_write(struct semihosting *semihosting, int fd, void *buf, int size)
+{
+ if (semihosting_is_redirected(semihosting, fd))
+ return semihosting_redirect_write(semihosting, buf, size);
+
+ /* default write */
+ return write(fd, buf, size);
+}
+
+static ssize_t semihosting_redirect_read(struct semihosting *semihosting, void *buf, int size)
+{
+ if (!semihosting->tcp_connection) {
+ LOG_ERROR("No connected TCP client for semihosting");
+ semihosting->sys_errno = EBADF; /* Bad file number */
+ return -1;
+ }
+
+ struct semihosting_tcp_service *service = semihosting->tcp_connection->service->priv;
+
+ service->error = ERROR_OK;
+ semihosting->tcp_connection->input_pending = true;
+
+ int retval = connection_read(semihosting->tcp_connection, buf, size);
+
+ if (retval <= 0)
+ service->error = ERROR_SERVER_REMOTE_CLOSED;
+
+ if (retval < 0)
+ log_socket_error(service->name);
+
+ semihosting->tcp_connection->input_pending = false;
+
+ return retval;
+}
+
+static inline int semihosting_putchar(struct semihosting *semihosting, int fd, int c)
+{
+ if (semihosting_is_redirected(semihosting, fd))
+ return semihosting_redirect_write(semihosting, &c, 1);
+
+ /* default putchar */
+ return putchar(c);
+}
+
+static inline ssize_t semihosting_read(struct semihosting *semihosting, int fd, void *buf, int size)
+{
+ if (semihosting_is_redirected(semihosting, fd))
+ return semihosting_redirect_read(semihosting, buf, size);
+
+ /* default read */
+ ssize_t result = read(fd, buf, size);
+ semihosting->sys_errno = errno;
+
+ return result;
+}
+
+static inline int semihosting_getchar(struct semihosting *semihosting, int fd)
+{
+ if (semihosting_is_redirected(semihosting, fd)) {
+ unsigned char c;
+
+ if (semihosting_redirect_read(semihosting, &c, 1) > 0)
+ return c;
+
+ return EOF;
+ }
+
+ /* default getchar */
+ return getchar();
+}
+
/**
* User operation parameter string storage buffer. Contains valid data when the
* TARGET_EVENT_SEMIHOSTING_USER_CMD_xxxxx event callbacks are running.
@@ -756,20 +896,23 @@ int semihosting_common(struct target *target)
* - 4-7 ("w") for stdout,
* - 8-11 ("a") for stderr */
if (mode < 4) {
- semihosting->result = dup(
- STDIN_FILENO);
+ int fd = dup(STDIN_FILENO);
+ semihosting->result = fd;
+ semihosting->stdin_fd = fd;
semihosting->sys_errno = errno;
LOG_DEBUG("dup(STDIN)=%d",
(int)semihosting->result);
} else if (mode < 8) {
- semihosting->result = dup(
- STDOUT_FILENO);
+ int fd = dup(STDOUT_FILENO);
+ semihosting->result = fd;
+ semihosting->stdout_fd = fd;
semihosting->sys_errno = errno;
LOG_DEBUG("dup(STDOUT)=%d",
(int)semihosting->result);
} else {
- semihosting->result = dup(
- STDERR_FILENO);
+ int fd = dup(STDERR_FILENO);
+ semihosting->result = fd;
+ semihosting->stderr_fd = fd;
semihosting->sys_errno = errno;
LOG_DEBUG("dup(STDERR)=%d",
(int)semihosting->result);
@@ -845,8 +988,7 @@ int semihosting_common(struct target *target)
semihosting->result = -1;
semihosting->sys_errno = ENOMEM;
} else {
- semihosting->result = read(fd, buf, len);
- semihosting->sys_errno = errno;
+ semihosting->result = semihosting_read(semihosting, fd, buf, len);
LOG_DEBUG("read(%d, 0x%" PRIx64 ", %zu)=%d",
fd,
addr,
@@ -886,7 +1028,7 @@ int semihosting_common(struct target *target)
LOG_ERROR("SYS_READC not supported by semihosting fileio");
return ERROR_FAIL;
}
- semihosting->result = getchar();
+ semihosting->result = semihosting_getchar(semihosting, semihosting->stdin_fd);
LOG_DEBUG("getchar()=%d", (int)semihosting->result);
break;
@@ -1189,7 +1331,7 @@ int semihosting_common(struct target *target)
free(buf);
return retval;
}
- semihosting->result = write(fd, buf, len);
+ semihosting->result = semihosting_write(semihosting, fd, buf, len);
semihosting->sys_errno = errno;
LOG_DEBUG("write(%d, 0x%" PRIx64 ", %zu)=%d",
fd,
@@ -1234,7 +1376,7 @@ int semihosting_common(struct target *target)
retval = target_read_memory(target, addr, 1, 1, &c);
if (retval != ERROR_OK)
return retval;
- putchar(c);
+ semihosting_putchar(semihosting, semihosting->stdout_fd, c);
semihosting->result = 0;
}
break;
@@ -1278,7 +1420,7 @@ int semihosting_common(struct target *target)
return retval;
if (!c)
break;
- putchar(c);
+ semihosting_putchar(semihosting, semihosting->stdout_fd, c);
} while (1);
semihosting->result = 0;
}
@@ -1557,6 +1699,70 @@ static void semihosting_set_field(struct target *target, uint64_t value,
target_buffer_set_u32(target, fields + (index * 4), value);
}
+/* -------------------------------------------------------------------------
+ * Semihosting redirect over TCP structs and functions */
+
+static int semihosting_service_new_connection_handler(struct connection *connection)
+{
+ struct semihosting_tcp_service *service = connection->service->priv;
+ service->semihosting->tcp_connection = connection;
+
+ return ERROR_OK;
+}
+
+static int semihosting_service_input_handler(struct connection *connection)
+{
+ struct semihosting_tcp_service *service = connection->service->priv;
+
+ if (!connection->input_pending) {
+ /* consume received data, not for semihosting IO */
+ const int buf_len = 100;
+ char buf[buf_len];
+ int bytes_read = connection_read(connection, buf, buf_len);
+
+ if (bytes_read == 0) {
+ return ERROR_SERVER_REMOTE_CLOSED;
+ } else if (bytes_read == -1) {
+ LOG_ERROR("error during read: %s", strerror(errno));
+ return ERROR_SERVER_REMOTE_CLOSED;
+ }
+ } else if (service->error != ERROR_OK) {
+ return ERROR_SERVER_REMOTE_CLOSED;
+ }
+
+ return ERROR_OK;
+}
+
+static int semihosting_service_connection_closed_handler(struct connection *connection)
+{
+ struct semihosting_tcp_service *service = connection->service->priv;
+ if (service) {
+ free(service->name);
+ free(service);
+ }
+
+ return ERROR_OK;
+}
+
+static void semihosting_tcp_close_cnx(struct semihosting *semihosting)
+{
+ if (!semihosting->tcp_connection)
+ return;
+
+ struct service *service = semihosting->tcp_connection->service;
+ remove_service(service->name, service->port);
+ semihosting->tcp_connection = NULL;
+
+}
+
+static const struct service_driver semihosting_service_driver = {
+ .name = "semihosting",
+ .new_connection_during_keep_alive_handler = NULL,
+ .new_connection_handler = semihosting_service_new_connection_handler,
+ .input_handler = semihosting_service_input_handler,
+ .connection_closed_handler = semihosting_service_connection_closed_handler,
+ .keep_client_alive_handler = NULL,
+};
/* -------------------------------------------------------------------------
* Common semihosting commands handlers. */
@@ -1602,6 +1808,91 @@ COMMAND_HANDLER(handle_common_semihosting_command)
return ERROR_OK;
}
+COMMAND_HANDLER(handle_common_semihosting_redirect_command)
+{
+ struct target *target = get_current_target(CMD_CTX);
+
+ if (target == NULL) {
+ LOG_ERROR("No target selected");
+ return ERROR_FAIL;
+ }
+
+ struct semihosting *semihosting = target->semihosting;
+ if (!semihosting) {
+ command_print(CMD, "semihosting not supported for current target");
+ return ERROR_FAIL;
+ }
+
+ if (!semihosting->is_active) {
+ command_print(CMD, "semihosting not yet enabled for current target");
+ return ERROR_FAIL;
+ }
+
+ enum semihosting_redirect_config cfg;
+ const char *port;
+
+ if (CMD_ARGC < 1)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
+ if (strcmp(CMD_ARGV[0], "disable") == 0) {
+ cfg = SEMIHOSTING_REDIRECT_CFG_NONE;
+ if (CMD_ARGC > 1)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ } else if (strcmp(CMD_ARGV[0], "tcp") == 0) {
+ if (CMD_ARGC < 2 || CMD_ARGC > 3)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
+ port = CMD_ARGV[1];
+
+ cfg = SEMIHOSTING_REDIRECT_CFG_ALL;
+ if (CMD_ARGC == 3) {
+ if (strcmp(CMD_ARGV[2], "debug") == 0)
+ cfg = SEMIHOSTING_REDIRECT_CFG_DEBUG;
+ else if (strcmp(CMD_ARGV[2], "stdio") == 0)
+ cfg = SEMIHOSTING_REDIRECT_CFG_STDIO;
+ else if (strcmp(CMD_ARGV[2], "all") != 0)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
+ } else {
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
+
+ semihosting_tcp_close_cnx(semihosting);
+ semihosting->redirect_cfg = SEMIHOSTING_REDIRECT_CFG_NONE;
+
+ if (cfg != SEMIHOSTING_REDIRECT_CFG_NONE) {
+ struct semihosting_tcp_service *service =
+ calloc(1, sizeof(struct semihosting_tcp_service));
+ if (!service) {
+ LOG_ERROR("Failed to allocate semihosting TCP service.");
+ return ERROR_FAIL;
+ }
+
+ service->semihosting = semihosting;
+
+ service->name = alloc_printf("%s semihosting service", target_name(target));
+ if (!service->name) {
+ LOG_ERROR("Out of memory");
+ free(service);
+ return ERROR_FAIL;
+ }
+
+ int ret = add_service(&semihosting_service_driver,
+ port, 1, service);
+
+ if (ret != ERROR_OK) {
+ LOG_ERROR("failed to initialize %s", service->name);
+ free(service->name);
+ free(service);
+ return ERROR_FAIL;
+ }
+ }
+
+ semihosting->redirect_cfg = cfg;
+
+ return ERROR_OK;
+}
+
COMMAND_HANDLER(handle_common_semihosting_fileio_command)
{
struct target *target = get_current_target(CMD_CTX);
@@ -1721,35 +2012,42 @@ COMMAND_HANDLER(handle_common_semihosting_read_user_param_command)
const struct command_registration semihosting_common_handlers[] = {
{
- "semihosting",
+ .name = "semihosting",
.handler = handle_common_semihosting_command,
.mode = COMMAND_EXEC,
.usage = "['enable'|'disable']",
.help = "activate support for semihosting operations",
},
{
- "semihosting_cmdline",
+ .name = "semihosting_redirect",
+ .handler = handle_common_semihosting_redirect_command,
+ .mode = COMMAND_EXEC,
+ .usage = "(disable | tcp <port> ['debug'|'stdio'|'all'])",
+ .help = "redirect semihosting IO",
+ },
+ {
+ .name = "semihosting_cmdline",
.handler = handle_common_semihosting_cmdline,
.mode = COMMAND_EXEC,
.usage = "arguments",
.help = "command line arguments to be passed to program",
},
{
- "semihosting_fileio",
+ .name = "semihosting_fileio",
.handler = handle_common_semihosting_fileio_command,
.mode = COMMAND_EXEC,
.usage = "['enable'|'disable']",
.help = "activate support for semihosting fileio operations",
},
{
- "semihosting_resexit",
+ .name = "semihosting_resexit",
.handler = handle_common_semihosting_resumable_exit_command,
.mode = COMMAND_EXEC,
.usage = "['enable'|'disable']",
.help = "activate support for semihosting resumable exit",
},
{
- "semihosting_read_user_param",
+ .name = "semihosting_read_user_param",
.handler = handle_common_semihosting_read_user_param_command,
.mode = COMMAND_EXEC,
.usage = "",
diff --git a/src/target/semihosting_common.h b/src/target/semihosting_common.h
index 6eb9ca252..459faf656 100644
--- a/src/target/semihosting_common.h
+++ b/src/target/semihosting_common.h
@@ -26,6 +26,7 @@
#include <stdbool.h>
#include <time.h>
#include "helper/replacements.h"
+#include <server/server.h>
/*
* According to:
@@ -95,6 +96,13 @@ enum semihosting_reported_exceptions {
ADP_STOPPED_RUN_TIME_ERROR = ((2 << 16) + 35),
};
+enum semihosting_redirect_config {
+ SEMIHOSTING_REDIRECT_CFG_NONE,
+ SEMIHOSTING_REDIRECT_CFG_DEBUG,
+ SEMIHOSTING_REDIRECT_CFG_STDIO,
+ SEMIHOSTING_REDIRECT_CFG_ALL,
+};
+
struct target;
/*
@@ -105,6 +113,15 @@ struct semihosting {
/** A flag reporting whether semihosting is active. */
bool is_active;
+ /** Semihosting STDIO file descriptors */
+ int stdin_fd, stdout_fd, stderr_fd;
+
+ /** redirection configuration, NONE by default */
+ enum semihosting_redirect_config redirect_cfg;
+
+ /** Handle to redirect semihosting print via tcp */
+ struct connection *tcp_connection;
+
/** A flag reporting whether semihosting fileio is active. */
bool is_fileio;
-----------------------------------------------------------------------
Summary of changes:
doc/openocd.texi | 11 ++
src/target/semihosting_common.c | 332 ++++++++++++++++++++++++++++++++++++++--
src/target/semihosting_common.h | 17 ++
3 files changed, 343 insertions(+), 17 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
