esp/apptrace: added table size entry to the stub entry table

Author: erhankur

src/target/esp.h

@@ -38,6 +38,7 @@
  */
 enum esp_dbg_stub_id {
 	ESP_DBG_STUB_ENTRY_MAGIC_NUM,
+	ESP_DBG_STUB_TABLE_SIZE,
 	ESP_DBG_STUB_TABLE_START,
 	ESP_DBG_STUB_DESC = ESP_DBG_STUB_TABLE_START,	/*< Stubs descriptor ID */
 	ESP_DBG_STUB_ENTRY_FIRST,

src/target/esp_xtensa.c

@@ -246,8 +246,7 @@ static void esp_xtensa_dbgstubs_addr_check(struct target *target)
 static void esp_xtensa_dbgstubs_info_update(struct target *target)
 {
 	struct esp_xtensa_common *esp_xtensa = target_to_esp_xtensa(target);
-	int table_start_id, desc_entry_id, gcov_entry_id;
-	int cap_entry_id, max_entry_id;
+	int table_size, table_start_id, desc_entry_id, gcov_entry_id;
 	uint32_t entries[ESP_DBG_STUB_ENTRY_MAX];
 
 	LOG_DEBUG("%s: Read debug stubs info %d / %d", target_name(target),
@@ -256,35 +255,46 @@ static void esp_xtensa_dbgstubs_info_update(struct target *target)
 	if (esp_xtensa->dbg_stubs.base == 0 || esp_xtensa->dbg_stubs.entries_count != 0)
 		return;
 
+	/* first read 2 entries to get magic num and table size */
 	int res = target_read_memory(target, esp_xtensa->dbg_stubs.base, sizeof(uint32_t),
-		1,
+		2,
 		(uint8_t *)&entries[0]);
 	if (res != ERROR_OK) {
 		LOG_ERROR("%s: Failed to read first debug stub entry!", target_name(target));
 		return;
 	}
 	if (entries[0] != ESP_DBG_STUB_MAGIC_NUM_VAL) {
-		/* old idf. check @esp_dbg_stub_id_v1 for ids*/
+		/* idf with the old table entry structure */
+		table_size = 2;
 		table_start_id = desc_entry_id = 0;
 		gcov_entry_id = 1;
-		cap_entry_id = -1;	/* none */
-		max_entry_id = 2;
 	} else {
+		table_size = entries[1];
 		table_start_id = desc_entry_id = ESP_DBG_STUB_TABLE_START;
 		gcov_entry_id = ESP_DBG_STUB_ENTRY_FIRST;
-		cap_entry_id = ESP_DBG_STUB_CAPABILITIES;
-		max_entry_id = ESP_DBG_STUB_ENTRY_MAX;
-	}
-	res = target_read_memory(target, esp_xtensa->dbg_stubs.base, sizeof(uint32_t),
-		max_entry_id,
-		(uint8_t *)&entries[0]);
-	if (res != ERROR_OK) {
-		LOG_ERROR("%s: Failed to read debug stubs info!", target_name(target));
-		return;
+
+		if (table_size < 2) {
+			LOG_ERROR("Invalid stub table entry size (%x)", table_size);
+			return;
+		}
+		/* discard unsupported entries */
+		if (table_size > ESP_DBG_STUB_ENTRY_MAX)
+			table_size = ESP_DBG_STUB_ENTRY_MAX;
+
+		/* now read the remaining entries */
+		res = target_read_memory(target,
+			esp_xtensa->dbg_stubs.base + 2 * sizeof(uint32_t),
+			sizeof(uint32_t),
+			table_size - 2,
+			(uint8_t *)&entries[2]);
+		if (res != ERROR_OK) {
+			LOG_ERROR("%s: Failed to read debug stubs info!", target_name(target));
+			return;
+		}
+		esp_xtensa->dbg_stubs.entries[ESP_DBG_STUB_CAPABILITIES] =
+			entries[ESP_DBG_STUB_CAPABILITIES];
 	}
 
-	if (cap_entry_id > 0)
-		esp_xtensa->dbg_stubs.entries[ESP_DBG_STUB_CAPABILITIES] = entries[cap_entry_id];
 	esp_xtensa->dbg_stubs.entries[ESP_DBG_STUB_DESC] = entries[desc_entry_id];
 	esp_xtensa->dbg_stubs.entries[ESP_DBG_STUB_ENTRY_GCOV] = entries[gcov_entry_id];
 
@@ -302,9 +312,9 @@ static void esp_xtensa_dbgstubs_info_update(struct target *target)
 		}
 	}
 	if (esp_xtensa->dbg_stubs.entries_count <
-		(uint32_t)(max_entry_id-table_start_id)) {
+		(uint32_t)(table_size - table_start_id)) {
 		LOG_WARNING("Not full dbg stub table %d of %d", esp_xtensa->dbg_stubs.entries_count,
-			(max_entry_id-table_start_id));
+			(table_size - table_start_id));
 	}
 	if (esp_xtensa->dbg_stubs.entries_count == 0)
 		return;