sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target: Use new target_addr type consistently in external interface. 

Flash routines still use uint32_t internally.
This commit is contained in:
Gareth McMullin 2016-07-04 10:31:32 +12:00
parent f9bdaf06a4
commit aeaca988c3
6 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gdb_main.c
View File

@ -156,7 +156,7 @@ int gdb_main_loop(struct target_controller *tc, bool in_syscall)
case '?': { /* '?': Request reason for target halt */ case '?': { /* '?': Request reason for target halt */
/* This packet isn't documented as being mandatory, /* This packet isn't documented as being mandatory,
* but GDB doesn't work without it. */ * but GDB doesn't work without it. */
uint32_t watch_addr; target_addr watch_addr;
int sig; int sig;
if(!cur_target) { if(!cur_target) {

18
src/include/target.h
View File

@ -91,8 +91,8 @@ bool target_check_error(target *t);
bool target_attached(target *t); bool target_attached(target *t);
/* Memory access functions */ /* Memory access functions */
void target_mem_read(target *t, void *dest, uint32_t src, size_t len); void target_mem_read(target *t, void *dest, target_addr src, size_t len);
void target_mem_write(target *t, uint32_t dest, const void *src, size_t len); void target_mem_write(target *t, target_addr dest, const void *src, size_t len);
/* Register access functions */ /* Register access functions */
void target_regs_read(target *t, void *data); void target_regs_read(target *t, void *data);
@ -105,16 +105,16 @@ int target_halt_wait(target *t);
void target_halt_resume(target *t, bool step); void target_halt_resume(target *t, bool step);
/* Break-/watchpoint functions */ /* Break-/watchpoint functions */
int target_set_hw_bp(target *t, uint32_t addr, uint8_t len); int target_set_hw_bp(target *t, target_addr addr, uint8_t len);
int target_clear_hw_bp(target *t, uint32_t addr, uint8_t len); int target_clear_hw_bp(target *t, target_addr addr, uint8_t len);
int target_set_hw_wp(target *t, uint8_t type, uint32_t addr, uint8_t len); int target_set_hw_wp(target *t, uint8_t type, target_addr addr, uint8_t len);
int target_clear_hw_wp(target *t, uint8_t type, uint32_t addr, uint8_t len); int target_clear_hw_wp(target *t, uint8_t type, target_addr addr, uint8_t len);
int target_check_hw_wp(target *t, uint32_t *addr); int target_check_hw_wp(target *t, target_addr *addr);
/* Flash memory access functions */ /* Flash memory access functions */
int target_flash_erase(target *t, uint32_t addr, size_t len); int target_flash_erase(target *t, target_addr addr, size_t len);
int target_flash_write(target *t, uint32_t dest, const void *src, size_t len); int target_flash_write(target *t, target_addr dest, const void *src, size_t len);
int target_flash_done(target *t); int target_flash_done(target *t);
/* Accessor functions */ /* Accessor functions */

18
src/target/cortexa.c
View File

@ -54,8 +54,8 @@ static void cortexa_reset(target *t);
static int cortexa_halt_wait(target *t); static int cortexa_halt_wait(target *t);
static void cortexa_halt_request(target *t); static void cortexa_halt_request(target *t);
static int cortexa_set_hw_bp(target *t, uint32_t addr, uint8_t len); static int cortexa_set_hw_bp(target *t, target_addr addr, uint8_t len);
static int cortexa_clear_hw_bp(target *t, uint32_t addr, uint8_t len); static int cortexa_clear_hw_bp(target *t, target_addr addr, uint8_t len);
static uint32_t bp_bas(uint32_t addr, uint8_t len); static uint32_t bp_bas(uint32_t addr, uint8_t len);
static void apb_write(target *t, uint16_t reg, uint32_t val); static void apb_write(target *t, uint16_t reg, uint32_t val);
@ -221,7 +221,7 @@ static uint32_t va_to_pa(target *t, uint32_t va)
return pa; return pa;
} }
static void cortexa_mem_read(target *t, void *dest, uint32_t src, size_t len) static void cortexa_mem_read(target *t, void *dest, target_addr src, size_t len)
{ {
/* Clean cache before reading */ /* Clean cache before reading */
for (uint32_t cl = src & ~(CACHE_LINE_LENGTH-1); for (uint32_t cl = src & ~(CACHE_LINE_LENGTH-1);
@ -234,7 +234,7 @@ static void cortexa_mem_read(target *t, void *dest, uint32_t src, size_t len)
adiv5_mem_read(ahb, dest, va_to_pa(t, src), len); adiv5_mem_read(ahb, dest, va_to_pa(t, src), len);
} }
static void cortexa_slow_mem_read(target *t, void *dest, uint32_t src, size_t len) static void cortexa_slow_mem_read(target *t, void *dest, target_addr src, size_t len)
{ {
struct cortexa_priv *priv = t->priv; struct cortexa_priv *priv = t->priv;
unsigned words = (len + (src & 3) + 3) / 4; unsigned words = (len + (src & 3) + 3) / 4;
@ -273,7 +273,7 @@ static void cortexa_slow_mem_read(target *t, void *dest, uint32_t src, size_t le
} }
} }
static void cortexa_mem_write(target *t, uint32_t dest, const void *src, size_t len) static void cortexa_mem_write(target *t, target_addr dest, const void *src, size_t len)
{ {
/* Clean and invalidate cache before writing */ /* Clean and invalidate cache before writing */
for (uint32_t cl = dest & ~(CACHE_LINE_LENGTH-1); for (uint32_t cl = dest & ~(CACHE_LINE_LENGTH-1);
@ -285,7 +285,7 @@ static void cortexa_mem_write(target *t, uint32_t dest, const void *src, size_t
adiv5_mem_write(ahb, va_to_pa(t, dest), src, len); adiv5_mem_write(ahb, va_to_pa(t, dest), src, len);
} }
static void cortexa_slow_mem_write_bytes(target *t, uint32_t dest, const uint8_t *src, size_t len) static void cortexa_slow_mem_write_bytes(target *t, target_addr dest, const uint8_t *src, size_t len)
{ {
struct cortexa_priv *priv = t->priv; struct cortexa_priv *priv = t->priv;
@ -304,7 +304,7 @@ static void cortexa_slow_mem_write_bytes(target *t, uint32_t dest, const uint8_t
} }
} }
static void cortexa_slow_mem_write(target *t, uint32_t dest, const void *src, size_t len) static void cortexa_slow_mem_write(target *t, target_addr dest, const void *src, size_t len)
{ {
struct cortexa_priv *priv = t->priv; struct cortexa_priv *priv = t->priv;
if (len == 0) if (len == 0)
@ -677,7 +677,7 @@ static uint32_t bp_bas(uint32_t addr, uint8_t len)
return DBGBCR_BAS_LOW_HW; return DBGBCR_BAS_LOW_HW;
} }
static int cortexa_set_hw_bp(target *t, uint32_t addr, uint8_t len) static int cortexa_set_hw_bp(target *t, target_addr addr, uint8_t len)
{ {
struct cortexa_priv *priv = t->priv; struct cortexa_priv *priv = t->priv;
unsigned i; unsigned i;
@ -698,7 +698,7 @@ static int cortexa_set_hw_bp(target *t, uint32_t addr, uint8_t len)
return 0; return 0;
} }
static int cortexa_clear_hw_bp(target *t, uint32_t addr, uint8_t len) static int cortexa_clear_hw_bp(target *t, target_addr addr, uint8_t len)
{ {
struct cortexa_priv *priv = t->priv; struct cortexa_priv *priv = t->priv;
unsigned i; unsigned i;

24
src/target/cortexm.c
View File

@ -62,13 +62,13 @@ static int cortexm_halt_wait(target *t);
static void cortexm_halt_request(target *t); static void cortexm_halt_request(target *t);
static int cortexm_fault_unwind(target *t); static int cortexm_fault_unwind(target *t);
static int cortexm_set_hw_bp(target *t, uint32_t addr, uint8_t len); static int cortexm_set_hw_bp(target *t, target_addr addr, uint8_t len);
static int cortexm_clear_hw_bp(target *t, uint32_t addr, uint8_t len); static int cortexm_clear_hw_bp(target *t, target_addr addr, uint8_t len);
static int cortexm_set_hw_wp(target *t, uint8_t type, uint32_t addr, uint8_t len); static int cortexm_set_hw_wp(target *t, uint8_t type, target_addr addr, uint8_t len);
static int cortexm_clear_hw_wp(target *t, uint8_t type, uint32_t addr, uint8_t len); static int cortexm_clear_hw_wp(target *t, uint8_t type, target_addr addr, uint8_t len);
static int cortexm_check_hw_wp(target *t, uint32_t *addr); static int cortexm_check_hw_wp(target *t, target_addr *addr);
#define CORTEXM_MAX_WATCHPOINTS 4 /* architecture says up to 15, no implementation has > 4 */ #define CORTEXM_MAX_WATCHPOINTS 4 /* architecture says up to 15, no implementation has > 4 */
#define CORTEXM_MAX_BREAKPOINTS 6 /* architecture says up to 127, no implementation has > 6 */ #define CORTEXM_MAX_BREAKPOINTS 6 /* architecture says up to 127, no implementation has > 6 */
@ -193,12 +193,12 @@ ADIv5_AP_t *cortexm_ap(target *t)
return ((struct cortexm_priv *)t->priv)->ap; return ((struct cortexm_priv *)t->priv)->ap;
} }
static void cortexm_mem_read(target *t, void *dest, uint32_t src, size_t len) static void cortexm_mem_read(target *t, void *dest, target_addr src, size_t len)
{ {
adiv5_mem_read(cortexm_ap(t), dest, src, len); adiv5_mem_read(cortexm_ap(t), dest, src, len);
} }
static void cortexm_mem_write(target *t, uint32_t dest, const void *src, size_t len) static void cortexm_mem_write(target *t, target_addr dest, const void *src, size_t len)
{ {
adiv5_mem_write(cortexm_ap(t), dest, src, len); adiv5_mem_write(cortexm_ap(t), dest, src, len);
} }
@ -656,7 +656,7 @@ int cortexm_run_stub(target *t, uint32_t loadaddr,
/* The following routines implement hardware breakpoints. /* The following routines implement hardware breakpoints.
* The Flash Patch and Breakpoint (FPB) system is used. */ * The Flash Patch and Breakpoint (FPB) system is used. */
static int cortexm_set_hw_bp(target *t, uint32_t addr, uint8_t len) static int cortexm_set_hw_bp(target *t, target_addr addr, uint8_t len)
{ {
(void)len; (void)len;
struct cortexm_priv *priv = t->priv; struct cortexm_priv *priv = t->priv;
@ -681,7 +681,7 @@ static int cortexm_set_hw_bp(target *t, uint32_t addr, uint8_t len)
return 0; return 0;
} }
static int cortexm_clear_hw_bp(target *t, uint32_t addr, uint8_t len) static int cortexm_clear_hw_bp(target *t, target_addr addr, uint8_t len)
{ {
(void)len; (void)len;
struct cortexm_priv *priv = t->priv; struct cortexm_priv *priv = t->priv;
@ -703,7 +703,7 @@ static int cortexm_clear_hw_bp(target *t, uint32_t addr, uint8_t len)
* The Data Watch and Trace (DWT) system is used. */ * The Data Watch and Trace (DWT) system is used. */
static int static int
cortexm_set_hw_wp(target *t, uint8_t type, uint32_t addr, uint8_t len) cortexm_set_hw_wp(target *t, uint8_t type, target_addr addr, uint8_t len)
{ {
struct cortexm_priv *priv = t->priv; struct cortexm_priv *priv = t->priv;
unsigned i; unsigned i;
@ -744,7 +744,7 @@ cortexm_set_hw_wp(target *t, uint8_t type, uint32_t addr, uint8_t len)
} }
static int static int
cortexm_clear_hw_wp(target *t, uint8_t type, uint32_t addr, uint8_t len) cortexm_clear_hw_wp(target *t, uint8_t type, target_addr addr, uint8_t len)
{ {
struct cortexm_priv *priv = t->priv; struct cortexm_priv *priv = t->priv;
unsigned i; unsigned i;
@ -779,7 +779,7 @@ cortexm_clear_hw_wp(target *t, uint8_t type, uint32_t addr, uint8_t len)
return 0; return 0;
} }
static int cortexm_check_hw_wp(target *t, uint32_t *addr) static int cortexm_check_hw_wp(target *t, target_addr *addr)
{ {
struct cortexm_priv *priv = t->priv; struct cortexm_priv *priv = t->priv;
unsigned i; unsigned i;

18
src/target/target.c
View File

@ -183,7 +183,7 @@ static struct target_flash *flash_for_addr(target *t, uint32_t addr)
return NULL; return NULL;
} }
int target_flash_erase(target *t, uint32_t addr, size_t len) int target_flash_erase(target *t, target_addr addr, size_t len)
{ {
int ret = 0; int ret = 0;
while (len) { while (len) {
@ -197,7 +197,7 @@ int target_flash_erase(target *t, uint32_t addr, size_t len)
} }
int target_flash_write(target *t, int target_flash_write(target *t,
uint32_t dest, const void *src, size_t len) target_addr dest, const void *src, size_t len)
{ {
int ret = 0; int ret = 0;
while (len) { while (len) {
@ -288,12 +288,12 @@ bool target_check_error(target *t) { return t->check_error(t); }
bool target_attached(target *t) { return t->attached; } bool target_attached(target *t) { return t->attached; }
/* Memory access functions */ /* Memory access functions */
void target_mem_read(target *t, void *dest, uint32_t src, size_t len) void target_mem_read(target *t, void *dest, target_addr src, size_t len)
{ {
t->mem_read(t, dest, src, len); t->mem_read(t, dest, src, len);
} }
void target_mem_write(target *t, uint32_t dest, const void *src, size_t len) void target_mem_write(target *t, target_addr dest, const void *src, size_t len)
{ {
t->mem_write(t, dest, src, len); t->mem_write(t, dest, src, len);
} }
@ -309,35 +309,35 @@ int target_halt_wait(target *t) { return t->halt_wait(t); }
void target_halt_resume(target *t, bool step) { t->halt_resume(t, step); } void target_halt_resume(target *t, bool step) { t->halt_resume(t, step); }
/* Break-/watchpoint functions */ /* Break-/watchpoint functions */
int target_set_hw_bp(target *t, uint32_t addr, uint8_t len) int target_set_hw_bp(target *t, target_addr addr, uint8_t len)
{ {
if (t->set_hw_bp == NULL) if (t->set_hw_bp == NULL)
return 0; return 0;
return t->set_hw_bp(t, addr, len); return t->set_hw_bp(t, addr, len);
} }
int target_clear_hw_bp(target *t, uint32_t addr, uint8_t len) int target_clear_hw_bp(target *t, target_addr addr, uint8_t len)
{ {
if (t->clear_hw_bp == NULL) if (t->clear_hw_bp == NULL)
return 0; return 0;
return t->clear_hw_bp(t, addr, len); return t->clear_hw_bp(t, addr, len);
} }
int target_set_hw_wp(target *t, uint8_t type, uint32_t addr, uint8_t len) int target_set_hw_wp(target *t, uint8_t type, target_addr addr, uint8_t len)
{ {
if (t->set_hw_wp == NULL) if (t->set_hw_wp == NULL)
return 0; return 0;
return t->set_hw_wp(t, type, addr, len); return t->set_hw_wp(t, type, addr, len);
} }
int target_clear_hw_wp(target *t, uint8_t type, uint32_t addr, uint8_t len) int target_clear_hw_wp(target *t, uint8_t type, target_addr addr, uint8_t len)
{ {
if (t->clear_hw_wp == NULL) if (t->clear_hw_wp == NULL)
return 0; return 0;
return t->clear_hw_wp(t, type, addr, len); return t->clear_hw_wp(t, type, addr, len);
} }
int target_check_hw_wp(target *t, uint32_t *addr) int target_check_hw_wp(target *t, target_addr *addr)
{ {
if (t->check_hw_wp == NULL) if (t->check_hw_wp == NULL)
return 0; return 0;

14
src/target/target_internal.h
View File

@ -78,9 +78,9 @@ struct target_s {
bool (*check_error)(target *t); bool (*check_error)(target *t);
/* Memory access functions */ /* Memory access functions */
void (*mem_read)(target *t, void *dest, uint32_t src, void (*mem_read)(target *t, void *dest, target_addr src,
size_t len); size_t len);
void (*mem_write)(target *t, uint32_t dest, void (*mem_write)(target *t, target_addr dest,
const void *src, size_t len); const void *src, size_t len);
/* Register access functions */ /* Register access functions */
@ -96,13 +96,13 @@ struct target_s {
void (*halt_resume)(target *t, bool step); void (*halt_resume)(target *t, bool step);
/* Break-/watchpoint functions */ /* Break-/watchpoint functions */
int (*set_hw_bp)(target *t, uint32_t addr, uint8_t len); int (*set_hw_bp)(target *t, target_addr addr, uint8_t len);
int (*clear_hw_bp)(target *t, uint32_t addr, uint8_t len); int (*clear_hw_bp)(target *t, target_addr addr, uint8_t len);
int (*set_hw_wp)(target *t, uint8_t type, uint32_t addr, uint8_t len); int (*set_hw_wp)(target *t, uint8_t type, target_addr addr, uint8_t len);
int (*clear_hw_wp)(target *t, uint8_t type, uint32_t addr, uint8_t len); int (*clear_hw_wp)(target *t, uint8_t type, target_addr addr, uint8_t len);
int (*check_hw_wp)(target *t, uint32_t *addr); int (*check_hw_wp)(target *t, target_addr *addr);
/* target-defined options */ /* target-defined options */
unsigned target_options; unsigned target_options;