X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fsmp.c;h=bdf81a0eeb3df88069a1ef94aa7daf2dfeeba808;hp=c0936ff5ca8ae4a47f5449af78789f2710a73447;hb=8b66c96974cafa24ebcd2739aae5e1a5a64fdf22;hpb=374127301ec1d72033b9d573b72c7abdfd61990d

diff --git a/src/target/smp.c b/src/target/smp.c
index c0936ff5ca..bdf81a0eeb 100644
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -13,9 +13,7 @@
  *   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
@@ -23,12 +21,12 @@
 #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"
 
 /*  implementation of new packet in gdb interface for smp feature          */
 /*                                                                         */
@@ -54,31 +52,22 @@
 /*  maint packet Jc01                                                      */
 /*  maint packet jc                                                        */
 
-static const char DIGITS[16] = "0123456789abcdef";
-
 /* packet j :smp status request */
 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);
-	uint32_t len = sizeof(int32_t);
-	uint8_t *buffer;
-	char *hex_buffer;
 	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];
-			}
-
-			retval = gdb_put_packet(connection, hex_buffer, len * 2);
+		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));
 
-			free(hex_buffer);
+			retval = gdb_put_packet(connection, hex_buffer, pkt_len);
 		}
 	} else
 		retval = gdb_put_packet(connection, "E01", 3);
@@ -87,7 +76,7 @@ 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;
@@ -96,7 +85,7 @@ int gdb_write_smp_packet(struct connection *connection,
 
 	/* skip command character */
 	if (target->smp) {
-		if (strstr(packet, "Jc")) {
+		if (strncmp(packet, "Jc", 2) == 0) {
 			packet += 2;
 			coreid = strtoul(packet, &separator, 16);
 			target->gdb_service->core[1] = coreid;