aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth McMullin2015-03-29 17:37:03 -0700
committerGareth McMullin2015-03-29 17:37:03 -0700
commitc2cde32716c5f4283877188d0e452dcf5e85e563 (patch)
treee8ed4a9dfe6cd9b848062b3858de542f696c2a7d
parent274b8185173d1bd0b28f1174ee29e2d2fdacbcae (diff)
Improve cortexm_read/write_regs. Use more sensible return types.
-rw-r--r--src/adiv5.c7
-rw-r--r--src/cortexm.c44
-rw-r--r--src/include/target.h6
3 files changed, 26 insertions, 31 deletions
diff --git a/src/adiv5.c b/src/adiv5.c
index 039f129..4bc64bb 100644
--- a/src/adiv5.c
+++ b/src/adiv5.c
@@ -37,7 +37,7 @@
static const char adiv5_driver_str[] = "ARM ADIv5 MEM-AP";
-static int ap_check_error(target *t);
+static bool ap_check_error(target *t);
static void ap_mem_read(target *t, void *dest, uint32_t src, size_t len);
static void ap_mem_write(target *t, uint32_t dest, const void *src, size_t len);
@@ -157,11 +157,10 @@ void adiv5_dp_init(ADIv5_DP_t *dp)
adiv5_dp_unref(dp);
}
-static int
-ap_check_error(target *t)
+static bool ap_check_error(target *t)
{
ADIv5_AP_t *ap = adiv5_target_ap(t);
- return adiv5_dp_error(ap->dp);
+ return adiv5_dp_error(ap->dp) != 0;
}
enum align {
diff --git a/src/cortexm.c b/src/cortexm.c
index c2684b5..ac4c549 100644
--- a/src/cortexm.c
+++ b/src/cortexm.c
@@ -57,8 +57,8 @@ const struct command_s cortexm_cmd_list[] = {
#define SIGSEGV 11
#define SIGLOST 29
-static int cortexm_regs_read(target *t, void *data);
-static int cortexm_regs_write(target *t, const void *data);
+static void cortexm_regs_read(target *t, void *data);
+static void cortexm_regs_write(target *t, const void *data);
static uint32_t cortexm_pc_read(target *t);
static void cortexm_reset(target *t);
@@ -343,15 +343,16 @@ void cortexm_detach(target *t)
target_mem_write32(t, CORTEXM_DHCSR, CORTEXM_DHCSR_DBGKEY);
}
-static int cortexm_regs_read(target *t, void *data)
+enum { DB_DHCSR, DB_DCRSR, DB_DCRDR, DB_DEMCR };
+
+static void cortexm_regs_read(target *t, void *data)
{
ADIv5_AP_t *ap = adiv5_target_ap(t);
uint32_t *regs = data;
unsigned i;
/* FIXME: Describe what's really going on here */
- adiv5_ap_write(ap, ADIV5_AP_CSW, ap->csw |
- ADIV5_AP_CSW_SIZE_WORD | ADIV5_AP_CSW_ADDRINC_SINGLE);
+ adiv5_ap_write(ap, ADIV5_AP_CSW, ap->csw | ADIV5_AP_CSW_SIZE_WORD);
/* Map the banked data registers (0x10-0x1c) to the
* debug registers DHCSR, DCRSR, DCRDR and DEMCR respectively */
@@ -359,33 +360,30 @@ static int cortexm_regs_read(target *t, void *data)
/* Walk the regnum_cortex_m array, reading the registers it
* calls out. */
- adiv5_ap_write(ap, ADIV5_AP_DB(1), regnum_cortex_m[0]); /* Required to switch banks */
- *regs++ = adiv5_dp_read(ap->dp, ADIV5_AP_DB(2));
+ adiv5_ap_write(ap, ADIV5_AP_DB(DB_DCRSR), regnum_cortex_m[0]); /* Required to switch banks */
+ *regs++ = adiv5_dp_read(ap->dp, ADIV5_AP_DB(DB_DCRDR));
for(i = 1; i < sizeof(regnum_cortex_m) / 4; i++) {
- adiv5_dp_low_access(ap->dp, ADIV5_LOW_WRITE, ADIV5_AP_DB(1),
+ adiv5_dp_low_access(ap->dp, ADIV5_LOW_WRITE, ADIV5_AP_DB(DB_DCRSR),
regnum_cortex_m[i]);
- *regs++ = adiv5_dp_read(ap->dp, ADIV5_AP_DB(2));
+ *regs++ = adiv5_dp_read(ap->dp, ADIV5_AP_DB(DB_DCRDR));
}
if (t->target_options & TOPT_FLAVOUR_V7MF)
for(i = 0; i < sizeof(regnum_cortex_mf) / 4; i++) {
adiv5_dp_low_access(ap->dp, ADIV5_LOW_WRITE,
- ADIV5_AP_DB(1),
+ ADIV5_AP_DB(DB_DCRSR),
regnum_cortex_mf[i]);
- *regs++ = adiv5_dp_read(ap->dp, ADIV5_AP_DB(2));
+ *regs++ = adiv5_dp_read(ap->dp, ADIV5_AP_DB(DB_DCRDR));
}
-
- return 0;
}
-static int cortexm_regs_write(target *t, const void *data)
+static void cortexm_regs_write(target *t, const void *data)
{
ADIv5_AP_t *ap = adiv5_target_ap(t);
const uint32_t *regs = data;
unsigned i;
/* FIXME: Describe what's really going on here */
- adiv5_ap_write(ap, ADIV5_AP_CSW, ap->csw |
- ADIV5_AP_CSW_SIZE_WORD | ADIV5_AP_CSW_ADDRINC_SINGLE);
+ adiv5_ap_write(ap, ADIV5_AP_CSW, ap->csw | ADIV5_AP_CSW_SIZE_WORD);
/* Map the banked data registers (0x10-0x1c) to the
* debug registers DHCSR, DCRSR, DCRDR and DEMCR respectively */
@@ -393,25 +391,23 @@ static int cortexm_regs_write(target *t, const void *data)
/* Walk the regnum_cortex_m array, writing the registers it
* calls out. */
- adiv5_ap_write(ap, ADIV5_AP_DB(2), *regs++); /* Required to switch banks */
- adiv5_dp_low_access(ap->dp, ADIV5_LOW_WRITE, ADIV5_AP_DB(1),
+ adiv5_ap_write(ap, ADIV5_AP_DB(DB_DCRDR), *regs++); /* Required to switch banks */
+ adiv5_dp_low_access(ap->dp, ADIV5_LOW_WRITE, ADIV5_AP_DB(DB_DCRSR),
0x10000 | regnum_cortex_m[0]);
for(i = 1; i < sizeof(regnum_cortex_m) / 4; i++) {
adiv5_dp_low_access(ap->dp, ADIV5_LOW_WRITE,
- ADIV5_AP_DB(2), *regs++);
- adiv5_dp_low_access(ap->dp, ADIV5_LOW_WRITE, ADIV5_AP_DB(1),
+ ADIV5_AP_DB(DB_DCRDR), *regs++);
+ adiv5_dp_low_access(ap->dp, ADIV5_LOW_WRITE, ADIV5_AP_DB(DB_DCRSR),
0x10000 | regnum_cortex_m[i]);
}
if (t->target_options & TOPT_FLAVOUR_V7MF)
for(i = 0; i < sizeof(regnum_cortex_mf) / 4; i++) {
adiv5_dp_low_access(ap->dp, ADIV5_LOW_WRITE,
- ADIV5_AP_DB(2), *regs++);
+ ADIV5_AP_DB(DB_DCRDR), *regs++);
adiv5_dp_low_access(ap->dp, ADIV5_LOW_WRITE,
- ADIV5_AP_DB(1),
+ ADIV5_AP_DB(DB_DCRSR),
0x10000 | regnum_cortex_mf[i]);
}
-
- return 0;
}
static uint32_t cortexm_pc_read(target *t)
diff --git a/src/include/target.h b/src/include/target.h
index 48e81f2..d844057 100644
--- a/src/include/target.h
+++ b/src/include/target.h
@@ -115,7 +115,7 @@ struct target_s {
/* Attach/Detach funcitons */
bool (*attach)(target *t);
void (*detach)(target *t);
- int (*check_error)(target *t);
+ bool (*check_error)(target *t);
/* Memory access functions */
void (*mem_read)(target *t, void *dest, uint32_t src,
@@ -126,8 +126,8 @@ struct target_s {
/* Register access functions */
int regs_size;
const char *tdesc;
- int (*regs_read)(target *t, void *data);
- int (*regs_write)(target *t, const void *data);
+ void (*regs_read)(target *t, void *data);
+ void (*regs_write)(target *t, const void *data);
/* Halt/resume functions */
void (*reset)(target *t);