[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-rc0-15-gf37c9b8

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  f37c9b8d1560d0081e53c71c55113a3c9858011a (commit)
      from  b5ce7fe8125da3044a2b4f2d0ef57af4d9eef5e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f37c9b8d1560d0081e53c71c55113a3c9858011a
Author: Øyvind Harboe <oyv...@zy...>
Date:   Tue Nov 3 12:28:00 2009 +0100

    arm920t: memory writes were broken when MMU was disabled
    
    To support breakpoints, flush data cache line and invalidate
    instruction cache when 4 and 2 byte words are written.
    
    The previous code was trying to write directly to the physical
    memory, which was buggy and had a number of other situations
    that were not handled.
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 2531d9b..a332db0 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -555,26 +555,25 @@ int arm920t_write_memory(struct target_s *target, uint32_t address, uint32_t siz
 	if ((retval = arm7_9_write_memory(target, address, size, count, buffer)) != ERROR_OK)
 		return retval;
 
+	/* This fn is used to write breakpoints, so we need to make sure that the
+	 * datacache is flushed and the instruction cache is invalidated */
 	if (((size == 4) || (size == 2)) && (count == 1))
 	{
 		if (arm920t->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled)
 		{
-			LOG_DEBUG("D-Cache enabled, writing through to main memory");
-			uint32_t pa, cb, ap;
-			int type, domain;
-
-			pa = armv4_5_mmu_translate_va(target, &arm920t->armv4_5_mmu, address, &type, &cb, &domain, &ap);
-			if (type == -1)
-				return ERROR_OK;
-			/* cacheable & bufferable means write-back region */
-			if (cb == 3)
-				armv4_5_mmu_write_physical(target, &arm920t->armv4_5_mmu, pa, size, count, buffer);
+			LOG_DEBUG("D-Cache enabled, flush and invalidate cache line");
+			/* MCR p15,0,Rd,c7,c10,2 */
+			retval = arm920t_write_cp15_interpreted(target, 0xee070f5e, 0x0, address);
+			if (retval != ERROR_OK)
+				return retval;
 		}
 
 		if (arm920t->armv4_5_mmu.armv4_5_cache.i_cache_enabled)
 		{
 			LOG_DEBUG("I-Cache enabled, invalidating affected I-Cache line");
-			arm920t_write_cp15_interpreted(target, 0xee070f35, 0x0, address);
+			retval = arm920t_write_cp15_interpreted(target, 0xee070f35, 0x0, address);
+			if (retval != ERROR_OK)
+				return retval;
 		}
 	}
 

-----------------------------------------------------------------------

Summary of changes:
 src/target/arm920t.c |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository