From 54790f032e579941731e98f006781082c0b3a386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Musia=C5=82?= Date: Sun, 26 Jun 2022 12:17:51 +0200 Subject: [PATCH] cortexm: fixed an issue with watchpoint handling and a register sanity check --- src/target/cortexm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/target/cortexm.c b/src/target/cortexm.c index 0c25509d..7502f1ab 100644 --- a/src/target/cortexm.c +++ b/src/target/cortexm.c @@ -502,7 +502,7 @@ bool cortexm_attach(target *t) priv->flash_patch_revision = (r >> 28); priv->hw_watchpoint_max = CORTEXM_MAX_WATCHPOINTS; r = target_mem_read32(t, CORTEXM_DWT_CTRL); - if ((r >> 28) > priv->hw_watchpoint_max) + if ((r >> 28) < priv->hw_watchpoint_max) priv->hw_watchpoint_max = r >> 28; /* Clear any stale breakpoints */ @@ -675,7 +675,7 @@ static int dcrsr_regnum(target *t, unsigned reg) return regnum_cortex_m[reg]; } else if ((t->target_options & TOPT_FLAVOUR_V7MF) && (reg < (sizeof(regnum_cortex_m) + - sizeof(regnum_cortex_mf) / 4))) { + sizeof(regnum_cortex_mf)) / 4)) { return regnum_cortex_mf[reg - sizeof(regnum_cortex_m)/4]; } else { return -1;