X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fxscale.c;h=77f0f1b8927756906e446f1ad47fb5ff57105ada;hp=2b8bff16a8a65fce5aba115f102da3e90eaf80af;hb=7e888741d13e66b6b343b8f0839621107c5a2962;hpb=e1c6f6783d68f0dcc766b3e6317348e3838a3856

diff --git a/src/target/xscale.c b/src/target/xscale.c
index 2b8bff16a8..77f0f1b892 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -1979,6 +1979,7 @@ static int xscale_write_memory(struct target *target, uint32_t address,
 		if ((retval = xscale_send_u32(target, 0x60)) != ERROR_OK)
 			return retval;
 
+		LOG_ERROR("data abort writing memory");
 		return ERROR_TARGET_DATA_ABORT;
 	}
 
@@ -2141,9 +2142,9 @@ static int xscale_set_breakpoint(struct target *target,
 			breakpoint->set = 2;	/* breakpoint set on second breakpoint register */
 		}
 		else
-		{
+		{	/* bug: availability previously verified in xscale_add_breakpoint() */
 			LOG_ERROR("BUG: no hardware comparator available");
-			return ERROR_OK;
+			return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 		}
 	}
 	else if (breakpoint->type == BKPT_SOFT)
@@ -2169,7 +2170,7 @@ static int xscale_set_breakpoint(struct target *target,
 				return retval;
 			}
 			/* write the bkpt instruction in target endianness (arm7_9->arm_bkpt is host endian) */
-			if ((retval = target_write_u32(target, breakpoint->address, xscale->thumb_bkpt)) != ERROR_OK)
+			if ((retval = target_write_u16(target, breakpoint->address, xscale->thumb_bkpt)) != ERROR_OK)
 			{
 				return retval;
 			}
@@ -2192,13 +2193,13 @@ static int xscale_add_breakpoint(struct target *target,
 
 	if ((breakpoint->type == BKPT_HARD) && (xscale->ibcr_available < 1))
 	{
-		LOG_INFO("no breakpoint unit available for hardware breakpoint");
+		LOG_ERROR("no breakpoint unit available for hardware breakpoint");
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
 
 	if ((breakpoint->length != 2) && (breakpoint->length != 4))
 	{
-		LOG_INFO("only breakpoints of two (Thumb) or four (ARM) bytes length supported");
+		LOG_ERROR("only breakpoints of two (Thumb) or four (ARM) bytes length supported");
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
 
@@ -2207,7 +2208,7 @@ static int xscale_add_breakpoint(struct target *target,
 		xscale->ibcr_available--;
 	}
 
-	return ERROR_OK;
+	return xscale_set_breakpoint(target, breakpoint);
 }
 
 static int xscale_unset_breakpoint(struct target *target,
@@ -2276,7 +2277,7 @@ static int xscale_remove_breakpoint(struct target *target, struct breakpoint *br
 
 	if (target->state != TARGET_HALTED)
 	{
-		LOG_WARNING("target not halted");
+		LOG_ERROR("target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
@@ -2301,7 +2302,7 @@ static int xscale_set_watchpoint(struct target *target,
 
 	if (target->state != TARGET_HALTED)
 	{
-		LOG_WARNING("target not halted");
+		LOG_ERROR("target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
@@ -2370,7 +2371,8 @@ static int xscale_add_watchpoint(struct target *target,
 
 	if (xscale->dbr_available < 1)
 	{
-		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+	   LOG_ERROR("no more watchpoint registers available");
+	   return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
 
 	if (watchpoint->value)
@@ -2394,7 +2396,10 @@ static int xscale_add_watchpoint(struct target *target,
 
 	/* watchpoints across multiple words require both DBR registers */
 	if (xscale->dbr_available < 2)
+	{
+	   LOG_ERROR("insufficient watchpoint registers available");
 	   return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+	}
 	
 	xscale->dbr_available = 0;
 	return ERROR_OK;
@@ -2449,7 +2454,7 @@ static int xscale_remove_watchpoint(struct target *target, struct watchpoint *wa
 
 	if (target->state != TARGET_HALTED)
 	{
-		LOG_WARNING("target not halted");
+		LOG_ERROR("target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}