X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Frtos%2Frtos.c;h=dff36502ebb8d7f2353932f3c852e07457f84d78;hp=e0160839bbc4cc93566c73c97735b395fbe81a02;hb=4a5c9a4965eff5aa678ccc7d1f50da714238b77a;hpb=16cd4e6fce1fd760517cf4d41ac54416c246bd83

diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index e0160839bb..dff36502eb 100644
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -34,12 +34,14 @@ extern struct rtos_type FreeRTOS_rtos;
 extern struct rtos_type ThreadX_rtos;
 extern struct rtos_type eCos_rtos;
 extern struct rtos_type Linux_os;
+extern struct rtos_type ChibiOS_rtos;
 
 static struct rtos_type *rtos_types[] = {
 	&ThreadX_rtos,
 	&FreeRTOS_rtos,
 	&eCos_rtos,
 	&Linux_os,
+	&ChibiOS_rtos,
 	NULL
 };
 
@@ -143,97 +145,117 @@ int gdb_thread_packet(struct connection *connection, char *packet, int packet_si
 										 *found*/
 	return target->rtos->gdb_thread_packet(connection, packet, packet_size);
 }
-/* return -1 if no rtos defined, 0 if rtos and symbol to be asked, 1 if all
- * symbol have been asked*/
+
+static char *next_symbol(struct rtos *os, char *cur_symbol, uint64_t cur_addr)
+{
+	symbol_table_elem_t *s;
+
+	if (!os->symbols)
+		os->type->get_symbol_list_to_lookup(&os->symbols);
+
+	if (!cur_symbol[0])
+		return os->symbols[0].symbol_name;
+
+	for (s = os->symbols; s->symbol_name; s++)
+		if (!strcmp(s->symbol_name, cur_symbol)) {
+			s->address = cur_addr;
+			s++;
+			return s->symbol_name;
+		}
+
+	return NULL;
+}
+
+/* rtos_qsymbol() processes and replies to all qSymbol packets from GDB.
+ *
+ * GDB sends a qSymbol:: packet (empty address, empty name) to notify
+ * that it can now answer qSymbol::hexcodedname queries, to look up symbols.
+ *
+ * If the qSymbol packet has no address that means GDB did not find the
+ * symbol, in which case auto-detect will move on to try the next RTOS.
+ *
+ * rtos_qsymbol() then calls the next_symbol() helper function, which
+ * iterates over symbol names for the current RTOS until it finds the
+ * symbol in the received GDB packet, and then returns the next entry
+ * in the list of symbols.
+ *
+ * If GDB replied about the last symbol for the RTOS and the RTOS was
+ * specified explicitly, then no further symbol lookup is done. When
+ * auto-detecting, the RTOS driver _detect() function must return success.
+ *
+ * rtos_qsymbol() returns 1 if an RTOS has been detected, or 0 otherwise.
+ */
 int rtos_qsymbol(struct connection *connection, char *packet, int packet_size)
 {
+	int rtos_detected = 0;
+	uint64_t addr;
+	size_t reply_len;
+	char reply[GDB_BUFFER_SIZE], cur_sym[GDB_BUFFER_SIZE / 2] = "", *next_sym;
 	struct target *target = get_target_from_connection(connection);
-	if (target->rtos != NULL) {
-		int next_symbol_num = -1;
-		if (target->rtos->symbols == NULL)
-			target->rtos->type->get_symbol_list_to_lookup(&target->rtos->symbols);
-		if (0 == strcmp("qSymbol::", packet))
-			/* first query - */
-			next_symbol_num = 0;
-		else {
-			int64_t value = 0;
-			char *hex_name_str = malloc(strlen(packet));
-			char *name_str;
-			int symbol_num;
-
-			char *found = strstr(packet, "qSymbol::");
-			if (0 == found)
-				sscanf(packet, "qSymbol:%" SCNx64 ":%s", &value, hex_name_str);
-			else
-				/* No value returned by GDB - symbol was not found*/
-				sscanf(packet, "qSymbol::%s", hex_name_str);
-			name_str = (char *) malloc(1 + strlen(hex_name_str) / 2);
-
-			hex_to_str(name_str, hex_name_str);
-			symbol_num = 0;
-			while ((target->rtos->symbols[symbol_num].symbol_name != NULL) &&
-					(0 != strcmp(target->rtos->symbols[symbol_num].symbol_name, name_str)))
-				symbol_num++;
-
-			if (target->rtos->symbols[symbol_num].symbol_name == NULL) {
-				LOG_OUTPUT("ERROR: unknown symbol\r\n");
-				gdb_put_packet(connection, "OK", 2);
-				free(hex_name_str);
-				free(name_str);
-				return ERROR_OK;
-			}
+	struct rtos *os = target->rtos;
+
+	reply_len = sprintf(reply, "OK");
+
+	if (!os)
+		goto done;
+
+	/* Decode any symbol name in the packet*/
+	hex_to_str(cur_sym, strchr(packet + 8, ':') + 1);
+
+	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 */
+		/* GDB could not find an address for the previous symbol */
+		if (!target->rtos_auto_detect) {
+			LOG_WARNING("RTOS %s not detected. (GDB could not find symbol \'%s\')", os->type->name, cur_sym);
+			goto done;
+		} else {
+			/* Autodetecting RTOS - try next RTOS */
+			if (!rtos_try_next(target))
+				goto done;
 
-			target->rtos->symbols[symbol_num].address = value;
+			/* Next RTOS selected - invalidate current symbol */
+			cur_sym[0] = '\x00';
 
-			next_symbol_num = symbol_num+1;
-			free(hex_name_str);
-			free(name_str);
 		}
+	}
+	next_sym = next_symbol(os, cur_sym, addr);
 
-		int symbols_done = 0;
-		if (target->rtos->symbols[next_symbol_num].symbol_name == NULL) {
-			if ((target->rtos_auto_detect == false) ||
-					(1 == target->rtos->type->detect_rtos(target))) {
-				/* Found correct RTOS or not autodetecting */
-				if (target->rtos_auto_detect == true)
-					LOG_OUTPUT("Auto-detected RTOS: %s\r\n",
-						target->rtos->type->name);
-				symbols_done = 1;
-			} else {
-				/* Auto detecting RTOS and currently not found */
-				if (1 != rtos_try_next(target))
-					/* No more RTOS's to try */
-					symbols_done = 1;
-				else {
-					next_symbol_num = 0;
-					target->rtos->type->get_symbol_list_to_lookup(
-						&target->rtos->symbols);
-				}
-			}
+	if (!next_sym) {
+		/* No more symbols need looking up */
+
+		if (!target->rtos_auto_detect) {
+			rtos_detected = 1;
+			goto done;
 		}
-		if (symbols_done == 1)
-			return symbols_done;
-		else {
-			char *symname = target->rtos->symbols[next_symbol_num].symbol_name;
-			char qsymstr[] = "qSymbol:";
-			char *opstring = (char *)malloc(sizeof(qsymstr)+strlen(symname)*2+1);
-			char *posptr = opstring;
-			posptr += sprintf(posptr, "%s", qsymstr);
-			str_to_hex(posptr, symname);
-			gdb_put_packet(connection, opstring, strlen(opstring));
-			free(opstring);
-			return symbols_done;
+
+		if (os->type->detect_rtos(target)) {
+			LOG_INFO("Auto-detected RTOS: %s", os->type->name);
+			rtos_detected = 1;
+			goto done;
+		} else {
+			LOG_WARNING("No RTOS could be auto-detected!");
+			goto done;
 		}
 	}
-	gdb_put_packet(connection, "OK", 2);
-	return -1;
+
+	if (8 + (strlen(next_sym) * 2) + 1 > sizeof(reply)) {
+		LOG_ERROR("ERROR: RTOS symbol '%s' name is too long for GDB!", next_sym);
+		goto done;
+	}
+
+	reply_len = sprintf(reply, "qSymbol:");
+	reply_len += str_to_hex(reply + reply_len, next_sym);
+
+done:
+	gdb_put_packet(connection, reply, reply_len);
+	return rtos_detected;
 }
 
 int rtos_thread_packet(struct connection *connection, char *packet, int packet_size)
 {
 	struct target *target = get_target_from_connection(connection);
 
-	if (strstr(packet, "qThreadExtraInfo,")) {
+	if (strncmp(packet, "qThreadExtraInfo,", 17) == 0) {
 		if ((target->rtos != NULL) && (target->rtos->thread_details != NULL) &&
 				(target->rtos->thread_count != 0)) {
 			threadid_t threadid = 0;
@@ -295,16 +317,14 @@ int rtos_thread_packet(struct connection *connection, char *packet, int packet_s
 		}
 		gdb_put_packet(connection, "", 0);
 		return ERROR_OK;
-	} else if (strstr(packet, "qSymbol")) {
+	} else if (strncmp(packet, "qSymbol", 7) == 0) {
 		if (rtos_qsymbol(connection, packet, packet_size) == 1) {
 			target->rtos_auto_detect = false;
 			target->rtos->type->create(target);
 			target->rtos->type->update_threads(target->rtos);
-			/* No more symbols needed */
-			gdb_put_packet(connection, "OK", 2);
 		}
 		return ERROR_OK;
-	} else if (strstr(packet, "qfThreadInfo")) {
+	} else if (strncmp(packet, "qfThreadInfo", 12) == 0) {
 		int i;
 		if ((target->rtos != NULL) && (target->rtos->thread_count != 0)) {
 
@@ -323,21 +343,25 @@ int rtos_thread_packet(struct connection *connection, char *packet, int packet_s
 			gdb_put_packet(connection, "", 0);
 
 		return ERROR_OK;
-	} else if (strstr(packet, "qsThreadInfo")) {
+	} else if (strncmp(packet, "qsThreadInfo", 12) == 0) {
 		gdb_put_packet(connection, "l", 1);
 		return ERROR_OK;
-	} else if (strstr(packet, "qAttached")) {
+	} else if (strncmp(packet, "qAttached", 9) == 0) {
 		gdb_put_packet(connection, "1", 1);
 		return ERROR_OK;
-	} else if (strstr(packet, "qOffsets")) {
+	} else if (strncmp(packet, "qOffsets", 8) == 0) {
 		char offsets[] = "Text=0;Data=0;Bss=0";
 		gdb_put_packet(connection, offsets, sizeof(offsets)-1);
 		return ERROR_OK;
-	} else if (strstr(packet, "qC")) {
+	} else if (strncmp(packet, "qCRC:", 5) == 0) {
+		/* make sure we check this before "qC" packet below
+		 * otherwise it gets incorrectly handled */
+		return GDB_THREAD_PACKET_NOT_CONSUMED;
+	} else if (strncmp(packet, "qC", 2) == 0) {
 		if (target->rtos != NULL) {
-			char buffer[15];
+			char buffer[19];
 			int size;
-			size = snprintf(buffer, 15, "QC%08X", (int)target->rtos->current_thread);
+			size = snprintf(buffer, 19, "QC%016" PRIx64, target->rtos->current_thread);
 			gdb_put_packet(connection, buffer, size);
 		} else
 			gdb_put_packet(connection, "QC0", 3);
@@ -405,7 +429,7 @@ int rtos_generic_stack_read(struct target *target,
 	int retval;
 
 	if (stack_ptr == 0) {
-		LOG_OUTPUT("Error: null stack pointer in thread\r\n");
+		LOG_ERROR("Error: null stack pointer in thread");
 		return -5;
 	}
 	/* Read the stack */
@@ -416,7 +440,7 @@ int rtos_generic_stack_read(struct target *target,
 		address -= stacking->stack_registers_size;
 	retval = target_read_buffer(target, address, stacking->stack_registers_size, stack_data);
 	if (retval != ERROR_OK) {
-		LOG_OUTPUT("Error reading stack frame from FreeRTOS thread\r\n");
+		LOG_ERROR("Error reading stack frame from thread");
 		return retval;
 	}
 #if 0
@@ -456,28 +480,25 @@ int rtos_generic_stack_read(struct target *target,
 
 int rtos_try_next(struct target *target)
 {
-	int x;
+	struct rtos *os = target->rtos;
+	struct rtos_type **type = rtos_types;
 
-	if (target->rtos == NULL)
-		return -1;
-
-	for (x = 0; rtos_types[x]; x++) {
-		if (target->rtos->type == rtos_types[x]) {
-			/* found */
-			if (rtos_types[x+1] != NULL) {
-				target->rtos->type = rtos_types[x+1];
-				if (target->rtos->symbols != NULL)
-					free(target->rtos->symbols);
-				return 1;
-			} else {
-				/* No more rtos types */
-				return 0;
-			}
+	if (!os)
+		return 0;
 
-		}
+	while (*type && os->type != *type)
+		type++;
+
+	if (!*type || !*(++type))
+		return 0;
+
+	os->type = *type;
+	if (os->symbols) {
+		free(os->symbols);
+		os->symbols = NULL;
 	}
-	return 0;
 
+	return 1;
 }
 
 static void hex_to_str(char *dst, char *hex_src)