From 59162a0b5c753cbcc4363c837b7034b883516e84 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Wed, 12 Oct 2011 21:24:33 +0000 Subject: [PATCH] More debug in prepration for working out writemem32 --- gdbserver/gdb-server.c | 8 +++++--- src/stlink-common.h | 2 ++ src/test_usb.c | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c index 1cce453..bf26d35 100644 --- a/gdbserver/gdb-server.c +++ b/gdbserver/gdb-server.c @@ -75,7 +75,7 @@ int main(int argc, char** argv) { } // FIXME - hardcoded to usb.... - stlink_t *sl =stlink_open_usb(argv[2], 10); + stlink_t *sl = stlink_open_usb(argv[2], 10); if (sl == NULL) return 1; @@ -297,12 +297,14 @@ struct code_hw_breakpoint code_breaks[CODE_BREAK_NUM]; static void init_code_breakpoints(stlink_t *sl) { memset(sl->q_buf, 0, 4); sl->q_buf[0] = 0x03; // KEY | ENABLE - stlink_write_mem32(sl, 0xe0002000, 4); + stlink_write_mem32(sl, CM3_REG_FP_CTRL, 4); + printf("KARL - should read back as 0x03, not 60 02 00 00\n"); + stlink_read_mem32(sl, CM3_REG_FP_CTRL, 4); memset(sl->q_buf, 0, 4); for(int i = 0; i < CODE_BREAK_NUM; i++) { code_breaks[i].type = 0; - stlink_write_mem32(sl, 0xe0002008 + i * 4, 4); + stlink_write_mem32(sl, CM3_REG_FP_COMP0 + i * 4, 4); } } diff --git a/src/stlink-common.h b/src/stlink-common.h index b357c7a..da78549 100644 --- a/src/stlink-common.h +++ b/src/stlink-common.h @@ -73,6 +73,8 @@ extern "C" { // cortex m3 technical reference manual #define CM3_REG_CPUID 0xE000ED00 +#define CM3_REG_FP_CTRL 0xE0002000 +#define CM3_REG_FP_COMP0 0xE0002008 typedef struct { uint32_t r[16]; diff --git a/src/test_usb.c b/src/test_usb.c index 886571c..cc8ae72 100644 --- a/src/test_usb.c +++ b/src/test_usb.c @@ -36,8 +36,9 @@ int main(int ac, char** av) { for (off = 0; off < 16; off += 4) stlink_read_mem32(sl, sram_base + off, 4); - printf("-- read_mem, cpuid\n"); - stlink_read_mem32(sl, 0xe000e008, 4); // ACTLR + printf("FP_CTRL\n"); + stlink_read_mem32(sl, CM3_REG_FP_CTRL, 4); + // no idea what reg this is.. */ /* stlink_read_mem32(sl, 0xe000ed90, 4); // no idea what register this is... -- 2.30.2