gdbserver: use common hexify/unhexify routines

Change-Id: I9989b625666e9c60ec9867cf6f4d94f41c998c3f
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1105
Tested-by: jenkins
Reviewed-by: Mathias Küster <kesmtp@freenet.de>
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>

src/rtos/linux.c

@@ -1217,7 +1217,7 @@ int linux_thread_extra_info(struct target *target,
 			char *tmp_str = (char *)calloc(1, str_size + 50);
 			char *tmp_str_ptr = tmp_str;
 
-			/*  discriminate cuurent task */
+			/*  discriminate current task */
 			if (temp->status == 3)
 				tmp_str_ptr += sprintf(tmp_str_ptr, "%s",
 						pid_current);
@@ -1229,10 +1229,9 @@ int linux_thread_extra_info(struct target *target,
 			tmp_str_ptr += sprintf(tmp_str_ptr, "%s", " | ");
 			sprintf(tmp_str_ptr, "%s", name);
 			sprintf(tmp_str_ptr, "%s", temp->name);
-			char *hex_str =
+			char *hex_str = (char *)calloc(1, strlen(tmp_str) * 2 + 1);
-				(char *)calloc(1, strlen(tmp_str) * 2 + 1);
+			int pkt_len = hexify(hex_str, tmp_str, 0, strlen(tmp_str) * 2 + 1);
-			str_to_hex(hex_str, tmp_str);
+			gdb_put_packet(connection, hex_str, pkt_len);
-			gdb_put_packet(connection, hex_str, strlen(hex_str));
 			free(hex_str);
 			free(tmp_str);
 			return ERROR_OK;

src/rtos/rtos.c

@@ -25,10 +25,9 @@
 #include "rtos.h"
 #include "target/target.h"
 #include "helper/log.h"
+#include "helper/binarybuffer.h"
 #include "server/gdb_server.h"
 
-static void hex_to_str(char *dst, char *hex_src);
-
 /* RTOSs */
 extern struct rtos_type FreeRTOS_rtos;
 extern struct rtos_type ThreadX_rtos;
@@ -200,7 +199,8 @@ int rtos_qsymbol(struct connection *connection, char *packet, int packet_size)
 		goto done;
 
 	/* Decode any symbol name in the packet*/
-	hex_to_str(cur_sym, strchr(packet + 8, ':') + 1);
+	int len = unhexify(cur_sym, strchr(packet + 8, ':') + 1, strlen(strchr(packet + 8, ':') + 1));
+	cur_sym[len] = 0;
 
 	if ((strcmp(packet, "qSymbol::") != 0) &&               /* GDB is not offering symbol lookup for the first time */
 	    (!sscanf(packet, "qSymbol:%" SCNx64 ":", &addr))) { /* GDB did not found an address for a symbol */
@@ -215,7 +215,6 @@ int rtos_qsymbol(struct connection *connection, char *packet, int packet_size)
 
 			/* Next RTOS selected - invalidate current symbol */
 			cur_sym[0] = '\x00';
-
 		}
 	}
 	next_sym = next_symbol(os, cur_sym, addr);
@@ -243,8 +242,8 @@ int rtos_qsymbol(struct connection *connection, char *packet, int packet_size)
 		goto done;
 	}
 
-	reply_len = sprintf(reply, "qSymbol:");
+	reply_len = snprintf(reply, sizeof(reply), "qSymbol:");
-	reply_len += str_to_hex(reply + reply_len, next_sym);
+	reply_len += hexify(reply + reply_len, next_sym, 0, sizeof(reply) - reply_len);
 
 done:
 	gdb_put_packet(connection, reply, reply_len);
@@ -306,10 +305,10 @@ int rtos_thread_packet(struct connection *connection, char *packet, int packet_s
 			assert(strlen(tmp_str) ==
 				(size_t) (tmp_str_ptr - tmp_str));
 
-			char *hex_str = (char *) malloc(strlen(tmp_str)*2 + 1);
+			char *hex_str = (char *) malloc(strlen(tmp_str) * 2 + 1);
-			str_to_hex(hex_str, tmp_str);
+			int pkt_len = unhexify(hex_str, tmp_str, strlen(tmp_str) * 2 + 1);
 
-			gdb_put_packet(connection, hex_str, strlen(hex_str));
+			gdb_put_packet(connection, hex_str, pkt_len);
 			free(hex_str);
 			free(tmp_str);
 			return ERROR_OK;
@@ -501,39 +500,6 @@ int rtos_try_next(struct target *target)
 	return 1;
 }
 
