X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fmips32.c;h=1315744cca3e86d4c9a142c578f1d6bad6de7003;hp=c109ed20fffd67e220716035a6e49e4c14be23eb;hb=1d4a09c2ef22dc10ec8a40183b8dd1b1102af20d;hpb=56504fdd7353732525e34f1e3fbd44346588f979 diff --git a/src/target/mips32.c b/src/target/mips32.c index c109ed20ff..1315744cca 100644 --- a/src/target/mips32.c +++ b/src/target/mips32.c @@ -4,7 +4,7 @@ * * * Copyright (C) 2008 by David T.L. Wong * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * This program is free software; you can redistribute it and/or modify * @@ -27,6 +27,7 @@ #endif #include "mips32.h" +#include "register.h" char* mips32_core_reg_list[] = @@ -38,7 +39,7 @@ char* mips32_core_reg_list[] = "status", "lo", "hi", "badvaddr", "cause", "pc" }; -mips32_core_reg_t mips32_core_reg_list_arch_info[MIPS32NUMCOREREGS] = +struct mips32_core_reg mips32_core_reg_list_arch_info[MIPS32NUMCOREREGS] = { {0, NULL, NULL}, {1, NULL, NULL}, @@ -72,7 +73,7 @@ mips32_core_reg_t mips32_core_reg_list_arch_info[MIPS32NUMCOREREGS] = {29, NULL, NULL}, {30, NULL, NULL}, {31, NULL, NULL}, - + {32, NULL, NULL}, {33, NULL, NULL}, {34, NULL, NULL}, @@ -86,43 +87,49 @@ mips32_core_reg_t mips32_core_reg_list_arch_info[MIPS32NUMCOREREGS] = #define MIPS32NUMFPREGS 34 + 18 -u8 mips32_gdb_dummy_fp_value[] = {0, 0, 0, 0}; +uint8_t mips32_gdb_dummy_fp_value[] = {0, 0, 0, 0}; -reg_t mips32_gdb_dummy_fp_reg = +struct reg mips32_gdb_dummy_fp_reg = { - "GDB dummy floating-point register", mips32_gdb_dummy_fp_value, 0, 1, 32, NULL, 0, NULL, 0 + .name = "GDB dummy floating-point register", + .value = mips32_gdb_dummy_fp_value, + .dirty = 0, + .valid = 1, + .size = 32, + .arch_info = NULL, + .arch_type = 0, }; int mips32_core_reg_arch_type = -1; -int mips32_get_core_reg(reg_t *reg) +int mips32_get_core_reg(struct reg *reg) { int retval; - mips32_core_reg_t *mips32_reg = reg->arch_info; - target_t *target = mips32_reg->target; - mips32_common_t *mips32_target = target->arch_info; - + struct mips32_core_reg *mips32_reg = reg->arch_info; + struct target *target = mips32_reg->target; + struct mips32_common *mips32_target = target->arch_info; + if (target->state != TARGET_HALTED) { return ERROR_TARGET_NOT_HALTED; } retval = mips32_target->read_core_reg(target, mips32_reg->num); - + return retval; } -int mips32_set_core_reg(reg_t *reg, u8 *buf) +int mips32_set_core_reg(struct reg *reg, uint8_t *buf) { - mips32_core_reg_t *mips32_reg = reg->arch_info; - target_t *target = mips32_reg->target; - u32 value = buf_get_u32(buf, 0, 32); - + struct mips32_core_reg *mips32_reg = reg->arch_info; + struct target *target = mips32_reg->target; + uint32_t value = buf_get_u32(buf, 0, 32); + if (target->state != TARGET_HALTED) { return ERROR_TARGET_NOT_HALTED; } - + buf_set_u32(reg->value, 0, 32, value); reg->dirty = 1; reg->valid = 1; @@ -130,14 +137,14 @@ int mips32_set_core_reg(reg_t *reg, u8 *buf) return ERROR_OK; } -int mips32_read_core_reg(struct target_s *target, int num) +int mips32_read_core_reg(struct target *target, int num) { - u32 reg_value; - mips32_core_reg_t *mips_core_reg; - + uint32_t reg_value; + struct mips32_core_reg *mips_core_reg; + /* get pointers to arch-specific information */ - mips32_common_t *mips32 = target->arch_info; - + struct mips32_common *mips32 = target->arch_info; + if ((num < 0) || (num >= MIPS32NUMCOREREGS)) return ERROR_INVALID_ARGUMENTS; @@ -146,61 +153,61 @@ int mips32_read_core_reg(struct target_s *target, int num) buf_set_u32(mips32->core_cache->reg_list[num].value, 0, 32, reg_value); mips32->core_cache->reg_list[num].valid = 1; mips32->core_cache->reg_list[num].dirty = 0; - - return ERROR_OK; + + return ERROR_OK; } -int mips32_write_core_reg(struct target_s *target, int num) +int mips32_write_core_reg(struct target *target, int num) { - u32 reg_value; - mips32_core_reg_t *mips_core_reg; - + uint32_t reg_value; + struct mips32_core_reg *mips_core_reg; + /* get pointers to arch-specific information */ - mips32_common_t *mips32 = target->arch_info; + struct mips32_common *mips32 = target->arch_info; if ((num < 0) || (num >= MIPS32NUMCOREREGS)) return ERROR_INVALID_ARGUMENTS; - + reg_value = buf_get_u32(mips32->core_cache->reg_list[num].value, 0, 32); mips_core_reg = mips32->core_cache->reg_list[num].arch_info; mips32->core_regs[num] = reg_value; - LOG_DEBUG("write core reg %i value 0x%x", num , reg_value); + LOG_DEBUG("write core reg %i value 0x%" PRIx32 "", num , reg_value); mips32->core_cache->reg_list[num].valid = 1; mips32->core_cache->reg_list[num].dirty = 0; - + return ERROR_OK; } -int mips32_invalidate_core_regs(target_t *target) +int mips32_invalidate_core_regs(struct target *target) { /* get pointers to arch-specific information */ - mips32_common_t *mips32 = target->arch_info; + struct mips32_common *mips32 = target->arch_info; int i; - + for (i = 0; i < mips32->core_cache->num_regs; i++) { mips32->core_cache->reg_list[i].valid = 0; mips32->core_cache->reg_list[i].dirty = 0; } - + return ERROR_OK; } -int mips32_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size) +int mips32_get_gdb_reg_list(struct target *target, struct reg **reg_list[], int *reg_list_size) { /* get pointers to arch-specific information */ - mips32_common_t *mips32 = target->arch_info; + struct mips32_common *mips32 = target->arch_info; int i; - + /* include floating point registers */ *reg_list_size = MIPS32NUMCOREREGS + MIPS32NUMFPREGS; - *reg_list = malloc(sizeof(reg_t*) * (*reg_list_size)); - + *reg_list = malloc(sizeof(struct reg*) * (*reg_list_size)); + for (i = 0; i < MIPS32NUMCOREREGS; i++) { (*reg_list)[i] = &mips32->core_cache->reg_list[i]; } - + /* add dummy floating points regs */ for (i = MIPS32NUMCOREREGS; i < (MIPS32NUMCOREREGS + MIPS32NUMFPREGS); i++) { @@ -210,17 +217,17 @@ int mips32_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_ return ERROR_OK; } -int mips32_save_context(target_t *target) +int mips32_save_context(struct target *target) { int i; - + /* get pointers to arch-specific information */ - mips32_common_t *mips32 = target->arch_info; - mips_ejtag_t *ejtag_info = &mips32->ejtag_info; - + struct mips32_common *mips32 = target->arch_info; + struct mips_ejtag *ejtag_info = &mips32->ejtag_info; + /* read core registers */ mips32_pracc_read_regs(ejtag_info, mips32->core_regs); - + for (i = 0; i < MIPS32NUMCOREREGS; i++) { if (!mips32->core_cache->reg_list[i].valid) @@ -228,18 +235,18 @@ int mips32_save_context(target_t *target) mips32->read_core_reg(target, i); } } - - return ERROR_OK; + + return ERROR_OK; } -int mips32_restore_context(target_t *target) +int mips32_restore_context(struct target *target) { int i; - + /* get pointers to arch-specific information */ - mips32_common_t *mips32 = target->arch_info; - mips_ejtag_t *ejtag_info = &mips32->ejtag_info; - + struct mips32_common *mips32 = target->arch_info; + struct mips_ejtag *ejtag_info = &mips32->ejtag_info; + for (i = 0; i < MIPS32NUMCOREREGS; i++) { if (mips32->core_cache->reg_list[i].dirty) @@ -247,55 +254,55 @@ int mips32_restore_context(target_t *target) mips32->write_core_reg(target, i); } } - + /* write core regs */ mips32_pracc_write_regs(ejtag_info, mips32->core_regs); - - return ERROR_OK; + + return ERROR_OK; } -int mips32_arch_state(struct target_s *target) +int mips32_arch_state(struct target *target) { - mips32_common_t *mips32 = target->arch_info; - + struct mips32_common *mips32 = target->arch_info; + if (mips32->common_magic != MIPS32_COMMON_MAGIC) { LOG_ERROR("BUG: called for a non-MIPS32 target"); - exit(-1); + return ERROR_FAIL; } - - LOG_USER("target halted due to %s, pc: 0x%8.8x", - Jim_Nvp_value2name_simple( nvp_target_debug_reason, target->debug_reason )->name , + + LOG_USER("target halted due to %s, pc: 0x%8.8" PRIx32 "", + Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name , buf_get_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 32)); - + return ERROR_OK; } -reg_cache_t *mips32_build_reg_cache(target_t *target) +struct reg_cache *mips32_build_reg_cache(struct target *target) { /* get pointers to arch-specific information */ - mips32_common_t *mips32 = target->arch_info; + struct mips32_common *mips32 = target->arch_info; int num_regs = MIPS32NUMCOREREGS; - reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache); - reg_cache_t *cache = malloc(sizeof(reg_cache_t)); - reg_t *reg_list = malloc(sizeof(reg_t) * num_regs); - mips32_core_reg_t *arch_info = malloc(sizeof(mips32_core_reg_t) * num_regs); + struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache); + struct reg_cache *cache = malloc(sizeof(struct reg_cache)); + struct reg *reg_list = malloc(sizeof(struct reg) * num_regs); + struct mips32_core_reg *arch_info = malloc(sizeof(struct mips32_core_reg) * num_regs); int i; - + if (mips32_core_reg_arch_type == -1) mips32_core_reg_arch_type = register_reg_arch_type(mips32_get_core_reg, mips32_set_core_reg); register_init_dummy(&mips32_gdb_dummy_fp_reg); - /* Build the process context cache */ + /* Build the process context cache */ cache->name = "mips32 registers"; cache->next = NULL; cache->reg_list = reg_list; cache->num_regs = num_regs; (*cache_p) = cache; mips32->core_cache = cache; - + for (i = 0; i < num_regs; i++) { arch_info[i] = mips32_core_reg_list_arch_info[i]; @@ -306,50 +313,48 @@ reg_cache_t *mips32_build_reg_cache(target_t *target) reg_list[i].value = calloc(1, 4); reg_list[i].dirty = 0; reg_list[i].valid = 0; - reg_list[i].bitfield_desc = NULL; - reg_list[i].num_bitfields = 0; reg_list[i].arch_type = mips32_core_reg_arch_type; reg_list[i].arch_info = &arch_info[i]; } - + return cache; } -int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, jtag_tap_t *tap) +int mips32_init_arch_info(struct target *target, struct mips32_common *mips32, struct jtag_tap *tap) { target->arch_info = mips32; mips32->common_magic = MIPS32_COMMON_MAGIC; - + /* has breakpoint/watchpint unit been scanned */ mips32->bp_scanned = 0; mips32->data_break_list = NULL; - + mips32->ejtag_info.tap = tap; mips32->read_core_reg = mips32_read_core_reg; mips32->write_core_reg = mips32_write_core_reg; - + return ERROR_OK; } -int mips32_register_commands(struct command_context_s *cmd_ctx) +int mips32_register_commands(struct command_context *cmd_ctx) { return ERROR_OK; } -int mips32_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) +int mips32_run_algorithm(struct target *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) { /*TODO*/ return ERROR_OK; } -int mips32_examine(struct target_s *target) +int mips32_examine(struct target *target) { - mips32_common_t *mips32 = target->arch_info; - - if (!target->type->examined) + struct mips32_common *mips32 = target->arch_info; + + if (!target_was_examined(target)) { - target->type->examined = 1; - + target_set_examined(target); + /* we will configure later */ mips32->bp_scanned = 0; mips32->num_inst_bpoints = 0; @@ -357,66 +362,104 @@ int mips32_examine(struct target_s *target) mips32->num_inst_bpoints_avail = 0; mips32->num_data_bpoints_avail = 0; } - + return ERROR_OK; } -int mips32_configure_break_unit(struct target_s *target) +int mips32_configure_break_unit(struct target *target) { /* get pointers to arch-specific information */ - mips32_common_t *mips32 = target->arch_info; + struct mips32_common *mips32 = target->arch_info; int retval; - u32 dcr, bpinfo; + uint32_t dcr, bpinfo; int i; - + if (mips32->bp_scanned) return ERROR_OK; - + /* get info about breakpoint support */ if ((retval = target_read_u32(target, EJTAG_DCR, &dcr)) != ERROR_OK) return retval; - + if (dcr & (1 << 16)) { /* get number of inst breakpoints */ if ((retval = target_read_u32(target, EJTAG_IBS, &bpinfo)) != ERROR_OK) return retval; - + mips32->num_inst_bpoints = (bpinfo >> 24) & 0x0F; mips32->num_inst_bpoints_avail = mips32->num_inst_bpoints; - mips32->inst_break_list = calloc(mips32->num_inst_bpoints, sizeof(mips32_comparator_t)); + mips32->inst_break_list = calloc(mips32->num_inst_bpoints, sizeof(struct mips32_comparator)); for (i = 0; i < mips32->num_inst_bpoints; i++) { mips32->inst_break_list[i].reg_address = EJTAG_IBA1 + (0x100 * i); } - + /* clear IBIS reg */ if ((retval = target_write_u32(target, EJTAG_IBS, 0)) != ERROR_OK) return retval; } - + if (dcr & (1 << 17)) { /* get number of data breakpoints */ if ((retval = target_read_u32(target, EJTAG_DBS, &bpinfo)) != ERROR_OK) return retval; - + mips32->num_data_bpoints = (bpinfo >> 24) & 0x0F; mips32->num_data_bpoints_avail = mips32->num_data_bpoints; - mips32->data_break_list = calloc(mips32->num_data_bpoints, sizeof(mips32_comparator_t)); + mips32->data_break_list = calloc(mips32->num_data_bpoints, sizeof(struct mips32_comparator)); for (i = 0; i < mips32->num_data_bpoints; i++) { mips32->data_break_list[i].reg_address = EJTAG_DBA1 + (0x100 * i); } - + /* clear DBIS reg */ if ((retval = target_write_u32(target, EJTAG_DBS, 0)) != ERROR_OK) return retval; } - - LOG_DEBUG("DCR 0x%x numinst %i numdata %i", dcr, mips32->num_inst_bpoints, mips32->num_data_bpoints); - + + LOG_DEBUG("DCR 0x%" PRIx32 " numinst %i numdata %i", dcr, mips32->num_inst_bpoints, mips32->num_data_bpoints); + mips32->bp_scanned = 1; - + + return ERROR_OK; +} + +int mips32_enable_interrupts(struct target *target, int enable) +{ + int retval; + int update = 0; + uint32_t dcr; + + /* read debug control register */ + if ((retval = target_read_u32(target, EJTAG_DCR, &dcr)) != ERROR_OK) + return retval; + + if (enable) + { + if (!(dcr & (1 << 4))) + { + /* enable interrupts */ + dcr |= (1 << 4); + update = 1; + } + } + else + { + if (dcr & (1 << 4)) + { + /* disable interrupts */ + dcr &= ~(1 << 4); + update = 1; + } + } + + if (update) + { + if ((retval = target_write_u32(target, EJTAG_DCR, dcr)) != ERROR_OK) + return retval; + } + return ERROR_OK; }