X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fsmp.c;h=569abd7860a4f632a6de652042583173a7cb3b12;hb=2053120ba10d68339c61cd2b247bde01bda41ab7;hp=aabfa5b8d63fd2ee62d0e4edd880d4605a468ac0;hpb=b778b36f29b74d6d571df85f984ae684672ea162;p=openocd.git

diff --git a/src/target/smp.c b/src/target/smp.c
index aabfa5b8d6..569abd7860 100644
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -13,23 +13,22 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "server/server.h"
-#include <helper/types.h>
 
 #include "target/target.h"
 
 #include "server/gdb_server.h"
 #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                                               */
@@ -53,64 +52,125 @@
 /*  Another way to test this packet is the usage of maintenance packet     */
 /*  maint packet Jc01                                                      */
 /*  maint packet jc                                                        */
-                                                
-static const char DIGITS[16] = "0123456789abcdef";
-
 
 /* 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,
-		struct target *target, char *packet, int packet_size)
+		char const *packet, int packet_size)
 {
-	uint32_t len = sizeof(int32_t);
-	uint8_t *buffer;
-	char *hex_buffer;
+	struct target *target = get_target_from_connection(connection);
 	int retval = ERROR_OK;
-	if (target->smp)
-	{
-		if (strstr(packet, "jc"))
-		{
-			hex_buffer = malloc(len * 2 + 1);
-			buffer = (uint8_t *)&target->gdb_service->core[0];
-			uint32_t i;
-			for (i = 0; i < 4; i++)
-			{
-				uint8_t t = buffer[i];
-				hex_buffer[2 * i] = DIGITS[(t >> 4) & 0xf];
-				hex_buffer[2 * i + 1] = DIGITS[t & 0xf];
-			}
-
-			gdb_put_packet(connection, hex_buffer, len * 2);
-
-			free(hex_buffer);
+
+	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];
+			uint8_t buffer[len];
+			buf_set_u32(buffer, 0, len * 8, target->gdb_service->core[0]);
+			size_t pkt_len = hexify(hex_buffer, buffer, sizeof(buffer),
+				sizeof(hex_buffer));
+
+			retval = gdb_put_packet(connection, hex_buffer, pkt_len);
 		}
-	}
-	else
-		retval = gdb_put_packet(connection,"E01",3);
+	} else
+		retval = gdb_put_packet(connection, "E01", 3);
 	return retval;
 }
 
 /* J :  smp set request */
 int gdb_write_smp_packet(struct connection *connection,
-		struct target *target, 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;
+	int retval = ERROR_OK;
+
+	LOG_WARNING(DEPRECATED_MSG);
 
 	/* skip command character */
-	if (target->smp)
-	{
-		if (strstr(packet, "Jc"))
-		{
-			packet+=2;
+	if (target->smp) {
+		if (strncmp(packet, "Jc", 2) == 0) {
+			packet += 2;
 			coreid = strtoul(packet, &separator, 16);
 			target->gdb_service->core[1] = coreid;
-			gdb_put_packet(connection, "OK", 2);
+			retval = gdb_put_packet(connection, "OK", 2);
 		}
+	} else
+		retval = gdb_put_packet(connection, "E01", 3);
+
+	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;
 	}
-	else
-	{
-		retval = gdb_put_packet(connection,"E01",3);
+
+	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
+};