build: cleanup src/target directory
[openocd.git] / src / target / mips_m4k.c
index 83a2a7bd81fc86330d97df963ee06b74ef9700d0..aa9dbe7ad2732ad610c59e8225f6b7c699a0943a 100644 (file)
@@ -24,6 +24,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -48,26 +49,27 @@ static int mips_m4k_examine_debug_reason(struct target *target)
        int retval;
 
        if ((target->debug_reason != DBG_REASON_DBGRQ)
-               && (target->debug_reason != DBG_REASON_SINGLESTEP))
-       {
+               && (target->debug_reason != DBG_REASON_SINGLESTEP)) {
                /* get info about inst breakpoint support */
-               if ((retval = target_read_u32(target, EJTAG_IBS, &break_status)) != ERROR_OK)
+               retval = target_read_u32(target, EJTAG_IBS, &break_status);
+               if (retval != ERROR_OK)
                        return retval;
-               if (break_status & 0x1f)
-               {
+               if (break_status & 0x1f) {
                        /* we have halted on a  breakpoint */
-                       if ((retval = target_write_u32(target, EJTAG_IBS, 0)) != ERROR_OK)
+                       retval = target_write_u32(target, EJTAG_IBS, 0);
+                       if (retval != ERROR_OK)
                                return retval;
                        target->debug_reason = DBG_REASON_BREAKPOINT;
                }
 
                /* get info about data breakpoint support */
-               if ((retval = target_read_u32(target, EJTAG_DBS, &break_status)) != ERROR_OK)
+               retval = target_read_u32(target, EJTAG_DBS, &break_status);
+               if (retval != ERROR_OK)
                        return retval;
-               if (break_status & 0x1f)
-               {
+               if (break_status & 0x1f) {
                        /* we have halted on a  breakpoint */
-                       if ((retval = target_write_u32(target, EJTAG_DBS, 0)) != ERROR_OK)
+                       retval = target_write_u32(target, EJTAG_DBS, 0);
+                       if (retval != ERROR_OK)
                                return retval;
                        target->debug_reason = DBG_REASON_WATCHPOINT;
                }
@@ -92,8 +94,7 @@ static int mips_m4k_debug_entry(struct target *target)
        mips_m4k_examine_debug_reason(target);
 
        /* clear single step if active */
-       if (debug_reg & EJTAG_DEBUG_DSS)
-       {
+       if (debug_reg & EJTAG_DEBUG_DSS) {
                /* stopped due to single step - clear step bit */
                mips_ejtag_config_step(ejtag_info, 0);
        }
@@ -103,9 +104,8 @@ static int mips_m4k_debug_entry(struct target *target)
        /* default to mips32 isa, it will be changed below if required */
        mips32->isa_mode = MIPS32_ISA_MIPS32;
 
-       if (ejtag_info->impcode & EJTAG_IMP_MIPS16) {
+       if (ejtag_info->impcode & EJTAG_IMP_MIPS16)
                mips32->isa_mode = buf_get_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 1);
-       }
 
        LOG_DEBUG("entered debug state at PC 0x%" PRIx32 ", target->state: %s",
                        buf_get_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 32),
@@ -129,8 +129,7 @@ static int mips_m4k_poll(struct target *target)
 
        /* clear this bit before handling polling
         * as after reset registers will read zero */
-       if (ejtag_ctrl & EJTAG_CTRL_ROCC)
-       {
+       if (ejtag_ctrl & EJTAG_CTRL_ROCC) {
                /* we have detected a reset, clear flag
                 * otherwise ejtag will not work */
                ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_ROCC;
@@ -143,35 +142,30 @@ static int mips_m4k_poll(struct target *target)
        }
 
        /* check for processor halted */
-       if (ejtag_ctrl & EJTAG_CTRL_BRKST)
-       {
-               if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET))
-               {
+       if (ejtag_ctrl & EJTAG_CTRL_BRKST) {
+               if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET)) {
                        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_NORMALBOOT);
 
                        target->state = TARGET_HALTED;
 
-                       if ((retval = mips_m4k_debug_entry(target)) != ERROR_OK)
+                       retval = mips_m4k_debug_entry(target);
+                       if (retval != ERROR_OK)
                                return retval;
 
                        target_call_event_callbacks(target, TARGET_EVENT_HALTED);
-               }
-               else if (target->state == TARGET_DEBUG_RUNNING)
-               {
+               } else if (target->state == TARGET_DEBUG_RUNNING) {
                        target->state = TARGET_HALTED;
 
-                       if ((retval = mips_m4k_debug_entry(target)) != ERROR_OK)
+                       retval = mips_m4k_debug_entry(target);
+                       if (retval != ERROR_OK)
                                return retval;
 
                        target_call_event_callbacks(target, TARGET_EVENT_DEBUG_HALTED);
                }
-       }
-       else
-       {
+       } else
                target->state = TARGET_RUNNING;
-       }
 
