X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fgdb_server.c;h=b6921ff25f304d5ff52891649d7096fec90b4036;hp=0b8085896615fa61aa5338f456d8987ab76933c8;hb=f6315d5e5b7b71515ef051711e5f818a42d6b3b3;hpb=b69119668ed8d9633280f8b596fe9af60f51644b

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 0b80858966..b6921ff25f 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -11,6 +11,9 @@
  *   Copyright (C) 2011 by Broadcom Corporation                            *
  *   Evan Hunter - ehunter@broadcom.com                                    *
  *                                                                         *
+ *   Copyright (C) ST-Ericsson SA 2011                                     *
+ *   michel.jaouen@stericsson.com : smp minimum support                    *
+ *                                                                         *
  *   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     *
@@ -39,6 +42,7 @@
 #include <target/image.h>
 #include <jtag/jtag.h>
 #include "rtos/rtos.h"
+#include "target/smp.h"
 
 
 /**
@@ -62,7 +66,7 @@ struct gdb_connection
 	int closed;
 	int busy;
 	int noack_mode;
-	bool sync; 	/* set flag to true if you want the next stepi to return immediately.
+	bool sync;	/* set flag to true if you want the next stepi to return immediately.
 	               allowing GDB to pick up a fresh set of register values from the target
 	               without modifying the target state. */
 	/* We delay reporting memory write errors until next step/continue or memory
@@ -1060,6 +1064,8 @@ static int gdb_get_registers_packet(struct connection *connection,
 
 	for (i = 0; i < reg_list_size; i++)
 	{
+		if (!reg_list[i]->valid)
+			reg_list[i]->type->get(reg_list[i]);
 		gdb_str_to_target(target, reg_packet_p, reg_list[i]);
 		reg_packet_p += DIV_ROUND_UP(reg_list[i]->size, 8) * 2;
 	}
@@ -1164,6 +1170,9 @@ static int gdb_get_register_packet(struct connection *connection,
 		exit(-1);
 	}
 
+	if (!reg_list[reg_num]->valid)
+		reg_list[reg_num]->type->get(reg_list[reg_num]);
+
 	reg_packet = malloc(DIV_ROUND_UP(reg_list[reg_num]->size, 8) * 2);
 
 	gdb_str_to_target(target, reg_packet, reg_list[reg_num]);
@@ -1722,11 +1731,10 @@ static int gdb_memory_map(struct connection *connection,
 	for (i = 0; i < flash_get_bank_count(); i++) {
 		int j;
 		unsigned sector_size = 0;
-		uint32_t start, end;
+		uint32_t start;
 
 		p = banks[i];
 		start = p->base;
-		end = p->base + p->size;
 
 		if (ram_start < p->base)
 			xml_printf(&retval, &xml, &pos, &size,
@@ -2359,7 +2367,26 @@ static int gdb_input_inner(struct connection *connection)
 					command_run_linef(connection->cmd_ctx,
 							"ocd_gdb_restart %s",
 							target_name(target));
+					gdb_put_packet(connection, "OK", 2);
+					break;
+
+				case 'j':
+				    /*  packet supported only by smp target i.e cortex_a.c*/
+					/* handle smp packet replying coreid played to gbd */
+					gdb_read_smp_packet(
+							connection, target,
+							packet, packet_size);
 					break;
+
+				case 'J':
+					/*  packet supported only by smp target i.e cortex_a.c */
+					/*  handle smp packet setting coreid to be played at next
+					 *  resume to gdb */
+					gdb_write_smp_packet(
+							connection, target,
+							packet, packet_size);
+					break;
+
 				default:
 					/* ignore unknown packets */
 					LOG_DEBUG("ignoring 0x%2.2x packet", packet[0]);
@@ -2411,21 +2438,43 @@ static int gdb_input(struct connection *connection)
 
 static int gdb_target_start(struct target *target, const char *port)
 {
-	struct gdb_service *gdb_service = malloc(sizeof(struct gdb_service));
+
+	struct gdb_service *gdb_service;
+	int ret;
+	gdb_service = malloc(sizeof(struct gdb_service));
+
 	if (NULL == gdb_service)
 		return -ENOMEM;
 
 	gdb_service->target = target;
+	gdb_service->core[0] = -1;
+	gdb_service->core[1] = -1;
+	target->gdb_service = gdb_service;
 
-	return add_service("gdb",
+	ret = add_service("gdb",
 			port, 1, &gdb_new_connection, &gdb_input,
 			&gdb_connection_closed, gdb_service);
+	/* initialialize all targets gdb service with the same pointer */
+	{
+		struct target_list *head;
+		struct target *curr;
+		head = target->head;
+		while(head != (struct target_list*)NULL)
+		{
+			curr = head->target;
+			if (curr != target) curr->gdb_service = gdb_service;
+			head = head->next;	
+		}
+	}
+	return ret;
 }
 
 static int gdb_target_add_one(struct target *target)
 {
+	/*  one gdb instance per smp list */
+	if ((target->smp) && (target->gdb_service)) return ERROR_OK;
 	int retval = gdb_target_start(target, gdb_port_next);
-	if (retval == ERROR_OK)
+	if (retval == ERROR_OK) 
 	{
 		long portnumber;
 		/* If we can parse the port number