X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm11.c;h=e5794b8ae53ddcdf593587615fcbee25b0e88c22;hp=7ccc7b82da874cc4e4b52e8e012a8c3519355884;hb=f3b3752a9eebae273da6580c182e9d1486e41ed9;hpb=0bba832713cca8e5931d5d21f37f526d0a3979cf diff --git a/src/target/arm11.c b/src/target/arm11.c index 7ccc7b82da..e5794b8ae5 100644 --- a/src/target/arm11.c +++ b/src/target/arm11.c @@ -1,7 +1,8 @@ /*************************************************************************** * Copyright (C) 2008 digenius technology GmbH. * + * Michael Bruck * * * - * Copyright (C) 2008 Oyvind Harboe oyvind.harboe@zylin.com * + * Copyright (C) 2008,2009 Oyvind Harboe oyvind.harboe@zylin.com * * * * Copyright (C) 2008 Georg Acher * * * @@ -26,11 +27,12 @@ #endif #include "arm11.h" -#include "jtag.h" -#include "log.h" +#include "arm11_dbgtap.h" +#include "armv4_5.h" +#include "arm_simulator.h" +#include "time_support.h" +#include "target_type.h" -#include -#include #if 0 #define _DEBUG_INSTRUCTION_EXECUTION_ @@ -48,57 +50,13 @@ #define FNC_INFO_NOTIMPLEMENTED #endif -static void arm11_on_enter_debug_state(arm11_common_t * arm11); - -bool arm11_config_memwrite_burst = true; -bool arm11_config_memwrite_error_fatal = true; -u32 arm11_vcr = 0; - -#define ARM11_HANDLER(x) \ - .x = arm11_##x - -target_type_t arm11_target = -{ - .name = "arm11", - - ARM11_HANDLER(poll), - ARM11_HANDLER(arch_state), - - ARM11_HANDLER(target_request_data), - - ARM11_HANDLER(halt), - ARM11_HANDLER(resume), - ARM11_HANDLER(step), - - ARM11_HANDLER(assert_reset), - ARM11_HANDLER(deassert_reset), - ARM11_HANDLER(soft_reset_halt), - - ARM11_HANDLER(get_gdb_reg_list), - - ARM11_HANDLER(read_memory), - ARM11_HANDLER(write_memory), - - ARM11_HANDLER(bulk_write_memory), - - ARM11_HANDLER(checksum_memory), - - ARM11_HANDLER(add_breakpoint), - ARM11_HANDLER(remove_breakpoint), - ARM11_HANDLER(add_watchpoint), - ARM11_HANDLER(remove_watchpoint), - - ARM11_HANDLER(run_algorithm), - - ARM11_HANDLER(register_commands), - ARM11_HANDLER(target_create), - ARM11_HANDLER(init_target), - ARM11_HANDLER(examine), - ARM11_HANDLER(quit), -}; - -int arm11_regs_arch_type = -1; +static bool arm11_config_memwrite_burst = true; +static bool arm11_config_memwrite_error_fatal = true; +static uint32_t arm11_vcr = 0; +static bool arm11_config_step_irq_enable = false; +static bool arm11_config_hardware_step = false; +static int arm11_regs_arch_type = -1; enum arm11_regtype { @@ -129,16 +87,16 @@ enum arm11_regtype }; -typedef struct arm11_reg_defs_s +struct arm11_reg_defs { - char * name; - u32 num; - int gdb_num; + char * name; + uint32_t num; + int gdb_num; enum arm11_regtype type; -} arm11_reg_defs_t; +}; /* update arm11_regcache_ids when changing this */ -static const arm11_reg_defs_t arm11_reg_defs[] = +static const struct arm11_reg_defs arm11_reg_defs[] = { {"r0", 0, 0, ARM11_REGISTER_CORE}, {"r1", 1, 1, ARM11_REGISTER_CORE}, @@ -288,69 +246,85 @@ enum arm11_regcache_ids #define ARM11_GDB_REGISTER_COUNT 26 -u8 arm11_gdb_dummy_fp_value[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; +static uint8_t arm11_gdb_dummy_fp_value[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; -reg_t arm11_gdb_dummy_fp_reg = +static reg_t arm11_gdb_dummy_fp_reg = { "GDB dummy floating-point register", arm11_gdb_dummy_fp_value, 0, 1, 96, NULL, 0, NULL, 0 }; -u8 arm11_gdb_dummy_fps_value[] = {0, 0, 0, 0}; +static uint8_t arm11_gdb_dummy_fps_value[] = {0, 0, 0, 0}; -reg_t arm11_gdb_dummy_fps_reg = +static reg_t arm11_gdb_dummy_fps_reg = { "GDB dummy floating-point status register", arm11_gdb_dummy_fps_value, 0, 1, 32, NULL, 0, NULL, 0 }; +static int arm11_on_enter_debug_state(struct arm11_common *arm11); +static int arm11_step(struct target_s *target, int current, + uint32_t address, int handle_breakpoints); +/* helpers */ +static int arm11_build_reg_cache(target_t *target); +static int arm11_set_reg(reg_t *reg, uint8_t *buf); +static int arm11_get_reg(reg_t *reg); + +static void arm11_record_register_history(struct arm11_common * arm11); +static void arm11_dump_reg_changes(struct arm11_common * arm11); + /** Check and if necessary take control of the system * * \param arm11 Target state variable. * \param dscr If the current DSCR content is - * available a pointer to a word holding the - * DSCR can be passed. Otherwise use NULL. + * available a pointer to a word holding the + * DSCR can be passed. Otherwise use NULL. */ -void arm11_check_init(arm11_common_t * arm11, u32 * dscr) +static int arm11_check_init(struct arm11_common *arm11, uint32_t *dscr) { FNC_INFO; - u32 dscr_local_tmp_copy; + uint32_t dscr_local_tmp_copy; if (!dscr) { - dscr = &dscr_local_tmp_copy; - *dscr = arm11_read_DSCR(arm11); + dscr = &dscr_local_tmp_copy; + + CHECK_RETVAL(arm11_read_DSCR(arm11, dscr)); } if (!(*dscr & ARM11_DSCR_MODE_SELECT)) { - LOG_DEBUG("Bringing target into debug mode"); + LOG_DEBUG("Bringing target into debug mode"); - *dscr |= ARM11_DSCR_MODE_SELECT; /* Halt debug-mode */ - arm11_write_DSCR(arm11, *dscr); + *dscr |= ARM11_DSCR_MODE_SELECT; /* Halt debug-mode */ + arm11_write_DSCR(arm11, *dscr); - /* add further reset initialization here */ + /* add further reset initialization here */ - arm11->simulate_reset_on_next_halt = true; + arm11->simulate_reset_on_next_halt = true; - if (*dscr & ARM11_DSCR_CORE_HALTED) - { - /** \todo TODO: this needs further scrutiny because - * arm11_on_enter_debug_state() never gets properly called - */ + if (*dscr & ARM11_DSCR_CORE_HALTED) + { + /** \todo TODO: this needs further scrutiny because + * arm11_on_enter_debug_state() never gets properly called. + * As a result we don't read the actual register states from + * the target. + */ + + arm11->target->state = TARGET_HALTED; + arm11->target->debug_reason = arm11_get_DSCR_debug_reason(*dscr); + } + else + { + arm11->target->state = TARGET_RUNNING; + arm11->target->debug_reason = DBG_REASON_NOTHALTED; + } - arm11->target->state = TARGET_HALTED; - arm11->target->debug_reason = arm11_get_DSCR_debug_reason(*dscr); - } - else - { - arm11->target->state = TARGET_RUNNING; - arm11->target->debug_reason = DBG_REASON_NOTHALTED; + arm11_sc7_clear_vbw(arm11); } - arm11_sc7_clear_vbw(arm11); - } + return ERROR_OK; } @@ -364,40 +338,39 @@ void arm11_check_init(arm11_common_t * arm11, u32 * dscr) * or on other occasions that stop the processor. * */ -static void arm11_on_enter_debug_state(arm11_common_t * arm11) +static int arm11_on_enter_debug_state(struct arm11_common *arm11) { + int retval; FNC_INFO; - {size_t i; - for(i = 0; i < asizeof(arm11->reg_values); i++) + for (size_t i = 0; i < asizeof(arm11->reg_values); i++) { - arm11->reg_list[i].valid = 1; - arm11->reg_list[i].dirty = 0; - }} + arm11->reg_list[i].valid = 1; + arm11->reg_list[i].dirty = 0; + } /* Save DSCR */ - - R(DSCR) = arm11_read_DSCR(arm11); + CHECK_RETVAL(arm11_read_DSCR(arm11, &R(DSCR))); /* Save wDTR */ if (R(DSCR) & ARM11_DSCR_WDTR_FULL) { - arm11_add_debug_SCAN_N(arm11, 0x05, TAP_INVALID); + arm11_add_debug_SCAN_N(arm11, 0x05, ARM11_TAP_DEFAULT); - arm11_add_IR(arm11, ARM11_INTEST, TAP_INVALID); + arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT); - scan_field_t chain5_fields[3]; + struct scan_field chain5_fields[3]; - arm11_setup_field(arm11, 32, NULL, &R(WDTR), chain5_fields + 0); - arm11_setup_field(arm11, 1, NULL, NULL, chain5_fields + 1); - arm11_setup_field(arm11, 1, NULL, NULL, chain5_fields + 2); + arm11_setup_field(arm11, 32, NULL, &R(WDTR), chain5_fields + 0); + arm11_setup_field(arm11, 1, NULL, NULL, chain5_fields + 1); + arm11_setup_field(arm11, 1, NULL, NULL, chain5_fields + 2); - arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE); + arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE); } else { - arm11->reg_list[ARM11_RC_WDTR].valid = 0; + arm11->reg_list[ARM11_RC_WDTR].valid = 0; } @@ -405,7 +378,7 @@ static void arm11_on_enter_debug_state(arm11_common_t * arm11) /* ARM1176 spec says this is needed only for wDTR/rDTR's "ITR mode", but not to issue ITRs ARM1136 seems to require this to issue ITR's as well */ - u32 new_dscr = R(DSCR) | ARM11_DSCR_EXECUTE_ARM_INSTRUCTION_ENABLE; + uint32_t new_dscr = R(DSCR) | ARM11_DSCR_EXECUTE_ARM_INSTRUCTION_ENABLE; /* this executes JTAG queue: */ @@ -413,49 +386,52 @@ static void arm11_on_enter_debug_state(arm11_common_t * arm11) /* From the spec: - Before executing any instruction in debug state you have to drain the write buffer. - This ensures that no imprecise Data Aborts can return at a later point:*/ + Before executing any instruction in debug state you have to drain the write buffer. + This ensures that no imprecise Data Aborts can return at a later point:*/ /** \todo TODO: Test drain write buffer. */ #if 0 while (1) { - /* MRC p14,0,R0,c5,c10,0 */ -// arm11_run_instr_no_data1(arm11, /*0xee150e1a*/0xe320f000); + /* MRC p14,0,R0,c5,c10,0 */ + // arm11_run_instr_no_data1(arm11, /*0xee150e1a*/0xe320f000); - /* mcr 15, 0, r0, cr7, cr10, {4} */ - arm11_run_instr_no_data1(arm11, 0xee070f9a); + /* mcr 15, 0, r0, cr7, cr10, {4} */ + arm11_run_instr_no_data1(arm11, 0xee070f9a); - u32 dscr = arm11_read_DSCR(arm11); + uint32_t dscr = arm11_read_DSCR(arm11); - LOG_DEBUG("DRAIN, DSCR %08x", dscr); + LOG_DEBUG("DRAIN, DSCR %08x", dscr); - if (dscr & ARM11_DSCR_STICKY_IMPRECISE_DATA_ABORT) - { - arm11_run_instr_no_data1(arm11, 0xe320f000); + if (dscr & ARM11_DSCR_STICKY_IMPRECISE_DATA_ABORT) + { + arm11_run_instr_no_data1(arm11, 0xe320f000); - dscr = arm11_read_DSCR(arm11); + dscr = arm11_read_DSCR(arm11); - LOG_DEBUG("DRAIN, DSCR %08x (DONE)", dscr); + LOG_DEBUG("DRAIN, DSCR %08x (DONE)", dscr); - break; - } + break; + } } #endif - arm11_run_instr_data_prepare(arm11); + retval = arm11_run_instr_data_prepare(arm11); + if (retval != ERROR_OK) + return retval; /* save r0 - r14 */ /** \todo TODO: handle other mode registers */ - {size_t i; - for (i = 0; i < 15; i++) + for (size_t i = 0; i < 15; i++) { - /* MCR p14,0,R?,c0,c5,0 */ - arm11_run_instr_data_from_core(arm11, 0xEE000E15 | (i << 12), &R(RX + i), 1); - }} + /* MCR p14,0,R?,c0,c5,0 */ + retval = arm11_run_instr_data_from_core(arm11, 0xEE000E15 | (i << 12), &R(RX + i), 1); + if (retval != ERROR_OK) + return retval; + } /* save rDTR */ @@ -463,80 +439,97 @@ static void arm11_on_enter_debug_state(arm11_common_t * arm11) if (R(DSCR) & ARM11_DSCR_RDTR_FULL) { - /* MRC p14,0,R0,c0,c5,0 (move rDTR -> r0 (-> wDTR -> local var)) */ - arm11_run_instr_data_from_core_via_r0(arm11, 0xEE100E15, &R(RDTR)); + /* MRC p14,0,R0,c0,c5,0 (move rDTR -> r0 (-> wDTR -> local var)) */ + retval = arm11_run_instr_data_from_core_via_r0(arm11, 0xEE100E15, &R(RDTR)); + if (retval != ERROR_OK) + return retval; } else { - arm11->reg_list[ARM11_RC_RDTR].valid = 0; + arm11->reg_list[ARM11_RC_RDTR].valid = 0; } /* save CPSR */ /* MRS r0,CPSR (move CPSR -> r0 (-> wDTR -> local var)) */ - arm11_run_instr_data_from_core_via_r0(arm11, 0xE10F0000, &R(CPSR)); + retval = arm11_run_instr_data_from_core_via_r0(arm11, 0xE10F0000, &R(CPSR)); + if (retval != ERROR_OK) + return retval; /* save PC */ /* MOV R0,PC (move PC -> r0 (-> wDTR -> local var)) */ - arm11_run_instr_data_from_core_via_r0(arm11, 0xE1A0000F, &R(PC)); + retval = arm11_run_instr_data_from_core_via_r0(arm11, 0xE1A0000F, &R(PC)); + if (retval != ERROR_OK) + return retval; /* adjust PC depending on ARM state */ if (R(CPSR) & ARM11_CPSR_J) /* Java state */ { - arm11->reg_values[ARM11_RC_PC] -= 0; + arm11->reg_values[ARM11_RC_PC] -= 0; } else if (R(CPSR) & ARM11_CPSR_T) /* Thumb state */ { - arm11->reg_values[ARM11_RC_PC] -= 4; + arm11->reg_values[ARM11_RC_PC] -= 4; } else /* ARM state */ { - arm11->reg_values[ARM11_RC_PC] -= 8; + arm11->reg_values[ARM11_RC_PC] -= 8; } if (arm11->simulate_reset_on_next_halt) { - arm11->simulate_reset_on_next_halt = false; + arm11->simulate_reset_on_next_halt = false; - LOG_DEBUG("Reset c1 Control Register"); + LOG_DEBUG("Reset c1 Control Register"); - /* Write 0 (reset value) to Control register 0 to disable MMU/Cache etc. */ + /* Write 0 (reset value) to Control register 0 to disable MMU/Cache etc. */ - /* MCR p15,0,R0,c1,c0,0 */ - arm11_run_instr_data_to_core_via_r0(arm11, 0xee010f10, 0); + /* MCR p15,0,R0,c1,c0,0 */ + retval = arm11_run_instr_data_to_core_via_r0(arm11, 0xee010f10, 0); + if (retval != ERROR_OK) + return retval; } - arm11_run_instr_data_finish(arm11); + retval = arm11_run_instr_data_finish(arm11); + if (retval != ERROR_OK) + return retval; arm11_dump_reg_changes(arm11); + + return ERROR_OK; } -void arm11_dump_reg_changes(arm11_common_t * arm11) +void arm11_dump_reg_changes(struct arm11_common * arm11) { - {size_t i; - for(i = 0; i < ARM11_REGCACHE_COUNT; i++) - { - if (!arm11->reg_list[i].valid) + + if (!(debug_level >= LOG_LVL_DEBUG)) { - if (arm11->reg_history[i].valid) - LOG_INFO("%8s INVALID (%08x)", arm11_reg_defs[i].name, arm11->reg_history[i].value); + return; } - else + + for (size_t i = 0; i < ARM11_REGCACHE_COUNT; i++) { - if (arm11->reg_history[i].valid) + if (!arm11->reg_list[i].valid) { - if (arm11->reg_history[i].value != arm11->reg_values[i]) - LOG_INFO("%8s %08x (%08x)", arm11_reg_defs[i].name, arm11->reg_values[i], arm11->reg_history[i].value); + if (arm11->reg_history[i].valid) + LOG_DEBUG("%8s INVALID (%08" PRIx32 ")", arm11_reg_defs[i].name, arm11->reg_history[i].value); } else { - LOG_INFO("%8s %08x (INVALID)", arm11_reg_defs[i].name, arm11->reg_values[i]); + if (arm11->reg_history[i].valid) + { + if (arm11->reg_history[i].value != arm11->reg_values[i]) + LOG_DEBUG("%8s %08" PRIx32 " (%08" PRIx32 ")", arm11_reg_defs[i].name, arm11->reg_values[i], arm11->reg_history[i].value); + } + else + { + LOG_DEBUG("%8s %08" PRIx32 " (INVALID)", arm11_reg_defs[i].name, arm11->reg_values[i]); + } } } - }} } /** Restore processor state @@ -544,67 +537,93 @@ void arm11_dump_reg_changes(arm11_common_t * arm11) * This is called in preparation for the RESTART function. * */ -void arm11_leave_debug_state(arm11_common_t * arm11) +static int arm11_leave_debug_state(struct arm11_common *arm11) { FNC_INFO; + int retval; - arm11_run_instr_data_prepare(arm11); + retval = arm11_run_instr_data_prepare(arm11); + if (retval != ERROR_OK) + return retval; /** \todo TODO: handle other mode registers */ /* restore R1 - R14 */ - {size_t i; - for (i = 1; i < 15; i++) + + for (size_t i = 1; i < 15; i++) { - if (!arm11->reg_list[ARM11_RC_RX + i].dirty) - continue; + if (!arm11->reg_list[ARM11_RC_RX + i].dirty) + continue; - /* MRC p14,0,r?,c0,c5,0 */ - arm11_run_instr_data_to_core1(arm11, 0xee100e15 | (i << 12), R(RX + i)); + /* MRC p14,0,r?,c0,c5,0 */ + arm11_run_instr_data_to_core1(arm11, 0xee100e15 | (i << 12), R(RX + i)); -// LOG_DEBUG("RESTORE R" ZU " %08x", i, R(RX + i)); - }} + // LOG_DEBUG("RESTORE R" ZU " %08x", i, R(RX + i)); + } - arm11_run_instr_data_finish(arm11); + retval = arm11_run_instr_data_finish(arm11); + if (retval != ERROR_OK) + return retval; /* spec says clear wDTR and rDTR; we assume they are clear as otherwise our programming would be sloppy */ - { - u32 DSCR = arm11_read_DSCR(arm11); + uint32_t DSCR; - if (DSCR & (ARM11_DSCR_RDTR_FULL | ARM11_DSCR_WDTR_FULL)) - { - LOG_ERROR("wDTR/rDTR inconsistent (DSCR %08x)", DSCR); - } + CHECK_RETVAL(arm11_read_DSCR(arm11, &DSCR)); + + if (DSCR & (ARM11_DSCR_RDTR_FULL | ARM11_DSCR_WDTR_FULL)) + { + /* + The wDTR/rDTR two registers that are used to send/receive data to/from + the core in tandem with corresponding instruction codes that are + written into the core. The RDTR FULL/WDTR FULL flag indicates that the + registers hold data that was written by one side (CPU or JTAG) and not + read out by the other side. + */ + LOG_ERROR("wDTR/rDTR inconsistent (DSCR %08" PRIx32 ")", DSCR); + return ERROR_FAIL; + } } - arm11_run_instr_data_prepare(arm11); + retval = arm11_run_instr_data_prepare(arm11); + if (retval != ERROR_OK) + return retval; /* restore original wDTR */ if ((R(DSCR) & ARM11_DSCR_WDTR_FULL) || arm11->reg_list[ARM11_RC_WDTR].dirty) { - /* MCR p14,0,R0,c0,c5,0 */ - arm11_run_instr_data_to_core_via_r0(arm11, 0xee000e15, R(WDTR)); + /* MCR p14,0,R0,c0,c5,0 */ + retval = arm11_run_instr_data_to_core_via_r0(arm11, 0xee000e15, R(WDTR)); + if (retval != ERROR_OK) + return retval; } /* restore CPSR */ /* MSR CPSR,R0*/ - arm11_run_instr_data_to_core_via_r0(arm11, 0xe129f000, R(CPSR)); + retval = arm11_run_instr_data_to_core_via_r0(arm11, 0xe129f000, R(CPSR)); + if (retval != ERROR_OK) + return retval; + /* restore PC */ /* MOV PC,R0 */ - arm11_run_instr_data_to_core_via_r0(arm11, 0xe1a0f000, R(PC)); + retval = arm11_run_instr_data_to_core_via_r0(arm11, 0xe1a0f000, R(PC)); + if (retval != ERROR_OK) + return retval; + /* restore R0 */ /* MRC p14,0,r0,c0,c5,0 */ arm11_run_instr_data_to_core1(arm11, 0xee100e15, R(R0)); - arm11_run_instr_data_finish(arm11); + retval = arm11_run_instr_data_finish(arm11); + if (retval != ERROR_OK) + return retval; /* restore DSCR */ @@ -614,92 +633,101 @@ void arm11_leave_debug_state(arm11_common_t * arm11) if (R(DSCR) & ARM11_DSCR_RDTR_FULL || arm11->reg_list[ARM11_RC_RDTR].dirty) { - arm11_add_debug_SCAN_N(arm11, 0x05, TAP_INVALID); + arm11_add_debug_SCAN_N(arm11, 0x05, ARM11_TAP_DEFAULT); - arm11_add_IR(arm11, ARM11_EXTEST, TAP_INVALID); + arm11_add_IR(arm11, ARM11_EXTEST, ARM11_TAP_DEFAULT); - scan_field_t chain5_fields[3]; + struct scan_field chain5_fields[3]; - u8 Ready = 0; /* ignored */ - u8 Valid = 0; /* ignored */ + uint8_t Ready = 0; /* ignored */ + uint8_t Valid = 0; /* ignored */ - arm11_setup_field(arm11, 32, &R(RDTR), NULL, chain5_fields + 0); - arm11_setup_field(arm11, 1, &Ready, NULL, chain5_fields + 1); - arm11_setup_field(arm11, 1, &Valid, NULL, chain5_fields + 2); + arm11_setup_field(arm11, 32, &R(RDTR), NULL, chain5_fields + 0); + arm11_setup_field(arm11, 1, &Ready, NULL, chain5_fields + 1); + arm11_setup_field(arm11, 1, &Valid, NULL, chain5_fields + 2); - arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE); + arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE); } arm11_record_register_history(arm11); + + return ERROR_OK; } -void arm11_record_register_history(arm11_common_t * arm11) +static void arm11_record_register_history(struct arm11_common *arm11) { - {size_t i; - for(i = 0; i < ARM11_REGCACHE_COUNT; i++) + for (size_t i = 0; i < ARM11_REGCACHE_COUNT; i++) { - arm11->reg_history[i].value = arm11->reg_values[i]; - arm11->reg_history[i].valid = arm11->reg_list[i].valid; + arm11->reg_history[i].value = arm11->reg_values[i]; + arm11->reg_history[i].valid = arm11->reg_list[i].valid; - arm11->reg_list[i].valid = 0; - arm11->reg_list[i].dirty = 0; - }} + arm11->reg_list[i].valid = 0; + arm11->reg_list[i].dirty = 0; + } } /* poll current target status */ -int arm11_poll(struct target_s *target) +static int arm11_poll(struct target_s *target) { FNC_INFO; + int retval; - arm11_common_t * arm11 = target->arch_info; + struct arm11_common * arm11 = target->arch_info; - if (arm11->trst_active) - return ERROR_OK; + uint32_t dscr; - u32 dscr = arm11_read_DSCR(arm11); + CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr)); - LOG_DEBUG("DSCR %08x", dscr); + LOG_DEBUG("DSCR %08" PRIx32 "", dscr); - arm11_check_init(arm11, &dscr); + CHECK_RETVAL(arm11_check_init(arm11, &dscr)); if (dscr & ARM11_DSCR_CORE_HALTED) { - if (target->state != TARGET_HALTED) - { - enum target_state old_state = target->state; + if (target->state != TARGET_HALTED) + { + enum target_state old_state = target->state; - LOG_DEBUG("enter TARGET_HALTED"); - target->state = TARGET_HALTED; - target->debug_reason = arm11_get_DSCR_debug_reason(dscr); - arm11_on_enter_debug_state(arm11); + LOG_DEBUG("enter TARGET_HALTED"); + target->state = TARGET_HALTED; + target->debug_reason = arm11_get_DSCR_debug_reason(dscr); + retval = arm11_on_enter_debug_state(arm11); + if (retval != ERROR_OK) + return retval; - target_call_event_callbacks(target, - old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED); - } + target_call_event_callbacks(target, + old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED); + } } else { - if (target->state != TARGET_RUNNING && target->state != TARGET_DEBUG_RUNNING) - { - LOG_DEBUG("enter TARGET_RUNNING"); - target->state = TARGET_RUNNING; - target->debug_reason = DBG_REASON_NOTHALTED; - } + if (target->state != TARGET_RUNNING && target->state != TARGET_DEBUG_RUNNING) + { + LOG_DEBUG("enter TARGET_RUNNING"); + target->state = TARGET_RUNNING; + target->debug_reason = DBG_REASON_NOTHALTED; + } } return ERROR_OK; } /* architecture specific status reply */ -int arm11_arch_state(struct target_s *target) +static int arm11_arch_state(struct target_s *target) { - FNC_INFO_NOTIMPLEMENTED; + struct arm11_common * arm11 = target->arch_info; + + LOG_USER("target halted due to %s\ncpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "", + Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name, + R(CPSR), + R(PC)); return ERROR_OK; } /* target request support */ -int arm11_target_request_data(struct target_s *target, u32 size, u8 *buffer) +static int arm11_target_request_data(struct target_s *target, + uint32_t size, uint8_t *buffer) { FNC_INFO_NOTIMPLEMENTED; @@ -707,20 +735,18 @@ int arm11_target_request_data(struct target_s *target, u32 size, u8 *buffer) } /* target execution control */ -int arm11_halt(struct target_s *target) +static int arm11_halt(struct target_s *target) { - int retval = ERROR_OK; - FNC_INFO; - arm11_common_t * arm11 = target->arch_info; + struct arm11_common * arm11 = target->arch_info; LOG_DEBUG("target->state: %s", - Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name ); + target_state_name(target)); if (target->state == TARGET_UNKNOWN) { - arm11->simulate_reset_on_next_halt = true; + arm11->simulate_reset_on_next_halt = true; } if (target->state == TARGET_HALTED) @@ -729,27 +755,35 @@ int arm11_halt(struct target_s *target) return ERROR_OK; } - if (arm11->trst_active) - { - arm11->halt_requested = true; - return ERROR_OK; - } - arm11_add_IR(arm11, ARM11_HALT, TAP_IDLE); - if((retval = jtag_execute_queue()) != ERROR_OK) - { - return retval; - } + CHECK_RETVAL(jtag_execute_queue()); - u32 dscr; + uint32_t dscr; + int i = 0; while (1) { - dscr = arm11_read_DSCR(arm11); + CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr)); - if (dscr & ARM11_DSCR_CORE_HALTED) - break; + if (dscr & ARM11_DSCR_CORE_HALTED) + break; + + + long long then = 0; + if (i == 1000) + { + then = timeval_ms(); + } + if (i >= 1000) + { + if ((timeval_ms()-then) > 1000) + { + LOG_WARNING("Timeout (1000ms) waiting for instructions to complete"); + return ERROR_FAIL; + } + } + i++; } arm11_on_enter_debug_state(arm11); @@ -759,28 +793,25 @@ int arm11_halt(struct target_s *target) target->state = TARGET_HALTED; target->debug_reason = arm11_get_DSCR_debug_reason(dscr); - if((retval = target_call_event_callbacks(target, - old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED)) != ERROR_OK) - { - return retval; - } + CHECK_RETVAL( + target_call_event_callbacks(target, + old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED)); return ERROR_OK; } -int arm11_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution) +static int arm11_resume(struct target_s *target, int current, + uint32_t address, int handle_breakpoints, int debug_execution) { - int retval = ERROR_OK; - FNC_INFO; -// LOG_DEBUG("current %d address %08x handle_breakpoints %d debug_execution %d", -// current, address, handle_breakpoints, debug_execution); + // LOG_DEBUG("current %d address %08x handle_breakpoints %d debug_execution %d", + // current, address, handle_breakpoints, debug_execution); - arm11_common_t * arm11 = target->arch_info; + struct arm11_common * arm11 = target->arch_info; LOG_DEBUG("target->state: %s", - Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name ); + target_state_name(target)); if (target->state != TARGET_HALTED) @@ -790,9 +821,9 @@ int arm11_resume(struct target_s *target, int current, u32 address, int handle_b } if (!current) - R(PC) = address; + R(PC) = address; - LOG_INFO("RESUME PC %08x%s", R(PC), !current ? "!" : ""); + LOG_DEBUG("RESUME PC %08" PRIx32 "%s", R(PC), !current ? "!" : ""); /* clear breakpoints/watchpoints and VCR*/ arm11_sc7_clear_vbw(arm11); @@ -800,251 +831,412 @@ int arm11_resume(struct target_s *target, int current, u32 address, int handle_b /* Set up breakpoints */ if (!debug_execution) { - /* check if one matches PC and step over it if necessary */ + /* check if one matches PC and step over it if necessary */ - breakpoint_t * bp; + breakpoint_t * bp; - for (bp = target->breakpoints; bp; bp = bp->next) - { - if (bp->address == R(PC)) + for (bp = target->breakpoints; bp; bp = bp->next) { - LOG_DEBUG("must step over %08x", bp->address); - arm11_step(target, 1, 0, 0); - break; + if (bp->address == R(PC)) + { + LOG_DEBUG("must step over %08" PRIx32 "", bp->address); + arm11_step(target, 1, 0, 0); + break; + } } - } - /* set all breakpoints */ + /* set all breakpoints */ - size_t brp_num = 0; + size_t brp_num = 0; - for (bp = target->breakpoints; bp; bp = bp->next) - { - arm11_sc7_action_t brp[2]; + for (bp = target->breakpoints; bp; bp = bp->next) + { + struct arm11_sc7_action brp[2]; - brp[0].write = 1; - brp[0].address = ARM11_SC7_BVR0 + brp_num; - brp[0].value = bp->address; - brp[1].write = 1; - brp[1].address = ARM11_SC7_BCR0 + brp_num; - brp[1].value = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (0 << 21); + brp[0].write = 1; + brp[0].address = ARM11_SC7_BVR0 + brp_num; + brp[0].value = bp->address; + brp[1].write = 1; + brp[1].address = ARM11_SC7_BCR0 + brp_num; + brp[1].value = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (0 << 21); - arm11_sc7_run(arm11, brp, asizeof(brp)); + arm11_sc7_run(arm11, brp, asizeof(brp)); - LOG_DEBUG("Add BP " ZU " at %08x", brp_num, bp->address); + LOG_DEBUG("Add BP " ZU " at %08" PRIx32 "", brp_num, bp->address); - brp_num++; - } + brp_num++; + } - arm11_sc7_set_vcr(arm11, arm11_vcr); + arm11_sc7_set_vcr(arm11, arm11_vcr); } arm11_leave_debug_state(arm11); arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE); - if((retval = jtag_execute_queue()) != ERROR_OK) - { - return retval; - } + CHECK_RETVAL(jtag_execute_queue()); + int i = 0; while (1) { - u32 dscr = arm11_read_DSCR(arm11); + uint32_t dscr; - LOG_DEBUG("DSCR %08x", dscr); + CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr)); - if (dscr & ARM11_DSCR_CORE_RESTARTED) - break; + LOG_DEBUG("DSCR %08" PRIx32 "", dscr); + + if (dscr & ARM11_DSCR_CORE_RESTARTED) + break; + + + long long then = 0; + if (i == 1000) + { + then = timeval_ms(); + } + if (i >= 1000) + { + if ((timeval_ms()-then) > 1000) + { + LOG_WARNING("Timeout (1000ms) waiting for instructions to complete"); + return ERROR_FAIL; + } + } + i++; } if (!debug_execution) { - target->state = TARGET_RUNNING; + target->state = TARGET_RUNNING; target->debug_reason = DBG_REASON_NOTHALTED; - if((retval = target_call_event_callbacks(target, TARGET_EVENT_RESUMED)) != ERROR_OK) - { - return retval; - } + + CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_RESUMED)); } else { - target->state = TARGET_DEBUG_RUNNING; + target->state = TARGET_DEBUG_RUNNING; target->debug_reason = DBG_REASON_NOTHALTED; - if((retval = target_call_event_callbacks(target, TARGET_EVENT_RESUMED)) != ERROR_OK) - { - return retval; - } + + CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_RESUMED)); } return ERROR_OK; } -int arm11_step(struct target_s *target, int current, u32 address, int handle_breakpoints) + +static int armv4_5_to_arm11(int reg) { - int retval = ERROR_OK; + if (reg < 16) + return reg; + switch (reg) + { + case ARMV4_5_CPSR: + return ARM11_RC_CPSR; + case 16: + /* FIX!!! handle thumb better! */ + return ARM11_RC_CPSR; + default: + LOG_ERROR("BUG: register translation from armv4_5 to arm11 not supported %d", reg); + exit(-1); + } +} + + +static uint32_t arm11_sim_get_reg(struct arm_sim_interface *sim, int reg) +{ + struct arm11_common * arm11 = (struct arm11_common *)sim->user_data; + + reg=armv4_5_to_arm11(reg); + + return buf_get_u32(arm11->reg_list[reg].value, 0, 32); +} + +static void arm11_sim_set_reg(struct arm_sim_interface *sim, + int reg, uint32_t value) +{ + struct arm11_common * arm11 = (struct arm11_common *)sim->user_data; + + reg=armv4_5_to_arm11(reg); + buf_set_u32(arm11->reg_list[reg].value, 0, 32, value); +} + +static uint32_t arm11_sim_get_cpsr(struct arm_sim_interface *sim, + int pos, int bits) +{ + struct arm11_common * arm11 = (struct arm11_common *)sim->user_data; + + return buf_get_u32(arm11->reg_list[ARM11_RC_CPSR].value, pos, bits); +} + +static enum armv4_5_state arm11_sim_get_state(struct arm_sim_interface *sim) +{ +// struct arm11_common * arm11 = (struct arm11_common *)sim->user_data; + + /* FIX!!!! we should implement thumb for arm11 */ + return ARMV4_5_STATE_ARM; +} + +static void arm11_sim_set_state(struct arm_sim_interface *sim, + enum armv4_5_state mode) +{ +// struct arm11_common * arm11 = (struct arm11_common *)sim->user_data; + + /* FIX!!!! we should implement thumb for arm11 */ + LOG_ERROR("Not implemetned!"); +} + + +static enum armv4_5_mode arm11_sim_get_mode(struct arm_sim_interface *sim) +{ + //struct arm11_common * arm11 = (struct arm11_common *)sim->user_data; + + /* FIX!!!! we should implement something that returns the current mode here!!! */ + return ARMV4_5_MODE_USR; +} + +static int arm11_simulate_step(target_t *target, uint32_t *dry_run_pc) +{ + struct arm_sim_interface sim; + + sim.user_data=target->arch_info; + sim.get_reg=&arm11_sim_get_reg; + sim.set_reg=&arm11_sim_set_reg; + sim.get_reg_mode=&arm11_sim_get_reg; + sim.set_reg_mode=&arm11_sim_set_reg; + sim.get_cpsr=&arm11_sim_get_cpsr; + sim.get_mode=&arm11_sim_get_mode; + sim.get_state=&arm11_sim_get_state; + sim.set_state=&arm11_sim_set_state; + + return arm_simulate_step_core(target, dry_run_pc, &sim); + +} + +static int arm11_step(struct target_s *target, int current, + uint32_t address, int handle_breakpoints) +{ FNC_INFO; LOG_DEBUG("target->state: %s", - Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name ); + target_state_name(target)); if (target->state != TARGET_HALTED) { - LOG_WARNING("target was not halted"); - return ERROR_TARGET_NOT_HALTED; + LOG_WARNING("target was not halted"); + return ERROR_TARGET_NOT_HALTED; } - arm11_common_t * arm11 = target->arch_info; + struct arm11_common * arm11 = target->arch_info; if (!current) - R(PC) = address; + R(PC) = address; + + LOG_DEBUG("STEP PC %08" PRIx32 "%s", R(PC), !current ? "!" : ""); - LOG_INFO("STEP PC %08x%s", R(PC), !current ? "!" : ""); /** \todo TODO: Thumb not supported here */ - u32 next_instruction; + uint32_t next_instruction; - arm11_read_memory_word(arm11, R(PC), &next_instruction); + CHECK_RETVAL(arm11_read_memory_word(arm11, R(PC), &next_instruction)); /* skip over BKPT */ if ((next_instruction & 0xFFF00070) == 0xe1200070) { - R(PC) += 4; - arm11->reg_list[ARM11_RC_PC].valid = 1; - arm11->reg_list[ARM11_RC_PC].dirty = 0; - LOG_INFO("Skipping BKPT"); + R(PC) += 4; + arm11->reg_list[ARM11_RC_PC].valid = 1; + arm11->reg_list[ARM11_RC_PC].dirty = 0; + LOG_DEBUG("Skipping BKPT"); } /* skip over Wait for interrupt / Standby */ /* mcr 15, 0, r?, cr7, cr0, {4} */ else if ((next_instruction & 0xFFFF0FFF) == 0xee070f90) { - R(PC) += 4; - arm11->reg_list[ARM11_RC_PC].valid = 1; - arm11->reg_list[ARM11_RC_PC].dirty = 0; - LOG_INFO("Skipping WFI"); + R(PC) += 4; + arm11->reg_list[ARM11_RC_PC].valid = 1; + arm11->reg_list[ARM11_RC_PC].dirty = 0; + LOG_DEBUG("Skipping WFI"); } /* ignore B to self */ else if ((next_instruction & 0xFEFFFFFF) == 0xeafffffe) { - LOG_INFO("Not stepping jump to self"); + LOG_DEBUG("Not stepping jump to self"); } else { - /** \todo TODO: check if break-/watchpoints make any sense at all in combination - * with this. */ + /** \todo TODO: check if break-/watchpoints make any sense at all in combination + * with this. */ + + /** \todo TODO: check if disabling IRQs might be a good idea here. Alternatively + * the VCR might be something worth looking into. */ + + + /* Set up breakpoint for stepping */ - /** \todo TODO: check if disabling IRQs might be a good idea here. Alternatively - * the VCR might be something worth looking into. */ + struct arm11_sc7_action brp[2]; + brp[0].write = 1; + brp[0].address = ARM11_SC7_BVR0; + brp[1].write = 1; + brp[1].address = ARM11_SC7_BCR0; - /* Set up breakpoint for stepping */ + if (arm11_config_hardware_step) + { + /* hardware single stepping be used if possible or is it better to + * always use the same code path? Hardware single stepping is not supported + * on all hardware + */ + brp[0].value = R(PC); + brp[1].value = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (2 << 21); + } else + { + /* sets a breakpoint on the next PC(calculated by simulation), + */ + uint32_t next_pc; + int retval; + retval = arm11_simulate_step(target, &next_pc); + if (retval != ERROR_OK) + return retval; + + brp[0].value = next_pc; + brp[1].value = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (0 << 21); + } - arm11_sc7_action_t brp[2]; + CHECK_RETVAL(arm11_sc7_run(arm11, brp, asizeof(brp))); - brp[0].write = 1; - brp[0].address = ARM11_SC7_BVR0; - brp[0].value = R(PC); - brp[1].write = 1; - brp[1].address = ARM11_SC7_BCR0; - brp[1].value = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (2 << 21); + /* resume */ - arm11_sc7_run(arm11, brp, asizeof(brp)); - /* resume */ + if (arm11_config_step_irq_enable) + R(DSCR) &= ~ARM11_DSCR_INTERRUPTS_DISABLE; /* should be redundant */ + else + R(DSCR) |= ARM11_DSCR_INTERRUPTS_DISABLE; - arm11_leave_debug_state(arm11); - arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE); + CHECK_RETVAL(arm11_leave_debug_state(arm11)); - if((retval = jtag_execute_queue()) != ERROR_OK) - { - return retval; - } + arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE); - /** \todo TODO: add a timeout */ + CHECK_RETVAL(jtag_execute_queue()); - /* wait for halt */ + /* wait for halt */ + int i = 0; + while (1) + { + uint32_t dscr; - while (1) - { - u32 dscr = arm11_read_DSCR(arm11); + CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr)); - LOG_DEBUG("DSCR %08x", dscr); + LOG_DEBUG("DSCR %08" PRIx32 "e", dscr); - if ((dscr & (ARM11_DSCR_CORE_RESTARTED | ARM11_DSCR_CORE_HALTED)) == - (ARM11_DSCR_CORE_RESTARTED | ARM11_DSCR_CORE_HALTED)) - break; - } + if ((dscr & (ARM11_DSCR_CORE_RESTARTED | ARM11_DSCR_CORE_HALTED)) == + (ARM11_DSCR_CORE_RESTARTED | ARM11_DSCR_CORE_HALTED)) + break; - /* clear breakpoint */ - arm11_sc7_clear_vbw(arm11); + long long then = 0; + if (i == 1000) + { + then = timeval_ms(); + } + if (i >= 1000) + { + if ((timeval_ms()-then) > 1000) + { + LOG_WARNING("Timeout (1000ms) waiting for instructions to complete"); + return ERROR_FAIL; + } + } + i++; + } + + /* clear breakpoint */ + arm11_sc7_clear_vbw(arm11); + + /* save state */ + CHECK_RETVAL(arm11_on_enter_debug_state(arm11)); + + /* restore default state */ + R(DSCR) &= ~ARM11_DSCR_INTERRUPTS_DISABLE; - /* save state */ - arm11_on_enter_debug_state(arm11); } -// target->state = TARGET_HALTED; + // target->state = TARGET_HALTED; target->debug_reason = DBG_REASON_SINGLESTEP; - if((retval = target_call_event_callbacks(target, TARGET_EVENT_HALTED)) != ERROR_OK) - { - return retval; - } + CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_HALTED)); return ERROR_OK; } -/* target reset control */ -int arm11_assert_reset(struct target_s *target) +static int arm11_assert_reset(target_t *target) { FNC_INFO; + int retval; -#if 0 - /* assert reset lines */ - /* resets only the DBGTAP, not the ARM */ + struct arm11_common * arm11 = target->arch_info; + retval = arm11_check_init(arm11, NULL); + if (retval != ERROR_OK) + return retval; - jtag_add_reset(1, 0); + target->state = TARGET_UNKNOWN; + + /* we would very much like to reset into the halted, state, + * but resetting and halting is second best... */ + if (target->reset_halt) + { + CHECK_RETVAL(target_halt(target)); + } + + + /* srst is funny. We can not do *anything* else while it's asserted + * and it has unkonwn side effects. Make sure no other code runs + * meanwhile. + * + * Code below assumes srst: + * + * - Causes power-on-reset (but of what parts of the system?). Bug + * in arm11? + * + * - Messes us TAP state without asserting trst. + * + * - There is another bug in the arm11 core. When you generate an access to + * external logic (for example ddr controller via AHB bus) and that block + * is not configured (perhaps it is still held in reset), that transaction + * will never complete. This will hang arm11 core but it will also hang + * JTAG controller. Nothing, short of srst assertion will bring it out of + * this. + * + * Mysteries: + * + * - What should the PC be after an srst reset when starting in the halted + * state? + */ + + jtag_add_reset(0, 1); + jtag_add_reset(0, 0); + + /* How long do we have to wait? */ jtag_add_sleep(5000); - arm11_common_t * arm11 = target->arch_info; - arm11->trst_active = true; -#endif + /* un-mess up TAP state */ + jtag_add_tlr(); - if (target->reset_halt) + retval = jtag_execute_queue(); + if (retval != ERROR_OK) { - int retval; - if ((retval = target_halt(target))!=ERROR_OK) - return retval; + return retval; } return ERROR_OK; } -int arm11_deassert_reset(struct target_s *target) +static int arm11_deassert_reset(target_t *target) { - FNC_INFO; - -#if 0 - LOG_DEBUG("target->state: %s", - Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name ); - - - /* deassert reset lines */ - jtag_add_reset(0, 0); - - arm11_common_t * arm11 = target->arch_info; - arm11->trst_active = false; - - if (arm11->halt_requested) - return arm11_halt(target); -#endif - return ERROR_OK; } -int arm11_soft_reset_halt(struct target_s *target) +static int arm11_soft_reset_halt(struct target_s *target) { FNC_INFO_NOTIMPLEMENTED; @@ -1052,265 +1244,338 @@ int arm11_soft_reset_halt(struct target_s *target) } /* target register access for gdb */ -int arm11_get_gdb_reg_list(struct target_s *target, struct reg_s **reg_list[], int *reg_list_size) +static int arm11_get_gdb_reg_list(struct target_s *target, + struct reg_s **reg_list[], int *reg_list_size) { FNC_INFO; - arm11_common_t * arm11 = target->arch_info; + struct arm11_common * arm11 = target->arch_info; *reg_list_size = ARM11_GDB_REGISTER_COUNT; *reg_list = malloc(sizeof(reg_t*) * ARM11_GDB_REGISTER_COUNT); - {size_t i; - for (i = 16; i < 24; i++) + for (size_t i = 16; i < 24; i++) { - (*reg_list)[i] = &arm11_gdb_dummy_fp_reg; - }} + (*reg_list)[i] = &arm11_gdb_dummy_fp_reg; + } (*reg_list)[24] = &arm11_gdb_dummy_fps_reg; - {size_t i; - for (i = 0; i < ARM11_REGCACHE_COUNT; i++) + for (size_t i = 0; i < ARM11_REGCACHE_COUNT; i++) { - if (arm11_reg_defs[i].gdb_num == -1) - continue; + if (arm11_reg_defs[i].gdb_num == -1) + continue; - (*reg_list)[arm11_reg_defs[i].gdb_num] = arm11->reg_list + i; - }} + (*reg_list)[arm11_reg_defs[i].gdb_num] = arm11->reg_list + i; + } return ERROR_OK; } /* target memory access -* size: 1 = byte (8bit), 2 = half-word (16bit), 4 = word (32bit) -* count: number of items of -*/ -int arm11_read_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer) + * size: 1 = byte (8bit), 2 = half-word (16bit), 4 = word (32bit) + * count: number of items of + * + * arm11_config_memrw_no_increment - in the future we may want to be able + * to read/write a range of data to a "port". a "port" is an action on + * read memory address for some peripheral. + */ +static int arm11_read_memory_inner(struct target_s *target, + uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer, + bool arm11_config_memrw_no_increment) { - /** \todo TODO: check if buffer cast to u32* and u16* might cause alignment problems */ + /** \todo TODO: check if buffer cast to uint32_t* and uint16_t* might cause alignment problems */ + int retval; FNC_INFO; if (target->state != TARGET_HALTED) { - LOG_WARNING("target was not halted"); - return ERROR_TARGET_NOT_HALTED; + LOG_WARNING("target was not halted"); + return ERROR_TARGET_NOT_HALTED; } - LOG_DEBUG("ADDR %08x SIZE %08x COUNT %08x", address, size, count); + LOG_DEBUG("ADDR %08" PRIx32 " SIZE %08" PRIx32 " COUNT %08" PRIx32 "", address, size, count); - arm11_common_t * arm11 = target->arch_info; + struct arm11_common * arm11 = target->arch_info; - arm11_run_instr_data_prepare(arm11); + retval = arm11_run_instr_data_prepare(arm11); + if (retval != ERROR_OK) + return retval; /* MRC p14,0,r0,c0,c5,0 */ - arm11_run_instr_data_to_core1(arm11, 0xee100e15, address); + retval = arm11_run_instr_data_to_core1(arm11, 0xee100e15, address); + if (retval != ERROR_OK) + return retval; switch (size) { case 1: - /** \todo TODO: check if dirty is the right choice to force a rewrite on arm11_resume() */ - arm11->reg_list[ARM11_RC_R1].dirty = 1; + /** \todo TODO: check if dirty is the right choice to force a rewrite on arm11_resume() */ + arm11->reg_list[ARM11_RC_R1].dirty = 1; - {size_t i; - for (i = 0; i < count; i++) - { - /* ldrb r1, [r0], #1 */ - arm11_run_instr_no_data1(arm11, 0xe4d01001); + for (size_t i = 0; i < count; i++) + { + /* ldrb r1, [r0], #1 */ + /* ldrb r1, [r0] */ + arm11_run_instr_no_data1(arm11, + !arm11_config_memrw_no_increment ? 0xe4d01001 : 0xe5d01000); - u32 res; - /* MCR p14,0,R1,c0,c5,0 */ - arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1); + uint32_t res; + /* MCR p14,0,R1,c0,c5,0 */ + arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1); - *buffer++ = res; - }} + *buffer++ = res; + } - break; + break; case 2: - { - arm11->reg_list[ARM11_RC_R1].dirty = 1; - - u16 * buf16 = (u16*)buffer; + { + arm11->reg_list[ARM11_RC_R1].dirty = 1; - {size_t i; - for (i = 0; i < count; i++) - { - /* ldrh r1, [r0], #2 */ - arm11_run_instr_no_data1(arm11, 0xe0d010b2); + for (size_t i = 0; i < count; i++) + { + /* ldrh r1, [r0], #2 */ + arm11_run_instr_no_data1(arm11, + !arm11_config_memrw_no_increment ? 0xe0d010b2 : 0xe1d010b0); - u32 res; + uint32_t res; - /* MCR p14,0,R1,c0,c5,0 */ - arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1); + /* MCR p14,0,R1,c0,c5,0 */ + arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1); - *buf16++ = res; - }} + uint16_t svalue = res; + memcpy(buffer + i * sizeof(uint16_t), &svalue, sizeof(uint16_t)); + } - break; - } + break; + } case 4: + { + uint32_t instr = !arm11_config_memrw_no_increment ? 0xecb05e01 : 0xed905e00; + /** \todo TODO: buffer cast to uint32_t* causes alignment warnings */ + uint32_t *words = (uint32_t *)buffer; - /* LDC p14,c5,[R0],#4 */ - arm11_run_instr_data_from_core(arm11, 0xecb05e01, (u32 *)buffer, count); - break; + /* LDC p14,c5,[R0],#4 */ + /* LDC p14,c5,[R0] */ + arm11_run_instr_data_from_core(arm11, instr, words, count); + break; + } } - arm11_run_instr_data_finish(arm11); + return arm11_run_instr_data_finish(arm11); +} - return ERROR_OK; +static int arm11_read_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) +{ + return arm11_read_memory_inner(target, address, size, count, buffer, false); } -int arm11_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer) +/* +* arm11_config_memrw_no_increment - in the future we may want to be able +* to read/write a range of data to a "port". a "port" is an action on +* read memory address for some peripheral. +*/ +static int arm11_write_memory_inner(struct target_s *target, + uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer, + bool arm11_config_memrw_no_increment) { + int retval; FNC_INFO; if (target->state != TARGET_HALTED) { - LOG_WARNING("target was not halted"); - return ERROR_TARGET_NOT_HALTED; + LOG_WARNING("target was not halted"); + return ERROR_TARGET_NOT_HALTED; } - LOG_DEBUG("ADDR %08x SIZE %08x COUNT %08x", address, size, count); + LOG_DEBUG("ADDR %08" PRIx32 " SIZE %08" PRIx32 " COUNT %08" PRIx32 "", address, size, count); - arm11_common_t * arm11 = target->arch_info; + struct arm11_common * arm11 = target->arch_info; - arm11_run_instr_data_prepare(arm11); + retval = arm11_run_instr_data_prepare(arm11); + if (retval != ERROR_OK) + return retval; /* MRC p14,0,r0,c0,c5,0 */ - arm11_run_instr_data_to_core1(arm11, 0xee100e15, address); + retval = arm11_run_instr_data_to_core1(arm11, 0xee100e15, address); + if (retval != ERROR_OK) + return retval; + + /* burst writes are not used for single words as those may well be + * reset init script writes. + * + * The other advantage is that as burst writes are default, we'll + * now exercise both burst and non-burst code paths with the + * default settings, increasing code coverage. + */ + bool burst = arm11_config_memwrite_burst && (count > 1); switch (size) { case 1: - { - arm11->reg_list[ARM11_RC_R1].dirty = 1; - - {size_t i; - for (i = 0; i < count; i++) - { - /* MRC p14,0,r1,c0,c5,0 */ - arm11_run_instr_data_to_core1(arm11, 0xee101e15, *buffer++); + { + arm11->reg_list[ARM11_RC_R1].dirty = 1; - /* strb r1, [r0], #1 */ - arm11_run_instr_no_data1(arm11, 0xe4c01001); - }} + for (size_t i = 0; i < count; i++) + { + /* MRC p14,0,r1,c0,c5,0 */ + retval = arm11_run_instr_data_to_core1(arm11, 0xee101e15, *buffer++); + if (retval != ERROR_OK) + return retval; + + /* strb r1, [r0], #1 */ + /* strb r1, [r0] */ + retval = arm11_run_instr_no_data1(arm11, + !arm11_config_memrw_no_increment ? 0xe4c01001 : 0xe5c01000); + if (retval != ERROR_OK) + return retval; + } - break; - } + break; + } case 2: - { - arm11->reg_list[ARM11_RC_R1].dirty = 1; + { + arm11->reg_list[ARM11_RC_R1].dirty = 1; - u16 * buf16 = (u16*)buffer; + for (size_t i = 0; i < count; i++) + { + uint16_t value; + memcpy(&value, buffer + i * sizeof(uint16_t), sizeof(uint16_t)); + + /* MRC p14,0,r1,c0,c5,0 */ + retval = arm11_run_instr_data_to_core1(arm11, 0xee101e15, value); + if (retval != ERROR_OK) + return retval; + + /* strh r1, [r0], #2 */ + /* strh r1, [r0] */ + retval = arm11_run_instr_no_data1(arm11, + !arm11_config_memrw_no_increment ? 0xe0c010b2 : 0xe1c010b0); + if (retval != ERROR_OK) + return retval; + } - {size_t i; - for (i = 0; i < count; i++) - { - /* MRC p14,0,r1,c0,c5,0 */ - arm11_run_instr_data_to_core1(arm11, 0xee101e15, *buf16++); + break; + } - /* strh r1, [r0], #2 */ - arm11_run_instr_no_data1(arm11, 0xe0c010b2); - }} + case 4: { + uint32_t instr = !arm11_config_memrw_no_increment ? 0xeca05e01 : 0xed805e00; - break; - } + /** \todo TODO: buffer cast to uint32_t* causes alignment warnings */ + uint32_t *words = (uint32_t*)buffer; - case 4: - /** \todo TODO: check if buffer cast to u32* might cause alignment problems */ + if (!burst) + { + /* STC p14,c5,[R0],#4 */ + /* STC p14,c5,[R0]*/ + retval = arm11_run_instr_data_to_core(arm11, instr, words, count); + if (retval != ERROR_OK) + return retval; + } + else + { + /* STC p14,c5,[R0],#4 */ + /* STC p14,c5,[R0]*/ + retval = arm11_run_instr_data_to_core_noack(arm11, instr, words, count); + if (retval != ERROR_OK) + return retval; + } - if (!arm11_config_memwrite_burst) - { - /* STC p14,c5,[R0],#4 */ - arm11_run_instr_data_to_core(arm11, 0xeca05e01, (u32 *)buffer, count); - } - else - { - /* STC p14,c5,[R0],#4 */ - arm11_run_instr_data_to_core_noack(arm11, 0xeca05e01, (u32 *)buffer, count); + break; } - - break; } -#if 1 /* r0 verification */ + if (!arm11_config_memrw_no_increment) { - u32 r0; + uint32_t r0; - /* MCR p14,0,R0,c0,c5,0 */ - arm11_run_instr_data_from_core(arm11, 0xEE000E15, &r0, 1); + /* MCR p14,0,R0,c0,c5,0 */ + retval = arm11_run_instr_data_from_core(arm11, 0xEE000E15, &r0, 1); + if (retval != ERROR_OK) + return retval; - if (address + size * count != r0) - { - LOG_ERROR("Data transfer failed. (%d)", (r0 - address) - size * count); + if (address + size * count != r0) + { + LOG_ERROR("Data transfer failed. Expected end " + "address 0x%08x, got 0x%08x", + (unsigned) (address + size * count), + (unsigned) r0); - if (arm11_config_memwrite_burst) - LOG_ERROR("use 'arm11 memwrite burst disable' to disable fast burst mode"); + if (burst) + LOG_ERROR("use 'arm11 memwrite burst disable' to disable fast burst mode"); - if (arm11_config_memwrite_error_fatal) - return ERROR_FAIL; - } + if (arm11_config_memwrite_error_fatal) + return ERROR_FAIL; + } } -#endif - - arm11_run_instr_data_finish(arm11); - return ERROR_OK; + return arm11_run_instr_data_finish(arm11); } +static int arm11_write_memory(struct target_s *target, + uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) +{ + return arm11_write_memory_inner(target, address, size, count, buffer, false); +} /* write target memory in multiples of 4 byte, optimized for writing large quantities of data */ -int arm11_bulk_write_memory(struct target_s *target, u32 address, u32 count, u8 *buffer) +static int arm11_bulk_write_memory(struct target_s *target, + uint32_t address, uint32_t count, uint8_t *buffer) { FNC_INFO; if (target->state != TARGET_HALTED) { - LOG_WARNING("target was not halted"); - return ERROR_TARGET_NOT_HALTED; + LOG_WARNING("target was not halted"); + return ERROR_TARGET_NOT_HALTED; } return arm11_write_memory(target, address, 4, count, buffer); } -int arm11_checksum_memory(struct target_s *target, u32 address, u32 count, u32* checksum) +/* here we have nothing target specific to contribute, so we fail and then the + * fallback code will read data from the target and calculate the CRC on the + * host. + */ +static int arm11_checksum_memory(struct target_s *target, + uint32_t address, uint32_t count, uint32_t* checksum) { - FNC_INFO_NOTIMPLEMENTED; - - return ERROR_OK; + return ERROR_FAIL; } /* target break-/watchpoint control * rw: 0 = write, 1 = read, 2 = access */ -int arm11_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint) +static int arm11_add_breakpoint(struct target_s *target, + breakpoint_t *breakpoint) { FNC_INFO; - arm11_common_t * arm11 = target->arch_info; + struct arm11_common * arm11 = target->arch_info; #if 0 if (breakpoint->type == BKPT_SOFT) { - LOG_INFO("sw breakpoint requested, but software breakpoints not enabled"); - return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; + LOG_INFO("sw breakpoint requested, but software breakpoints not enabled"); + return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } #endif if (!arm11->free_brps) { - LOG_INFO("no breakpoint unit available for hardware breakpoint"); - return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; + LOG_DEBUG("no breakpoint unit available for hardware breakpoint"); + return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } if (breakpoint->length != 4) { - LOG_INFO("only breakpoints of four bytes length supported"); - return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; + LOG_DEBUG("only breakpoints of four bytes length supported"); + return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } arm11->free_brps--; @@ -1318,25 +1583,28 @@ int arm11_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint) return ERROR_OK; } -int arm11_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint) +static int arm11_remove_breakpoint(struct target_s *target, + breakpoint_t *breakpoint) { FNC_INFO; - arm11_common_t * arm11 = target->arch_info; + struct arm11_common * arm11 = target->arch_info; arm11->free_brps++; return ERROR_OK; } -int arm11_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint) +static int arm11_add_watchpoint(struct target_s *target, + watchpoint_t *watchpoint) { FNC_INFO_NOTIMPLEMENTED; return ERROR_OK; } -int arm11_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint) +static int arm11_remove_watchpoint(struct target_s *target, + watchpoint_t *watchpoint) { FNC_INFO_NOTIMPLEMENTED; @@ -1345,26 +1613,21 @@ int arm11_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint) // HACKHACKHACK - FIXME mode/state /* target algorithm support */ -int arm11_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t *mem_params, - int num_reg_params, reg_param_t *reg_params, u32 entry_point, u32 exit_point, - int timeout_ms, void *arch_info) +static int arm11_run_algorithm(struct target_s *target, + int num_mem_params, struct mem_param *mem_params, + int num_reg_params, struct reg_param *reg_params, + uint32_t entry_point, uint32_t exit_point, + int timeout_ms, void *arch_info) { - arm11_common_t *arm11 = target->arch_info; - armv4_5_algorithm_t *arm11_algorithm_info = arch_info; + struct arm11_common *arm11 = target->arch_info; // enum armv4_5_state core_state = arm11->core_state; // enum armv4_5_mode core_mode = arm11->core_mode; - u32 context[16]; - u32 cpsr; + uint32_t context[16]; + uint32_t cpsr; int exit_breakpoint_size = 0; - int i; int retval = ERROR_OK; LOG_DEBUG("Running algorithm"); - if (arm11_algorithm_info->common_magic != ARMV4_5_COMMON_MAGIC) - { - LOG_ERROR("current target isn't an ARMV4/5 target"); - return ERROR_TARGET_INVALID; - } if (target->state != TARGET_HALTED) { @@ -1377,22 +1640,22 @@ int arm11_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t // return ERROR_FAIL; // Save regs - for (i = 0; i < 16; i++) + for (unsigned i = 0; i < 16; i++) { - context[i] = buf_get_u32((u8*)(&arm11->reg_values[i]),0,32); - LOG_DEBUG("Save %i: 0x%x",i,context[i]); + context[i] = buf_get_u32((uint8_t*)(&arm11->reg_values[i]),0,32); + LOG_DEBUG("Save %u: 0x%" PRIx32 "", i, context[i]); } - cpsr = buf_get_u32((u8*)(arm11->reg_values+ARM11_RC_CPSR),0,32); - LOG_DEBUG("Save CPSR: 0x%x", cpsr); + cpsr = buf_get_u32((uint8_t*)(arm11->reg_values + ARM11_RC_CPSR),0,32); + LOG_DEBUG("Save CPSR: 0x%" PRIx32 "", cpsr); - for (i = 0; i < num_mem_params; i++) + for (int i = 0; i < num_mem_params; i++) { target_write_buffer(target, mem_params[i].address, mem_params[i].size, mem_params[i].value); } // Set register parameters - for (i = 0; i < num_reg_params; i++) + for (int i = 0; i < num_reg_params; i++) { reg_t *reg = register_get_by_name(arm11->core_cache, reg_params[i].reg_name, 0); if (!reg) @@ -1423,6 +1686,12 @@ int arm11_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t exit(-1); } */ + + +/* arm11 at this point only supports ARM not THUMB mode + however if this test needs to be reactivated the current state can be read back + from CPSR */ +#if 0 if (arm11_algorithm_info->core_mode != ARMV4_5_MODE_ANY) { LOG_DEBUG("setting core_mode: 0x%2.2x", arm11_algorithm_info->core_mode); @@ -1430,6 +1699,7 @@ int arm11_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t arm11->reg_list[ARM11_RC_CPSR].dirty = 1; arm11->reg_list[ARM11_RC_CPSR].valid = 1; } +#endif if ((retval = breakpoint_add(target, exit_point, exit_breakpoint_size, BKPT_HARD)) != ERROR_OK) { @@ -1439,43 +1709,36 @@ int arm11_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t } // no debug, otherwise breakpoint is not set - if((retval = target_resume(target, 0, entry_point, 1, 0)) != ERROR_OK) - { - return retval; - } + CHECK_RETVAL(target_resume(target, 0, entry_point, 1, 0)); - if((retval = target_wait_state(target, TARGET_HALTED, timeout_ms)) != ERROR_OK) - { - return retval; - } + CHECK_RETVAL(target_wait_state(target, TARGET_HALTED, timeout_ms)); if (target->state != TARGET_HALTED) { - if ((retval=target_halt(target))!=ERROR_OK) - return retval; - if ((retval=target_wait_state(target, TARGET_HALTED, 500))!=ERROR_OK) - { - return retval; - } + CHECK_RETVAL(target_halt(target)); + + CHECK_RETVAL(target_wait_state(target, TARGET_HALTED, 500)); + retval = ERROR_TARGET_TIMEOUT; + goto del_breakpoint; } if (buf_get_u32(arm11->reg_list[15].value, 0, 32) != exit_point) { - LOG_WARNING("target reentered debug state, but not at the desired exit point: 0x%4.4x", + LOG_WARNING("target reentered debug state, but not at the desired exit point: 0x%4.4" PRIx32 "", buf_get_u32(arm11->reg_list[15].value, 0, 32)); retval = ERROR_TARGET_TIMEOUT; goto del_breakpoint; } - for (i = 0; i < num_mem_params; i++) + for (int i = 0; i < num_mem_params; i++) { if (mem_params[i].direction != PARAM_OUT) target_read_buffer(target, mem_params[i].address, mem_params[i].size, mem_params[i].value); } - for (i = 0; i < num_reg_params; i++) + for (int i = 0; i < num_reg_params; i++) { if (reg_params[i].direction != PARAM_OUT) { @@ -1501,14 +1764,14 @@ del_breakpoint: restore: // Restore context - for (i = 0; i < 16; i++) + for (size_t i = 0; i < 16; i++) { - LOG_DEBUG("restoring register %s with value 0x%8.8x", + LOG_DEBUG("restoring register %s with value 0x%8.8" PRIx32 "", arm11->reg_list[i].name, context[i]); - arm11_set_reg(&arm11->reg_list[i], (u8*)&context[i]); + arm11_set_reg(&arm11->reg_list[i], (uint8_t*)&context[i]); } - LOG_DEBUG("restoring CPSR with value 0x%8.8x", cpsr); - arm11_set_reg(&arm11->reg_list[ARM11_RC_CPSR], (u8*)&cpsr); + LOG_DEBUG("restoring CPSR with value 0x%8.8" PRIx32 "", cpsr); + arm11_set_reg(&arm11->reg_list[ARM11_RC_CPSR], (uint8_t*)&cpsr); // arm11->core_state = core_state; // arm11->core_mode = core_mode; @@ -1516,25 +1779,15 @@ restore: return retval; } -int arm11_target_create(struct target_s *target, Jim_Interp *interp) +static int arm11_target_create(struct target_s *target, Jim_Interp *interp) { - int retval = ERROR_OK; FNC_INFO; - NEW(arm11_common_t, arm11, 1); + NEW(struct arm11_common, arm11, 1); arm11->target = target; - /* prepare JTAG information for the new target */ - arm11->jtag_info.tap = target->tap; - arm11->jtag_info.scann_size = 5; - - if((retval = arm_jtag_setup_connection(&arm11->jtag_info)) != ERROR_OK) - { - return retval; - } - - if (target->tap==NULL) + if (target->tap == NULL) return ERROR_FAIL; if (target->tap->ir_length != 5) @@ -1548,26 +1801,27 @@ int arm11_target_create(struct target_s *target, Jim_Interp *interp) return ERROR_OK; } -int arm11_init_target(struct command_context_s *cmd_ctx, struct target_s *target) +static int arm11_init_target(struct command_context_s *cmd_ctx, + struct target_s *target) { /* Initialize anything we can set up without talking to the target */ return arm11_build_reg_cache(target); - } /* talk to the target and set things up */ -int arm11_examine(struct target_s *target) +static int arm11_examine(struct target_s *target) { - FNC_INFO; int retval; - arm11_common_t * arm11 = target->arch_info; + FNC_INFO; + + struct arm11_common * arm11 = target->arch_info; /* check IDCODE */ - arm11_add_IR(arm11, ARM11_IDCODE, TAP_INVALID); + arm11_add_IR(arm11, ARM11_IDCODE, ARM11_TAP_DEFAULT); - scan_field_t idcode_field; + struct scan_field idcode_field; arm11_setup_field(arm11, 32, NULL, &arm11->device_id, &idcode_field); @@ -1575,20 +1829,18 @@ int arm11_examine(struct target_s *target) /* check DIDR */ - arm11_add_debug_SCAN_N(arm11, 0x00, TAP_INVALID); + arm11_add_debug_SCAN_N(arm11, 0x00, ARM11_TAP_DEFAULT); - arm11_add_IR(arm11, ARM11_INTEST, TAP_INVALID); + arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT); - scan_field_t chain0_fields[2]; + struct scan_field chain0_fields[2]; arm11_setup_field(arm11, 32, NULL, &arm11->didr, chain0_fields + 0); arm11_setup_field(arm11, 8, NULL, &arm11->implementor, chain0_fields + 1); arm11_add_dr_scan_vc(asizeof(chain0_fields), chain0_fields, TAP_IDLE); - if ((retval=jtag_execute_queue())!=ERROR_OK) - return retval; - + CHECK_RETVAL(jtag_execute_queue()); switch (arm11->device_id & 0x0FFFF000) { @@ -1605,13 +1857,12 @@ int arm11_examine(struct target_s *target) arm11->debug_version = (arm11->didr >> 16) & 0x0F; if (arm11->debug_version != ARM11_DEBUG_V6 && - arm11->debug_version != ARM11_DEBUG_V61) + arm11->debug_version != ARM11_DEBUG_V61) { - LOG_ERROR("Only ARMv6 v6 and v6.1 architectures supported."); - return ERROR_FAIL; + LOG_ERROR("Only ARMv6 v6 and v6.1 architectures supported."); + return ERROR_FAIL; } - arm11->brp = ((arm11->didr >> 24) & 0x0F) + 1; arm11->wrp = ((arm11->didr >> 28) & 0x0F) + 1; @@ -1619,76 +1870,72 @@ int arm11_examine(struct target_s *target) arm11->free_brps = arm11->brp; arm11->free_wrps = arm11->wrp; - LOG_DEBUG("IDCODE %08x IMPLEMENTOR %02x DIDR %08x", - arm11->device_id, - arm11->implementor, - arm11->didr); + LOG_DEBUG("IDCODE %08" PRIx32 " IMPLEMENTOR %02x DIDR %08" PRIx32 "", + arm11->device_id, + (int)(arm11->implementor), + arm11->didr); /* as a side-effect this reads DSCR and thus * clears the ARM11_DSCR_STICKY_PRECISE_DATA_ABORT / Sticky Precise Data Abort Flag * as suggested by the spec. */ - arm11_check_init(arm11, NULL); + retval = arm11_check_init(arm11, NULL); + if (retval != ERROR_OK) + return retval; - target->type->examined = 1; + target_set_examined(target); return ERROR_OK; } -int arm11_quit(void) -{ - FNC_INFO_NOTIMPLEMENTED; - - return ERROR_OK; -} /** Load a register that is marked !valid in the register cache */ -int arm11_get_reg(reg_t *reg) +static int arm11_get_reg(reg_t *reg) { FNC_INFO; - target_t * target = ((arm11_reg_state_t *)reg->arch_info)->target; + target_t * target = ((struct arm11_reg_state *)reg->arch_info)->target; if (target->state != TARGET_HALTED) { - LOG_WARNING("target was not halted"); - return ERROR_TARGET_NOT_HALTED; + LOG_WARNING("target was not halted"); + return ERROR_TARGET_NOT_HALTED; } /** \todo TODO: Check this. We assume that all registers are fetched at debug entry. */ #if 0 - arm11_common_t *arm11 = target->arch_info; - const arm11_reg_defs_t * arm11_reg_info = arm11_reg_defs + ((arm11_reg_state_t *)reg->arch_info)->def_index; + struct arm11_common *arm11 = target->arch_info; + const struct arm11_reg_defs * arm11_reg_info = arm11_reg_defs + ((struct arm11_reg_state *)reg->arch_info)->def_index; #endif return ERROR_OK; } /** Change a value in the register cache */ -int arm11_set_reg(reg_t *reg, u8 *buf) +static int arm11_set_reg(reg_t *reg, uint8_t *buf) { FNC_INFO; - target_t * target = ((arm11_reg_state_t *)reg->arch_info)->target; - arm11_common_t *arm11 = target->arch_info; -// const arm11_reg_defs_t * arm11_reg_info = arm11_reg_defs + ((arm11_reg_state_t *)reg->arch_info)->def_index; + target_t * target = ((struct arm11_reg_state *)reg->arch_info)->target; + struct arm11_common *arm11 = target->arch_info; +// const struct arm11_reg_defs * arm11_reg_info = arm11_reg_defs + ((struct arm11_reg_state *)reg->arch_info)->def_index; - arm11->reg_values[((arm11_reg_state_t *)reg->arch_info)->def_index] = buf_get_u32(buf, 0, 32); + arm11->reg_values[((struct arm11_reg_state *)reg->arch_info)->def_index] = buf_get_u32(buf, 0, 32); reg->valid = 1; reg->dirty = 1; return ERROR_OK; } -int arm11_build_reg_cache(target_t *target) +static int arm11_build_reg_cache(target_t *target) { - arm11_common_t *arm11 = target->arch_info; + struct arm11_common *arm11 = target->arch_info; - NEW(reg_cache_t, cache, 1); - NEW(reg_t, reg_list, ARM11_REGCACHE_COUNT); - NEW(arm11_reg_state_t, arm11_reg_states, ARM11_REGCACHE_COUNT); + NEW(reg_cache_t, cache, 1); + NEW(reg_t, reg_list, ARM11_REGCACHE_COUNT); + NEW(struct arm11_reg_state, arm11_reg_states, ARM11_REGCACHE_COUNT); if (arm11_regs_arch_type == -1) arm11_regs_arch_type = register_reg_arch_type(arm11_get_reg, arm11_set_reg); @@ -1714,45 +1961,46 @@ int arm11_build_reg_cache(target_t *target) /* Not very elegant assertion */ if (ARM11_REGCACHE_COUNT != asizeof(arm11->reg_values) || - ARM11_REGCACHE_COUNT != asizeof(arm11_reg_defs) || - ARM11_REGCACHE_COUNT != ARM11_RC_MAX) + ARM11_REGCACHE_COUNT != asizeof(arm11_reg_defs) || + ARM11_REGCACHE_COUNT != ARM11_RC_MAX) { - LOG_ERROR("BUG: arm11->reg_values inconsistent (%d " ZU " " ZU " %d)", ARM11_REGCACHE_COUNT, asizeof(arm11->reg_values), asizeof(arm11_reg_defs), ARM11_RC_MAX); - exit(-1); + LOG_ERROR("BUG: arm11->reg_values inconsistent (%d " ZU " " ZU " %d)", ARM11_REGCACHE_COUNT, asizeof(arm11->reg_values), asizeof(arm11_reg_defs), ARM11_RC_MAX); + exit(-1); } for (i = 0; i < ARM11_REGCACHE_COUNT; i++) { - reg_t * r = reg_list + i; - const arm11_reg_defs_t * rd = arm11_reg_defs + i; - arm11_reg_state_t * rs = arm11_reg_states + i; + reg_t * r = reg_list + i; + const struct arm11_reg_defs * rd = arm11_reg_defs + i; + struct arm11_reg_state * rs = arm11_reg_states + i; - r->name = rd->name; - r->size = 32; - r->value = (u8 *)(arm11->reg_values + i); - r->dirty = 0; - r->valid = 0; - r->bitfield_desc = NULL; - r->num_bitfields = 0; - r->arch_type = arm11_regs_arch_type; - r->arch_info = rs; + r->name = rd->name; + r->size = 32; + r->value = (uint8_t *)(arm11->reg_values + i); + r->dirty = 0; + r->valid = 0; + r->bitfield_desc = NULL; + r->num_bitfields = 0; + r->arch_type = arm11_regs_arch_type; + r->arch_info = rs; - rs->def_index = i; - rs->target = target; + rs->def_index = i; + rs->target = target; } + return ERROR_OK; } -int arm11_handle_bool(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, bool * var, char * name) +static COMMAND_HELPER(arm11_handle_bool, bool *var, char *name) { if (argc == 0) { - LOG_INFO("%s is %s.", name, *var ? "enabled" : "disabled"); - return ERROR_OK; + LOG_INFO("%s is %s.", name, *var ? "enabled" : "disabled"); + return ERROR_OK; } if (argc != 1) - return ERROR_COMMAND_SYNTAX_ERROR; + return ERROR_COMMAND_SYNTAX_ERROR; switch (args[0][0]) { @@ -1761,16 +2009,16 @@ int arm11_handle_bool(struct command_context_s *cmd_ctx, char *cmd, char **args, case 'F': case 'd': /* disable */ case 'D': - *var = false; - break; + *var = false; + break; case '1': /* 1 */ case 't': /* true */ case 'T': case 'e': /* enable */ case 'E': - *var = true; - break; + *var = true; + break; } LOG_INFO("%s %s.", *var ? "Enabled" : "Disabled", name); @@ -1779,190 +2027,262 @@ int arm11_handle_bool(struct command_context_s *cmd_ctx, char *cmd, char **args, } #define BOOL_WRAPPER(name, print_name) \ -int arm11_handle_bool_##name(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) \ -{ \ - return arm11_handle_bool(cmd_ctx, cmd, args, argc, &arm11_config_##name, print_name); \ -} - -#define RC_TOP(name, descr, more) \ +COMMAND_HANDLER(arm11_handle_bool_##name) \ { \ - command_t * new_cmd = register_command(cmd_ctx, top_cmd, name, NULL, COMMAND_ANY, descr); \ - command_t * top_cmd = new_cmd; \ - more \ + return CALL_COMMAND_HANDLER(arm11_handle_bool, \ + &arm11_config_##name, print_name); \ } -#define RC_FINAL(name, descr, handler) \ - register_command(cmd_ctx, top_cmd, name, handler, COMMAND_ANY, descr); +BOOL_WRAPPER(memwrite_burst, "memory write burst mode") +BOOL_WRAPPER(memwrite_error_fatal, "fatal error mode for memory writes") +BOOL_WRAPPER(step_irq_enable, "IRQs while stepping") +BOOL_WRAPPER(hardware_step, "hardware single step") -#define RC_FINAL_BOOL(name, descr, var) \ - register_command(cmd_ctx, top_cmd, name, arm11_handle_bool_##var, COMMAND_ANY, descr); - -BOOL_WRAPPER(memwrite_burst, "memory write burst mode") -BOOL_WRAPPER(memwrite_error_fatal, "fatal error mode for memory writes") - -int arm11_handle_vcr(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(arm11_handle_vcr) { - if (argc == 1) - { - arm11_vcr = strtoul(args[0], NULL, 0); - } - else if (argc != 0) - { - return ERROR_COMMAND_SYNTAX_ERROR; + switch (argc) { + case 0: + break; + case 1: + COMMAND_PARSE_NUMBER(u32, args[0], arm11_vcr); + break; + default: + return ERROR_COMMAND_SYNTAX_ERROR; } - LOG_INFO("VCR 0x%08X", arm11_vcr); + LOG_INFO("VCR 0x%08" PRIx32 "", arm11_vcr); return ERROR_OK; } -const u32 arm11_coproc_instruction_limits[] = +static const uint32_t arm11_coproc_instruction_limits[] = { - 15, /* coprocessor */ - 7, /* opcode 1 */ - 15, /* CRn */ - 15, /* CRm */ - 7, /* opcode 2 */ + 15, /* coprocessor */ + 7, /* opcode 1 */ + 15, /* CRn */ + 15, /* CRm */ + 7, /* opcode 2 */ 0xFFFFFFFF, /* value */ }; -const char arm11_mrc_syntax[] = "Syntax: mrc . All parameters are numbers only."; -const char arm11_mcr_syntax[] = "Syntax: mcr <32bit value to write>. All parameters are numbers only."; - -arm11_common_t * arm11_find_target(const char * arg) +static struct arm11_common * arm11_find_target(const char * arg) { - jtag_tap_t *tap; - target_t * t; + struct jtag_tap * tap; + target_t * t; - tap = jtag_TapByString( arg ); - if( !tap ){ - return NULL; - } + tap = jtag_tap_by_string(arg); - for (t = all_targets; t; t = t->next){ - if( t->tap == tap ){ - if( 0 == strcmp(t->type->name,"arm11")){ - arm11_common_t * arm11 = t->arch_info; - return arm11; - } - } + if (!tap) + return 0; + + for (t = all_targets; t; t = t->next) + { + if (t->tap != tap) + continue; + + /* if (t->type == arm11_target) */ + if (0 == strcmp(target_get_name(t), "arm11")) + return t->arch_info; } + return 0; } -int arm11_handle_mrc_mcr(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, bool read) +static int arm11_mrc_inner(target_t *target, int cpnum, + uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, + uint32_t *value, bool read) { - if (argc != (read ? 6 : 7)) + int retval; + + if (target->state != TARGET_HALTED) { - LOG_ERROR("Invalid number of arguments. %s", read ? arm11_mrc_syntax : arm11_mcr_syntax); - return -1; + LOG_ERROR("Target not halted"); + return ERROR_FAIL; } + + struct arm11_common * arm11 = target->arch_info; - arm11_common_t * arm11 = arm11_find_target(args[0]); + uint32_t instr = 0xEE000010 | + (cpnum << 8) | + (op1 << 21) | + (CRn << 16) | + (CRm << 0) | + (op2 << 5); - if (!arm11) - { - LOG_ERROR("Parameter 1 is not a the JTAG chain position of an ARM11 device. %s", - read ? arm11_mrc_syntax : arm11_mcr_syntax); + if (read) + instr |= 0x00100000; - return -1; + retval = arm11_run_instr_data_prepare(arm11); + if (retval != ERROR_OK) + return retval; + if (read) + { + retval = arm11_run_instr_data_from_core_via_r0(arm11, instr, value); + if (retval != ERROR_OK) + return retval; } - - if (arm11->target->state != TARGET_HALTED) + else { - LOG_WARNING("target was not halted"); - return ERROR_TARGET_NOT_HALTED; + retval = arm11_run_instr_data_to_core_via_r0(arm11, instr, *value); + if (retval != ERROR_OK) + return retval; } - u32 values[6]; + return arm11_run_instr_data_finish(arm11); +} - {size_t i; - for (i = 0; i < (read ? 5 : 6); i++) - { - values[i] = strtoul(args[i + 1], NULL, 0); +static int arm11_mrc(target_t *target, int cpnum, + uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value) +{ + return arm11_mrc_inner(target, cpnum, op1, op2, CRn, CRm, value, true); +} + +static int arm11_mcr(target_t *target, int cpnum, + uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value) +{ + return arm11_mrc_inner(target, cpnum, op1, op2, CRn, CRm, &value, false); +} - if (values[i] > arm11_coproc_instruction_limits[i]) +static COMMAND_HELPER(arm11_handle_etm_read_write, bool read) +{ + if (argc != (read ? 2 : 3)) { - LOG_ERROR("Parameter %ld out of bounds (%d max). %s", - (long)(i + 2), arm11_coproc_instruction_limits[i], - read ? arm11_mrc_syntax : arm11_mcr_syntax); - return -1; + LOG_ERROR("Invalid number of arguments."); + return ERROR_COMMAND_SYNTAX_ERROR; } - }} - u32 instr = 0xEE000010 | - (values[0] << 8) | - (values[1] << 21) | - (values[2] << 16) | - (values[3] << 0) | - (values[4] << 5); + struct arm11_common * arm11 = arm11_find_target(args[0]); - if (read) - instr |= 0x00100000; + if (!arm11) + { + LOG_ERROR("Parameter 1 is not the target name of an ARM11 device."); + return ERROR_COMMAND_SYNTAX_ERROR; + } - arm11_run_instr_data_prepare(arm11); + uint32_t address; + COMMAND_PARSE_NUMBER(u32, args[1], address); - if (read) + if (!read) { - u32 result; - arm11_run_instr_data_from_core_via_r0(arm11, instr, &result); + uint32_t value; + COMMAND_PARSE_NUMBER(u32, args[2], value); + + LOG_INFO("ETM write register 0x%02" PRIx32 " (%" PRId32 ") = 0x%08" PRIx32 " (%" PRId32 ")", + address, address, value, value); - LOG_INFO("MRC p%d, %d, R0, c%d, c%d, %d = 0x%08x (%d)", - values[0], values[1], values[2], values[3], values[4], result, result); + CHECK_RETVAL(arm11_write_etm(arm11, address, value)); } else { - arm11_run_instr_data_to_core_via_r0(arm11, instr, values[5]); - - LOG_INFO("MRC p%d, %d, R0 (#0x%08x), c%d, c%d, %d", - values[0], values[1], - values[5], - values[2], values[3], values[4]); - } + uint32_t value; - arm11_run_instr_data_finish(arm11); + CHECK_RETVAL(arm11_read_etm(arm11, address, &value)); + LOG_INFO("ETM read register 0x%02" PRIx32 " (%" PRId32 ") = 0x%08" PRIx32 " (%" PRId32 ")", + address, address, value, value); + } return ERROR_OK; } -int arm11_handle_mrc(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(arm11_handle_etmr) { - return arm11_handle_mrc_mcr(cmd_ctx, cmd, args, argc, true); + return CALL_COMMAND_HANDLER(arm11_handle_etm_read_write, true); } -int arm11_handle_mcr(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(arm11_handle_etmw) { - return arm11_handle_mrc_mcr(cmd_ctx, cmd, args, argc, false); + return CALL_COMMAND_HANDLER(arm11_handle_etm_read_write, false); } -int arm11_register_commands(struct command_context_s *cmd_ctx) -{ - FNC_INFO; +#define ARM11_HANDLER(x) .x = arm11_##x + +target_type_t arm11_target = { + .name = "arm11", + + ARM11_HANDLER(poll), + ARM11_HANDLER(arch_state), - command_t * top_cmd = NULL; + ARM11_HANDLER(target_request_data), - RC_TOP( "arm11", "arm11 specific commands", + ARM11_HANDLER(halt), + ARM11_HANDLER(resume), + ARM11_HANDLER(step), - RC_TOP( "memwrite", "Control memory write transfer mode", + ARM11_HANDLER(assert_reset), + ARM11_HANDLER(deassert_reset), + ARM11_HANDLER(soft_reset_halt), - RC_FINAL_BOOL( "burst", "Enable/Disable non-standard but fast burst mode (default: enabled)", - memwrite_burst) + ARM11_HANDLER(get_gdb_reg_list), - RC_FINAL_BOOL( "error_fatal", - "Terminate program if transfer error was found (default: enabled)", - memwrite_error_fatal) - ) + ARM11_HANDLER(read_memory), + ARM11_HANDLER(write_memory), - RC_FINAL( "vcr", "Control (Interrupt) Vector Catch Register", - arm11_handle_vcr) + ARM11_HANDLER(bulk_write_memory), - RC_FINAL( "mrc", "Read Coprocessor register", - arm11_handle_mrc) + ARM11_HANDLER(checksum_memory), - RC_FINAL( "mcr", "Write Coprocessor register", - arm11_handle_mcr) - ) + ARM11_HANDLER(add_breakpoint), + ARM11_HANDLER(remove_breakpoint), + ARM11_HANDLER(add_watchpoint), + ARM11_HANDLER(remove_watchpoint), + + ARM11_HANDLER(run_algorithm), + + ARM11_HANDLER(register_commands), + ARM11_HANDLER(target_create), + ARM11_HANDLER(init_target), + ARM11_HANDLER(examine), + + ARM11_HANDLER(mrc), + ARM11_HANDLER(mcr), + }; + + +int arm11_register_commands(struct command_context_s *cmd_ctx) +{ + FNC_INFO; + + command_t *top_cmd, *mw_cmd; + + top_cmd = register_command(cmd_ctx, NULL, "arm11", + NULL, COMMAND_ANY, NULL); + + register_command(cmd_ctx, top_cmd, "etmr", + arm11_handle_etmr, COMMAND_ANY, + "Read Embedded Trace Macrocell (ETM) register. etmr "); + + register_command(cmd_ctx, top_cmd, "etmw", + arm11_handle_etmw, COMMAND_ANY, + "Write Embedded Trace Macrocell (ETM) register. etmr "); + + /* "hardware_step" is only here to check if the default + * simulate + breakpoint implementation is broken. + * TEMPORARY! NOT DOCUMENTED! + */ + register_command(cmd_ctx, top_cmd, "hardware_step", + arm11_handle_bool_hardware_step, COMMAND_ANY, + "DEBUG ONLY - Hardware single stepping" + " (default: disabled)"); + + mw_cmd = register_command(cmd_ctx, top_cmd, "memwrite", + NULL, COMMAND_ANY, NULL); + register_command(cmd_ctx, mw_cmd, "burst", + arm11_handle_bool_memwrite_burst, COMMAND_ANY, + "Enable/Disable non-standard but fast burst mode" + " (default: enabled)"); + register_command(cmd_ctx, mw_cmd, "error_fatal", + arm11_handle_bool_memwrite_error_fatal, COMMAND_ANY, + "Terminate program if transfer error was found" + " (default: enabled)"); + + register_command(cmd_ctx, top_cmd, "step_irq_enable", + arm11_handle_bool_step_irq_enable, COMMAND_ANY, + "Enable interrupts while stepping" + " (default: disabled)"); + register_command(cmd_ctx, top_cmd, "vcr", + arm11_handle_vcr, COMMAND_ANY, + "Control (Interrupt) Vector Catch Register"); return ERROR_OK; }