X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fsmp.c;h=effc63f5217333e79486d811448ae70ea67a219e;hb=382148e4dd437978997d668f6ec715ddcec1c46e;hp=d14ceba962283c2d460db3ccbb84c67c5ef4654e;hpb=4f6f065201e908497f087769dcdff1728466df4e;p=fw%2Fopenocd

diff --git a/src/target/smp.c b/src/target/smp.c
index d14ceba96..effc63f52 100644
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *                                                                         *
  * Copyright (C) ST-Ericsson SA 2011                                       *
  * Author: Michel Jaouen <michel.jaouen@stericsson.com> for ST-Ericsson.   *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -30,6 +18,7 @@
 #include "smp.h"
 #include "helper/binarybuffer.h"
 
+/* DEPRECATED: gdb_read_smp_packet/gdb_write_smp_packet to be removed      */
 /*  implementation of new packet in gdb interface for smp feature          */
 /*                                                                         */
 /*   j : smp  status request                                               */
@@ -55,18 +44,23 @@
 /*  maint packet jc                                                        */
 
 /* packet j :smp status request */
+#define DEPRECATED_MSG "DEPRECATED: This method is deprecated in favor of the hwthread pseudo RTOS"
 int gdb_read_smp_packet(struct connection *connection,
-		char *packet, int packet_size)
+		char const *packet, int packet_size)
 {
 	struct target *target = get_target_from_connection(connection);
 	int retval = ERROR_OK;
+
+	LOG_WARNING(DEPRECATED_MSG);
+
 	if (target->smp) {
 		if (strncmp(packet, "jc", 2) == 0) {
 			const uint32_t len = sizeof(target->gdb_service->core[0]);
 			char hex_buffer[len * 2 + 1];
-			char buffer[len];
+			uint8_t buffer[len];
 			buf_set_u32(buffer, 0, len * 8, target->gdb_service->core[0]);
-			int pkt_len = hexify(hex_buffer, buffer, sizeof(buffer), sizeof(hex_buffer));
+			size_t pkt_len = hexify(hex_buffer, buffer, sizeof(buffer),
+				sizeof(hex_buffer));
 
 			retval = gdb_put_packet(connection, hex_buffer, pkt_len);
 		}
@@ -77,13 +71,15 @@ int gdb_read_smp_packet(struct connection *connection,
 
 /* J :  smp set request */
 int gdb_write_smp_packet(struct connection *connection,
-		char *packet, int packet_size)
+		char const *packet, int packet_size)
 {
 	struct target *target = get_target_from_connection(connection);
 	char *separator;
 	int coreid = 0;
 	int retval = ERROR_OK;
 
+	LOG_WARNING(DEPRECATED_MSG);
+
 	/* skip command character */
 	if (target->smp) {
 		if (strncmp(packet, "Jc", 2) == 0) {
@@ -97,3 +93,74 @@ int gdb_write_smp_packet(struct connection *connection,
 
 	return retval;
 }
+
+COMMAND_HANDLER(default_handle_smp_command)
+{
+	struct target *target = get_current_target(CMD_CTX);
+	struct target_list *head;
+
+	if (CMD_ARGC > 1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	if (!CMD_ARGC) {
+		command_print(CMD, "%s", target->smp ? "on" : "off");
+		return ERROR_OK;
+	}
+
+	if (!strcmp(CMD_ARGV[0], "on")) {
+		foreach_smp_target(head, target->smp_targets)
+			head->target->smp = 1;
+
+		return ERROR_OK;
+	}
+
+	if (!strcmp(CMD_ARGV[0], "off")) {
+		foreach_smp_target(head, target->smp_targets)
+			head->target->smp = 0;
+
+		/* fixes the target display to the debugger */
+		if (!list_empty(target->smp_targets))
+			target->gdb_service->target = target;
+
+		return ERROR_OK;
+	}
+
+	return ERROR_COMMAND_SYNTAX_ERROR;
+}
+
+COMMAND_HANDLER(handle_smp_gdb_command)
+{
+	struct target *target = get_current_target(CMD_CTX);
+	int retval = ERROR_OK;
+	if (!list_empty(target->smp_targets)) {
+		if (CMD_ARGC == 1) {
+			int coreid = 0;
+			COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], coreid);
+			if (retval != ERROR_OK)
+				return retval;
+			target->gdb_service->core[1] = coreid;
+
+		}
+		command_print(CMD, "gdb coreid  %" PRId32 " -> %" PRId32, target->gdb_service->core[0]
+			, target->gdb_service->core[1]);
+	}
+	return ERROR_OK;
+}
+
+const struct command_registration smp_command_handlers[] = {
+	{
+		.name = "smp",
+		.handler = default_handle_smp_command,
+		.mode = COMMAND_EXEC,
+		.help = "smp handling",
+		.usage = "[on|off]",
+	},
+	{
+		.name = "smp_gdb",
+		.handler = handle_smp_gdb_command,
+		.mode = COMMAND_EXEC,
+		.help = "display/fix current core played to gdb",
+		.usage = "",
+	},
+	COMMAND_REGISTRATION_DONE
+};