Add Breakpoint/Watchpoint unique ID to help debug hardware debug register leakage

git-svn-id: svn://svn.berlios.de/openocd/trunk@2408 b42882b7-edfa-0310-969c-e2dbd0fdcd60

5 files changed, 100 insertions, 21 deletions

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 9be0d38e..5afc010f 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -58,6 +58,7 @@ int handle_arm7_9_etm_command(struct command_context_s *cmd_ctx, char *cmd, char
  */
 static int arm7_9_clear_watchpoints(arm7_9_common_t *arm7_9)
 {
+	LOG_DEBUG("-");
 	embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], 0x0);
 	embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE], 0x0);
 	arm7_9->sw_breakpoints_added = 0;
@@ -93,6 +94,10 @@ static void arm7_9_assign_wp(arm7_9_common_t *arm7_9, breakpoint_t *breakpoint)
 	{
 		LOG_ERROR("BUG: no hardware comparator available");
 	}
+	LOG_DEBUG("BPID: %d (0x%08" PRIx32 ") using hw wp: %d", 
+			  breakpoint->unique_id,
+			  breakpoint->address,
+			  breakpoint->set );
 }
 
 /**
@@ -152,6 +157,8 @@ static int arm7_9_set_software_breakpoints(arm7_9_common_t *arm7_9)
 		LOG_ERROR("BUG: both watchpoints used, but wp_available >= 1");
 		return ERROR_FAIL;
 	}
+	LOG_DEBUG("SW BP using hw wp: %d", 
+			  arm7_9->sw_breakpoints_added );
 
 	return jtag_execute_queue();
 }
@@ -220,6 +227,10 @@ int arm7_9_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 	arm7_9_common_t *arm7_9 = armv4_5->arch_info;
 	int retval = ERROR_OK;
 
+	LOG_DEBUG("BPID: %d, Address: 0x%08" PRIx32,
+			  breakpoint->unique_id,
+			  breakpoint->address );
+
 	if (target->state != TARGET_HALTED)
 	{
 		LOG_WARNING("target not halted");
@@ -343,6 +354,10 @@ int arm7_9_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 	armv4_5_common_t *armv4_5 = target->arch_info;
 	arm7_9_common_t *arm7_9 = armv4_5->arch_info;
 
+	LOG_DEBUG("BPID: %d, Address: 0x%08" PRIx32,
+			  breakpoint->unique_id,
+			  breakpoint->address );
+
 	if (!breakpoint->set)
 	{
 		LOG_WARNING("breakpoint not set");
@@ -351,6 +366,9 @@ int arm7_9_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 
 	if (breakpoint->type == BKPT_HARD)
 	{
+		LOG_DEBUG("BPID: %d Releasing hw wp: %d", 
+				  breakpoint->unique_id,
+				  breakpoint->set );
 		if (breakpoint->set == 1)
 		{
 			embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], 0x0);
@@ -1807,7 +1825,7 @@ int arm7_9_resume(struct target_s *target, int current, uint32_t address, int ha
 	{
 		if ((breakpoint = breakpoint_find(target, buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32))))
 		{
-			LOG_DEBUG("unset breakpoint at 0x%8.8" PRIx32 "", breakpoint->address);
+			LOG_DEBUG("unset breakpoint at 0x%8.8" PRIx32 " (id: %d)", breakpoint->address, breakpoint->unique_id );
 			if ((retval = arm7_9_unset_breakpoint(target, breakpoint)) != ERROR_OK)
 			{
 				return retval;
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index c8cd1c3b..d7c10e05 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -39,16 +39,25 @@ static char *watchpoint_rw_strings[] =
 	"access"
 };
 
+// monotonic counter/id-number for breakpoints and watch points
+static int bpwp_unique_id;
+
 int breakpoint_add(target_t *target, uint32_t address, uint32_t length, enum breakpoint_type type)
 {
 	breakpoint_t *breakpoint = target->breakpoints;
 	breakpoint_t **breakpoint_p = &target->breakpoints;
 	int retval;
+	int n;
 
+	n = 0;
 	while (breakpoint)
 	{
-		if (breakpoint->address == address)
+		n++;
+		if (breakpoint->address == address){
+			LOG_DEBUG("Duplicate Breakpoint address: 0x%08" PRIx32 " (BP %d)", 
+				  address, breakpoint->unique_id );
 			return ERROR_OK;
+		}
 		breakpoint_p = &breakpoint->next;
 		breakpoint = breakpoint->next;
 	}
@@ -60,20 +69,25 @@ int breakpoint_add(target_t *target, uint32_t address, uint32_t length, enum bre
 	(*breakpoint_p)->set = 0;
 	(*breakpoint_p)->orig_instr = malloc(length);
 	(*breakpoint_p)->next = NULL;
+	(*breakpoint_p)->unique_id = bpwp_unique_id++;
 
 	if ((retval = target_add_breakpoint(target, *breakpoint_p)) != ERROR_OK)
 	{
 		switch (retval)
 		{
 			case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-				LOG_INFO("can't add %s breakpoint, resource not available", breakpoint_type_strings[(*breakpoint_p)->type]);
+				LOG_INFO("can't add %s breakpoint, resource not available (BPID=%d)", 
+					 breakpoint_type_strings[(*breakpoint_p)->type],
+					 (*breakpoint_p)->unique_id );
+				
 				free((*breakpoint_p)->orig_instr);
 				free(*breakpoint_p);
 				*breakpoint_p = NULL;
 				return retval;
 				break;
 			case ERROR_TARGET_NOT_HALTED:
-				LOG_INFO("can't add breakpoint while target is running");
+				LOG_INFO("can't add breakpoint while target is running (BPID: %d)",
+						 (*breakpoint_p)->unique_id );						 
 				free((*breakpoint_p)->orig_instr);
 				free(*breakpoint_p);
 				*breakpoint_p = NULL;
@@ -84,9 +98,10 @@ int breakpoint_add(target_t *target, uint32_t address, uint32_t length, enum bre
 		}
 	}
 
-	LOG_DEBUG("added %s breakpoint at 0x%8.8" PRIx32 " of length 0x%8.8x",
-		breakpoint_type_strings[(*breakpoint_p)->type],
-		(*breakpoint_p)->address, (*breakpoint_p)->length);
+	LOG_DEBUG("added %s breakpoint at 0x%8.8" PRIx32 " of length 0x%8.8x, (BPID: %d)",
+			  breakpoint_type_strings[(*breakpoint_p)->type],
+			  (*breakpoint_p)->address, (*breakpoint_p)->length,
+			  (*breakpoint_p)->unique_id  );
 
 	return ERROR_OK;
 }
@@ -110,6 +125,7 @@ static void breakpoint_free(target_t *target, breakpoint_t *breakpoint_remove)
 
 	target_remove_breakpoint(target, breakpoint);
 
+	LOG_DEBUG("BPID: %d", breakpoint->unique_id );
 	(*breakpoint_p) = breakpoint->next;
 	free(breakpoint->orig_instr);
 	free(breakpoint);
@@ -141,6 +157,7 @@ void breakpoint_remove(target_t *target, uint32_t address)
 void breakpoint_clear_target(target_t *target)
 {
 	breakpoint_t *breakpoint;
+	LOG_DEBUG("Delete all breakpoints for target: %s", target_get_name( target ));
 	while ((breakpoint = target->breakpoints) != NULL)
 	{
 		breakpoint_free(target, breakpoint);
@@ -183,19 +200,23 @@ int watchpoint_add(target_t *target, uint32_t address, uint32_t length, enum wat
 	(*watchpoint_p)->rw = rw;
 	(*watchpoint_p)->set = 0;
 	(*watchpoint_p)->next = NULL;
+	(*watchpoint_p)->unique_id = bpwp_unique_id++;
 
 	if ((retval = target_add_watchpoint(target, *watchpoint_p)) != ERROR_OK)
 	{
 		switch (retval)
 		{
 			case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-				LOG_INFO("can't add %s watchpoint, resource not available", watchpoint_rw_strings[(*watchpoint_p)->rw]);
+				LOG_INFO("can't add %s watchpoint, resource not available (WPID: %d)", 
+					 watchpoint_rw_strings[(*watchpoint_p)->rw],
+					 (*watchpoint_p)->unique_id );
 				free (*watchpoint_p);
 				*watchpoint_p = NULL;
 				return retval;
 				break;
 			case ERROR_TARGET_NOT_HALTED:
-				LOG_INFO("can't add watchpoint while target is running");
+				LOG_INFO("can't add watchpoint while target is running (WPID: %d)",
+						 (*watchpoint_p)->unique_id );
 				free (*watchpoint_p);
 				*watchpoint_p = NULL;
 				return retval;
@@ -207,9 +228,11 @@ int watchpoint_add(target_t *target, uint32_t address, uint32_t length, enum wat
 		}
 	}
 
-	LOG_DEBUG("added %s watchpoint at 0x%8.8" PRIx32 " of length 0x%8.8x",
-		watchpoint_rw_strings[(*watchpoint_p)->rw],
-		(*watchpoint_p)->address, (*watchpoint_p)->length);
+	LOG_DEBUG("added %s watchpoint at 0x%8.8" PRIx32 " of length 0x%8.8x (WPID: %d)",
+			  watchpoint_rw_strings[(*watchpoint_p)->rw],
+			  (*watchpoint_p)->address, 
+			  (*watchpoint_p)->length,
+			  (*watchpoint_p)->unique_id );
 
 	return ERROR_OK;
 }
@@ -230,6 +253,7 @@ static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove)
 	if (watchpoint == NULL)
 		return;
 	target_remove_watchpoint(target, watchpoint);
+	LOG_DEBUG("WPID: %d", watchpoint->unique_id );
 	(*watchpoint_p) = watchpoint->next;
 	free(watchpoint);
 }
@@ -260,6 +284,7 @@ void watchpoint_remove(target_t *target, uint32_t address)
 void watchpoint_clear_target(target_t *target)
 {
 	watchpoint_t *watchpoint;
+	LOG_DEBUG("Delete all watchpoints for target: %s", target_get_name( target ));
 	while ((watchpoint = target->watchpoints) != NULL)
 	{
 		watchpoint_free(target, watchpoint);
diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 610b8847..b75aae62 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -43,6 +43,7 @@ typedef struct breakpoint_s
 	int set;
 	uint8_t *orig_instr;
 	struct breakpoint_s *next;
+	int unique_id;
 } breakpoint_t;
 
 typedef struct watchpoint_s
@@ -54,6 +55,7 @@ typedef struct watchpoint_s
 	enum watchpoint_rw rw;
 	int set;
 	struct watchpoint_s *next;
+	int unique_id;
 } watchpoint_t;
 
 extern void breakpoint_clear_target(struct target_s *target);
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index b913c4ee..dffb0ce0 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -664,7 +664,9 @@ int cortex_m3_resume(struct target_s *target, int current, uint32_t address, int
 		/* Single step past breakpoint at current address */
 		if ((breakpoint = breakpoint_find(target, resume_pc)))
 		{
-			LOG_DEBUG("unset breakpoint at 0x%8.8" PRIx32 "", breakpoint->address);
+			LOG_DEBUG("unset breakpoint at 0x%8.8" PRIx32 " (ID: %d)", 
+					  breakpoint->address,
+					  breakpoint->unique_id );
 			cortex_m3_unset_breakpoint(target, breakpoint);
 			cortex_m3_single_step_core(target);
 			cortex_m3_set_breakpoint(target, breakpoint);
@@ -897,7 +899,7 @@ int cortex_m3_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 
 	if (breakpoint->set)
 	{
-		LOG_WARNING("breakpoint already set");
+		LOG_WARNING("breakpoint (BPID: %d) already set", breakpoint->unique_id);
 		return ERROR_OK;
 	}
 
@@ -943,6 +945,13 @@ int cortex_m3_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 		breakpoint->set = 0x11; /* Any nice value but 0 */
 	}
 
