[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-40-g27401e4

[Ø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  27401e4c80b137f599954ac521387b247002770c (commit)
      from  afbf92766348a32a700d62a29b9a6c92537b9271 (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 27401e4c80b137f599954ac521387b247002770c
Author: Øyvind Harboe <oyv...@zy...>
Date:   Mon Mar 1 15:22:10 2010 +0100

    zy1000: arm11 load is now faster
    
    290kBytes/s @ 8MHz, no need to inline jtag_tap_next_enabled().
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index b730b72..6465aaa 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -888,57 +888,86 @@ int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap * tap, uint32_t opc
 	 * with unaligned uint32_t * pointers... */
 	const uint8_t *t = (const uint8_t *)data;
 
-	while (count--)
-	{
-		values[0] = *t++;
-		values[0] |= (*t++<<8);
-		values[0] |= (*t++<<16);
-		values[0] |= (*t++<<24);
 
-		if (count > 0)
+	/* bypass bits before and after */
+	int pre_bits = 0;
+	int post_bits = 0;
+
+	bool found = false;
+	struct jtag_tap *cur_tap, *nextTap;
+	for (cur_tap = jtag_tap_next_enabled(NULL); cur_tap!= NULL; cur_tap = nextTap)
+	{
+		nextTap = jtag_tap_next_enabled(cur_tap);
+		if (cur_tap == tap)
 		{
-			jtag_add_dr_out(tap,
-				2,
-				bits,
-				values,
-				TAP_DRPAUSE);
+			found = true;
+		} else
+		{
+			if (found)
+			{
+				post_bits++;
+			} else
+			{
+				pre_bits++;
+			}
+		}
+	}
+
+	post_bits+=2;
+
+
+	while (--count > 0)
+	{
+		shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, pre_bits, 0);
+
+		uint32_t value;
+		value = *t++;
+		value |= (*t++<<8);
+		value |= (*t++<<16);
+		value |= (*t++<<24);
+
+		shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, value);
+		shiftValueInner(TAP_DRSHIFT, TAP_DRPAUSE, post_bits, 0);
 
 #if 1
-			/* copy & paste from arm11_dbgtap.c */
-			//TAP_DREXIT2, TAP_DRUPDATE, TAP_IDLE, TAP_IDLE, TAP_IDLE, TAP_DRSELECT, TAP_DRCAPTURE, TAP_DRSHIFT
-
-			waitIdle();
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-			waitIdle();
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRSHIFT);
+		/* copy & paste from arm11_dbgtap.c */
+		//TAP_DREXIT2, TAP_DRUPDATE, TAP_IDLE, TAP_IDLE, TAP_IDLE, TAP_DRSELECT, TAP_DRCAPTURE, TAP_DRSHIFT
+
+		waitIdle();
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
+		/* we don't have to wait for the queue to empty here. waitIdle();	 */
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRSHIFT);
 #else
-			static const tap_state_t arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay[] =
-			{
-				TAP_DREXIT2, TAP_DRUPDATE, TAP_IDLE, TAP_IDLE, TAP_IDLE, TAP_DRSELECT, TAP_DRCAPTURE, TAP_DRSHIFT
-			};
+		static const tap_state_t arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay[] =
+		{
+			TAP_DREXIT2, TAP_DRUPDATE, TAP_IDLE, TAP_IDLE, TAP_IDLE, TAP_DRSELECT, TAP_DRCAPTURE, TAP_DRSHIFT
+		};
 
-			jtag_add_pathmove(ARRAY_SIZE(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
-				arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay);
+		jtag_add_pathmove(ARRAY_SIZE(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
+			arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay);
 #endif
-		} else
-		{
-			/* This will happen on the last iteration updating the current tap state
-			 * so we don't have to track it during the common code path */
-			jtag_add_dr_out(tap,
-				2,
-				bits,
-				values,
-				TAP_IDLE);
-		}
 	}
 
+	values[0] = *t++;
+	values[0] |= (*t++<<8);
+	values[0] |= (*t++<<16);
+	values[0] |= (*t++<<24);
+
+	/* This will happen on the last iteration updating the current tap state
+	 * so we don't have to track it during the common code path */
+	jtag_add_dr_out(tap,
+		2,
+		bits,
+		values,
+		TAP_IDLE);
+
 	return jtag_execute_queue();
 #endif
 }

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

Summary of changes:
 src/jtag/zy1000/zy1000.c |  113 +++++++++++++++++++++++++++++-----------------
 1 files changed, 71 insertions(+), 42 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository