X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Ftcl_server.c;h=409567c9d90e9e515cee078dea3b3048409daf4e;hp=f82cafefd5492fd1a7943d2fd7127122a2c8a31a;hb=d28ab08cfafb3ad7ff8dc539644883217e89f8c4;hpb=6c137a2fc0bf53b9c0b8eda51e6f5361552b0112 diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c index f82cafefd5..409567c9d9 100644 --- a/src/server/tcl_server.c +++ b/src/server/tcl_server.c @@ -15,7 +15,7 @@ * 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. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -23,19 +23,23 @@ #endif #include "tcl_server.h" +#include +#include - -#define TCL_SERVER_VERSION "TCL Server 0.1" -#define TCL_MAX_LINE (4096) +#define TCL_SERVER_VERSION "TCL Server 0.1" +#define TCL_MAX_LINE (4096) struct tcl_connection { int tc_linedrop; int tc_lineoffset; char tc_line[TCL_MAX_LINE]; - int tc_outerror; /* flag an output error */ + int tc_outerror;/* flag an output error */ + enum target_state tc_laststate; + bool tc_notify; + bool tc_trace; }; -static const char *tcl_port; +static char *tcl_port; /* handlers */ static int tcl_new_connection(struct connection *connection); @@ -43,6 +47,74 @@ static int tcl_input(struct connection *connection); static int tcl_output(struct connection *connection, const void *buf, ssize_t len); static int tcl_closed(struct connection *connection); +static int tcl_target_callback_event_handler(struct target *target, + enum target_event event, void *priv) +{ + struct connection *connection = priv; + struct tcl_connection *tclc; + char buf[256]; + + tclc = connection->priv; + + if (tclc->tc_notify) { + snprintf(buf, sizeof(buf), "type target_event event %s\r\n\x1a", target_event_name(event)); + tcl_output(connection, buf, strlen(buf)); + } + + if (tclc->tc_laststate != target->state) { + tclc->tc_laststate = target->state; + if (tclc->tc_notify) { + snprintf(buf, sizeof(buf), "type target_state state %s\r\n\x1a", target_state_name(target)); + tcl_output(connection, buf, strlen(buf)); + } + } + + return ERROR_OK; +} + +static int tcl_target_callback_reset_handler(struct target *target, + enum target_reset_mode reset_mode, void *priv) +{ + struct connection *connection = priv; + struct tcl_connection *tclc; + char buf[256]; + + tclc = connection->priv; + + if (tclc->tc_notify) { + snprintf(buf, sizeof(buf), "type target_reset mode %s\r\n\x1a", target_reset_mode_name(reset_mode)); + tcl_output(connection, buf, strlen(buf)); + } + + return ERROR_OK; +} + +static int tcl_target_callback_trace_handler(struct target *target, + size_t len, uint8_t *data, void *priv) +{ + struct connection *connection = priv; + struct tcl_connection *tclc; + char *header = "type target_trace data "; + char *trailer = "\r\n\x1a"; + size_t hex_len = len * 2 + 1; + size_t max_len = hex_len + strlen(header) + strlen(trailer); + char *buf, *hex; + + tclc = connection->priv; + + if (tclc->tc_trace) { + hex = malloc(hex_len); + buf = malloc(max_len); + hexify(hex, (const char *)data, len, hex_len); + snprintf(buf, max_len, "%s%s%s", header, hex, trailer); + tcl_output(connection, buf, strlen(buf)); + free(hex); + free(buf); + } + + return ERROR_OK; +} + /* write data out to a socket. * * this is a blocking write, so the return value must equal the length, if @@ -78,6 +150,18 @@ static int tcl_new_connection(struct connection *connection) memset(tclc, 0, sizeof(struct tcl_connection)); connection->priv = tclc; + + struct target *target = get_target_by_num(connection->cmd_ctx->current_target); + if (target != NULL) + tclc->tc_laststate = target->state; + + /* store the connection object on cmd_ctx so we can access it from command handlers */ + connection->cmd_ctx->output_handler_priv = connection; + + target_register_event_callback(tcl_target_callback_event_handler, connection); + target_register_reset_callback(tcl_target_callback_reset_handler, connection); + target_register_trace_callback(tcl_target_callback_trace_handler, connection); + return ERROR_OK; } @@ -104,8 +188,7 @@ static int tcl_input(struct connection *connection) return ERROR_CONNECTION_REJECTED; /* push as much data into the line as possible */ - for (i = 0; i < rlen; i++) - { + for (i = 0; i < rlen; i++) { /* buffer the data */ tclc->tc_line[tclc->tc_lineoffset] = in[i]; if (tclc->tc_lineoffset < TCL_MAX_LINE) @@ -127,12 +210,9 @@ static int tcl_input(struct connection *connection) if (retval != ERROR_OK) return retval; #undef ESTR - } - else { + } else { tclc->tc_line[tclc->tc_lineoffset-1] = '\0'; - LOG_DEBUG("Executing script:\n %s", tclc->tc_line); - retval = Jim_Eval_Named(interp, tclc->tc_line, "remote:connection",1); - LOG_DEBUG("Result: %d\n %s", retval, Jim_GetString(Jim_GetResult(interp), &reslen)); + command_run_line(connection->cmd_ctx, tclc->tc_line); result = Jim_GetString(Jim_GetResult(interp), &reslen); retval = tcl_output(connection, result, reslen); if (retval != ERROR_OK) @@ -155,20 +235,24 @@ static int tcl_closed(struct connection *connection) free(connection->priv); connection->priv = NULL; } + + target_unregister_event_callback(tcl_target_callback_event_handler, connection); + target_unregister_reset_callback(tcl_target_callback_reset_handler, connection); + target_unregister_trace_callback(tcl_target_callback_trace_handler, connection); + return ERROR_OK; } int tcl_init(void) { - if (strcmp(tcl_port, "disabled") == 0) - { + if (strcmp(tcl_port, "disabled") == 0) { LOG_INFO("tcl server disabled"); return ERROR_OK; } - return add_service_pipe("tcl", tcl_port, 1, - &tcl_new_connection, &tcl_input, - &tcl_closed, NULL); + return add_service("tcl", tcl_port, 1, + &tcl_new_connection, &tcl_input, + &tcl_closed, NULL); } COMMAND_HANDLER(handle_tcl_port_command) @@ -176,16 +260,64 @@ COMMAND_HANDLER(handle_tcl_port_command) return CALL_COMMAND_HANDLER(server_pipe_command, &tcl_port); } +COMMAND_HANDLER(handle_tcl_notifications_command) +{ + struct connection *connection = NULL; + struct tcl_connection *tclc = NULL; + + if (CMD_CTX->output_handler_priv != NULL) + connection = CMD_CTX->output_handler_priv; + + if (connection != NULL && !strcmp(connection->service->name, "tcl")) { + tclc = connection->priv; + return CALL_COMMAND_HANDLER(handle_command_parse_bool, &tclc->tc_notify, "Target Notification output "); + } else { + LOG_ERROR("%s: can only be called from the tcl server", CMD_NAME); + return ERROR_COMMAND_SYNTAX_ERROR; + } +} + +COMMAND_HANDLER(handle_tcl_trace_command) +{ + struct connection *connection = NULL; + struct tcl_connection *tclc = NULL; + + if (CMD_CTX->output_handler_priv != NULL) + connection = CMD_CTX->output_handler_priv; + + if (connection != NULL && !strcmp(connection->service->name, "tcl")) { + tclc = connection->priv; + return CALL_COMMAND_HANDLER(handle_command_parse_bool, &tclc->tc_trace, "Target trace output "); + } else { + LOG_ERROR("%s: can only be called from the tcl server", CMD_NAME); + return ERROR_COMMAND_SYNTAX_ERROR; + } +} + static const struct command_registration tcl_command_handlers[] = { { .name = "tcl_port", .handler = handle_tcl_port_command, - .mode = COMMAND_CONFIG, + .mode = COMMAND_ANY, .help = "Specify port on which to listen " "for incoming Tcl syntax. " - "No arguments reports Tcl port; zero disables.", + "Read help on 'gdb_port'.", .usage = "[port_num]", }, + { + .name = "tcl_notifications", + .handler = handle_tcl_notifications_command, + .mode = COMMAND_EXEC, + .help = "Target Notification output", + .usage = "[on|off]", + }, + { + .name = "tcl_trace", + .handler = handle_tcl_trace_command, + .mode = COMMAND_EXEC, + .help = "Target trace output", + .usage = "[on|off]", + }, COMMAND_REGISTRATION_DONE };