imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cortex-A8: minor cleanup

Browse Source 
Make various functions static, add some comments, report
vector catch as a flavor of DBG_REASON_BREAKPOINT, get
rid of needless/undesirable ARMV4_5_CORE_REG_MODE, etc.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-11-24 21:24:44 -08:00
parent 338a674faa
commit 991daa03eb
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/target/cortex_a8.c
View File

@ -89,7 +89,12 @@ static int cortex_a8_init_debug_access(struct target *target)
return retval; return retval;
} }
int cortex_a8_exec_opcode(struct target *target, uint32_t opcode) /* FIXME we waste a *LOT* of round-trips with needless DSCR reads, which
* slows down operations considerably. One good way to start reducing
* them would pass current values into and out of this routine. That
* should also help synch DCC read/write.
*/
static int cortex_a8_exec_opcode(struct target *target, uint32_t opcode)
{ {
uint32_t dscr; uint32_t dscr;
int retval; int retval;
@ -592,6 +597,12 @@ static int cortex_a8_debug_entry(struct target *target)
/* Enable the ITR execution once we are in debug mode */ /* Enable the ITR execution once we are in debug mode */
mem_ap_read_atomic_u32(swjdp, mem_ap_read_atomic_u32(swjdp,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
/* REVISIT see A8 TRM 12.11.4 steps 2..3 -- make sure that any
* imprecise data aborts get discarded by issuing a Data
* Synchronization Barrier: ARMV4_5_MCR(15, 0, 0, 7, 10, 4).
*/
dscr |= (1 << DSCR_EXT_INT_EN); dscr |= (1 << DSCR_EXT_INT_EN);
retval = mem_ap_write_atomic_u32(swjdp, retval = mem_ap_write_atomic_u32(swjdp,
armv7a->debug_base + CPUDBG_DSCR, dscr); armv7a->debug_base + CPUDBG_DSCR, dscr);
@ -599,22 +610,28 @@ static int cortex_a8_debug_entry(struct target *target)
/* Examine debug reason */ /* Examine debug reason */
switch ((cortex_a8->cpudbg_dscr >> 2)&0xF) switch ((cortex_a8->cpudbg_dscr >> 2)&0xF)
{ {
case 0: case 0: /* DRCR[0] write */
case 4: case 4: /* EDBGRQ */
target->debug_reason = DBG_REASON_DBGRQ; target->debug_reason = DBG_REASON_DBGRQ;
break; break;
case 1: case 1: /* HW breakpoint */
case 3: case 3: /* SW BKPT */
case 5: /* vector catch */
target->debug_reason = DBG_REASON_BREAKPOINT; target->debug_reason = DBG_REASON_BREAKPOINT;
break; break;
case 10: case 10: /* precise watchpoint */
target->debug_reason = DBG_REASON_WATCHPOINT; target->debug_reason = DBG_REASON_WATCHPOINT;
/* REVISIT could collect WFAR later, to see just
* which instruction triggered the watchpoint.
*/
break; break;
default: default:
target->debug_reason = DBG_REASON_UNDEFINED; target->debug_reason = DBG_REASON_UNDEFINED;
break; break;
} }
/* REVISIT fast_reg_read is never set ... */
/* Examine target state and mode */ /* Examine target state and mode */
if (cortex_a8->fast_reg_read) if (cortex_a8->fast_reg_read)
target_alloc_working_area(target, 64, &regfile_working_area); target_alloc_working_area(target, 64, &regfile_working_area);
@ -738,6 +755,7 @@ static int cortex_a8_step(struct target *target, int current, uint32_t address,
struct arm *armv4_5 = &armv7a->armv4_5_common; struct arm *armv4_5 = &armv7a->armv4_5_common;
struct breakpoint *breakpoint = NULL; struct breakpoint *breakpoint = NULL;
struct breakpoint stepbreakpoint; struct breakpoint stepbreakpoint;
struct reg *r;
int timeout = 100; int timeout = 100;
@ -748,17 +766,14 @@ static int cortex_a8_step(struct target *target, int current, uint32_t address,
} }
/* current = 1: continue on current pc, otherwise continue at <address> */ /* current = 1: continue on current pc, otherwise continue at <address> */
r = armv4_5->core_cache->reg_list + 15;
if (!current) if (!current)
{ {
buf_set_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, buf_set_u32(r->value, 0, 32, address);
armv4_5->core_mode, ARM_PC).value,
0, 32, address);
} }
else else
{ {
address = buf_get_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, address = buf_get_u32(r->value, 0, 32);
armv4_5->core_mode, ARM_PC).value,
0, 32);
} }
/* The front-end may request us not to handle breakpoints. /* The front-end may request us not to handle breakpoints.
@ -767,11 +782,7 @@ static int cortex_a8_step(struct target *target, int current, uint32_t address,
*/ */
handle_breakpoints = 1; handle_breakpoints = 1;
if (handle_breakpoints) { if (handle_breakpoints) {
breakpoint = breakpoint_find(target, breakpoint = breakpoint_find(target, address);
buf_get_u32(ARMV4_5_CORE_REG_MODE(
armv4_5->core_cache,
armv4_5->core_mode, 15).value,
0, 32));
if (breakpoint) if (breakpoint)
cortex_a8_unset_breakpoint(target, breakpoint); cortex_a8_unset_breakpoint(target, breakpoint);
} }
@ -1235,7 +1246,8 @@ static int cortex_a8_unset_breakpoint(struct target *target, struct breakpoint *
return ERROR_OK; return ERROR_OK;
} }
int cortex_a8_add_breakpoint(struct target *target, struct breakpoint *breakpoint) static int cortex_a8_add_breakpoint(struct target *target,
struct breakpoint *breakpoint)
{ {
struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
@ -1346,7 +1358,7 @@ static int cortex_a8_read_memory(struct target *target, uint32_t address,
return retval; return retval;
} }
int cortex_a8_write_memory(struct target *target, uint32_t address, static int cortex_a8_write_memory(struct target *target, uint32_t address,
uint32_t size, uint32_t count, uint8_t *buffer) uint32_t size, uint32_t count, uint8_t *buffer)
{ {
struct armv7a_common *armv7a = target_to_armv7a(target); struct armv7a_common *armv7a = target_to_armv7a(target);
@ -1591,7 +1603,7 @@ static int cortex_a8_init_target(struct command_context *cmd_ctx,
return ERROR_OK; return ERROR_OK;
} }
int cortex_a8_init_arch_info(struct target *target, static int cortex_a8_init_arch_info(struct target *target,
struct cortex_a8_common *cortex_a8, struct jtag_tap *tap) struct cortex_a8_common *cortex_a8, struct jtag_tap *tap)
{ {
struct armv7a_common *armv7a = &cortex_a8->armv7a_common; struct armv7a_common *armv7a = &cortex_a8->armv7a_common;
@ -1605,7 +1617,7 @@ int cortex_a8_init_arch_info(struct target *target,
/* prepare JTAG information for the new target */ /* prepare JTAG information for the new target */
cortex_a8->jtag_info.tap = tap; cortex_a8->jtag_info.tap = tap;
cortex_a8->jtag_info.scann_size = 4; cortex_a8->jtag_info.scann_size = 4;
LOG_DEBUG(" ");
swjdp->dp_select_value = -1; swjdp->dp_select_value = -1;
swjdp->ap_csw_value = -1; swjdp->ap_csw_value = -1;
swjdp->ap_tar_value = -1; swjdp->ap_tar_value = -1;

3
src/target/cortex_a8.h
View File

@ -140,7 +140,4 @@ target_to_cortex_a8(struct target *target)
armv7a_common.armv4_5_common); armv7a_common.armv4_5_common);
} }
int cortex_a8_init_arch_info(struct target *target,
struct cortex_a8_common *cortex_a8, struct jtag_tap *tap);
#endif /* CORTEX_A8_H */ #endif /* CORTEX_A8_H */