+	LOG_DEBUG("BPID: %d, Type: %d, Address: 0x%08" PRIx32 " Length: %d (set=%d)", 
+			  breakpoint->unique_id,
+			  (int)(breakpoint->type),
+			  breakpoint->address,
+			  breakpoint->length,
+			  breakpoint->set);
+
 	return ERROR_OK;
 }
 
@@ -960,6 +969,13 @@ int cortex_m3_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint
 		return ERROR_OK;
 	}
 
+	LOG_DEBUG("BPID: %d, Type: %d, Address: 0x%08" PRIx32 " Length: %d (set=%d)", 
+			  breakpoint->unique_id,
+			  (int)(breakpoint->type),
+			  breakpoint->address,
+			  breakpoint->length,
+			  breakpoint->set);
+
 	if (breakpoint->type == BKPT_HARD)
 	{
 		int fp_num = breakpoint->set - 1;
@@ -1085,7 +1101,7 @@ int cortex_m3_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 
 	if (watchpoint->set)
 	{
-		LOG_WARNING("watchpoint already set");
+		LOG_WARNING("watchpoint (%d) already set", watchpoint->unique_id );
 		return ERROR_OK;
 	}
 
@@ -1118,10 +1134,13 @@ int cortex_m3_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 	}
 	else
 	{
-		LOG_WARNING("Cannot watch data values");  /* Move this test to add_watchpoint */
+		/* Move this test to add_watchpoint */
+		LOG_WARNING("Cannot watch data values (id: %d)",
+				  watchpoint->unique_id );
 		return ERROR_OK;
 	}
