X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fcortex_a8.c;h=325a54b521b9b2ff19cbbbf3770312b1a2ae9ada;hb=8a41656391bd8eb6854c8573920d1155d815966b;hp=28c75b591da3f6dc4b9f2dd24bc3843cb8dd3bae;hpb=c008d30fe85a674842632e32d732e22e0a91b95d;p=openocd.git diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c index 28c75b591d..325a54b521 100644 --- a/src/target/cortex_a8.c +++ b/src/target/cortex_a8.c @@ -89,20 +89,25 @@ static int cortex_a8_init_debug_access(struct target *target) return retval; } -/* 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. +/* To reduce needless round-trips, pass in a pointer to the current + * DSCR value. Initialize it to zero if you just need to know the + * value on return from this function; or (1 << DSCR_INSTR_COMP) if + * you happen to know that no instruction is pending. */ -static int cortex_a8_exec_opcode(struct target *target, uint32_t opcode) +static int cortex_a8_exec_opcode(struct target *target, + uint32_t opcode, uint32_t *dscr_p) { uint32_t dscr; int retval; struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; + dscr = dscr_p ? *dscr_p : 0; + LOG_DEBUG("exec opcode 0x%08" PRIx32, opcode); - do + + /* Wait for InstrCompl bit to be set */ + while ((dscr & (1 << DSCR_INSTR_COMP)) == 0) { retval = mem_ap_read_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_DSCR, &dscr); @@ -112,7 +117,6 @@ static int cortex_a8_exec_opcode(struct target *target, uint32_t opcode) return retval; } } - while ((dscr & (1 << DSCR_INSTR_COMP)) == 0); /* Wait for InstrCompl bit to be set */ mem_ap_write_u32(swjdp, armv7a->debug_base + CPUDBG_ITR, opcode); @@ -128,6 +132,9 @@ static int cortex_a8_exec_opcode(struct target *target, uint32_t opcode) } while ((dscr & (1 << DSCR_INSTR_COMP)) == 0); /* Wait for InstrCompl bit to be set */ + if (dscr_p) + *dscr_p = dscr; + return retval; } @@ -144,7 +151,7 @@ static int cortex_a8_read_regs_through_mem(struct target *target, uint32_t addre cortex_a8_dap_read_coreregister_u32(target, regfile, 0); cortex_a8_dap_write_coreregister_u32(target, address, 0); - cortex_a8_exec_opcode(target, ARMV4_5_STMIA(0, 0xFFFE, 0, 0)); + cortex_a8_exec_opcode(target, ARMV4_5_STMIA(0, 0xFFFE, 0, 0), NULL); dap_ap_select(swjdp, swjdp_memoryap); mem_ap_read_buf_u32(swjdp, (uint8_t *)(®file[1]), 4*15, address); dap_ap_select(swjdp, swjdp_debugap); @@ -158,10 +165,15 @@ static int cortex_a8_read_cp(struct target *target, uint32_t *value, uint8_t CP, int retval; struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; + uint32_t dscr = 0; + + /* MRC(...) to read coprocessor register into r0 */ + cortex_a8_exec_opcode(target, ARMV4_5_MRC(CP, op1, 0, CRn, CRm, op2), + &dscr); - cortex_a8_exec_opcode(target, ARMV4_5_MRC(CP, op1, 0, CRn, CRm, op2)); /* Move R0 to DTRTX */ - cortex_a8_exec_opcode(target, ARMV4_5_MCR(14, 0, 0, 0, 5, 0)); + cortex_a8_exec_opcode(target, ARMV4_5_MCR(14, 0, 0, 0, 5, 0), + &dscr); /* Read DCCTX */ retval = mem_ap_read_atomic_u32(swjdp, @@ -187,16 +199,21 @@ static int cortex_a8_write_cp(struct target *target, uint32_t value, { LOG_ERROR("DSCR_DTR_RX_FULL, dscr 0x%08" PRIx32, dscr); /* Clear DCCRX with MCR(p14, 0, Rd, c0, c5, 0), opcode 0xEE000E15 */ - cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0)); + cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), + &dscr); } + /* Write DTRRX ... sets DSCR.DTRRXfull but exec_opcode() won't care */ retval = mem_ap_write_u32(swjdp, armv7a->debug_base + CPUDBG_DTRRX, value); + /* Move DTRRX to r0 */ - cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0)); + cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), &dscr); - cortex_a8_exec_opcode(target, ARMV4_5_MCR(CP, op1, 0, CRn, CRm, op2)); - return retval; + /* MCR(...) to write r0 to coprocessor */ + return cortex_a8_exec_opcode(target, + ARMV4_5_MCR(CP, op1, 0, CRn, CRm, op2), + &dscr); } static int cortex_a8_read_cp15(struct target *target, uint32_t op1, uint32_t op2, @@ -238,7 +255,7 @@ static int cortex_a8_dap_read_coreregister_u32(struct target *target, { int retval = ERROR_OK; uint8_t reg = regnum&0xFF; - uint32_t dscr; + uint32_t dscr = 0; struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; @@ -248,30 +265,35 @@ static int cortex_a8_dap_read_coreregister_u32(struct target *target, if (reg < 15) { /* Rn to DCCTX, "MCR p14, 0, Rn, c0, c5, 0" 0xEE00nE15 */ - cortex_a8_exec_opcode(target, ARMV4_5_MCR(14, 0, reg, 0, 5, 0)); + cortex_a8_exec_opcode(target, + ARMV4_5_MCR(14, 0, reg, 0, 5, 0), + &dscr); } else if (reg == 15) { /* "MOV r0, r15"; then move r0 to DCCTX */ - cortex_a8_exec_opcode(target, 0xE1A0000F); - cortex_a8_exec_opcode(target, ARMV4_5_MCR(14, 0, 0, 0, 5, 0)); + cortex_a8_exec_opcode(target, 0xE1A0000F, &dscr); + cortex_a8_exec_opcode(target, + ARMV4_5_MCR(14, 0, 0, 0, 5, 0), + &dscr); } else { /* "MRS r0, CPSR" or "MRS r0, SPSR" * then move r0 to DCCTX */ - cortex_a8_exec_opcode(target, ARMV4_5_MRS(0, reg & 1)); - cortex_a8_exec_opcode(target, ARMV4_5_MCR(14, 0, 0, 0, 5, 0)); + cortex_a8_exec_opcode(target, ARMV4_5_MRS(0, reg & 1), &dscr); + cortex_a8_exec_opcode(target, + ARMV4_5_MCR(14, 0, 0, 0, 5, 0), + &dscr); } - /* Read DTRRTX */ - do + /* Wait for DTRRXfull then read DTRRTX */ + while ((dscr & (1 << DSCR_DTR_TX_FULL)) == 0) { retval = mem_ap_read_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_DSCR, &dscr); } - while ((dscr & (1 << DSCR_DTR_TX_FULL)) == 0); /* Wait for DTRRXfull */ retval = mem_ap_read_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_DTRTX, value); @@ -298,13 +320,14 @@ static int cortex_a8_dap_write_coreregister_u32(struct target *target, { LOG_ERROR("DSCR_DTR_RX_FULL, dscr 0x%08" PRIx32, dscr); /* Clear DCCRX with MCR(p14, 0, Rd, c0, c5, 0), opcode 0xEE000E15 */ - cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0)); + cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), + &dscr); } if (Rd > 17) return retval; - /* Write to DCCRX */ + /* Write DTRRX ... sets DSCR.DTRRXfull but exec_opcode() won't care */ LOG_DEBUG("write DCC 0x%08" PRIx32, value); retval = mem_ap_write_u32(swjdp, armv7a->debug_base + CPUDBG_DTRRX, value); @@ -312,28 +335,33 @@ static int cortex_a8_dap_write_coreregister_u32(struct target *target, if (Rd < 15) { /* DCCRX to Rn, "MCR p14, 0, Rn, c0, c5, 0", 0xEE00nE15 */ - cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, Rd, 0, 5, 0)); + cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, Rd, 0, 5, 0), + &dscr); } else if (Rd == 15) { /* DCCRX to R0, "MCR p14, 0, R0, c0, c5, 0", 0xEE000E15 * then "mov r15, r0" */ - cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0)); - cortex_a8_exec_opcode(target, 0xE1A0F000); + cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), + &dscr); + cortex_a8_exec_opcode(target, 0xE1A0F000, &dscr); } else { /* DCCRX to R0, "MCR p14, 0, R0, c0, c5, 0", 0xEE000E15 * then "MSR CPSR_cxsf, r0" or "MSR SPSR_cxsf, r0" (all fields) */ - cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0)); - cortex_a8_exec_opcode(target, ARMV4_5_MSR_GP(0, 0xF, Rd & 1)); + cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), + &dscr); + cortex_a8_exec_opcode(target, ARMV4_5_MSR_GP(0, 0xF, Rd & 1), + &dscr); /* "Prefetch flush" after modifying execution status in CPSR */ if (Rd == 16) cortex_a8_exec_opcode(target, - ARMV4_5_MCR(15, 0, 0, 7, 5, 4)); + ARMV4_5_MCR(15, 0, 0, 7, 5, 4), + &dscr); } return retval; @@ -354,6 +382,9 @@ static int cortex_a8_dap_write_memap_register_u32(struct target *target, uint32_ /* * Cortex-A8 implementation of Debug Programmer's Model * + * NOTE the invariant: these routines return with DSCR_INSTR_COMP set, + * so there's no need to poll for it before executing an instruction. + * * NOTE that in several of these cases the "stall" mode might be useful. * It'd let us queue a few operations together... prepare/finish might * be the places to enable/disable that mode. @@ -371,23 +402,30 @@ static int cortex_a8_write_dcc(struct cortex_a8_common *a8, uint32_t data) a8->armv7a_common.debug_base + CPUDBG_DTRRX, data); } -static int cortex_a8_read_dcc(struct cortex_a8_common *a8, uint32_t *data) +static int cortex_a8_read_dcc(struct cortex_a8_common *a8, uint32_t *data, + uint32_t *dscr_p) { struct swjdp_common *swjdp = &a8->armv7a_common.swjdp_info; - uint32_t dscr; + uint32_t dscr = 1 << DSCR_INSTR_COMP; int retval; + if (dscr_p) + dscr = *dscr_p; + /* Wait for DTRRXfull */ - do { + while ((dscr & (1 << DSCR_DTR_TX_FULL)) == 0) { retval = mem_ap_read_atomic_u32(swjdp, a8->armv7a_common.debug_base + CPUDBG_DSCR, &dscr); - } while ((dscr & (1 << DSCR_DTR_TX_FULL)) == 0); + } retval = mem_ap_read_atomic_u32(swjdp, a8->armv7a_common.debug_base + CPUDBG_DTRTX, data); LOG_DEBUG("read DCC 0x%08" PRIx32, *data); + if (dscr_p) + *dscr_p = dscr; + return retval; } @@ -398,9 +436,12 @@ static int cortex_a8_dpm_prepare(struct arm_dpm *dpm) uint32_t dscr; int retval; - retval = mem_ap_read_atomic_u32(swjdp, - a8->armv7a_common.debug_base + CPUDBG_DSCR, - &dscr); + /* set up invariant: INSTR_COMP is set after ever DPM operation */ + do { + retval = mem_ap_read_atomic_u32(swjdp, + a8->armv7a_common.debug_base + CPUDBG_DSCR, + &dscr); + } while ((dscr & (1 << DSCR_INSTR_COMP)) == 0); /* this "should never happen" ... */ if (dscr & (1 << DSCR_DTR_RX_FULL)) { @@ -408,7 +449,8 @@ static int cortex_a8_dpm_prepare(struct arm_dpm *dpm) /* Clear DCCRX */ retval = cortex_a8_exec_opcode( a8->armv7a_common.armv4_5_common.target, - ARMV4_5_MRC(14, 0, 0, 0, 5, 0)); + ARMV4_5_MRC(14, 0, 0, 0, 5, 0), + &dscr); } return retval; @@ -425,18 +467,21 @@ static int cortex_a8_instr_write_data_dcc(struct arm_dpm *dpm, { struct cortex_a8_common *a8 = dpm_to_a8(dpm); int retval; + uint32_t dscr = 1 << DSCR_INSTR_COMP; retval = cortex_a8_write_dcc(a8, data); return cortex_a8_exec_opcode( a8->armv7a_common.armv4_5_common.target, - opcode); + opcode, + &dscr); } static int cortex_a8_instr_write_data_r0(struct arm_dpm *dpm, uint32_t opcode, uint32_t data) { struct cortex_a8_common *a8 = dpm_to_a8(dpm); + uint32_t dscr = 1 << DSCR_INSTR_COMP; int retval; retval = cortex_a8_write_dcc(a8, data); @@ -444,12 +489,14 @@ static int cortex_a8_instr_write_data_r0(struct arm_dpm *dpm, /* DCCRX to R0, "MCR p14, 0, R0, c0, c5, 0", 0xEE000E15 */ retval = cortex_a8_exec_opcode( a8->armv7a_common.armv4_5_common.target, - ARMV4_5_MRC(14, 0, 0, 0, 5, 0)); + ARMV4_5_MRC(14, 0, 0, 0, 5, 0), + &dscr); /* then the opcode, taking data from R0 */ retval = cortex_a8_exec_opcode( a8->armv7a_common.armv4_5_common.target, - opcode); + opcode, + &dscr); return retval; } @@ -457,9 +504,12 @@ static int cortex_a8_instr_write_data_r0(struct arm_dpm *dpm, static int cortex_a8_instr_cpsr_sync(struct arm_dpm *dpm) { struct target *target = dpm->arm->target; + uint32_t dscr = 1 << DSCR_INSTR_COMP; /* "Prefetch flush" after modifying execution status in CPSR */ - return cortex_a8_exec_opcode(target, ARMV4_5_MCR(15, 0, 0, 7, 5, 4)); + return cortex_a8_exec_opcode(target, + ARMV4_5_MCR(15, 0, 0, 7, 5, 4), + &dscr); } static int cortex_a8_instr_read_data_dcc(struct arm_dpm *dpm, @@ -467,13 +517,15 @@ static int cortex_a8_instr_read_data_dcc(struct arm_dpm *dpm, { struct cortex_a8_common *a8 = dpm_to_a8(dpm); int retval; + uint32_t dscr = 1 << DSCR_INSTR_COMP; /* the opcode, writing data to DCC */ retval = cortex_a8_exec_opcode( a8->armv7a_common.armv4_5_common.target, - opcode); + opcode, + &dscr); - return cortex_a8_read_dcc(a8, data); + return cortex_a8_read_dcc(a8, data, &dscr); } @@ -481,23 +533,25 @@ static int cortex_a8_instr_read_data_r0(struct arm_dpm *dpm, uint32_t opcode, uint32_t *data) { struct cortex_a8_common *a8 = dpm_to_a8(dpm); + uint32_t dscr = 1 << DSCR_INSTR_COMP; int retval; /* the opcode, writing data to R0 */ retval = cortex_a8_exec_opcode( a8->armv7a_common.armv4_5_common.target, - opcode); + opcode, + &dscr); /* write R0 to DCC */ retval = cortex_a8_exec_opcode( a8->armv7a_common.armv4_5_common.target, - ARMV4_5_MCR(14, 0, 0, 0, 5, 0)); + ARMV4_5_MCR(14, 0, 0, 0, 5, 0), + &dscr); - return cortex_a8_read_dcc(a8, data); + return cortex_a8_read_dcc(a8, data, &dscr); } -// static -int cortex_a8_dpm_setup(struct cortex_a8_common *a8, uint32_t didr) +static int cortex_a8_dpm_setup(struct cortex_a8_common *a8, uint32_t didr) { struct arm_dpm *dpm = &a8->armv7a_common.dpm; @@ -806,12 +860,7 @@ static int cortex_a8_debug_entry(struct target *target) /* First load register acessible through core debug port*/ if (!regfile_working_area) { - /* FIXME we don't actually need all these registers; - * reading them slows us down. Just R0, PC, CPSR... - */ - for (i = 0; i <= 15; i++) - cortex_a8_dap_read_coreregister_u32(target, - ®file[i], i); + retval = arm_dpm_read_current_registers(&armv7a->dpm); } else { @@ -820,44 +869,41 @@ static int cortex_a8_debug_entry(struct target *target) regfile_working_area->address, regfile); dap_ap_select(swjdp, swjdp_memoryap); target_free_working_area(target, regfile_working_area); - } - /* read Current PSR */ - cortex_a8_dap_read_coreregister_u32(target, &cpsr, 16); - pc = regfile[15]; - dap_ap_select(swjdp, swjdp_debugap); - LOG_DEBUG("cpsr: %8.8" PRIx32, cpsr); + /* read Current PSR */ + cortex_a8_dap_read_coreregister_u32(target, &cpsr, 16); + pc = regfile[15]; + dap_ap_select(swjdp, swjdp_debugap); + LOG_DEBUG("cpsr: %8.8" PRIx32, cpsr); - arm_set_cpsr(armv4_5, cpsr); + arm_set_cpsr(armv4_5, cpsr); - /* update cache */ - for (i = 0; i <= ARM_PC; i++) - { - reg = arm_reg_current(armv4_5, i); + /* update cache */ + for (i = 0; i <= ARM_PC; i++) + { + reg = arm_reg_current(armv4_5, i); - buf_set_u32(reg->value, 0, 32, regfile[i]); - reg->valid = 1; - reg->dirty = 0; - } + buf_set_u32(reg->value, 0, 32, regfile[i]); + reg->valid = 1; + reg->dirty = 0; + } - /* Fixup PC Resume Address */ - if (cpsr & (1 << 5)) - { - // T bit set for Thumb or ThumbEE state - regfile[ARM_PC] -= 4; - } - else - { - // ARM state - regfile[ARM_PC] -= 8; - } + /* Fixup PC Resume Address */ + if (cpsr & (1 << 5)) + { + // T bit set for Thumb or ThumbEE state + regfile[ARM_PC] -= 4; + } + else + { + // ARM state + regfile[ARM_PC] -= 8; + } - reg = armv4_5->core_cache->reg_list + 15; - buf_set_u32(reg->value, 0, 32, regfile[ARM_PC]); - reg->dirty = reg->valid; - ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, 15) - .dirty = ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, - armv4_5->core_mode, 15).valid; + reg = armv4_5->core_cache->reg_list + 15; + buf_set_u32(reg->value, 0, 32, regfile[ARM_PC]); + reg->dirty = reg->valid; + } #if 0 /* TODO, Move this */ @@ -992,83 +1038,14 @@ static int cortex_a8_step(struct target *target, int current, uint32_t address, static int cortex_a8_restore_context(struct target *target) { - uint32_t value; struct armv7a_common *armv7a = target_to_armv7a(target); - struct reg_cache *cache = armv7a->armv4_5_common.core_cache; - unsigned max = cache->num_regs; - struct reg *r; - bool flushed, flush_cpsr = false; LOG_DEBUG(" "); if (armv7a->pre_restore_context) armv7a->pre_restore_context(target); - /* Flush all dirty registers from the cache, one mode at a time so - * that we write CPSR as little as possible. Save CPSR and R0 for - * last; they're used to change modes and write other registers. - * - * REVISIT be smarter: save eventual mode for last loop, don't - * need to write CPSR an extra time. - */ - do { - enum armv4_5_mode mode = ARMV4_5_MODE_ANY; - unsigned i; - - flushed = false; - - /* write dirty non-{R0,CPSR} registers sharing the same mode */ - for (i = max - 1, r = cache->reg_list + 1; i > 0; i--, r++) { - struct arm_reg *reg; - - if (!r->dirty || r == armv7a->armv4_5_common.cpsr) - continue; - reg = r->arch_info; - - /* TODO Check return values */ - - /* Pick a mode and update CPSR; else ignore this - * register if it's for a different mode than what - * we're handling on this pass. - * - * REVISIT don't distinguish SYS and USR modes. - * - * FIXME if we restore from FIQ mode, R8..R12 will - * get wrongly flushed onto FIQ shadows... - */ - if (mode == ARMV4_5_MODE_ANY) { - mode = reg->mode; - if (mode != ARMV4_5_MODE_ANY) { - cortex_a8_dap_write_coreregister_u32( - target, mode, 16); - flush_cpsr = true; - } - } else if (mode != reg->mode) - continue; - - /* Write this register */ - value = buf_get_u32(r->value, 0, 32); - cortex_a8_dap_write_coreregister_u32(target, value, - (reg->num == 16) ? 17 : reg->num); - r->dirty = false; - flushed = true; - } - - } while (flushed); - - /* now flush CPSR if needed ... */ - r = armv7a->armv4_5_common.cpsr; - if (flush_cpsr || r->dirty) { - value = buf_get_u32(r->value, 0, 32); - cortex_a8_dap_write_coreregister_u32(target, value, 16); - r->dirty = false; - } - - /* ... and R0 always (it was dirtied when we saved context) */ - r = cache->reg_list + 0; - value = buf_get_u32(r->value, 0, 32); - cortex_a8_dap_write_coreregister_u32(target, value, 0); - r->dirty = false; + arm_dpm_write_dirty_registers(&armv7a->dpm); if (armv7a->post_restore_context) armv7a->post_restore_context(target); @@ -1077,204 +1054,6 @@ static int cortex_a8_restore_context(struct target *target) } -#if 0 -/* - * Cortex-A8 Core register functions - */ -static int cortex_a8_load_core_reg_u32(struct target *target, int num, - armv4_5_mode_t mode, uint32_t * value) -{ - int retval; - struct arm *armv4_5 = target_to_armv4_5(target); - - if ((num <= ARM_CPSR)) - { - /* read a normal core register */ - retval = cortex_a8_dap_read_coreregister_u32(target, value, num); - - if (retval != ERROR_OK) - { - LOG_ERROR("JTAG failure %i", retval); - return ERROR_JTAG_DEVICE_ERROR; - } - LOG_DEBUG("load from core reg %i value 0x%" PRIx32, num, *value); - } - else - { - return ERROR_INVALID_ARGUMENTS; - } - - /* Register other than r0 - r14 uses r0 for access */ - if (num > 14) - ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, - armv4_5->core_mode, 0).dirty = - ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, - armv4_5->core_mode, 0).valid; - ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, - armv4_5->core_mode, 15).dirty = - ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, - armv4_5->core_mode, 15).valid; - - return ERROR_OK; -} - -static int cortex_a8_store_core_reg_u32(struct target *target, int num, - armv4_5_mode_t mode, uint32_t value) -{ - int retval; -// uint32_t reg; - struct arm *armv4_5 = target_to_armv4_5(target); - -#ifdef ARMV7_GDB_HACKS - /* If the LR register is being modified, make sure it will put us - * in "thumb" mode, or an INVSTATE exception will occur. This is a - * hack to deal with the fact that gdb will sometimes "forge" - * return addresses, and doesn't set the LSB correctly (i.e., when - * printing expressions containing function calls, it sets LR=0.) */ - - if (num == 14) - value |= 0x01; -#endif - - if ((num <= ARM_CPSR)) - { - retval = cortex_a8_dap_write_coreregister_u32(target, value, num); - if (retval != ERROR_OK) - { - LOG_ERROR("JTAG failure %i", retval); - ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, - armv4_5->core_mode, num).dirty = - ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, - armv4_5->core_mode, num).valid; - return ERROR_JTAG_DEVICE_ERROR; - } - LOG_DEBUG("write core reg %i value 0x%" PRIx32, num, value); - } - else - { - return ERROR_INVALID_ARGUMENTS; - } - - return ERROR_OK; -} -#endif - - -static int cortex_a8_write_core_reg(struct target *target, struct reg *r, - int num, enum armv4_5_mode mode, uint32_t value); - -static int cortex_a8_read_core_reg(struct target *target, struct reg *r, - int num, enum armv4_5_mode mode) -{ - uint32_t value; - int retval; - struct arm *armv4_5 = target_to_armv4_5(target); - struct reg *cpsr_r = NULL; - uint32_t cpsr = 0; - unsigned cookie = num; - - /* avoid some needless mode changes - * FIXME move some of these to shared ARM code... - */ - if (mode != armv4_5->core_mode) { - if ((armv4_5->core_mode == ARMV4_5_MODE_SYS) - && (mode == ARMV4_5_MODE_USR)) - mode = ARMV4_5_MODE_ANY; - else if ((mode != ARMV4_5_MODE_FIQ) && (num <= 12)) - mode = ARMV4_5_MODE_ANY; - - if (mode != ARMV4_5_MODE_ANY) { - cpsr_r = armv4_5->cpsr; - cpsr = buf_get_u32(cpsr_r->value, 0, 32); - cortex_a8_write_core_reg(target, cpsr_r, - 16, ARMV4_5_MODE_ANY, mode); - } - } - - if (num == 16) { - switch (mode) { - case ARMV4_5_MODE_USR: - case ARMV4_5_MODE_SYS: - case ARMV4_5_MODE_ANY: - /* CPSR */ - break; - default: - /* SPSR */ - cookie++; - break; - } - } - - cortex_a8_dap_read_coreregister_u32(target, &value, cookie); - retval = jtag_execute_queue(); - if (retval == ERROR_OK) { - r->valid = 1; - r->dirty = 0; - buf_set_u32(r->value, 0, 32, value); - } - - if (cpsr_r) - cortex_a8_write_core_reg(target, cpsr_r, - 16, ARMV4_5_MODE_ANY, cpsr); - return retval; -} - -static int cortex_a8_write_core_reg(struct target *target, struct reg *r, - int num, enum armv4_5_mode mode, uint32_t value) -{ - int retval; - struct arm *armv4_5 = target_to_armv4_5(target); - struct reg *cpsr_r = NULL; - uint32_t cpsr = 0; - unsigned cookie = num; - - /* avoid some needless mode changes - * FIXME move some of these to shared ARM code... - */ - if (mode != armv4_5->core_mode) { - if ((armv4_5->core_mode == ARMV4_5_MODE_SYS) - && (mode == ARMV4_5_MODE_USR)) - mode = ARMV4_5_MODE_ANY; - else if ((mode != ARMV4_5_MODE_FIQ) && (num <= 12)) - mode = ARMV4_5_MODE_ANY; - - if (mode != ARMV4_5_MODE_ANY) { - cpsr_r = armv4_5->cpsr; - cpsr = buf_get_u32(cpsr_r->value, 0, 32); - cortex_a8_write_core_reg(target, cpsr_r, - 16, ARMV4_5_MODE_ANY, mode); - } - } - - - if (num == 16) { - switch (mode) { - case ARMV4_5_MODE_USR: - case ARMV4_5_MODE_SYS: - case ARMV4_5_MODE_ANY: - /* CPSR */ - break; - default: - /* SPSR */ - cookie++; - break; - } - } - - cortex_a8_dap_write_coreregister_u32(target, value, cookie); - if ((retval = jtag_execute_queue()) == ERROR_OK) { - buf_set_u32(r->value, 0, 32, value); - r->valid = 1; - r->dirty = 0; - } - - if (cpsr_r) - cortex_a8_write_core_reg(target, cpsr_r, - 16, ARMV4_5_MODE_ANY, cpsr); - return retval; -} - - /* * Cortex-A8 Breakpoint and watchpoint fuctions */ @@ -1696,6 +1475,8 @@ static int cortex_a8_examine_first(struct target *target) LOG_DEBUG("ttypr = 0x%08" PRIx32, ttypr); LOG_DEBUG("didr = 0x%08" PRIx32, didr); + cortex_a8_dpm_setup(cortex_a8, didr); + /* Setup Breakpoint Register Pairs */ cortex_a8->brp_num = ((didr >> 24) & 0x0F) + 1; cortex_a8->brp_num_context = ((didr >> 20) & 0x0F) + 1; @@ -1752,21 +1533,10 @@ static int cortex_a8_examine(struct target *target) * Cortex-A8 target creation and initialization */ -static void cortex_a8_build_reg_cache(struct target *target) -{ - struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache); - struct arm *armv4_5 = target_to_armv4_5(target); - - armv4_5->core_type = ARM_MODE_MON; - - (*cache_p) = armv4_5_build_reg_cache(target, armv4_5); -} - - static int cortex_a8_init_target(struct command_context *cmd_ctx, struct target *target) { - cortex_a8_build_reg_cache(target); + /* examine_first() does a bunch of this */ return ERROR_OK; } @@ -1818,9 +1588,6 @@ static int cortex_a8_init_arch_info(struct target *target, // arm7_9->handle_target_request = cortex_a8_handle_target_request; - armv4_5->read_core_reg = cortex_a8_read_core_reg; - armv4_5->write_core_reg = cortex_a8_write_core_reg; - /* REVISIT v7a setup should be in a v7a-specific routine */ armv4_5_init_arch_info(target, armv4_5); armv7a->common_magic = ARMV7_COMMON_MAGIC; @@ -1858,28 +1625,36 @@ COMMAND_HANDLER(cortex_a8_handle_dbginit_command) return ERROR_OK; } +static const struct command_registration cortex_a8_exec_command_handlers[] = { + { + .name = "cache_info", + .handler = &cortex_a8_handle_cache_info_command, + .mode = COMMAND_EXEC, + .help = "display information about target caches", + }, + { + .name = "dbginit", + .handler = &cortex_a8_handle_dbginit_command, + .mode = COMMAND_EXEC, + .help = "Initialize core debug", + }, + COMMAND_REGISTRATION_DONE +}; +static const struct command_registration cortex_a8_command_handlers[] = { + { + .name = "cortex_a8", + .mode = COMMAND_ANY, + .help = "Cortex-A8 command group", + .chain = cortex_a8_exec_command_handlers, + }, + COMMAND_REGISTRATION_DONE +}; static int cortex_a8_register_commands(struct command_context *cmd_ctx) { - struct command *cortex_a8_cmd; - int retval = ERROR_OK; - armv4_5_register_commands(cmd_ctx); armv7a_register_commands(cmd_ctx); - - cortex_a8_cmd = register_command(cmd_ctx, NULL, "cortex_a8", - NULL, COMMAND_ANY, - "cortex_a8 specific commands"); - - register_command(cmd_ctx, cortex_a8_cmd, "cache_info", - cortex_a8_handle_cache_info_command, COMMAND_EXEC, - "display information about target caches"); - - register_command(cmd_ctx, cortex_a8_cmd, "dbginit", - cortex_a8_handle_dbginit_command, COMMAND_EXEC, - "Initialize core debug"); - - return retval; + return register_commands(cmd_ctx, NULL, cortex_a8_command_handlers); } struct target_type cortexa8_target = {