Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 9716632)
fix single step of bx instruction going into Thumb mode
authorNicolas Pitre <nico@fluxnic.net>
Mon, 19 Oct 2009 19:49:46 +0000 (15:49 -0400)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Mon, 19 Oct 2009 20:04:07 +0000 (22:04 +0200)
Without this fix, the following code cannot be single stepped:

add ip, pc, #1
bx ip
[thumb code here]

src/target/arm_simulator.c patch | blob | history

diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c
index 93fb3dd9b522b93ec0319d11b4e66f06362202a7..e2f49c390331dbc988178d9159e7850c702b0e9a 100644 (file)
--- 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
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)