-
+	LOG_DEBUG("Watchpoint (ID: %d) address: 0x%08" PRIx32 " set=%d ", 
+			  watchpoint->unique_id, watchpoint->address, watchpoint->set );
 	return ERROR_OK;
 
 }
@@ -1136,10 +1155,13 @@ int cortex_m3_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint
 
 	if (!watchpoint->set)
 	{
-		LOG_WARNING("watchpoint not set");
+		LOG_WARNING("watchpoint (wpid: %d) not set", watchpoint->unique_id );
 		return ERROR_OK;
 	}
 
+	LOG_DEBUG("Watchpoint (ID: %d) address: 0x%08" PRIx32 " set=%d ", 
+			  watchpoint->unique_id, watchpoint->address,watchpoint->set );
+
 	dwt_num = watchpoint->set - 1;
 
 	if ((dwt_num < 0) || (dwt_num >= cortex_m3->dwt_num_comp))
@@ -1179,6 +1201,7 @@ int cortex_m3_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 	}
 
 	cortex_m3->dwt_comp_available--;
+	LOG_DEBUG("dwt_comp_available: %d", cortex_m3->dwt_comp_available);
 
 	return ERROR_OK;
 }
@@ -1201,6 +1224,7 @@ int cortex_m3_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoin
 	}
 
 	cortex_m3->dwt_comp_available++;
