Cortex-A8: mode support
[openocd.git] / src / target / cortex_a8.c
index 025eb45f8f42ce11c1323418a543d14b270c9fa4..01b7aee808b931d8482fe958a1e4a4b0f8877c5b 100644 (file)
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "cortex_a8.h"
+#include "register.h"
 #include "target_request.h"
 #include "target_type.h"
 
+static int cortex_a8_poll(struct target *target);
+static int cortex_a8_debug_entry(struct target *target);
+static int cortex_a8_restore_context(struct target *target);
+static int cortex_a8_set_breakpoint(struct target *target,
+               struct breakpoint *breakpoint, uint8_t matchmode);
+static int cortex_a8_unset_breakpoint(struct target *target,
+               struct breakpoint *breakpoint);
+static int cortex_a8_dap_read_coreregister_u32(struct target *target,
+               uint32_t *value, int regnum);
+static int cortex_a8_dap_write_coreregister_u32(struct target *target,
+               uint32_t value, int regnum);
+/*
+ * FIXME do topology discovery using the ROM; don't
+ * assume this is an OMAP3.
+ */
+#define swjdp_memoryap 0
+#define swjdp_debugap 1
+#define OMAP3530_DEBUG_BASE 0x54011000
 
-/* cli handling */
-int cortex_a8_register_commands(struct command_context_s *cmd_ctx);
+/*
+ * Cortex-A8 Basic debug access, very low level assumes state is saved
+ */
+static int cortex_a8_init_debug_access(struct target *target)
+{
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
+       int retval;
+       uint32_t dummy;
+
+       LOG_DEBUG(" ");
+
+       /* Unlocking the debug registers for modification */
+       /* The debugport might be uninitialised so try twice */
+       retval = mem_ap_write_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_LOCKACCESS, 0xC5ACCE55);
+       if (retval != ERROR_OK)
+               mem_ap_write_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_LOCKACCESS, 0xC5ACCE55);
+       /* Clear Sticky Power Down status Bit in PRSR to enable access to
+          the registers in the Core Power Domain */
+       retval = mem_ap_read_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_PRSR, &dummy);
+       /* Enabling of instruction execution in debug mode is done in debug_entry code */
+
+       /* Resync breakpoint registers */
+
+       /* Since this is likley called from init or reset, update targtet state information*/
+       cortex_a8_poll(target);
+
+       return retval;
+}
+
+int cortex_a8_exec_opcode(struct target *target, uint32_t opcode)
+{
+       uint32_t dscr;
+       int retval;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
+       LOG_DEBUG("exec opcode 0x%08" PRIx32, opcode);
+       do
+       {
+               retval = mem_ap_read_atomic_u32(swjdp,
+                               armv7a->debug_base + CPUDBG_DSCR, &dscr);
+               if (retval != ERROR_OK)
+               {
+                       LOG_ERROR("Could not read DSCR register, opcode = 0x%08" PRIx32, 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);
+
+       do
+       {
+               retval = mem_ap_read_atomic_u32(swjdp,
+                               armv7a->debug_base + CPUDBG_DSCR, &dscr);
+               if (retval != ERROR_OK)
+               {
+                       LOG_ERROR("Could not read DSCR register");
+                       return retval;
+               }
+       }
+       while ((dscr & (1 << DSCR_INSTR_COMP)) == 0); /* Wait for InstrCompl bit to be set */
+
+       return retval;
+}
+
+/**************************************************************************
+Read core register with very few exec_opcode, fast but needs work_area.
+This can cause problems with MMU active.
+**************************************************************************/
+static int cortex_a8_read_regs_through_mem(struct target *target, uint32_t address,
+               uint32_t * regfile)
+{
+       int retval = ERROR_OK;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
+       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));
+       dap_ap_select(swjdp, swjdp_memoryap);
+       mem_ap_read_buf_u32(swjdp, (uint8_t *)(&regfile[1]), 4*15, address);
+       dap_ap_select(swjdp, swjdp_debugap);
+
+       return retval;
+}
+
+static int cortex_a8_read_cp(struct target *target, uint32_t *value, uint8_t CP,
+               uint8_t op1, uint8_t CRn, uint8_t CRm, uint8_t op2)
+{
+       int retval;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
+       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));
+
+       /* Read DCCTX */
+       retval = mem_ap_read_atomic_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_DTRTX, value);
+
+       return retval;
+}
+
+static int cortex_a8_write_cp(struct target *target, uint32_t value,
+       uint8_t CP, uint8_t op1, uint8_t CRn, uint8_t CRm, uint8_t op2)
+{
+       int retval;
+       uint32_t dscr;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
+       LOG_DEBUG("CP%i, CRn %i, value 0x%08" PRIx32, CP, CRn, value);
+
+       /* Check that DCCRX is not full */
+       retval = mem_ap_read_atomic_u32(swjdp,
+                               armv7a->debug_base + CPUDBG_DSCR, &dscr);
+       if (dscr & (1 << DSCR_DTR_RX_FULL))
+       {
+               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));
+       }
+
+       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_MCR(CP, op1, 0, CRn, CRm, op2));
+       return retval;
+}
+
+static int cortex_a8_read_cp15(struct target *target, uint32_t op1, uint32_t op2,
+               uint32_t CRn, uint32_t CRm, uint32_t *value)
+{
+       return cortex_a8_read_cp(target, value, 15, op1, CRn, CRm, op2);
+}
+
+static int cortex_a8_write_cp15(struct target *target, uint32_t op1, uint32_t op2,
+               uint32_t CRn, uint32_t CRm, uint32_t value)
+{
+       return cortex_a8_write_cp(target, value, 15, op1, CRn, CRm, op2);
+}
+
+static int cortex_a8_mrc(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value)
+{
+       if (cpnum!=15)
+       {
+               LOG_ERROR("Only cp15 is supported");
+               return ERROR_FAIL;
+       }
+       return cortex_a8_read_cp15(target, op1, op2, CRn, CRm, value);
+}
+
+static int cortex_a8_mcr(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value)
+{
+       if (cpnum!=15)
+       {
+               LOG_ERROR("Only cp15 is supported");
+               return ERROR_FAIL;
+       }
+       return cortex_a8_write_cp15(target, op1, op2, CRn, CRm, value);
+}
+
+
+
+static int cortex_a8_dap_read_coreregister_u32(struct target *target,
+               uint32_t *value, int regnum)
+{
+       int retval = ERROR_OK;
+       uint8_t reg = regnum&0xFF;
+       uint32_t dscr;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
+       if (reg > 17)
+               return retval;
+
+       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));
+       }
+       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));
+       }
+       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));
+       }
+
+       /* Read DTRRTX */
+       do
+       {
+               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);
+       LOG_DEBUG("read DCC 0x%08" PRIx32, *value);
+
+       return retval;
+}
+
+static int cortex_a8_dap_write_coreregister_u32(struct target *target,
+               uint32_t value, int regnum)
+{
+       int retval = ERROR_OK;
+       uint8_t Rd = regnum&0xFF;
+       uint32_t dscr;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
+       LOG_DEBUG("register %i, value 0x%08" PRIx32, regnum, value);
+
+       /* Check that DCCRX is not full */
+       retval = mem_ap_read_atomic_u32(swjdp,
+                               armv7a->debug_base + CPUDBG_DSCR, &dscr);
+       if (dscr & (1 << DSCR_DTR_RX_FULL))
+       {
+               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));
+       }
+
+       if (Rd > 17)
+               return retval;
+
+       /* Write to DCCRX */
+       LOG_DEBUG("write DCC 0x%08" PRIx32, value);
+       retval = mem_ap_write_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_DTRRX, value);
+
+       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));
+       }
+       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);
+       }
+       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));
+
+               /* "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));
+       }
+
+       return retval;
+}
+
+/* Write to memory mapped registers directly with no cache or mmu handling */
+static int cortex_a8_dap_write_memap_register_u32(struct target *target, uint32_t address, uint32_t value)
+{
+       int retval;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
+       retval = mem_ap_write_atomic_u32(swjdp, address, value);
+
+       return retval;
+}
+
+/*
+ * Cortex-A8 Run control
+ */
+
+static int cortex_a8_poll(struct target *target)
+{
+       int retval = ERROR_OK;
+       uint32_t dscr;
+       struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
+       struct armv7a_common *armv7a = &cortex_a8->armv7a_common;
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+       enum target_state prev_target_state = target->state;
+       uint8_t saved_apsel = dap_ap_get_select(swjdp);
+
+       dap_ap_select(swjdp, swjdp_debugap);
+       retval = mem_ap_read_atomic_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_DSCR, &dscr);
+       if (retval != ERROR_OK)
+       {
+               dap_ap_select(swjdp, saved_apsel);
+               return retval;
+       }
+       cortex_a8->cpudbg_dscr = dscr;
+
+       if ((dscr & 0x3) == 0x3)
+       {
+               if (prev_target_state != TARGET_HALTED)
+               {
+                       /* We have a halting debug event */
+                       LOG_DEBUG("Target halted");
+                       target->state = TARGET_HALTED;
+                       if ((prev_target_state == TARGET_RUNNING)
+                                       || (prev_target_state == TARGET_RESET))
+                       {
+                               retval = cortex_a8_debug_entry(target);
+                               if (retval != ERROR_OK)
+                                       return retval;
+
+                               target_call_event_callbacks(target,
+                                               TARGET_EVENT_HALTED);
+                       }
+                       if (prev_target_state == TARGET_DEBUG_RUNNING)
+                       {
+                               LOG_DEBUG(" ");
+
+                               retval = cortex_a8_debug_entry(target);
+                               if (retval != ERROR_OK)
+                                       return retval;
+
+                               target_call_event_callbacks(target,
+                                               TARGET_EVENT_DEBUG_HALTED);
+                       }
+               }
+       }
+       else if ((dscr & 0x3) == 0x2)
+       {
+               target->state = TARGET_RUNNING;
+       }
+       else
+       {
+               LOG_DEBUG("Unknown target state dscr = 0x%08" PRIx32, dscr);
+               target->state = TARGET_UNKNOWN;
+       }
+
+       dap_ap_select(swjdp, saved_apsel);
+
+       return retval;
+}
+
+static int cortex_a8_halt(struct target *target)
+{
+       int retval = ERROR_OK;
+       uint32_t dscr;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+       uint8_t saved_apsel = dap_ap_get_select(swjdp);
+       dap_ap_select(swjdp, swjdp_debugap);
+
+       /*
+        * Tell the core to be halted by writing DRCR with 0x1
+        * and then wait for the core to be halted.
+        */
+       retval = mem_ap_write_atomic_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_DRCR, 0x1);
+
+       /*
+        * enter halting debug mode
+        */
+       mem_ap_read_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_DSCR, &dscr);
+       retval = mem_ap_write_atomic_u32(swjdp,
+               armv7a->debug_base + CPUDBG_DSCR, dscr | (1 << DSCR_HALT_DBG_MODE));
+
+       if (retval != ERROR_OK)
+               goto out;
+
+       do {
+               mem_ap_read_atomic_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_DSCR, &dscr);
+       } while ((dscr & (1 << DSCR_CORE_HALTED)) == 0);
+
+       target->debug_reason = DBG_REASON_DBGRQ;
+
+out:
+       dap_ap_select(swjdp, saved_apsel);
+       return retval;
+}
+
+static int cortex_a8_resume(struct target *target, int current,
+               uint32_t address, int handle_breakpoints, int debug_execution)
+{
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common;
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
+//     struct breakpoint *breakpoint = NULL;
+       uint32_t resume_pc, dscr;
+
+       uint8_t saved_apsel = dap_ap_get_select(swjdp);
+       dap_ap_select(swjdp, swjdp_debugap);
+
+       if (!debug_execution)
+       {
+               target_free_all_working_areas(target);
+//             cortex_m3_enable_breakpoints(target);
+//             cortex_m3_enable_watchpoints(target);
+       }
+
+#if 0
+       if (debug_execution)
+       {
+               /* Disable interrupts */
+               /* We disable interrupts in the PRIMASK register instead of
+                * masking with C_MASKINTS,
+                * This is probably the same issue as Cortex-M3 Errata 377493:
+                * C_MASKINTS in parallel with disabled interrupts can cause
+                * local faults to not be taken. */
+               buf_set_u32(armv7m->core_cache->reg_list[ARMV7M_PRIMASK].value, 0, 32, 1);
+               armv7m->core_cache->reg_list[ARMV7M_PRIMASK].dirty = 1;
+               armv7m->core_cache->reg_list[ARMV7M_PRIMASK].valid = 1;
+
+               /* Make sure we are in Thumb mode */
+               buf_set_u32(armv7m->core_cache->reg_list[ARMV7M_xPSR].value, 0, 32,
+                       buf_get_u32(armv7m->core_cache->reg_list[ARMV7M_xPSR].value, 0, 32) | (1 << 24));
+               armv7m->core_cache->reg_list[ARMV7M_xPSR].dirty = 1;
+               armv7m->core_cache->reg_list[ARMV7M_xPSR].valid = 1;
+       }
+#endif
+
+       /* current = 1: continue on current pc, otherwise continue at <address> */
+       resume_pc = buf_get_u32(
+                       ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+                               armv4_5->core_mode, 15).value,
+                       0, 32);
+       if (!current)
+               resume_pc = address;
+
+       /* Make sure that the Armv7 gdb thumb fixups does not
+        * kill the return address
+        */
+       switch (armv4_5->core_state)
+       {
+       case ARMV4_5_STATE_ARM:
+               resume_pc &= 0xFFFFFFFC;
+               break;
+       case ARMV4_5_STATE_THUMB:
+       case ARM_STATE_THUMB_EE:
+               /* When the return address is loaded into PC
+                * bit 0 must be 1 to stay in Thumb state
+                */
+               resume_pc |= 0x1;
+               break;
+       case ARMV4_5_STATE_JAZELLE:
+               LOG_ERROR("How do I resume into Jazelle state??");
+               return ERROR_FAIL;
+       }
+       LOG_DEBUG("resume pc = 0x%08" PRIx32, resume_pc);
+       buf_set_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+                               armv4_5->core_mode, 15).value,
+                       0, 32, resume_pc);
+       ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+                       armv4_5->core_mode, 15).dirty = 1;
+       ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+                       armv4_5->core_mode, 15).valid = 1;
+
+       cortex_a8_restore_context(target);
+//     arm7_9_restore_context(target); TODO Context is currently NOT Properly restored
+#if 0
+       /* the front-end may request us not to handle breakpoints */
+       if (handle_breakpoints)
+       {
+               /* Single step past breakpoint at current address */
+               if ((breakpoint = breakpoint_find(target, resume_pc)))
+               {
+                       LOG_DEBUG("unset breakpoint at 0x%8.8x", breakpoint->address);
+                       cortex_m3_unset_breakpoint(target, breakpoint);
+                       cortex_m3_single_step_core(target);
+                       cortex_m3_set_breakpoint(target, breakpoint);
+               }
+       }
+
+#endif
+       /* Restart core and wait for it to be started */
+       mem_ap_write_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_DRCR, 0x2);
+
+       do {
+               mem_ap_read_atomic_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_DSCR, &dscr);
+       } while ((dscr & (1 << DSCR_CORE_RESTARTED)) == 0);
+
+       target->debug_reason = DBG_REASON_NOTHALTED;
+       target->state = TARGET_RUNNING;
+
+       /* registers are now invalid */
+       register_cache_invalidate(armv4_5->core_cache);
+
+       if (!debug_execution)
+       {
+               target->state = TARGET_RUNNING;
+               target_call_event_callbacks(target, TARGET_EVENT_RESUMED);
+               LOG_DEBUG("target resumed at 0x%" PRIx32, resume_pc);
+       }
+       else
+       {
+               target->state = TARGET_DEBUG_RUNNING;
+               target_call_event_callbacks(target, TARGET_EVENT_DEBUG_RESUMED);
+               LOG_DEBUG("target debug resumed at 0x%" PRIx32, resume_pc);
+       }
+
+       dap_ap_select(swjdp, saved_apsel);
+
+       return ERROR_OK;
+}
+
+static int cortex_a8_debug_entry(struct target *target)
+{
+       int i;
+       uint32_t regfile[16], pc, cpsr, dscr;
+       int retval = ERROR_OK;
+       struct working_area *regfile_working_area = NULL;
+       struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common;
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+       struct reg *reg;
+
+       LOG_DEBUG("dscr = 0x%08" PRIx32, cortex_a8->cpudbg_dscr);
+
+       /* Enable the ITR execution once we are in debug mode */
+       mem_ap_read_atomic_u32(swjdp,
+                               armv7a->debug_base + CPUDBG_DSCR, &dscr);
+       dscr |= (1 << DSCR_EXT_INT_EN);
+       retval = mem_ap_write_atomic_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_DSCR, dscr);
+
+       /* Examine debug reason */
+       switch ((cortex_a8->cpudbg_dscr >> 2)&0xF)
+       {
+               case 0:
+               case 4:
+                       target->debug_reason = DBG_REASON_DBGRQ;
+                       break;
+               case 1:
+               case 3:
+                       target->debug_reason = DBG_REASON_BREAKPOINT;
+                       break;
+               case 10:
+                       target->debug_reason = DBG_REASON_WATCHPOINT;
+                       break;
+               default:
+                       target->debug_reason = DBG_REASON_UNDEFINED;
+                       break;
+       }
+
+       /* Examine target state and mode */
+       if (cortex_a8->fast_reg_read)
+               target_alloc_working_area(target, 64, &regfile_working_area);
+
+       /* 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,
+                                       &regfile[i], i);
+       }
+       else
+       {
+               dap_ap_select(swjdp, swjdp_memoryap);
+               cortex_a8_read_regs_through_mem(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);
+
+       armv4_5->core_mode = cpsr & 0x1F;
+
+       i = (cpsr >> 5) & 1;    /* T */
+       i |= (cpsr >> 23) & 1;  /* J << 1 */
+       switch (i) {
+       case 0: /* J = 0, T = 0 */
+               armv4_5->core_state = ARMV4_5_STATE_ARM;
+               break;
+       case 1: /* J = 0, T = 1 */
+               armv4_5->core_state = ARMV4_5_STATE_THUMB;
+               break;
+       case 2: /* J = 1, T = 0 */
+               LOG_WARNING("Jazelle state -- not handled");
+               armv4_5->core_state = ARMV4_5_STATE_JAZELLE;
+               break;
+       case 3: /* J = 1, T = 1 */
+               /* ThumbEE is very much like Thumb, but some of the
+                * instructions are different.  Single stepping and
+                * breakpoints need updating...
+                */
+               LOG_WARNING("ThumbEE -- incomplete support");
+               armv4_5->core_state = ARM_STATE_THUMB_EE;
+               break;
+       }
+
+       /* update cache */
+       reg = armv4_5->core_cache->reg_list + ARMV4_5_CPSR;
+       buf_set_u32(reg->value, 0, 32, cpsr);
+       reg->valid = 1;
+       reg->dirty = 0;
+
+       for (i = 0; i <= ARM_PC; i++)
+       {
+               reg = &ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+                                       armv4_5->core_mode, i);
+
+               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;
+       }
+       buf_set_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+                               armv4_5->core_mode, ARM_PC).value,
+                       0, 32, regfile[ARM_PC]);
+
+       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;
+
+#if 0
+/* TODO, Move this */
+       uint32_t cp15_control_register, cp15_cacr, cp15_nacr;
+       cortex_a8_read_cp(target, &cp15_control_register, 15, 0, 1, 0, 0);
+       LOG_DEBUG("cp15_control_register = 0x%08x", cp15_control_register);
+
+       cortex_a8_read_cp(target, &cp15_cacr, 15, 0, 1, 0, 2);
+       LOG_DEBUG("cp15 Coprocessor Access Control Register = 0x%08x", cp15_cacr);
+
+       cortex_a8_read_cp(target, &cp15_nacr, 15, 0, 1, 1, 2);
+       LOG_DEBUG("cp15 Nonsecure Access Control Register = 0x%08x", cp15_nacr);
+#endif
+
+       /* Are we in an exception handler */
+//     armv4_5->exception_number = 0;
+       if (armv7a->post_debug_entry)
+               armv7a->post_debug_entry(target);
+
+
+
+       return retval;
+
+}
+
+static void cortex_a8_post_debug_entry(struct target *target)
+{
+       struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
+       struct armv7a_common *armv7a = &cortex_a8->armv7a_common;
+
+//     cortex_a8_read_cp(target, &cp15_control_register, 15, 0, 1, 0, 0);
+       /* examine cp15 control reg */
+       armv7a->read_cp15(target, 0, 0, 1, 0, &cortex_a8->cp15_control_reg);
+       jtag_execute_queue();
+       LOG_DEBUG("cp15_control_reg: %8.8" PRIx32, cortex_a8->cp15_control_reg);
+
+       if (armv7a->armv4_5_mmu.armv4_5_cache.ctype == -1)
+       {
+               uint32_t cache_type_reg;
+               /* identify caches */
+               armv7a->read_cp15(target, 0, 1, 0, 0, &cache_type_reg);
+               jtag_execute_queue();
+               /* FIXME the armv4_4 cache info DOES NOT APPLY to Cortex-A8 */
+               armv4_5_identify_cache(cache_type_reg,
+                               &armv7a->armv4_5_mmu.armv4_5_cache);
+       }
+
+       armv7a->armv4_5_mmu.mmu_enabled =
+                       (cortex_a8->cp15_control_reg & 0x1U) ? 1 : 0;
+       armv7a->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled =
+                       (cortex_a8->cp15_control_reg & 0x4U) ? 1 : 0;
+       armv7a->armv4_5_mmu.armv4_5_cache.i_cache_enabled =
+                       (cortex_a8->cp15_control_reg & 0x1000U) ? 1 : 0;
+
+
+}
+
+static int cortex_a8_step(struct target *target, int current, uint32_t address,
+               int handle_breakpoints)
+{
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common;
+       struct breakpoint *breakpoint = NULL;
+       struct breakpoint stepbreakpoint;
+
+       int timeout = 100;
+
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_WARNING("target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+
+       /* current = 1: continue on current pc, otherwise continue at <address> */
+       if (!current)
+       {
+               buf_set_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+                                       armv4_5->core_mode, ARM_PC).value,
+                               0, 32, address);
+       }
+       else
+       {
+               address = buf_get_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+                                       armv4_5->core_mode, ARM_PC).value,
+                               0, 32);
+       }
+
+       /* The front-end may request us not to handle breakpoints.
+        * But since Cortex-A8 uses breakpoint for single step,
+        * we MUST handle breakpoints.
+        */
+       handle_breakpoints = 1;
+       if (handle_breakpoints) {
+               breakpoint = breakpoint_find(target,
+                               buf_get_u32(ARMV4_5_CORE_REG_MODE(
+                                       armv4_5->core_cache,
+                                       armv4_5->core_mode, 15).value,
+                       0, 32));
+               if (breakpoint)
+                       cortex_a8_unset_breakpoint(target, breakpoint);
+       }
+
+       /* Setup single step breakpoint */
+       stepbreakpoint.address = address;
+       stepbreakpoint.length = (armv4_5->core_state == ARMV4_5_STATE_THUMB)
+                       ? 2 : 4;
+       stepbreakpoint.type = BKPT_HARD;
+       stepbreakpoint.set = 0;
+
+       /* Break on IVA mismatch */
+       cortex_a8_set_breakpoint(target, &stepbreakpoint, 0x04);
+
+       target->debug_reason = DBG_REASON_SINGLESTEP;
+
+       cortex_a8_resume(target, 1, address, 0, 0);
+
+       while (target->state != TARGET_HALTED)
+       {
+               cortex_a8_poll(target);
+               if (--timeout == 0)
+               {
+                       LOG_WARNING("timeout waiting for target halt");
+                       break;
+               }
+       }
+
+       cortex_a8_unset_breakpoint(target, &stepbreakpoint);
+       if (timeout > 0) target->debug_reason = DBG_REASON_BREAKPOINT;
+
+       if (breakpoint)
+               cortex_a8_set_breakpoint(target, breakpoint, 0);
+
+       if (target->state != TARGET_HALTED)
+               LOG_DEBUG("target stepped");
+
+       return ERROR_OK;
+}
+
+static int cortex_a8_restore_context(struct target *target)
+{
+       int i;
+       uint32_t value;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common;
+
+       LOG_DEBUG(" ");
+
+       if (armv7a->pre_restore_context)
+               armv7a->pre_restore_context(target);
+
+       for (i = 15; i >= 0; i--)
+       {
+               if (ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+                                       armv4_5->core_mode, i).dirty)
+               {
+                       value = buf_get_u32(ARMV4_5_CORE_REG_MODE(
+                                               armv4_5->core_cache,
+                                               armv4_5->core_mode, i).value,
+                                       0, 32);
+                       /* TODO Check return values */
+                       cortex_a8_dap_write_coreregister_u32(target, value, i);
+               }
+       }
+
+       if (armv7a->post_restore_context)
+               armv7a->post_restore_context(target);
+
+       return ERROR_OK;
+}
+
+
+#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 armv4_5_common_s *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 armv4_5_common_s *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
 
