aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Welwarsky <matthias.welwarsky@sysgo.com>2016-09-16 15:16:19 +0200
committerMatthias Welwarsky <matthias.welwarsky@sysgo.com>2017-02-10 14:01:38 +0100
commit42574b3a10ca8b10e8b84b84c6427a3b9d09fe13 (patch)
tree1e2816667cca36437be295fcf1a7b5a64ff73c86 /src
parent4314624669fbeb5b4aed7ae33f9a031e022383c5 (diff)
downloadriscv-openocd-42574b3a10ca8b10e8b84b84c6427a3b9d09fe13.zip
riscv-openocd-42574b3a10ca8b10e8b84b84c6427a3b9d09fe13.tar.gz
riscv-openocd-42574b3a10ca8b10e8b84b84c6427a3b9d09fe13.tar.bz2
aarch64: correct breakpoint register offset
armv8 breakpoint register spacing is 16, not 4 as in armv7-a Change-Id: I0d49d06878a0c9dab35cde478064e5366f01a8e0 Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com>
Diffstat (limited to 'src')
-rw-r--r--src/target/aarch64.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index c2cd441..4d4b461 100644
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -690,8 +690,8 @@ static int aarch64_bpwp_enable(struct arm_dpm *dpm, unsigned index_t,
default:
return ERROR_FAIL;
}
- vr += 4 * index_t;
- cr += 4 * index_t;
+ vr += 16 * index_t;
+ cr += 16 * index_t;
LOG_DEBUG("A8: bpwp enable, vr %08x cr %08x",
(unsigned) vr, (unsigned) cr);
@@ -707,9 +707,6 @@ static int aarch64_bpwp_enable(struct arm_dpm *dpm, unsigned index_t,
static int aarch64_bpwp_disable(struct arm_dpm *dpm, unsigned index_t)
{
- return ERROR_OK;
-
-#if 0
struct aarch64_common *a = dpm_to_a8(dpm);
uint32_t cr;
@@ -724,13 +721,13 @@ static int aarch64_bpwp_disable(struct arm_dpm *dpm, unsigned index_t)
default:
return ERROR_FAIL;
}
- cr += 4 * index_t;
+ cr += 16 * index_t;
LOG_DEBUG("A: bpwp disable, cr %08x", (unsigned) cr);
/* clear control register */
return aarch64_dap_write_memap_register_u32(dpm->arm->target, cr, 0);
-#endif
+
}
static int aarch64_dpm_setup(struct aarch64_common *a8, uint32_t debug)