X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fnds32_v3_common.c;h=b0c3de622fb80a6ba7b30ed9dcc317aca71aacd8;hb=c0c7d6fe8b04f521a7262303083ef5eb6ebaf4e5;hp=2fbd1a3780ad61928f76febcd38e6a3d3dfd841a;hpb=80d412bafc03ce9a0418a2b98de2668b0f8de0e6;p=fw%2Fopenocd diff --git a/src/target/nds32_v3_common.c b/src/target/nds32_v3_common.c index 2fbd1a378..b0c3de622 100644 --- a/src/target/nds32_v3_common.c +++ b/src/target/nds32_v3_common.c @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -59,8 +57,6 @@ static int nds32_v3_debug_entry(struct nds32 *nds32, bool enable_watchpoint) { LOG_DEBUG("nds32_v3_debug_entry"); - jtag_poll_set_enabled(false); - enum target_state backup_state = nds32->target->state; nds32->target->state = TARGET_HALTED; @@ -80,7 +76,24 @@ static int nds32_v3_debug_entry(struct nds32 *nds32, bool enable_watchpoint) if (enable_watchpoint) CHECK_RETVAL(v3_common_callback->deactivate_hardware_watchpoint(nds32->target)); - if (ERROR_OK != nds32_examine_debug_reason(nds32)) { + struct breakpoint *syscall_break = &(nds32->syscall_break); + if (nds32->virtual_hosting) { + if (syscall_break->set) { + /** disable virtual hosting */ + + /* remove breakpoint at syscall entry */ + target_remove_breakpoint(nds32->target, syscall_break); + syscall_break->set = 0; + + uint32_t value_pc; + nds32_get_mapped_reg(nds32, PC, &value_pc); + if (value_pc == syscall_break->address) + /** process syscall for virtual hosting */ + nds32->hit_syscall = true; + } + } + + if (nds32_examine_debug_reason(nds32) != ERROR_OK) { nds32->target->state = backup_state; /* re-activate all hardware breakpoints & watchpoints */ @@ -89,8 +102,6 @@ static int nds32_v3_debug_entry(struct nds32 *nds32, bool enable_watchpoint) if (enable_watchpoint) CHECK_RETVAL(v3_common_callback->activate_hardware_watchpoint(nds32->target)); - jtag_poll_set_enabled(true); - return ERROR_FAIL; } @@ -132,8 +143,75 @@ static int nds32_v3_leave_debug_state(struct nds32 *nds32, bool enable_watchpoin */ CHECK_RETVAL(nds32_restore_context(target)); - /* enable polling */ - jtag_poll_set_enabled(true); + if (nds32->virtual_hosting) { + /** enable virtual hosting */ + uint32_t value_ir3; + uint32_t entry_size; + uint32_t syscall_address; + + /* get syscall entry address */ + nds32_get_mapped_reg(nds32, IR3, &value_ir3); + entry_size = 0x4 << (((value_ir3 >> 14) & 0x3) << 1); + syscall_address = (value_ir3 & 0xFFFF0000) + entry_size * 8; /* The index of SYSCALL is 8 */ + + if (nds32->hit_syscall) { + /* single step to skip syscall entry */ + /* use IRET to skip syscall */ + struct aice_port_s *aice = target_to_aice(target); + uint32_t value_ir9; + uint32_t value_ir6; + uint32_t syscall_id; + + nds32_get_mapped_reg(nds32, IR6, &value_ir6); + syscall_id = (value_ir6 >> 16) & 0x7FFF; + + if (syscall_id == NDS32_SYSCALL_EXIT) { + /* If target hits exit syscall, do not use IRET to skip handler. */ + aice_step(aice); + } else { + /* use api->read/write_reg to skip nds32 register cache */ + uint32_t value_dimbr; + aice_read_debug_reg(aice, NDS_EDM_SR_DIMBR, &value_dimbr); + aice_write_register(aice, IR11, value_dimbr + 0xC); + + aice_read_register(aice, IR9, &value_ir9); + value_ir9 += 4; /* syscall is always 4 bytes */ + aice_write_register(aice, IR9, value_ir9); + + /* backup hardware breakpoint 0 */ + uint32_t backup_bpa, backup_bpam, backup_bpc; + aice_read_debug_reg(aice, NDS_EDM_SR_BPA0, &backup_bpa); + aice_read_debug_reg(aice, NDS_EDM_SR_BPAM0, &backup_bpam); + aice_read_debug_reg(aice, NDS_EDM_SR_BPC0, &backup_bpc); + + /* use hardware breakpoint 0 to stop cpu after skipping syscall */ + aice_write_debug_reg(aice, NDS_EDM_SR_BPA0, value_ir9); + aice_write_debug_reg(aice, NDS_EDM_SR_BPAM0, 0); + aice_write_debug_reg(aice, NDS_EDM_SR_BPC0, 0xA); + + /* Execute two IRET. + * First IRET is used to quit debug mode. + * Second IRET is used to quit current syscall. */ + uint32_t dim_inst[4] = {NOP, NOP, IRET, IRET}; + aice_execute(aice, dim_inst, 4); + + /* restore origin hardware breakpoint 0 */ + aice_write_debug_reg(aice, NDS_EDM_SR_BPA0, backup_bpa); + aice_write_debug_reg(aice, NDS_EDM_SR_BPAM0, backup_bpam); + aice_write_debug_reg(aice, NDS_EDM_SR_BPC0, backup_bpc); + } + + nds32->hit_syscall = false; + } + + /* insert breakpoint at syscall entry */ + struct breakpoint *syscall_break = &(nds32->syscall_break); + + syscall_break->address = syscall_address; + syscall_break->type = BKPT_SOFT; + syscall_break->set = 1; + target_add_breakpoint(target, syscall_break); + } return ERROR_OK; } @@ -151,6 +229,7 @@ static int nds32_v3_get_exception_address(struct nds32 *nds32, uint32_t match_count; int32_t i; static int32_t number_of_hard_break; + uint32_t bp_control; if (number_of_hard_break == 0) { aice_read_debug_reg(aice, NDS_EDM_SR_EDM_CFG, &edm_cfg); @@ -166,6 +245,14 @@ static int nds32_v3_get_exception_address(struct nds32 *nds32, if (match_bits & (1 << i)) { aice_read_debug_reg(aice, NDS_EDM_SR_BPA0 + i, address); match_count++; + + /* If target hits multiple read/access watchpoint, + * select the first one. */ + aice_read_debug_reg(aice, NDS_EDM_SR_BPC0 + i, &bp_control); + if (0x3 == (bp_control & 0x3)) { + match_count = 1; + break; + } } } @@ -181,8 +268,8 @@ static int nds32_v3_get_exception_address(struct nds32 *nds32, nds32_get_mapped_reg(nds32, PC, &val_pc); - if ((NDS32_DEBUG_DATA_ADDR_WATCHPOINT_NEXT_PRECISE == reason) || - (NDS32_DEBUG_DATA_VALUE_WATCHPOINT_NEXT_PRECISE == reason)) { + if ((reason == NDS32_DEBUG_DATA_ADDR_WATCHPOINT_NEXT_PRECISE) || + (reason == NDS32_DEBUG_DATA_VALUE_WATCHPOINT_NEXT_PRECISE)) { if (edmsw & 0x4) /* check EDMSW.IS_16BIT */ val_pc -= 2; else @@ -192,8 +279,8 @@ static int nds32_v3_get_exception_address(struct nds32 *nds32, nds32_read_opcode(nds32, val_pc, &opcode); nds32_evaluate_opcode(nds32, opcode, val_pc, &instruction); - LOG_DEBUG("PC: 0x%08x, access start: 0x%08x, end: 0x%08x", val_pc, - instruction.access_start, instruction.access_end); + LOG_DEBUG("PC: 0x%08" PRIx32 ", access start: 0x%08" PRIx32 ", end: 0x%08" PRIx32, + val_pc, instruction.access_start, instruction.access_end); /* check if multiple hits in the access range */ uint32_t in_range_watch_count = 0; @@ -233,7 +320,7 @@ static int nds32_v3_get_exception_address(struct nds32 *nds32, return ERROR_FAIL; } else if (match_count == 0) { /* global stop is precise exception */ - if ((NDS32_DEBUG_LOAD_STORE_GLOBAL_STOP == reason) && nds32->global_stop) { + if ((reason == NDS32_DEBUG_LOAD_STORE_GLOBAL_STOP) && nds32->global_stop) { /* parse instruction to get correct access address */ uint32_t val_pc; uint32_t opcode; @@ -280,14 +367,8 @@ int nds32_v3_target_request_data(struct target *target, return ERROR_OK; } -int nds32_v3_soft_reset_halt(struct target *target) -{ - struct aice_port_s *aice = target_to_aice(target); - return aice_assert_srst(aice, AICE_RESET_HOLD); -} - int nds32_v3_checksum_memory(struct target *target, - uint32_t address, uint32_t count, uint32_t *checksum) + target_addr_t address, uint32_t count, uint32_t *checksum) { LOG_WARNING("Not implemented: %s", __func__); @@ -353,8 +434,8 @@ int nds32_v3_run_algorithm(struct target *target, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_params, - uint32_t entry_point, - uint32_t exit_point, + target_addr_t entry_point, + target_addr_t exit_point, int timeout_ms, void *arch_info) { @@ -363,19 +444,19 @@ int nds32_v3_run_algorithm(struct target *target, return ERROR_FAIL; } -int nds32_v3_read_buffer(struct target *target, uint32_t address, +int nds32_v3_read_buffer(struct target *target, target_addr_t address, uint32_t size, uint8_t *buffer) { struct nds32 *nds32 = target_to_nds32(target); struct nds32_memory *memory = &(nds32->memory); - if ((NDS_MEMORY_ACC_CPU == memory->access_channel) && + if ((memory->access_channel == NDS_MEMORY_ACC_CPU) && (target->state != TARGET_HALTED)) { LOG_WARNING("target was not halted"); return ERROR_TARGET_NOT_HALTED; } - uint32_t physical_address; + target_addr_t physical_address; /* BUG: If access range crosses multiple pages, the translation will not correct * for second page or so. */ @@ -393,27 +474,47 @@ int nds32_v3_read_buffer(struct target *target, uint32_t address, * Because hardware will turn off IT/DT by default, it MUST translate virtual address * to physical address. */ - if (ERROR_OK == target->type->virt2phys(target, address, &physical_address)) + if (target->type->virt2phys(target, address, &physical_address) == ERROR_OK) address = physical_address; else return ERROR_FAIL; - return nds32_read_buffer(target, address, size, buffer); + int result; + struct aice_port_s *aice = target_to_aice(target); + /* give arbitrary initial value to avoid warning messages */ + enum nds_memory_access origin_access_channel = NDS_MEMORY_ACC_CPU; + + if (nds32->hit_syscall) { + /* Use bus mode to access memory during virtual hosting */ + origin_access_channel = memory->access_channel; + memory->access_channel = NDS_MEMORY_ACC_BUS; + aice_memory_access(aice, NDS_MEMORY_ACC_BUS); + } + + result = nds32_read_buffer(target, address, size, buffer); + + if (nds32->hit_syscall) { + /* Restore access_channel after virtual hosting */ + memory->access_channel = origin_access_channel; + aice_memory_access(aice, origin_access_channel); + } + + return result; } -int nds32_v3_write_buffer(struct target *target, uint32_t address, +int nds32_v3_write_buffer(struct target *target, target_addr_t address, uint32_t size, const uint8_t *buffer) { struct nds32 *nds32 = target_to_nds32(target); struct nds32_memory *memory = &(nds32->memory); - if ((NDS_MEMORY_ACC_CPU == memory->access_channel) && + if ((memory->access_channel == NDS_MEMORY_ACC_CPU) && (target->state != TARGET_HALTED)) { LOG_WARNING("target was not halted"); return ERROR_TARGET_NOT_HALTED; } - uint32_t physical_address; + target_addr_t physical_address; /* BUG: If access range crosses multiple pages, the translation will not correct * for second page or so. */ @@ -431,27 +532,51 @@ int nds32_v3_write_buffer(struct target *target, uint32_t address, * Because hardware will turn off IT/DT by default, it MUST translate virtual address * to physical address. */ - if (ERROR_OK == target->type->virt2phys(target, address, &physical_address)) + if (target->type->virt2phys(target, address, &physical_address) == ERROR_OK) address = physical_address; else return ERROR_FAIL; + if (nds32->hit_syscall) { + struct aice_port_s *aice = target_to_aice(target); + enum nds_memory_access origin_access_channel; + origin_access_channel = memory->access_channel; + + /* If target has no cache, use BUS mode to access memory. */ + if ((memory->dcache.line_size == 0) + || (memory->dcache.enable == false)) { + /* There is no Dcache or Dcache is disabled. */ + memory->access_channel = NDS_MEMORY_ACC_BUS; + aice_memory_access(aice, NDS_MEMORY_ACC_BUS); + } + + int result; + result = nds32_gdb_fileio_write_memory(nds32, address, size, buffer); + + if (origin_access_channel == NDS_MEMORY_ACC_CPU) { + memory->access_channel = NDS_MEMORY_ACC_CPU; + aice_memory_access(aice, NDS_MEMORY_ACC_CPU); + } + + return result; + } + return nds32_write_buffer(target, address, size, buffer); } -int nds32_v3_read_memory(struct target *target, uint32_t address, +int nds32_v3_read_memory(struct target *target, target_addr_t address, uint32_t size, uint32_t count, uint8_t *buffer) { struct nds32 *nds32 = target_to_nds32(target); struct nds32_memory *memory = &(nds32->memory); - if ((NDS_MEMORY_ACC_CPU == memory->access_channel) && + if ((memory->access_channel == NDS_MEMORY_ACC_CPU) && (target->state != TARGET_HALTED)) { LOG_WARNING("target was not halted"); return ERROR_TARGET_NOT_HALTED; } - uint32_t physical_address; + target_addr_t physical_address; /* BUG: If access range crosses multiple pages, the translation will not correct * for second page or so. */ @@ -469,31 +594,47 @@ int nds32_v3_read_memory(struct target *target, uint32_t address, * Because hardware will turn off IT/DT by default, it MUST translate virtual address * to physical address. */ - if (ERROR_OK == target->type->virt2phys(target, address, &physical_address)) + if (target->type->virt2phys(target, address, &physical_address) == ERROR_OK) address = physical_address; else return ERROR_FAIL; + struct aice_port_s *aice = target_to_aice(target); + /* give arbitrary initial value to avoid warning messages */ + enum nds_memory_access origin_access_channel = NDS_MEMORY_ACC_CPU; int result; + if (nds32->hit_syscall) { + /* Use bus mode to access memory during virtual hosting */ + origin_access_channel = memory->access_channel; + memory->access_channel = NDS_MEMORY_ACC_BUS; + aice_memory_access(aice, NDS_MEMORY_ACC_BUS); + } + result = nds32_read_memory(target, address, size, count, buffer); + if (nds32->hit_syscall) { + /* Restore access_channel after virtual hosting */ + memory->access_channel = origin_access_channel; + aice_memory_access(aice, origin_access_channel); + } + return result; } -int nds32_v3_write_memory(struct target *target, uint32_t address, +int nds32_v3_write_memory(struct target *target, target_addr_t address, uint32_t size, uint32_t count, const uint8_t *buffer) { struct nds32 *nds32 = target_to_nds32(target); struct nds32_memory *memory = &(nds32->memory); - if ((NDS_MEMORY_ACC_CPU == memory->access_channel) && + if ((memory->access_channel == NDS_MEMORY_ACC_CPU) && (target->state != TARGET_HALTED)) { LOG_WARNING("target was not halted"); return ERROR_TARGET_NOT_HALTED; } - uint32_t physical_address; + target_addr_t physical_address; /* BUG: If access range crosses multiple pages, the translation will not correct * for second page or so. */ @@ -511,7 +652,7 @@ int nds32_v3_write_memory(struct target *target, uint32_t address, * Because hardware will turn off IT/DT by default, it MUST translate virtual address * to physical address. */ - if (ERROR_OK == target->type->virt2phys(target, address, &physical_address)) + if (target->type->virt2phys(target, address, &physical_address) == ERROR_OK) address = physical_address; else return ERROR_FAIL; @@ -527,5 +668,8 @@ int nds32_v3_init_target(struct command_context *cmd_ctx, nds32_init(nds32); + target->fileio_info = malloc(sizeof(struct gdb_fileio_info)); + target->fileio_info->identifier = NULL; + return ERROR_OK; }