-/* forward declarations */
-int cortex_a8_target_create(struct target_s *target, Jim_Interp *interp);
 
-target_type_t cortexa8_target =
+static int cortex_a8_write_core_reg(struct target *target, int num,
+               enum armv4_5_mode mode, uint32_t value);
+
+static int cortex_a8_read_core_reg(struct target *target, int num,
+               enum armv4_5_mode mode)
 {
-       .name = "cortex_a8",
+       uint32_t value;
+       int retval;
+       struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
+       struct reg_cache *cache = armv4_5->core_cache;
+       uint32_t cpsr = 0;
+       unsigned cookie = num;
 
-       .poll = NULL,
-       .arch_state = armv7m_arch_state,
+       /* 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;
 
-       .target_request_data = NULL,
+               if (mode != ARMV4_5_MODE_ANY) {
+                       cpsr = buf_get_u32(cache ->reg_list[ARMV4_5_CPSR]
+                                       .value, 0, 32);
+                       cortex_a8_write_core_reg(target, 16,
+                                       ARMV4_5_MODE_ANY, mode);
+               }
+       }
 
-       .halt = NULL,
-       .resume = NULL,
-       .step = NULL,
+       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;
+               }
+       }
 
-       .assert_reset = NULL,
-       .deassert_reset = NULL,
-       .soft_reset_halt = NULL,
+       cortex_a8_dap_read_coreregister_u32(target, &value, cookie);
+       retval = jtag_execute_queue();
+       if (retval == ERROR_OK) {
+               struct reg *r = &ARMV4_5_CORE_REG_MODE(cache, mode, num);
 
-       .get_gdb_reg_list = armv7m_get_gdb_reg_list,
+               r->valid = 1;
+               r->dirty = 0;
+               buf_set_u32(r->value, 0, 32, value);
+       }
 
-       .read_memory = cortex_a8_read_memory,
-       .write_memory = cortex_a8_write_memory,
-       .bulk_write_memory = NULL,
-       .checksum_memory = NULL,
-       .blank_check_memory = NULL,
+       if (cpsr)
+               cortex_a8_write_core_reg(target, 16, ARMV4_5_MODE_ANY, cpsr);
+       return retval;
+}
 
-       .run_algorithm = armv7m_run_algorithm,
+static int cortex_a8_write_core_reg(struct target *target, int num,
+               enum armv4_5_mode mode, uint32_t value)
+{
+       int retval;
+       struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
+       struct reg_cache *cache = armv4_5->core_cache;
+       uint32_t cpsr = 0;
+       unsigned cookie = num;
 
-       .add_breakpoint = NULL,
-       .remove_breakpoint = NULL,
-       .add_watchpoint = NULL,
-       .remove_watchpoint = NULL,
+       /* 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;
 
-       .register_commands = cortex_a8_register_commands,
-       .target_create = cortex_a8_target_create,
-       .init_target = NULL,
-       .examine = NULL,
-       .quit = NULL
-};
+               if (mode != ARMV4_5_MODE_ANY) {
+                       cpsr = buf_get_u32(cache ->reg_list[ARMV4_5_CPSR]
+                                       .value, 0, 32);
+                       cortex_a8_write_core_reg(target, 16,
+                                       ARMV4_5_MODE_ANY, mode);
+               }
+       }
 
-int cortex_a8_dcc_read(swjdp_common_t *swjdp, u8 *value, u8 *ctrl)
-{
-       u16 dcrdr;
 
-       mem_ap_read_buf_u16( swjdp, (u8*)&dcrdr, 1, DCB_DCRDR);
-       *ctrl = (u8)dcrdr;
-       *value = (u8)(dcrdr >> 8);
+       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;
+               }
+       }
 
-       LOG_DEBUG("data 0x%x ctrl 0x%x", *value, *ctrl);
+       cortex_a8_dap_write_coreregister_u32(target, value, cookie);
+       if ((retval = jtag_execute_queue()) == ERROR_OK) {
+               struct reg *r = &ARMV4_5_CORE_REG_MODE(cache, mode, num);
 
-       /* write ack back to software dcc register
-        * signify we have read data */
-       if (dcrdr & (1 << 0))
+               buf_set_u32(r->value, 0, 32, value);
+               r->valid = 1;
+               r->dirty = 0;
+       }
+
+       if (cpsr)
+               cortex_a8_write_core_reg(target, 16, ARMV4_5_MODE_ANY, cpsr);
+       return retval;
+}
+
+
+/*
+ * Cortex-A8 Breakpoint and watchpoint fuctions
+ */
+
+/* Setup hardware Breakpoint Register Pair */
+static int cortex_a8_set_breakpoint(struct target *target,
+               struct breakpoint *breakpoint, uint8_t matchmode)
+{
+       int retval;
+       int brp_i=0;
+       uint32_t control;
+       uint8_t byte_addr_select = 0x0F;
+       struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
+       struct armv7a_common *armv7a = &cortex_a8->armv7a_common;
+       struct cortex_a8_brp * brp_list = cortex_a8->brp_list;
+
+       if (breakpoint->set)
        {
-               dcrdr = 0;
-               mem_ap_write_buf_u16( swjdp, (u8*)&dcrdr, 1, DCB_DCRDR);
+               LOG_WARNING("breakpoint already set");
+               return ERROR_OK;
+       }
+
+       if (breakpoint->type == BKPT_HARD)
+       {
+               while (brp_list[brp_i].used && (brp_i < cortex_a8->brp_num))
+                       brp_i++ ;
+               if (brp_i >= cortex_a8->brp_num)
+               {
+                       LOG_ERROR("ERROR Can not find free Breakpoint Register Pair");
+                       return ERROR_FAIL;
+               }
+               breakpoint->set = brp_i + 1;
+               if (breakpoint->length == 2)
+               {
+                       byte_addr_select = (3 << (breakpoint->address & 0x02));
+               }
+               control = ((matchmode & 0x7) << 20)
+                               | (byte_addr_select << 5)
+                               | (3 << 1) | 1;
+               brp_list[brp_i].used = 1;
+               brp_list[brp_i].value = (breakpoint->address & 0xFFFFFFFC);
+               brp_list[brp_i].control = control;
+               cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base
+                               + CPUDBG_BVR_BASE + 4 * brp_list[brp_i].BRPn,
+                               brp_list[brp_i].value);
+               cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base
+                               + CPUDBG_BCR_BASE + 4 * brp_list[brp_i].BRPn,
+                               brp_list[brp_i].control);
+               LOG_DEBUG("brp %i control 0x%0" PRIx32 " value 0x%0" PRIx32, brp_i,
+                               brp_list[brp_i].control,
+                               brp_list[brp_i].value);
+       }
+       else if (breakpoint->type == BKPT_SOFT)
+       {
+               uint8_t code[4];
+               if (breakpoint->length == 2)
+               {
+                       buf_set_u32(code, 0, 32, ARMV5_T_BKPT(0x11));
+               }
+               else
+               {
+                       buf_set_u32(code, 0, 32, ARMV5_BKPT(0x11));
+               }
+               retval = target->type->read_memory(target,
+                               breakpoint->address & 0xFFFFFFFE,
+                               breakpoint->length, 1,
+                               breakpoint->orig_instr);
+               if (retval != ERROR_OK)
+                       return retval;
+               retval = target->type->write_memory(target,
+                               breakpoint->address & 0xFFFFFFFE,
+                               breakpoint->length, 1, code);
+               if (retval != ERROR_OK)
+                       return retval;
+               breakpoint->set = 0x11; /* Any nice value but 0 */
        }
 
        return ERROR_OK;
 }
 
