[openocd-svn] Main OpenOCD repository branch, master, updated. 0.2.0-388-g6308af5

[Ø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  6308af523a5dcbcea59561925f8f63a6ee29e3ed (commit)
      from  3b95d0e079c6a0c6c1fdd2cc2ef381753baafc28 (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 6308af523a5dcbcea59561925f8f63a6ee29e3ed
Author: Nicolas Pitre <ni...@fl...>
Date:   Mon Oct 19 15:49:46 2009 -0400

    fix single step of bx instruction going into Thumb mode
    
    Without this fix, the following code cannot be single stepped:
    
    	add	ip, pc, #1
    	bx	ip
    	[thumb code here]

diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c
index 93fb3dd..e2f49c3 100644
--- a/src/target/arm_simulator.c
+++ b/src/target/arm_simulator.c
@@ -358,7 +358,7 @@ int arm_simulate_step_core(target_t *target, uint32_t *dry_run_pc, struct arm_si
 
 		if (dry_run_pc)
 		{
-			*dry_run_pc = target;
+			*dry_run_pc = target & ~1;
 			return ERROR_OK;
 		}
 		else

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

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


hooks/post-receive
-- 
Main OpenOCD repository