-//     LOG_DEBUG("ctrl = 0x%08X", ejtag_ctrl);
+/*     LOG_DEBUG("ctrl = 0x%08X", ejtag_ctrl); */
 
        return ERROR_OK;
 }
@@ -181,29 +175,21 @@ static int mips_m4k_halt(struct target *target)
        struct mips32_common *mips32 = target_to_mips32(target);
        struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
 
-       LOG_DEBUG("target->state: %s",
-                 target_state_name(target));
+       LOG_DEBUG("target->state: %s", target_state_name(target));
 
-       if (target->state == TARGET_HALTED)
-       {
+       if (target->state == TARGET_HALTED) {
                LOG_DEBUG("target was already halted");
                return ERROR_OK;
        }
 
        if (target->state == TARGET_UNKNOWN)
-       {
                LOG_WARNING("target was in unknown state when halt was requested");
-       }
 
-       if (target->state == TARGET_RESET)
-       {
-               if ((jtag_get_reset_config() & RESET_SRST_PULLS_TRST) && jtag_get_srst())
-               {
+       if (target->state == TARGET_RESET) {
+               if ((jtag_get_reset_config() & RESET_SRST_PULLS_TRST) && jtag_get_srst()) {
                        LOG_ERROR("can't request a halt while in reset if nSRST pulls nTRST");
                        return ERROR_TARGET_FAILURE;
-               }
-               else
-               {
+               } else {
                        /* we came here in a reset_halt or reset_init sequence
                         * debug entry was already prepared in mips32_prepare_reset_halt()
                         */
@@ -235,32 +221,20 @@ static int mips_m4k_assert_reset(struct target *target)
        if (!(jtag_reset_config & RESET_HAS_SRST))
                assert_srst = 0;
 
-       if (target->reset_halt)
-       {
+       if (target->reset_halt) {
                /* use hardware to catch reset */
                mips_ejtag_set_instr(ejtag_info, EJTAG_INST_EJTAGBOOT);
-       }
-       else
-       {
+       } else
                mips_ejtag_set_instr(ejtag_info, EJTAG_INST_NORMALBOOT);
-       }
 
-       if (assert_srst)
-       {
+       if (assert_srst) {
                /* here we should issue a srst only, but we may have to assert trst as well */
                if (jtag_reset_config & RESET_SRST_PULLS_TRST)
-               {
                        jtag_add_reset(1, 1);
-               }
                else
-               {
                        jtag_add_reset(0, 1);
-               }
-       }
-       else
-       {
-               if (mips_m4k->is_pic32mx)
-               {
+       } else {
+               if (mips_m4k->is_pic32mx) {
                        LOG_DEBUG("Using MTAP reset to reset processor...");
 
                        /* use microchip specific MTAP reset */
@@ -270,9 +244,7 @@ static int mips_m4k_assert_reset(struct target *target)
                        mips_ejtag_drscan_8_out(ejtag_info, MCHP_ASERT_RST);
                        mips_ejtag_drscan_8_out(ejtag_info, MCHP_DE_ASSERT_RST);
                        mips_ejtag_set_instr(ejtag_info, MTAP_SW_ETAP);
-               }
-               else
-               {
+               } else {
                        /* use ejtag reset - not supported by all cores */
                        uint32_t ejtag_ctrl = ejtag_info->ejtag_ctrl | EJTAG_CTRL_PRRST | EJTAG_CTRL_PERRST;
                        LOG_DEBUG("Using EJTAG reset (PRRST) to reset processor...");
@@ -286,10 +258,9 @@ static int mips_m4k_assert_reset(struct target *target)
 
        register_cache_invalidate(mips_m4k->mips32.core_cache);
 
-       if (target->reset_halt)
-       {
-               int retval;
-               if ((retval = target_halt(target)) != ERROR_OK)
+       if (target->reset_halt) {
+               int retval = target_halt(target);
+               if (retval != ERROR_OK)
                        return retval;
        }
 
@@ -298,8 +269,7 @@ static int mips_m4k_assert_reset(struct target *target)
 
 static int mips_m4k_deassert_reset(struct target *target)
 {
-       LOG_DEBUG("target->state: %s",
-               target_state_name(target));
+       LOG_DEBUG("target->state: %s", target_state_name(target));
 
        /* deassert reset lines */
        jtag_add_reset(0, 0);
@@ -340,41 +310,36 @@ static int mips_m4k_resume(struct target *target, int current,
        struct breakpoint *breakpoint = NULL;
        uint32_t resume_pc;
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (!debug_execution)
-       {
+       if (!debug_execution) {
                target_free_all_working_areas(target);
                mips_m4k_enable_breakpoints(target);
                mips_m4k_enable_watchpoints(target);
        }
 
        /* current = 1: continue on current pc, otherwise continue at <address> */
-       if (!current)
-       {
+       if (!current) {
                buf_set_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 32, address);
                mips32->core_cache->reg_list[MIPS32_PC].dirty = 1;
                mips32->core_cache->reg_list[MIPS32_PC].valid = 1;
        }
 
-       if (ejtag_info->impcode & EJTAG_IMP_MIPS16) {
+       if (ejtag_info->impcode & EJTAG_IMP_MIPS16)
                buf_set_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 1, mips32->isa_mode);
-       }
 
        resume_pc = buf_get_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 32);
 
        mips32_restore_context(target);
 
        /* the front-end may request us not to handle breakpoints */
-       if (handle_breakpoints)
-       {
+       if (handle_breakpoints) {
                /* Single step past breakpoint at current address */
-               if ((breakpoint = breakpoint_find(target, resume_pc)))
-               {
+               breakpoint = breakpoint_find(target, resume_pc);
+               if (breakpoint) {
                        LOG_DEBUG("unset breakpoint at 0x%8.8" PRIx32 "", breakpoint->address);
                        mips_m4k_unset_breakpoint(target, breakpoint);
                        mips_m4k_single_step_core(target);
@@ -392,14 +357,11 @@ static int mips_m4k_resume(struct target *target, int current,
        /* registers are now invalid */
        register_cache_invalidate(mips32->core_cache);
 
-       if (!debug_execution)
-       {
+       if (!debug_execution) {
                target->state = TARGET_RUNNING;
                target_call_event_callbacks(target, TARGET_EVENT_RESUMED);
                LOG_DEBUG("target resumed at 0x%" PRIx32 "", resume_pc);
-       }
-       else
-       {
+       } else {
                target->state = TARGET_DEBUG_RUNNING;
                target_call_event_callbacks(target, TARGET_EVENT_DEBUG_RESUMED);
                LOG_DEBUG("target debug resumed at 0x%" PRIx32 "", resume_pc);
@@ -416,15 +378,13 @@ static int mips_m4k_step(struct target *target, int current,
        struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
        struct breakpoint *breakpoint = NULL;
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
        /* current = 1: continue on current pc, otherwise continue at <address> */
-       if (!current)
-       {
+       if (!current) {
                buf_set_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 32, address);
                mips32->core_cache->reg_list[MIPS32_PC].dirty = 1;
                mips32->core_cache->reg_list[MIPS32_PC].valid = 1;
@@ -473,8 +433,7 @@ static void mips_m4k_enable_breakpoints(struct target *target)
        struct breakpoint *breakpoint = target->breakpoints;
 
        /* set any pending breakpoints */
-       while (breakpoint)
-       {
+       while (breakpoint) {
                if (breakpoint->set == 0)
                        mips_m4k_set_breakpoint(target, breakpoint);
                breakpoint = breakpoint->next;
@@ -485,85 +444,72 @@ static int mips_m4k_set_breakpoint(struct target *target,
                struct breakpoint *breakpoint)
 {
        struct mips32_common *mips32 = target_to_mips32(target);
-       struct mips32_comparator * comparator_list = mips32->inst_break_list;
+       struct mips32_comparator *comparator_list = mips32->inst_break_list;
        int retval;
 
-       if (breakpoint->set)
-       {
+       if (breakpoint->set) {
                LOG_WARNING("breakpoint already set");
                return ERROR_OK;
        }
 
-       if (breakpoint->type == BKPT_HARD)
-       {
+       if (breakpoint->type == BKPT_HARD) {
                int bp_num = 0;
 
                while (comparator_list[bp_num].used && (bp_num < mips32->num_inst_bpoints))
                        bp_num++;
-               if (bp_num >= mips32->num_inst_bpoints)
-               {
+               if (bp_num >= mips32->num_inst_bpoints) {
                        LOG_ERROR("Can not find free FP Comparator(bpid: %d)",
-                                         breakpoint->unique_id );
+                                       breakpoint->unique_id);
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
                }
                breakpoint->set = bp_num + 1;
                comparator_list[bp_num].used = 1;
                comparator_list[bp_num].bp_value = breakpoint->address;
-               target_write_u32(target, comparator_list[bp_num].reg_address, comparator_list[bp_num].bp_value);
+               target_write_u32(target, comparator_list[bp_num].reg_address,
+                               comparator_list[bp_num].bp_value);
                target_write_u32(target, comparator_list[bp_num].reg_address + 0x08, 0x00000000);
                target_write_u32(target, comparator_list[bp_num].reg_address + 0x18, 1);
                LOG_DEBUG("bpid: %d, bp_num %i bp_value 0x%" PRIx32 "",
                                  breakpoint->unique_id,
                                  bp_num, comparator_list[bp_num].bp_value);
-       }
-       else if (breakpoint->type == BKPT_SOFT)
-       {
-               LOG_DEBUG("bpid: %d", breakpoint->unique_id );
-               if (breakpoint->length == 4)
-               {
+       } else if (breakpoint->type == BKPT_SOFT) {
+               LOG_DEBUG("bpid: %d", breakpoint->unique_id);
+               if (breakpoint->length == 4) {
                        uint32_t verify = 0xffffffff;
 
-                       if ((retval = target_read_memory(target, breakpoint->address, breakpoint->length, 1,
-                                       breakpoint->orig_instr)) != ERROR_OK)
-                       {
+                       retval = target_read_memory(target, breakpoint->address, breakpoint->length, 1,
+                                       breakpoint->orig_instr);
+                       if (retval != ERROR_OK)
                                return retval;
-                       }
-                       if ((retval = target_write_u32(target, breakpoint->address, MIPS32_SDBBP)) != ERROR_OK)
-                       {
+                       retval = target_write_u32(target, breakpoint->address, MIPS32_SDBBP);
+                       if (retval != ERROR_OK)
                                return retval;
-                       }
 
-                       if ((retval = target_read_u32(target, breakpoint->address, &verify)) != ERROR_OK)
-                       {
+                       retval = target_read_u32(target, breakpoint->address, &verify);
+                       if (retval != ERROR_OK)
                                return retval;
-                       }
-                       if (verify != MIPS32_SDBBP)
-                       {
-                               LOG_ERROR("Unable to set 32bit breakpoint at address %08" PRIx32 " - check that memory is read/writable", breakpoint->address);
+                       if (verify != MIPS32_SDBBP) {
+                               LOG_ERROR("Unable to set 32bit breakpoint at address %08" PRIx32
+                                               " - check that memory is read/writable", breakpoint->address);
                                return ERROR_OK;
                        }
-               }
-               else
-               {
+               } else {
                        uint16_t verify = 0xffff;
 
-                       if ((retval = target_read_memory(target, breakpoint->address, breakpoint->length, 1,
-                                       breakpoint->orig_instr)) != ERROR_OK)
-                       {
+                       retval = target_read_memory(target, breakpoint->address, breakpoint->length, 1,
+                                       breakpoint->orig_instr);
+                       if (retval != ERROR_OK)
                                return retval;
-                       }
-                       if ((retval = target_write_u16(target, breakpoint->address, MIPS16_SDBBP)) != ERROR_OK)
-                       {
+                       retval = target_write_u16(target, breakpoint->address, MIPS16_SDBBP);
+                       if (retval != ERROR_OK)
                                return retval;
-                       }
 
-                       if ((retval = target_read_u16(target, breakpoint->address, &verify)) != ERROR_OK)
-                       {
+                       retval = target_read_u16(target, breakpoint->address, &verify);
+                       if (retval != ERROR_OK)
                                return retval;
-                       }
-                       if (verify != MIPS16_SDBBP)
-                       {
-                               LOG_ERROR("Unable to set 16bit breakpoint at address %08" PRIx32 " - check that memory is read/writable", breakpoint->address);
+                       if (verify != MIPS16_SDBBP) {
+                               LOG_ERROR("Unable to set 16bit breakpoint at address %08" PRIx32
+                                               " - check that memory is read/writable", breakpoint->address);
                                return ERROR_OK;
                        }
                }
@@ -582,43 +528,36 @@ static int mips_m4k_unset_breakpoint(struct target *target,
        struct mips32_comparator *comparator_list = mips32->inst_break_list;
        int retval;
 
-       if (!breakpoint->set)
-       {
+       if (!breakpoint->set) {
                LOG_WARNING("breakpoint not set");
                return ERROR_OK;
        }
 
-       if (breakpoint->type == BKPT_HARD)
-       {
+       if (breakpoint->type == BKPT_HARD) {
                int bp_num = breakpoint->set - 1;
-               if ((bp_num < 0) || (bp_num >= mips32->num_inst_bpoints))
-               {
+               if ((bp_num < 0) || (bp_num >= mips32->num_inst_bpoints)) {
                        LOG_DEBUG("Invalid FP Comparator number in breakpoint (bpid: %d)",
                                          breakpoint->unique_id);
                        return ERROR_OK;
                }
                LOG_DEBUG("bpid: %d - releasing hw: %d",
-                                 breakpoint->unique_id,
-                                 bp_num );
+                               breakpoint->unique_id,
+                               bp_num);
                comparator_list[bp_num].used = 0;
                comparator_list[bp_num].bp_value = 0;
                target_write_u32(target, comparator_list[bp_num].reg_address + 0x18, 0);
 
-       }
-       else
-       {
+       } else {
                /* restore original instruction (kept in target endianness) */
                LOG_DEBUG("bpid: %d", breakpoint->unique_id);
-               if (breakpoint->length == 4)
-               {
+               if (breakpoint->length == 4) {
                        uint32_t current_instr;
 
                        /* check that user program has not modified breakpoint instruction */
-                       if ((retval = target_read_memory(target, breakpoint->address, 4, 1,
-                                       (uint8_t*)&current_instr)) != ERROR_OK)
-                       {
+                       retval = target_read_memory(target, breakpoint->address, 4, 1,
+                                       (uint8_t *)&current_instr);
+                       if (retval != ERROR_OK)
                                return retval;
-                       }
 
                        /**
                         * target_read_memory() gets us data in _target_ endianess.
@@ -627,33 +566,26 @@ static int mips_m4k_unset_breakpoint(struct target *target,
                         */
                        current_instr = target_buffer_get_u32(target, (uint8_t *)&current_instr);
 
-                       if (current_instr == MIPS32_SDBBP)
-                       {
-                               if ((retval = target_write_memory(target, breakpoint->address, 4, 1,
-                                               breakpoint->orig_instr)) != ERROR_OK)
-                               {
+                       if (current_instr == MIPS32_SDBBP) {
+                               retval = target_write_memory(target, breakpoint->address, 4, 1,
+                                               breakpoint->orig_instr);
+                               if (retval != ERROR_OK)
                                        return retval;
-                               }
                        }
-               }
-               else
-               {
+               } else {
                        uint16_t current_instr;
 
                        /* check that user program has not modified breakpoint instruction */
-                       if ((retval = target_read_memory(target, breakpoint->address, 2, 1,
-                                       (uint8_t*)&current_instr)) != ERROR_OK)
-                       {
+                       retval = target_read_memory(target, breakpoint->address, 2, 1,
+                                       (uint8_t *)&current_instr);
+                       if (retval != ERROR_OK)
                                return retval;
-                       }
                        current_instr = target_buffer_get_u16(target, (uint8_t *)&current_instr);
-                       if (current_instr == MIPS16_SDBBP)
-                       {
-                               if ((retval = target_write_memory(target, breakpoint->address, 2, 1,
-                                               breakpoint->orig_instr)) != ERROR_OK)
-                               {
+                       if (current_instr == MIPS16_SDBBP) {
+                               retval = target_write_memory(target, breakpoint->address, 2, 1,
+                                               breakpoint->orig_instr);
+                               if (retval != ERROR_OK)
                                        return retval;
-                               }
                        }
                }
        }
@@ -666,10 +598,8 @@ static int mips_m4k_add_breakpoint(struct target *target, struct breakpoint *bre
 {
        struct mips32_common *mips32 = target_to_mips32(target);
 
-       if (breakpoint->type == BKPT_HARD)
-       {
-               if (mips32->num_inst_bpoints_avail < 1)
-               {
+       if (breakpoint->type == BKPT_HARD) {
+               if (mips32->num_inst_bpoints_avail < 1) {
                        LOG_INFO("no hardware breakpoint available");
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
                }
@@ -686,16 +616,13 @@ static int mips_m4k_remove_breakpoint(struct target *target,
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
        if (breakpoint->set)
-       {
                mips_m4k_unset_breakpoint(target, breakpoint);
-       }
 
        if (breakpoint->type == BKPT_HARD)
                mips32->num_inst_bpoints_avail++;
@@ -715,36 +642,31 @@ static int mips_m4k_set_watchpoint(struct target *target,
         * condition evaluation
        */
        int enable = EJTAG_DBCn_NOSB | EJTAG_DBCn_NOLB | EJTAG_DBCn_BE |
-                (0xff << EJTAG_DBCn_BLM_SHIFT);
+                       (0xff << EJTAG_DBCn_BLM_SHIFT);
 
-       if (watchpoint->set)
-       {
+       if (watchpoint->set) {
                LOG_WARNING("watchpoint already set");
                return ERROR_OK;
        }
 
-       while(comparator_list[wp_num].used && (wp_num < mips32->num_data_bpoints))
+       while (comparator_list[wp_num].used && (wp_num < mips32->num_data_bpoints))
                wp_num++;
-       if (wp_num >= mips32->num_data_bpoints)
-       {
+       if (wp_num >= mips32->num_data_bpoints) {
                LOG_ERROR("Can not find free FP Comparator");
                return ERROR_FAIL;
        }
 
-       if (watchpoint->length != 4)
-       {
+       if (watchpoint->length != 4) {
                LOG_ERROR("Only watchpoints of length 4 are supported");
                return ERROR_TARGET_UNALIGNED_ACCESS;
        }
 
-       if (watchpoint->address % 4)
-       {
+       if (watchpoint->address % 4) {
                LOG_ERROR("Watchpoints address should be word aligned");
                return ERROR_TARGET_UNALIGNED_ACCESS;
        }
 
-       switch (watchpoint->rw)
-       {
+       switch (watchpoint->rw) {
                case WPT_READ:
                        enable &= ~EJTAG_DBCn_NOLB;
                        break;
@@ -778,15 +700,13 @@ static int mips_m4k_unset_watchpoint(struct target *target,
        struct mips32_common *mips32 = target_to_mips32(target);
        struct mips32_comparator *comparator_list = mips32->data_break_list;
 
-       if (!watchpoint->set)
-       {
+       if (!watchpoint->set) {
                LOG_WARNING("watchpoint not set");
                return ERROR_OK;
        }
 
        int wp_num = watchpoint->set - 1;
-       if ((wp_num < 0) || (wp_num >= mips32->num_data_bpoints))
-       {
+       if ((wp_num < 0) || (wp_num >= mips32->num_data_bpoints)) {
                LOG_DEBUG("Invalid FP Comparator number in watchpoint");
                return ERROR_OK;
        }
@@ -802,8 +722,7 @@ static int mips_m4k_add_watchpoint(struct target *target, struct watchpoint *wat
 {
        struct mips32_common *mips32 = target_to_mips32(target);
 
-       if (mips32->num_data_bpoints_avail < 1)
-       {
+       if (mips32->num_data_bpoints_avail < 1) {
                LOG_INFO("no hardware watchpoints available");
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
@@ -820,16 +739,13 @@ static int mips_m4k_remove_watchpoint(struct target *target,
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
        if (watchpoint->set)
-       {
                mips_m4k_unset_watchpoint(target, watchpoint);
-       }
 
        mips32->num_data_bpoints_avail++;
 
@@ -841,8 +757,7 @@ static void mips_m4k_enable_watchpoints(struct target *target)
        struct watchpoint *watchpoint = target->watchpoints;
 
        /* set any pending watchpoints */
-       while (watchpoint)
-       {
+       while (watchpoint) {
                if (watchpoint->set == 0)
                        mips_m4k_set_watchpoint(target, watchpoint);
                watchpoint = watchpoint->next;
@@ -855,10 +770,10 @@ static int mips_m4k_read_memory(struct target *target, uint32_t address,
        struct mips32_common *mips32 = target_to_mips32(target);
        struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
 
-       LOG_DEBUG("address: 0x%8.8" PRIx32 ", size: 0x%8.8" PRIx32 ", count: 0x%8.8" PRIx32 "", address, size, count);
+       LOG_DEBUG("address: 0x%8.8" PRIx32 ", size: 0x%8.8" PRIx32 ", count: 0x%8.8" PRIx32 "",
+                       address, size, count);
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
@@ -873,19 +788,14 @@ static int mips_m4k_read_memory(struct target *target, uint32_t address,
        /* since we don't know if buffer is aligned, we allocate new mem that is always aligned */
        void *t = NULL;
 
-       if (size > 1)
-       {
+       if (size > 1) {
                t = malloc(count * size * sizeof(uint8_t));
-               if (t == NULL)
-               {
+               if (t == NULL) {
                        LOG_ERROR("Out of memory");
                        return ERROR_FAIL;
                }
-       }
-       else
-       {
+       } else
                t = buffer;
-       }
 
        /* if noDMA off, use DMAACC mode for memory read */
        int retval;
@@ -896,15 +806,13 @@ static int mips_m4k_read_memory(struct target *target, uint32_t address,
 
        /* mips32_..._read_mem with size 4/2 returns uint32_t/uint16_t in host */
        /* endianness, but byte array should represent target endianness       */
-       if (ERROR_OK == retval)
-       {
-               switch(size)
-               {
+       if (ERROR_OK == retval) {
+               switch (size) {
                case 4:
-                       target_buffer_set_u32_array(target,buffer,count,t);
+                       target_buffer_set_u32_array(target, buffer, count, t);
                        break;
                case 2:
-                       target_buffer_set_u16_array(target,buffer,count,t);
+                       target_buffer_set_u16_array(target, buffer, count, t);
                        break;
                }
        }
@@ -924,8 +832,7 @@ static int mips_m4k_write_memory(struct target *target, uint32_t address,
        LOG_DEBUG("address: 0x%8.8" PRIx32 ", size: 0x%8.8" PRIx32 ", count: 0x%8.8" PRIx32 "",
                        address, size, count);
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
@@ -939,24 +846,21 @@ static int mips_m4k_write_memory(struct target *target, uint32_t address,
 
        /** correct endianess if we have word or hword access */
        void *t = NULL;
-       if (size > 1)
-       {
+       if (size > 1) {
                /* mips32_..._write_mem with size 4/2 requires uint32_t/uint16_t in host */
                /* endianness, but byte array represents target endianness               */
                t = malloc(count * size * sizeof(uint8_t));
-               if (t == NULL)
-               {
+               if (t == NULL) {
                        LOG_ERROR("Out of memory");
                        return ERROR_FAIL;
                }
 
-               switch(size)
-               {
+               switch (size) {
                case 4:
-                       target_buffer_get_u32_array(target,buffer,count,(uint32_t*)t);
+                       target_buffer_get_u32_array(target, buffer, count, (uint32_t *)t);
                        break;
                case 2:
-                       target_buffer_get_u16_array(target,buffer,count,(uint16_t*)t);
+                       target_buffer_get_u16_array(target, buffer, count, (uint16_t *)t);
                        break;
                }
                buffer = t;
@@ -1016,15 +920,13 @@ static int mips_m4k_examine(struct target *target)
        struct mips_ejtag *ejtag_info = &mips_m4k->mips32.ejtag_info;
        uint32_t idcode = 0;
 
-       if (!target_was_examined(target))
-       {
+       if (!target_was_examined(target)) {
                retval = mips_ejtag_get_idcode(ejtag_info, &idcode);
                if (retval != ERROR_OK)
                        return retval;
                ejtag_info->idcode = idcode;
 
-               if (((idcode >> 1) & 0x7FF) == 0x29)
-               {
+               if (((idcode >> 1) & 0x7FF) == 0x29) {
                        /* we are using a pic32mx so select ejtag port
                         * as it is not selected by default */
                        mips_ejtag_set_instr(ejtag_info, MTAP_SW_ETAP);
@@ -1034,10 +936,12 @@ static int mips_m4k_examine(struct target *target)
        }
 
        /* init rest of ejtag interface */
-       if ((retval = mips_ejtag_init(ejtag_info)) != ERROR_OK)
+       retval = mips_ejtag_init(ejtag_info);
+       if (retval != ERROR_OK)
                return retval;
 
-       if ((retval = mips32_examine(target)) != ERROR_OK)
+       retval = mips32_examine(target);
+       if (retval != ERROR_OK)
                return retval;
 
        return ERROR_OK;
@@ -1053,8 +957,7 @@ static int mips_m4k_bulk_write_memory(struct target *target, uint32_t address,
 
        LOG_DEBUG("address: 0x%8.8" PRIx32 ", count: 0x%8.8" PRIx32 "", address, count);
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
@@ -1063,8 +966,7 @@ static int mips_m4k_bulk_write_memory(struct target *target, uint32_t address,
        if (address & 0x3u)
                return ERROR_TARGET_UNALIGNED_ACCESS;
 
-       if (mips32->fast_data_area == NULL)
-       {
+       if (mips32->fast_data_area == NULL) {
                /* Get memory for block write handler
                 * we preserve this area between calls and gain a speed increase
                 * of about 3kb/sec when writing flash
@@ -1072,8 +974,7 @@ static int mips_m4k_bulk_write_memory(struct target *target, uint32_t address,
                retval = target_alloc_working_area(target,
                                MIPS32_FASTDATA_HANDLER_SIZE,
                                &mips32->fast_data_area);
-               if (retval != ERROR_OK)
-               {
+               if (retval != ERROR_OK) {
                        LOG_WARNING("No working area available, falling back to non-bulk write");
                        return mips_m4k_write_memory(target, address, 4, count, buffer);
                }
@@ -1086,13 +987,12 @@ static int mips_m4k_bulk_write_memory(struct target *target, uint32_t address,
        /* but byte array represents target endianness                      */
        uint32_t *t = NULL;
        t = malloc(count * sizeof(uint32_t));
-       if (t == NULL)
-       {
+       if (t == NULL) {
                LOG_ERROR("Out of memory");
                return ERROR_FAIL;
        }
 
-       target_buffer_get_u32_array(target,buffer,count,t);
+       target_buffer_get_u32_array(target, buffer, count, t);
 
        retval = mips32_pracc_fastdata_xfer(ejtag_info, mips32->fast_data_area, write_t, address,
                        count, t);
@@ -1100,8 +1000,7 @@ static int mips_m4k_bulk_write_memory(struct target *target, uint32_t address,
        if (t != NULL)
                free(t);
 
-       if (retval != ERROR_OK)
-       {
+       if (retval != ERROR_OK) {
                /* FASTDATA access failed, try normal memory write */
                LOG_DEBUG("Fastdata access Failed, falling back to non-bulk write");
                retval = mips_m4k_write_memory(target, address, 4, count, buffer);
@@ -1131,48 +1030,40 @@ COMMAND_HANDLER(mips_m4k_handle_cp0_command)
        if (retval != ERROR_OK)
                return retval;
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                command_print(CMD_CTX, "target must be stopped for \"%s\" command", CMD_NAME);
                return ERROR_OK;
        }
 
        /* two or more argument, access a single register/select (write if third argument is given) */
        if (CMD_ARGC < 2)
-       {
-           return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-       else
-       {
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       else {
                uint32_t cp0_reg, cp0_sel;
                COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], cp0_reg);
                COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], cp0_sel);
 
-               if (CMD_ARGC == 2)
-               {
+               if (CMD_ARGC == 2) {
                        uint32_t value;
 
-                       if ((retval = mips32_cp0_read(ejtag_info, &value, cp0_reg, cp0_sel)) != ERROR_OK)
-                       {
+                       retval = mips32_cp0_read(ejtag_info, &value, cp0_reg, cp0_sel);
+                       if (retval != ERROR_OK) {
                                command_print(CMD_CTX,
                                                "couldn't access reg %" PRIi32,
                                                cp0_reg);
                                return ERROR_OK;
                        }
-                       if ((retval = jtag_execute_queue()) != ERROR_OK)
-                       {
+                       retval = jtag_execute_queue();
+                       if (retval != ERROR_OK)
                                return retval;
-                       }
 
                        command_print(CMD_CTX, "cp0 reg %" PRIi32 ", select %" PRIi32 ": %8.8" PRIx32,
                                        cp0_reg, cp0_sel, value);
-               }
-               else if (CMD_ARGC == 3)
-               {
+               } else if (CMD_ARGC == 3) {
                        uint32_t value;
                        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], value);
-                       if ((retval = mips32_cp0_write(ejtag_info, value, cp0_reg, cp0_sel)) != ERROR_OK)
-                       {
+                       retval = mips32_cp0_write(ejtag_info, value, cp0_reg, cp0_sel);
+                       if (retval != ERROR_OK) {
                                command_print(CMD_CTX,
                                                "couldn't access cp0 reg %" PRIi32 ", select %" PRIi32,
                                                cp0_reg,  cp0_sel);
@@ -1211,8 +1102,7 @@ const struct command_registration mips_m4k_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-struct target_type mips_m4k_target =
-{
+struct target_type mips_m4k_target = {
        .name = "mips_m4k",
 
        .poll = mips_m4k_poll,

Linking to existing account procedure

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

SSH host keys fingerprints

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