aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2015-01-22 23:22:07 +0800
committerMatthias Welwarsky <matthias@welwarsky.de>2018-06-04 09:17:14 +0100
commit5952f5e50a163f82385c6ccf88d84e8372f496b7 (patch)
tree8038c110f22bf17bffc9d1cfeda4682aa3b715f4
parent74831e74c8a6ac445a8320d2314bcc3c93ddec22 (diff)
downloadriscv-openocd-5952f5e50a163f82385c6ccf88d84e8372f496b7.zip
riscv-openocd-5952f5e50a163f82385c6ccf88d84e8372f496b7.tar.gz
riscv-openocd-5952f5e50a163f82385c6ccf88d84e8372f496b7.tar.bz2
breakpoints: simplify the test to find a breakpoint
The test is overly complicated and unreadable. Simplify it while keeping the exact same behaviour. Change-Id: I6b22291ca454e1eddeeab4024d3983dc4c603d3a Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: http://openocd.zylin.com/4512 Tested-by: jenkins Reviewed-by: Christopher Head <chead@zaber.com> Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
-rw-r--r--src/target/breakpoints.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 7cf4a69..58bcc86 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -315,11 +315,8 @@ int breakpoint_remove_internal(struct target *target, target_addr_t address)
struct breakpoint *breakpoint = target->breakpoints;
while (breakpoint) {
- if ((breakpoint->address == address) && (breakpoint->asid == 0))
- break;
- else if ((breakpoint->address == 0) && (breakpoint->asid == address))
- break;
- else if ((breakpoint->address == address) && (breakpoint->asid != 0))
+ if ((breakpoint->address == address) ||
+ (breakpoint->address == 0 && breakpoint->asid == address))
break;
breakpoint = breakpoint->next;
}