Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 5535399)
fix pass_condition() LE condition code check
authorLennert Buytenhek <buytenh@wantstofly.org>
Tue, 13 Oct 2009 18:27:03 +0000 (20:27 +0200)
committerDavid Brownell <dbrownell@users.sourceforge.net>
Tue, 13 Oct 2009 22:33:04 +0000 (15:33 -0700)
The LE check is obviously buggy (as easily triggered during some
testing), but I didn't audit the rest of the cases.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
src/target/arm_simulator.c patch | blob | history

diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c
index 7c610a5ba804267f1cd4b77858c2d6732c836113..93fb3dd9b522b93ec0319d11b4e66f06362202a7 100644 (file)
--- a/src/target/arm_simulator.c
+++ b/src/target/arm_simulator.c
@@ -243,9 +243,9 @@ int pass_condition(uint32_t cpsr, uint32_t opcode)
                        else
                                return 0;
                case 0xd:       /* LE */
-                       if ((cpsr & 0x40000000) &&
-                               (((cpsr & 0x80000000) && !(cpsr & 0x10000000))
-                               || (!(cpsr & 0x80000000) && (cpsr & 0x10000000))))
+                       if ((cpsr & 0x40000000) ||
+                               ((cpsr & 0x80000000) && !(cpsr & 0x10000000))
+                               || (!(cpsr & 0x80000000) && (cpsr & 0x10000000)))
                                return 1;
                        else
                                return 0;
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)