-int cortex_a8_read_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer)
+static int cortex_a8_unset_breakpoint(struct target *target, struct breakpoint *breakpoint)
 {
-       /* get pointers to arch-specific information */
-       armv7m_common_t *armv7m = target->arch_info;
-       swjdp_common_t *swjdp = &armv7m->swjdp_info;
        int retval;
+       struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
+       struct armv7a_common *armv7a = &cortex_a8->armv7a_common;
+       struct cortex_a8_brp * brp_list = cortex_a8->brp_list;
 
-       /* sanitize arguments */
-       if (((size != 4) && (size != 2) && (size != 1)) || (count == 0) || !(buffer))
-               return ERROR_INVALID_ARGUMENTS;
+       if (!breakpoint->set)
+       {
+               LOG_WARNING("breakpoint not set");
+               return ERROR_OK;
+       }
 
-       /* cortex_a8 handles unaligned memory access */
+       if (breakpoint->type == BKPT_HARD)
+       {
+               int brp_i = breakpoint->set - 1;
+               if ((brp_i < 0) || (brp_i >= cortex_a8->brp_num))
+               {
+                       LOG_DEBUG("Invalid BRP number in breakpoint");
+                       return ERROR_OK;
+               }
+               LOG_DEBUG("rbp %i control 0x%0" PRIx32 " value 0x%0" PRIx32, brp_i,
+                               brp_list[brp_i].control, brp_list[brp_i].value);
+               brp_list[brp_i].used = 0;
+               brp_list[brp_i].value = 0;
+               brp_list[brp_i].control = 0;
+               cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base
+                               + CPUDBG_BCR_BASE + 4 * brp_list[brp_i].BRPn,
+                               brp_list[brp_i].control);
+               cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base
+                               + CPUDBG_BVR_BASE + 4 * brp_list[brp_i].BRPn,
+                               brp_list[brp_i].value);
+       }
+       else
+       {
+               /* restore original instruction (kept in target endianness) */
+               if (breakpoint->length == 4)
+               {
+                       retval = target->type->write_memory(target,
+                                       breakpoint->address & 0xFFFFFFFE,
+                                       4, 1, breakpoint->orig_instr);
+                       if (retval != ERROR_OK)
+                               return retval;
+               }
+               else
+               {
+                       retval = target->type->write_memory(target,
+                                       breakpoint->address & 0xFFFFFFFE,
+                                       2, 1, breakpoint->orig_instr);
+                       if (retval != ERROR_OK)
+                               return retval;
+               }
+       }
+       breakpoint->set = 0;
+
+       return ERROR_OK;
+}
+
+int cortex_a8_add_breakpoint(struct target *target, struct breakpoint *breakpoint)
+{
+       struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
+
+       if ((breakpoint->type == BKPT_HARD) && (cortex_a8->brp_num_available < 1))
+       {
+               LOG_INFO("no hardware breakpoint available");
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+       }
+
+       if (breakpoint->type == BKPT_HARD)
+               cortex_a8->brp_num_available--;
+       cortex_a8_set_breakpoint(target, breakpoint, 0x00); /* Exact match */
+
+       return ERROR_OK;
+}
+
+static int cortex_a8_remove_breakpoint(struct target *target, struct breakpoint *breakpoint)
+{
+       struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
+
+#if 0
+/* It is perfectly possible to remove brakpoints while the taget is running */
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_WARNING("target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+#endif
+
+       if (breakpoint->set)
+       {
+               cortex_a8_unset_breakpoint(target, breakpoint);
+               if (breakpoint->type == BKPT_HARD)
+                       cortex_a8->brp_num_available++ ;
+       }
+
+
+       return ERROR_OK;
+}
+
+
+
+/*
+ * Cortex-A8 Reset fuctions
+ */
+
+static int cortex_a8_assert_reset(struct target *target)
+{
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+
+       LOG_DEBUG(" ");
 
-       switch (size)
+       /* registers are now invalid */
+       register_cache_invalidate(armv7a->armv4_5_common.core_cache);
+
+       target->state = TARGET_RESET;
+
+       return ERROR_OK;
+}
+
+static int cortex_a8_deassert_reset(struct target *target)
+{
+
+       LOG_DEBUG(" ");
+
+       if (target->reset_halt)
        {
+               int retval;
+               if ((retval = target_halt(target)) != ERROR_OK)
+                       return retval;
+       }
+
+       return ERROR_OK;
+}
+
+/*
+ * Cortex-A8 Memory access
+ *
+ * This is same Cortex M3 but we must also use the correct
+ * ap number for every access.
+ */
+
+static int cortex_a8_read_memory(struct target *target, uint32_t address,
+               uint32_t size, uint32_t count, uint8_t *buffer)
+{
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+       int retval = ERROR_INVALID_ARGUMENTS;
+
+       /* cortex_a8 handles unaligned memory access */
+
+// ??? dap_ap_select(swjdp, swjdp_memoryap);
+
+       if (count && buffer) {
+               switch (size) {
                case 4:
                        retval = mem_ap_read_buf_u32(swjdp, buffer, 4 * count, address);
                        break;
@@ -128,27 +1324,23 @@ int cortex_a8_read_memory(struct target_s *target, u32 address, u32 size, u32 co
                case 1:
                        retval = mem_ap_read_buf_u8(swjdp, buffer, count, address);
                        break;
-               default:
-                       LOG_ERROR("BUG: we shouldn't get here");
-                       exit(-1);
+               }
        }
 
        return retval;
 }
 
-int cortex_a8_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer)
+int cortex_a8_write_memory(struct target *target, uint32_t address,
+               uint32_t size, uint32_t count, uint8_t *buffer)
 {
-       /* get pointers to arch-specific information */
-       armv7m_common_t *armv7m = target->arch_info;
-       swjdp_common_t *swjdp = &armv7m->swjdp_info;
-       int retval;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+       int retval = ERROR_INVALID_ARGUMENTS;
 
-       /* sanitize arguments */
-       if (((size != 4) && (size != 2) && (size != 1)) || (count == 0) || !(buffer))
-               return ERROR_INVALID_ARGUMENTS;
+// ??? dap_ap_select(swjdp, swjdp_memoryap);
 
-       switch (size)
-       {
+       if (count && buffer) {
+               switch (size) {
                case 4:
                        retval = mem_ap_write_buf_u32(swjdp, buffer, 4 * count, address);
                        break;
@@ -158,36 +1350,85 @@ int cortex_a8_write_memory(struct target_s *target, u32 address, u32 size, u32 c
                case 1:
                        retval = mem_ap_write_buf_u8(swjdp, buffer, count, address);
                        break;
-               default:
-                       LOG_ERROR("BUG: we shouldn't get here");
-                       exit(-1);
+               }
+       }
+
+       if (retval == ERROR_OK && target->state == TARGET_HALTED)
+       {
+               /* The Cache handling will NOT work with MMU active, the wrong addresses will be invalidated */
+               /* invalidate I-Cache */
+               if (armv7a->armv4_5_mmu.armv4_5_cache.i_cache_enabled)
+               {
+                       /* Invalidate ICache single entry with MVA, repeat this for all cache
+                          lines in the address range, Cortex-A8 has fixed 64 byte line length */
+                       /* Invalidate Cache single entry with MVA to PoU */
+                       for (uint32_t cacheline=address; cacheline<address+size*count; cacheline+=64)
+                               armv7a->write_cp15(target, 0, 1, 7, 5, cacheline); /* I-Cache to PoU */
+               }
+               /* invalidate D-Cache */
+               if (armv7a->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled)
+               {
+                       /* Invalidate Cache single entry with MVA to PoC */
+                       for (uint32_t cacheline=address; cacheline<address+size*count; cacheline+=64)
+                               armv7a->write_cp15(target, 0, 1, 7, 6, cacheline); /* U/D cache to PoC */
+               }
        }
 
        return retval;
 }
 
-int cortex_a8_handle_target_request(void *priv)
+static int cortex_a8_bulk_write_memory(struct target *target, uint32_t address,
+               uint32_t count, uint8_t *buffer)
+{
+       return cortex_a8_write_memory(target, address, 4, count, buffer);
+}
+
+
+static int cortex_a8_dcc_read(struct swjdp_common *swjdp, uint8_t *value, uint8_t *ctrl)
+{
+#if 0
+       u16 dcrdr;
+
+       mem_ap_read_buf_u16(swjdp, (uint8_t*)&dcrdr, 1, DCB_DCRDR);
+       *ctrl = (uint8_t)dcrdr;
+       *value = (uint8_t)(dcrdr >> 8);
+
+       LOG_DEBUG("data 0x%x ctrl 0x%x", *value, *ctrl);
+
+       /* write ack back to software dcc register
+        * signify we have read data */
+       if (dcrdr & (1 << 0))
+       {
+               dcrdr = 0;
+               mem_ap_write_buf_u16(swjdp, (uint8_t*)&dcrdr, 1, DCB_DCRDR);
+       }
+#endif
+       return ERROR_OK;
+}
+
+
+static int cortex_a8_handle_target_request(void *priv)
 {
-       target_t *target = priv;
+       struct target *target = priv;
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
        if (!target_was_examined(target))
                return ERROR_OK;
-       armv7m_common_t *armv7m = target->arch_info;
-       swjdp_common_t *swjdp = &armv7m->swjdp_info;
-
        if (!target->dbg_msg_enabled)
                return ERROR_OK;
 
        if (target->state == TARGET_RUNNING)
        {
-               u8 data;
-               u8 ctrl;
+               uint8_t data = 0;
+               uint8_t ctrl = 0;
 
                cortex_a8_dcc_read(swjdp, &data, &ctrl);
 
                /* check if we have data */
                if (ctrl & (1 << 0))
                {
-                       u32 request;
+                       uint32_t request;
 
                        /* we assume target is quick enough */
                        request = data;
@@ -204,60 +1445,285 @@ int cortex_a8_handle_target_request(void *priv)
        return ERROR_OK;
 }
 
-int cortex_a8_init_arch_info(target_t *target, cortex_a8_common_t *cortex_a8, jtag_tap_t *tap)
+/*
+ * Cortex-A8 target information and configuration
+ */
+
+static int cortex_a8_examine_first(struct target *target)
+{
+       struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
+       struct armv7a_common *armv7a = &cortex_a8->armv7a_common;
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+       int i;
+       int retval = ERROR_OK;
+       uint32_t didr, ctypr, ttypr, cpuid;
+
+       LOG_DEBUG("TODO");
+
+       /* Here we shall insert a proper ROM Table scan */
+       armv7a->debug_base = OMAP3530_DEBUG_BASE;
+
+       /* We do one extra read to ensure DAP is configured,
+        * we call ahbap_debugport_init(swjdp) instead
+        */
+       ahbap_debugport_init(swjdp);
+       mem_ap_read_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_CPUID, &cpuid);
+       if ((retval = mem_ap_read_atomic_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_CPUID, &cpuid)) != ERROR_OK)
+       {
+               LOG_DEBUG("Examine failed");
+               return retval;
+       }
+
+       if ((retval = mem_ap_read_atomic_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_CTYPR, &ctypr)) != ERROR_OK)
+       {
+               LOG_DEBUG("Examine failed");
+               return retval;
+       }
+
+       if ((retval = mem_ap_read_atomic_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_TTYPR, &ttypr)) != ERROR_OK)
+       {
+               LOG_DEBUG("Examine failed");
+               return retval;
+       }
+
+       if ((retval = mem_ap_read_atomic_u32(swjdp,
+                       armv7a->debug_base + CPUDBG_DIDR, &didr)) != ERROR_OK)
+       {
+               LOG_DEBUG("Examine failed");
+               return retval;
+       }
+
+       LOG_DEBUG("cpuid = 0x%08" PRIx32, cpuid);
+       LOG_DEBUG("ctypr = 0x%08" PRIx32, ctypr);
+       LOG_DEBUG("ttypr = 0x%08" PRIx32, ttypr);
+       LOG_DEBUG("didr = 0x%08" PRIx32, didr);
+
+       /* Setup Breakpoint Register Pairs */
+       cortex_a8->brp_num = ((didr >> 24) & 0x0F) + 1;
+       cortex_a8->brp_num_context = ((didr >> 20) & 0x0F) + 1;
+       cortex_a8->brp_num_available = cortex_a8->brp_num;
+       cortex_a8->brp_list = calloc(cortex_a8->brp_num, sizeof(struct cortex_a8_brp));
+//     cortex_a8->brb_enabled = ????;
+       for (i = 0; i < cortex_a8->brp_num; i++)
+       {
+               cortex_a8->brp_list[i].used = 0;
+               if (i < (cortex_a8->brp_num-cortex_a8->brp_num_context))
+                       cortex_a8->brp_list[i].type = BRP_NORMAL;
+               else
+                       cortex_a8->brp_list[i].type = BRP_CONTEXT;
+               cortex_a8->brp_list[i].value = 0;
+               cortex_a8->brp_list[i].control = 0;
+               cortex_a8->brp_list[i].BRPn = i;
+       }
+
+       /* Setup Watchpoint Register Pairs */
+       cortex_a8->wrp_num = ((didr >> 28) & 0x0F) + 1;
+       cortex_a8->wrp_num_available = cortex_a8->wrp_num;
+       cortex_a8->wrp_list = calloc(cortex_a8->wrp_num, sizeof(struct cortex_a8_wrp));
+       for (i = 0; i < cortex_a8->wrp_num; i++)
+       {
+               cortex_a8->wrp_list[i].used = 0;
+               cortex_a8->wrp_list[i].type = 0;
+               cortex_a8->wrp_list[i].value = 0;
+               cortex_a8->wrp_list[i].control = 0;
+               cortex_a8->wrp_list[i].WRPn = i;
+       }
+       LOG_DEBUG("Configured %i hw breakpoint pairs and %i hw watchpoint pairs",
+                       cortex_a8->brp_num , cortex_a8->wrp_num);
+
+       target_set_examined(target);
+       return ERROR_OK;
+}
+
+static int cortex_a8_examine(struct target *target)
+{
+       int retval = ERROR_OK;
+
+       /* don't re-probe hardware after each reset */
+       if (!target_was_examined(target))
+               retval = cortex_a8_examine_first(target);
+
+       /* Configure core debug access */
+       if (retval == ERROR_OK)
+               retval = cortex_a8_init_debug_access(target);
+
+       return retval;
+}
+
+/*
+ *     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 armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
+
+       armv4_5->core_type = ARM_MODE_MON;
+
+       (*cache_p) = armv4_5_build_reg_cache(target, armv4_5);
+       armv4_5->core_cache = (*cache_p);
+}
+
+
+static int cortex_a8_init_target(struct command_context *cmd_ctx,
+               struct target *target)
+{
+       cortex_a8_build_reg_cache(target);
+       return ERROR_OK;
+}
+
+int cortex_a8_init_arch_info(struct target *target,
+               struct cortex_a8_common *cortex_a8, struct jtag_tap *tap)
 {
-       armv7m_common_t *armv7m;
-       armv7m = &cortex_a8->armv7m;
+       struct armv7a_common *armv7a = &cortex_a8->armv7a_common;
+       struct arm *armv4_5 = &armv7a->armv4_5_common;
+       struct swjdp_common *swjdp = &armv7a->swjdp_info;
+
+       /* Setup struct cortex_a8_common */
+       cortex_a8->common_magic = CORTEX_A8_COMMON_MAGIC;
+       armv4_5->arch_info = armv7a;
 
        /* prepare JTAG information for the new target */
        cortex_a8->jtag_info.tap = tap;
        cortex_a8->jtag_info.scann_size = 4;
+LOG_DEBUG(" ");
+       swjdp->dp_select_value = -1;
+       swjdp->ap_csw_value = -1;
+       swjdp->ap_tar_value = -1;
+       swjdp->jtag_info = &cortex_a8->jtag_info;
+       swjdp->memaccess_tck = 80;
 
-       armv7m->swjdp_info.dp_select_value = -1;
-       armv7m->swjdp_info.ap_csw_value = -1;
-       armv7m->swjdp_info.ap_tar_value = -1;
-       armv7m->swjdp_info.jtag_info = &cortex_a8->jtag_info;
+       /* Number of bits for tar autoincrement, impl. dep. at least 10 */
+       swjdp->tar_autoincr_block = (1 << 10);
 
-       /* initialize arch-specific breakpoint handling */
+       cortex_a8->fast_reg_read = 0;
 
-       cortex_a8->common_magic = CORTEX_A8_COMMON_MAGIC;
-       cortex_a8->arch_info = NULL;
 
        /* register arch-specific functions */
-       armv7m->examine_debug_reason = NULL;
+       armv7a->examine_debug_reason = NULL;
+
+       armv7a->post_debug_entry = cortex_a8_post_debug_entry;
+
+       armv7a->pre_restore_context = NULL;
+       armv7a->post_restore_context = NULL;
+       armv7a->armv4_5_mmu.armv4_5_cache.ctype = -1;
+//     armv7a->armv4_5_mmu.get_ttb = armv7a_get_ttb;
+       armv7a->armv4_5_mmu.read_memory = cortex_a8_read_memory;
+       armv7a->armv4_5_mmu.write_memory = cortex_a8_write_memory;
+//     armv7a->armv4_5_mmu.disable_mmu_caches = armv7a_disable_mmu_caches;
+//     armv7a->armv4_5_mmu.enable_mmu_caches = armv7a_enable_mmu_caches;
+       armv7a->armv4_5_mmu.has_tiny_pages = 1;
+       armv7a->armv4_5_mmu.mmu_enabled = 0;
+       armv7a->read_cp15 = cortex_a8_read_cp15;
+       armv7a->write_cp15 = cortex_a8_write_cp15;
+
 
-       armv7m->pre_debug_entry = NULL;
-       armv7m->post_debug_entry = NULL;
+//     arm7_9->handle_target_request = cortex_a8_handle_target_request;
 
-       armv7m->pre_restore_context = NULL;
-       armv7m->post_restore_context = NULL;
+       armv4_5->read_core_reg = cortex_a8_read_core_reg;
+       armv4_5->write_core_reg = cortex_a8_write_core_reg;
 
-       armv7m_init_arch_info(target, armv7m);
-       armv7m->arch_info = cortex_a8;
-       armv7m->load_core_reg_u32 = NULL;
-       armv7m->store_core_reg_u32 = NULL;
+       /* REVISIT v7a setup should be in a v7a-specific routine */
+       armv4_5_init_arch_info(target, armv4_5);
+       armv7a->common_magic = ARMV7_COMMON_MAGIC;
 
        target_register_timer_callback(cortex_a8_handle_target_request, 1, 1, target);
 
        return ERROR_OK;
 }
 