-static void hex_to_str(char *dst, char *hex_src)
-{
-	int src_pos = 0;
-	int dst_pos = 0;
-
-	while (hex_src[src_pos] != '\x00') {
-		char hex_char = hex_src[src_pos];
-		char hex_digit_val =
-			(hex_char >=
-			 'a') ? hex_char-'a'+
-			10 : (hex_char >= 'A') ? hex_char-'A'+10 : hex_char-'0';
-		if (0 == (src_pos & 0x01)) {
-			dst[dst_pos] = hex_digit_val;
-			dst[dst_pos+1] = 0;
-		} else {
-			((unsigned char *)dst)[dst_pos] <<= 4;
-			((unsigned char *)dst)[dst_pos] += hex_digit_val;
-			dst_pos++;
-		}
-		src_pos++;
-	}
-
-}
-
-int str_to_hex(char *hex_dst, char *src)
-{
-	char *posptr = hex_dst;
-	unsigned i;
-	for (i = 0; i < strlen(src); i++)
-		posptr += sprintf(posptr, "%02x", (unsigned char)src[i]);
-	return posptr - hex_dst;
-}
-
 int rtos_update_threads(struct target *target)
 {
 	if ((target->rtos != NULL) && (target->rtos->type != NULL))

src/rtos/rtos.h

@@ -101,6 +101,5 @@ int rtos_update_threads(struct target *target);
 int rtos_smp_init(struct target *target);
 /*  function for handling symbol access */
 int rtos_qsymbol(struct connection *connection, char *packet, int packet_size);
-int str_to_hex(char *hex_dst, char *src);
 
 #endif	/* RTOS_H */

src/server/gdb_server.c

@@ -662,20 +662,17 @@ static int gdb_get_packet(struct connection *connection, char *buffer, int *len)
 static int gdb_output_con(struct connection *connection, const char *line)
 {
 	char *hex_buffer;
-	int i, bin_size;
+	int bin_size;
 
 	bin_size = strlen(line);
 
-	hex_buffer = malloc(bin_size*2 + 2);
+	hex_buffer = malloc(bin_size * 2 + 2);
 	if (hex_buffer == NULL)
 		return ERROR_GDB_BUFFER_TOO_SMALL;
 
 	hex_buffer[0] = 'O';
-	for (i = 0; i < bin_size; i++)
+	int pkt_len = hexify(hex_buffer + 1, line, bin_size, bin_size * 2 + 1);
-		snprintf(hex_buffer + 1 + i*2, 3, "%2.2x", line[i]);
+	int retval = gdb_put_packet(connection, hex_buffer, pkt_len + 1);
-	hex_buffer[bin_size*2 + 1] = 0;
-
-	int retval = gdb_put_packet(connection, hex_buffer, bin_size*2 + 1);
 
 	free(hex_buffer);
 	return retval;
@@ -1231,14 +1228,9 @@ static int gdb_read_memory_packet(struct connection *connection,
 	if (retval == ERROR_OK) {
 		hex_buffer = malloc(len * 2 + 1);
 
-		uint32_t i;
+		int pkt_len = hexify(hex_buffer, (char *)buffer, len, len * 2 + 1);
-		for (i = 0; i < len; 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);
+		gdb_put_packet(connection, hex_buffer, pkt_len);
 
 		free(hex_buffer);
 	} else
@@ -1258,8 +1250,6 @@ static int gdb_write_memory_packet(struct connection *connection,
 	uint32_t len = 0;
 
 	uint8_t *buffer;
-
-	uint32_t i;
 	int retval;
 
 	/* skip command character */
@@ -1283,11 +1273,8 @@ static int gdb_write_memory_packet(struct connection *connection,
 
 	LOG_DEBUG("addr: 0x%8.8" PRIx32 ", len: 0x%8.8" PRIx32 "", addr, len);
 
-	for (i = 0; i < len; i++) {
+	if (unhexify((char *)buffer, separator + 2, len) != (int)len)
-		uint32_t tmp;
+		LOG_ERROR("unable to decode memory packet");
-		sscanf(separator + 2*i, "%2" SCNx32, &tmp);
-		buffer[i] = tmp;
-	}
 
 	retval = target_write_buffer(target, addr, len, buffer);
 
@@ -1708,14 +1695,9 @@ static int gdb_query_packet(struct connection *connection,
 	if (strncmp(packet, "qRcmd,", 6) == 0) {
 		if (packet_size > 6) {
 			char *cmd;
-			int i;
+			cmd = malloc((packet_size - 6) / 2 + 1);
-			cmd = malloc((packet_size - 6)/2 + 1);
+			int len = unhexify(cmd, packet + 6, (packet_size - 6) / 2);
-			for (i = 0; i < (packet_size - 6)/2; i++) {
+			cmd[len] = 0;
-				uint32_t tmp;
-				sscanf(packet + 6 + 2*i, "%2" SCNx32, &tmp);
-				cmd[i] = tmp;
-			}
-			cmd[(packet_size - 6)/2] = 0x0;
 
 			/* We want to print all debug output to GDB connection */
 			log_add_callback(gdb_log_callback, connection);

src/target/smp.c

@@ -28,6 +28,7 @@
 
 #include "server/gdb_server.h"
 #include "smp.h"
+#include "helper/binarybuffer.h"
 
 /*  implementation of new packet in gdb interface for smp feature          */
 /*                                                                         */
@@ -53,8 +54,6 @@
 /*  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)
@@ -68,15 +67,9 @@ int gdb_read_smp_packet(struct connection *connection,
 		if (strncmp(packet, "jc", 2) == 0) {
 			hex_buffer = malloc(len * 2 + 1);
 			buffer = (uint8_t *)&target->gdb_service->core[0];
-			uint32_t i;
+			int pkt_len = hexify(hex_buffer, (char *)buffer, len, len * 2 + 1);
-			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);
 
+			retval = gdb_put_packet(connection, hex_buffer, pkt_len);
 			free(hex_buffer);
 		}
 	} else