[openocd-svn] Main OpenOCD repository branch, master, updated. v0.2.0-411-g517e812

[David B. <dbr...@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  517e812de3782a6b592cb69416d1327a9b94ac9f (commit)
      from  f593ff0a3dd08052648da61a75f5ad5a35945194 (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 517e812de3782a6b592cb69416d1327a9b94ac9f
Author: Nicolas Pitre <ni...@fl...>
Date:   Thu Oct 22 23:23:44 2009 -0400

    Ferocion: fix corruption of r0 when resuming Thumb mode
    
    The wrong variable (pc instead of r0) was used.  Furthermore, someone
    did cover this error by stupidly silencing the compiler warning that
    occurred before a dummy void reference to r0 was added to the code.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/target/feroceon.c b/src/target/feroceon.c
index 8eea33e..f084201 100644
--- a/src/target/feroceon.c
+++ b/src/target/feroceon.c
@@ -335,7 +335,6 @@ void feroceon_branch_resume_thumb(target_t *target)
 	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
 	uint32_t r0 = buf_get_u32(armv4_5->core_cache->reg_list[0].value, 0, 32);
 	uint32_t pc = buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32);
-	(void)(r0); // use R0...
 
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
@@ -351,7 +350,7 @@ void feroceon_branch_resume_thumb(target_t *target)
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
 
-	arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, pc, NULL, 0);
+	arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, r0, NULL, 0);
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
 

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

Summary of changes:
 src/target/feroceon.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository