- Fixed bug in pathmove for XScale

- added virtual address to working_area.
- Improved error messages in a number of places
- Added ERROR_COMMAND_SYNTAX_ERROR that commands can return to have syntax printed
- Added help for some config commands
- Added verification of sw breakpoints with ERROR() message
- Removed a couple of exit()'s and replaced with error message
- cosmetic fix to armv4_5.c, easier to read
- added polymorphic(with default) virt2phys and mmu enable query function to target.h
- added virt2phys command that uses target->type->virt2phys() fn
Thanks to Øyvind Harboe

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

1 files changed, 20 insertions, 2 deletions

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 825f7fac..45411c19 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -186,17 +186,33 @@ int arm7_9_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 	{
 		if (breakpoint->length == 4)
 		{
+			u32 verify = 0xffffffff;
 			/* keep the original instruction in target endianness */
 			target->type->read_memory(target, breakpoint->address, 4, 1, breakpoint->orig_instr);
 			/* write the breakpoint instruction in target endianness (arm7_9->arm_bkpt is host endian) */
 			target_write_u32(target, breakpoint->address, arm7_9->arm_bkpt);
+			
+			target->type->read_memory(target, breakpoint->address, 4, 1, (u8 *)&verify);
+			if (verify != arm7_9->arm_bkpt)
+			{
+				ERROR("Unable to set 32 bit software breakpoint at address %08x", breakpoint->address);
+				return ERROR_OK;
+			}
 		}
 		else
 		{
+			u16 verify = 0xffff;
 			/* keep the original instruction in target endianness */
 			target->type->read_memory(target, breakpoint->address, 2, 1, breakpoint->orig_instr);
 			/* write the breakpoint instruction in target endianness (arm7_9->thumb_bkpt is host endian) */
 			target_write_u16(target, breakpoint->address, arm7_9->thumb_bkpt);
+			
+			target->type->read_memory(target, breakpoint->address, 2, 1, (u8 *)&verify);
+			if (verify != arm7_9->thumb_bkpt)
+			{
+				ERROR("Unable to set thumb software breakpoint at address %08x", breakpoint->address);
+				return ERROR_OK;
+			}
 		}
 		breakpoint->set = 1;
 	}
@@ -1914,7 +1930,7 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
 	if ((retval = jtag_execute_queue()) != ERROR_OK)
 	{
 		ERROR("JTAG error while reading cpsr");
-		exit(-1);
+		return ERROR_TARGET_DATA_ABORT;
 	}
 
 	if (((cpsr & 0x1f) == ARMV4_5_MODE_ABT) && (armv4_5->core_mode != ARMV4_5_MODE_ABT))
@@ -1943,7 +1959,9 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
 	int retval;
 	int last_reg = 0;
 
+#ifdef _DEBUG_ARM7_9_
 	DEBUG("address: 0x%8.8x, size: 0x%8.8x, count: 0x%8.8x", address, size, count);
+#endif
 
 	if (target->state != TARGET_HALTED)
 	{
@@ -2079,7 +2097,7 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun
 	if ((retval = jtag_execute_queue()) != ERROR_OK)
 	{
 		ERROR("JTAG error while reading cpsr");
-		exit(-1);
+		return ERROR_TARGET_DATA_ABORT;
 	}
 
 	if (((cpsr & 0x1f) == ARMV4_5_MODE_ABT) && (armv4_5->core_mode != ARMV4_5_MODE_ABT))