X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.c;h=c0905ede6ab5caad3dc2254465b9bedfecfc3bc6;hb=033d1053ae42b913ff7100221628c0376e596d71;hp=e6eb673893ba6c471b6327924efeac15c71060e7;hpb=f6315d5e5b7b71515ef051711e5f818a42d6b3b3;p=openocd.git

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index e6eb673893..c0905ede6a 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -63,7 +63,7 @@ int breakpoint_add_internal(struct target *target, uint32_t address, uint32_t le
 			 * succeeding.
 			 */
 			LOG_DEBUG("Duplicate Breakpoint address: 0x%08" PRIx32 " (BP %d)",
-				  address, breakpoint->unique_id );
+					address, breakpoint->unique_id);
 			return ERROR_OK;
 		}
 		breakpoint_p = &breakpoint->next;
@@ -72,6 +72,7 @@ int breakpoint_add_internal(struct target *target, uint32_t address, uint32_t le
 
 	(*breakpoint_p) = malloc(sizeof(struct breakpoint));
 	(*breakpoint_p)->address = address;
+	(*breakpoint_p)->asid = 0;
 	(*breakpoint_p)->length = length;
 	(*breakpoint_p)->type = type;
 	(*breakpoint_p)->set = 0;
@@ -100,33 +101,191 @@ fail:
 	}
 
 	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  );
+			breakpoint_type_strings[(*breakpoint_p)->type],
+			(*breakpoint_p)->address, (*breakpoint_p)->length,
+			(*breakpoint_p)->unique_id);
 
 	return ERROR_OK;
 }
 
+int context_breakpoint_add_internal(struct target *target, uint32_t asid, uint32_t length, enum breakpoint_type type)
+{
+	struct breakpoint *breakpoint = target->breakpoints;
+	struct breakpoint **breakpoint_p = &target->breakpoints;
+	int retval;
+	int n;
+
+	n = 0;
+	while (breakpoint)
+	{
+		n++;
+		if (breakpoint->asid == asid)
+		{
+			/* FIXME don't assume "same address" means "same
+			 * breakpoint" ... check all the parameters before
+			 * succeeding.
+			 */
+			LOG_DEBUG("Duplicate Breakpoint asid: 0x%08" PRIx32 " (BP %d)",
+					asid, breakpoint->unique_id);
+			return -1;
+		}
+		breakpoint_p = &breakpoint->next;
+		breakpoint = breakpoint->next;
+	}
+
+	(*breakpoint_p) = malloc(sizeof(struct breakpoint));
+	(*breakpoint_p)->address = 0;
+	(*breakpoint_p)->asid = asid;
+	(*breakpoint_p)->length = length;
+	(*breakpoint_p)->type = type;
+	(*breakpoint_p)->set = 0;
+	(*breakpoint_p)->orig_instr = malloc(length);
+	(*breakpoint_p)->next = NULL;
+	(*breakpoint_p)->unique_id = bpwp_unique_id++;
+	retval = target_add_context_breakpoint(target, *breakpoint_p);
+	if (retval != ERROR_OK)
+	{
+		LOG_ERROR("could not add breakpoint");
+		free((*breakpoint_p)->orig_instr);
+		free(*breakpoint_p);
+		*breakpoint_p = NULL;
+		return retval;
+	}
+
+	LOG_DEBUG("added %s Context breakpoint at 0x%8.8" PRIx32 " of length 0x%8.8x, (BPID: %d)",
+			breakpoint_type_strings[(*breakpoint_p)->type],
+			(*breakpoint_p)->asid, (*breakpoint_p)->length,
+			(*breakpoint_p)->unique_id);
+
+	return ERROR_OK;
+}
+
+int hybrid_breakpoint_add_internal(struct target *target, uint32_t address, uint32_t asid, uint32_t length, enum breakpoint_type type)
+{
+	struct breakpoint *breakpoint = target->breakpoints;
+	struct breakpoint **breakpoint_p = &target->breakpoints;
+	int retval;
+	int n;
+	n = 0;
+	while (breakpoint)
+	{
+		n++;
+		if ((breakpoint->asid == asid) && (breakpoint->address == address)) {
+			/* FIXME don't assume "same address" means "same
+			 * breakpoint" ... check all the parameters before
+			 * succeeding.
+			 */
+			LOG_DEBUG("Duplicate Hybrid Breakpoint asid: 0x%08" PRIx32 " (BP %d)",
+					asid, breakpoint->unique_id);
+			return -1;
+		}
+		else if ((breakpoint->address == address) && (breakpoint->asid == 0))
+		{
+			LOG_DEBUG("Duplicate Breakpoint IVA: 0x%08" PRIx32 " (BP %d)",
+					address, breakpoint->unique_id);
+			return -1;
+
+		}
+		breakpoint_p = &breakpoint->next;
+		breakpoint = breakpoint->next;
+	}
+	(*breakpoint_p) = malloc(sizeof(struct breakpoint));
+	(*breakpoint_p)->address = address;
+	(*breakpoint_p)->asid = asid;
+	(*breakpoint_p)->length = length;
+	(*breakpoint_p)->type = type;
+	(*breakpoint_p)->set = 0;
+	(*breakpoint_p)->orig_instr = malloc(length);
+	(*breakpoint_p)->next = NULL;
+	(*breakpoint_p)->unique_id = bpwp_unique_id++;
+
+
+	retval = target_add_hybrid_breakpoint(target, *breakpoint_p);
+	if (retval != ERROR_OK)
+	{
+		LOG_ERROR("could not add breakpoint");
+		free((*breakpoint_p)->orig_instr);
+		free(*breakpoint_p);
+		*breakpoint_p = NULL;
+		return retval;
+	}
+	LOG_DEBUG("added %s Hybrid breakpoint at address 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;
+}
+
+
+
 int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enum breakpoint_type type)
 {
 
-int retval = ERROR_OK;
-    if (target->smp)
+	int retval = ERROR_OK;
+	if (target->smp)
 	{
 		struct target_list *head;
 		struct target *curr;
 		head = target->head;
+		if (type == BKPT_SOFT)
+			return(breakpoint_add_internal(head->target, address,length, type));
+
 		while(head != (struct target_list*)NULL)
 		{
 			curr = head->target;
 			retval = breakpoint_add_internal(curr, address,length, type);
 			if (retval != ERROR_OK) return retval;
-			head = head->next;	
+			head = head->next;
 		}
 		return retval;
 	}
 	else
-	return(breakpoint_add_internal(target, address, length, type));
+		return(breakpoint_add_internal(target, address, length, type));
+
+}
+int context_breakpoint_add(struct target *target, uint32_t asid, uint32_t length, enum breakpoint_type type)
+{
+
+	int retval = ERROR_OK;
+	if (target->smp)
+	{
+		struct target_list *head;
+		struct target *curr;
+		head = target->head;
+		while(head != (struct target_list*)NULL)
+		{
+			curr = head->target;
+			retval = context_breakpoint_add_internal(curr, asid,length, type);
+			if (retval != ERROR_OK) return retval;
+			head = head->next;
+		}
+		return retval;
+	}
+	else
+		return(context_breakpoint_add_internal(target, asid, length, type));
+
+}
+int hybrid_breakpoint_add(struct target *target, uint32_t address, uint32_t asid, uint32_t length, enum breakpoint_type type)
+{
+
+	int retval = ERROR_OK;
+	if (target->smp)
+	{
+		struct target_list *head;
+		struct target *curr;
+		head = target->head;
+		while(head != (struct target_list*)NULL)
+		{
+			curr = head->target;
+			retval = hybrid_breakpoint_add_internal(curr, address, asid, length, type);
+			if (retval != ERROR_OK) return retval;
+			head = head->next;
+		}
+		return retval;
+	}
+	else
+		return(hybrid_breakpoint_add_internal(target, address, asid, length, type));
 
 }
 