-int cortex_a8_target_create(struct target_s *target, Jim_Interp *interp)
+static int cortex_a8_target_create(struct target *target, Jim_Interp *interp)
 {
-       cortex_a8_common_t *cortex_a8 = calloc(1,sizeof(cortex_a8_common_t));
+       struct cortex_a8_common *cortex_a8 = calloc(1, sizeof(struct cortex_a8_common));
 
        cortex_a8_init_arch_info(target, cortex_a8, target->tap);
 
        return ERROR_OK;
 }
 
-int cortex_a8_register_commands(struct command_context_s *cmd_ctx)
+COMMAND_HANDLER(cortex_a8_handle_cache_info_command)
 {
-       int retval;
+       struct target *target = get_current_target(CMD_CTX);
+       struct armv7a_common *armv7a = target_to_armv7a(target);
+
+       return armv4_5_handle_cache_info_command(CMD_CTX,
+                       &armv7a->armv4_5_mmu.armv4_5_cache);
+}
+
 
-       retval = armv7m_register_commands(cmd_ctx);
+COMMAND_HANDLER(cortex_a8_handle_dbginit_command)
+{
+       struct target *target = get_current_target(CMD_CTX);
+
+       cortex_a8_init_debug_access(target);
+
+       return ERROR_OK;
+}
+
+
+static int cortex_a8_register_commands(struct command_context *cmd_ctx)
+{
+       struct command *cortex_a8_cmd;
+       int retval = ERROR_OK;
 
-       register_command(cmd_ctx, NULL, "cortex_a8", NULL, COMMAND_ANY, "cortex_a8 specific commands");
+       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;
 }