+	LOG_DEBUG("dwt_comp_available: %d", cortex_m3->dwt_comp_available);
 
 	return ERROR_OK;
 }
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 07ecb556..e1b98a2b 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -513,7 +513,8 @@ int mips_m4k_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 			bp_num++;
 		if (bp_num >= mips32->num_inst_bpoints)
 		{
-			LOG_DEBUG("ERROR Can not find free FP Comparator");
+			LOG_DEBUG("ERROR Can not find free FP Comparator(bpid: %d)",
+					  breakpoint->unique_id );
 			LOG_WARNING("ERROR Can not find free FP Comparator");
 			exit(-1);
 		}
@@ -523,10 +524,13 @@ int mips_m4k_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 		target_write_u32(target, comparator_list[bp_num].reg_address, comparator_list[bp_num].bp_value);
 		target_write_u32(target, comparator_list[bp_num].reg_address + 0x08, 0x00000000);
 		target_write_u32(target, comparator_list[bp_num].reg_address + 0x18, 1);
-		LOG_DEBUG("bp_num %i bp_value 0x%" PRIx32 "", bp_num, comparator_list[bp_num].bp_value);
+		LOG_DEBUG("bpid: %d, bp_num %i bp_value 0x%" PRIx32 "", 
+				  breakpoint->unique_id,
+				  bp_num, comparator_list[bp_num].bp_value);
 	}
 	else if (breakpoint->type == BKPT_SOFT)
 	{
+		LOG_DEBUG("bpid: %d", breakpoint->unique_id );
 		if (breakpoint->length == 4)
 		{
 			uint32_t verify = 0xffffffff;
@@ -598,16 +602,22 @@ int mips_m4k_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 		int bp_num = breakpoint->set - 1;
 		if ((bp_num < 0) || (bp_num >= mips32->num_inst_bpoints))
 		{
-			LOG_DEBUG("Invalid FP Comparator number in breakpoint");
+			LOG_DEBUG("Invalid FP Comparator number in breakpoint (bpid: %d)",
+					  breakpoint->unique_id);
 			return ERROR_OK;
 		}
+		LOG_DEBUG("bpid: %d - releasing hw: %d",
+				  breakpoint->unique_id,
+				  bp_num );
 		comparator_list[bp_num].used = 0;
 		comparator_list[bp_num].bp_value = 0;
 		target_write_u32(target, comparator_list[bp_num].reg_address + 0x18, 0);
+		
 	}
 	else
 	{
 		/* restore original instruction (kept in target endianness) */
+		LOG_DEBUG("bpid: %d", breakpoint->unique_id);
 		if (breakpoint->length == 4)
 		{
 			uint32_t current_instr;