@@ -156,13 +315,17 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
 	free(breakpoint);
 }
 
-void breakpoint_remove_internal(struct target *target, uint32_t address)
+int breakpoint_remove_internal(struct target *target, uint32_t address)
 {
 	struct breakpoint *breakpoint = target->breakpoints;
 
 	while (breakpoint)
 	{
-		if (breakpoint->address == address)
+		if ((breakpoint->address == address) && (breakpoint->asid == 0))
+			break;
+		else if ((breakpoint->address == 0) && (breakpoint->asid == address))
+			break;
+		else if ((breakpoint->address == address) && (breakpoint->asid != 0))
 			break;
 		breakpoint = breakpoint->next;
 	}
@@ -170,15 +333,19 @@ void breakpoint_remove_internal(struct target *target, uint32_t address)
 	if (breakpoint)
 	{
 		breakpoint_free(target, breakpoint);
+		return 1;
 	}
 	else
 	{
-		LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
+		if (!target->smp)
+			LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
+		return 0;
 	}
 }
 void breakpoint_remove(struct target *target, uint32_t address)
 {
-    if ((target->smp))
+	int found = 0;
+	if (target->smp)
 	{
 		struct target_list *head;
 		struct target *curr;
@@ -186,9 +353,11 @@ void breakpoint_remove(struct target *target, uint32_t address)
 		while(head != (struct target_list*)NULL)
 		{
 			curr = head->target;
-			breakpoint_remove_internal(curr, address);
-			head = head->next;	
+			found += breakpoint_remove_internal(curr, address);
+			head = head->next;
 		}
+		if (found == 0)
+			LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
 	}
 	else  breakpoint_remove_internal(target, address);
 }
@@ -207,7 +376,7 @@ void breakpoint_clear_target_internal(struct target *target)
 
 void breakpoint_clear_target(struct target *target)
 {
-    if (target->smp)
+	if (target->smp)
 	{
 		struct target_list *head;
 		struct target *curr;
@@ -215,12 +384,12 @@ void breakpoint_clear_target(struct target *target)
 		while(head != (struct target_list*)NULL)
 		{
 			curr = head->target;
-		    breakpoint_clear_target_internal(curr);
-			head = head->next;	
+			breakpoint_clear_target_internal(curr);
+			head = head->next;
 		}
-     }
-	 else breakpoint_clear_target_internal(target);
-	
+	}
+	else breakpoint_clear_target_internal(target);
+
 }
 
 
@@ -288,8 +457,8 @@ int watchpoint_add(struct target *target, uint32_t address, uint32_t length,
 		reason = "unrecognized error";
 bye:
 		LOG_ERROR("can't add %s watchpoint at 0x%8.8" PRIx32 ", %s",
-			 watchpoint_rw_strings[(*watchpoint_p)->rw],
-			 address, reason);
+				watchpoint_rw_strings[(*watchpoint_p)->rw],
+				address, reason);
 		free (*watchpoint_p);
 		*watchpoint_p = NULL;
 		return retval;
@@ -300,7 +469,7 @@ bye:
 			watchpoint_rw_strings[(*watchpoint_p)->rw],
 			(*watchpoint_p)->address,
 			(*watchpoint_p)->length,
-			(*watchpoint_p)->unique_id );
+			(*watchpoint_p)->unique_id);
 
 	return ERROR_OK;
 }