+
+struct target_type cortexa8_target = {
+       .name = "cortex_a8",
+
+       .poll = cortex_a8_poll,
+       .arch_state = armv7a_arch_state,
+
+       .target_request_data = NULL,
+
+       .halt = cortex_a8_halt,
+       .resume = cortex_a8_resume,
+       .step = cortex_a8_step,
+
+       .assert_reset = cortex_a8_assert_reset,
+       .deassert_reset = cortex_a8_deassert_reset,
+       .soft_reset_halt = NULL,
+
+       .get_gdb_reg_list = armv4_5_get_gdb_reg_list,
+
+       .read_memory = cortex_a8_read_memory,
+       .write_memory = cortex_a8_write_memory,
+       .bulk_write_memory = cortex_a8_bulk_write_memory,
+
+       .checksum_memory = arm_checksum_memory,
+       .blank_check_memory = arm_blank_check_memory,
+
+       .run_algorithm = armv4_5_run_algorithm,
+
+       .add_breakpoint = cortex_a8_add_breakpoint,
+       .remove_breakpoint = cortex_a8_remove_breakpoint,
+       .add_watchpoint = NULL,
+       .remove_watchpoint = NULL,
+
+       .register_commands = cortex_a8_register_commands,
+       .target_create = cortex_a8_target_create,
+       .init_target = cortex_a8_init_target,
+       .examine = cortex_a8_examine,
+       .mrc = cortex_a8_mrc,
+       .mcr = cortex_a8_mcr,
+};

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)