mips32, implement assembler li instruction
[openocd.git] / src / target / mips32_pracc.c
index e2b40c4c65bd448ebbb084a132810a6e3b4eab9c..6da184384a03ee900f3d1b68d332e1de69f350c6 100644 (file)
@@ -20,9 +20,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 <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 /*
 #include "mips32.h"
 #include "mips32_pracc.h"
 
-struct mips32_pracc_context {
-       uint32_t *local_oparam;
-       int num_oparam;
-       const uint32_t *code;
-       int code_len;
-       uint32_t stack[32];
-       int stack_offset;
-       struct mips_ejtag *ejtag_info;
-};
-
-static int wait_for_pracc_rw(struct mips_ejtag *ejtag_info, uint32_t *ctrl)
+static int wait_for_pracc_rw(struct mips_ejtag *ejtag_info)
 {
-       uint32_t ejtag_ctrl;
-       long long then = timeval_ms();
+       int64_t then = timeval_ms();
 
        /* wait for the PrAcc to become "1" */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
 
        while (1) {
-               ejtag_ctrl = ejtag_info->ejtag_ctrl;
-               int retval = mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
+               ejtag_info->pa_ctrl = ejtag_info->ejtag_ctrl;
+               int retval = mips_ejtag_drscan_32(ejtag_info, &ejtag_info->pa_ctrl);
                if (retval != ERROR_OK)
                        return retval;
 
-               if (ejtag_ctrl & EJTAG_CTRL_PRACC)
+               if (ejtag_info->pa_ctrl & EJTAG_CTRL_PRACC)
                        break;
 
-               int timeout = timeval_ms() - then;
+               int64_t timeout = timeval_ms() - then;
                if (timeout > 1000) {
                        LOG_DEBUG("DEBUGMODULE: No memory access in progress!");
                        return ERROR_JTAG_DEVICE_ERROR;
                }
        }
 
-       *ctrl = ejtag_ctrl;
        return ERROR_OK;
 }
 
 /* Shift in control and address for a new processor access, save them in ejtag_info */
 static int mips32_pracc_read_ctrl_addr(struct mips_ejtag *ejtag_info)
 {
-       int retval = wait_for_pracc_rw(ejtag_info, &ejtag_info->pa_ctrl);
+       int retval = wait_for_pracc_rw(ejtag_info);
        if (retval != ERROR_OK)
                return retval;
 
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS);
-       ejtag_info->pa_addr = 0;
-       retval = mips_ejtag_drscan_32(ejtag_info, &ejtag_info->pa_addr);
 
-       return retval;
+       ejtag_info->pa_addr = 0;
+       return  mips_ejtag_drscan_32(ejtag_info, &ejtag_info->pa_addr);
 }
 
 /* Finish processor access */
-static int mips32_pracc_finish(struct mips_ejtag *ejtag_info)
+static void mips32_pracc_finish(struct mips_ejtag *ejtag_info)
 {
        uint32_t ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_PRACC;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        mips_ejtag_drscan_32_out(ejtag_info, ctrl);
-
-       return jtag_execute_queue();
 }
 
 int mips32_pracc_clean_text_jump(struct mips_ejtag *ejtag_info)
 {
        uint32_t jt_code = MIPS32_J((0x0FFFFFFF & MIPS32_PRACC_TEXT) >> 2);
-       int retval;
 
        /* do 3 0/nops to clean pipeline before a jump to pracc text, NOP in delay slot */
        for (int i = 0; i != 5; i++) {
                /* Wait for pracc */
-               retval = wait_for_pracc_rw(ejtag_info, &ejtag_info->pa_ctrl);
+               int retval = wait_for_pracc_rw(ejtag_info);
                if (retval != ERROR_OK)
                        return retval;
 
@@ -155,24 +137,23 @@ int mips32_pracc_clean_text_jump(struct mips_ejtag *ejtag_info)
                mips_ejtag_drscan_32_out(ejtag_info, data);
 
                /* finish pa */
-               retval = mips32_pracc_finish(ejtag_info);
-               if (retval != ERROR_OK)
-                       return retval;
+               mips32_pracc_finish(ejtag_info);
        }
 
-       if (ejtag_info->mode != 0)      /* done, queued mode won't work with lexra cores */
+       if (ejtag_info->mode != 0)      /* async mode support only for MIPS ... */
                return ERROR_OK;
 
-       retval = mips32_pracc_read_ctrl_addr(ejtag_info);
-       if (retval != ERROR_OK)
-               return retval;
-
-       if (ejtag_info->pa_addr != MIPS32_PRACC_TEXT) {                 /* LEXRA/BMIPS ?, shift out another NOP */
-               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
-               mips_ejtag_drscan_32_out(ejtag_info, MIPS32_NOP);
-               retval = mips32_pracc_finish(ejtag_info);
+       for (int i = 0; i != 2; i++) {
+               int retval = mips32_pracc_read_ctrl_addr(ejtag_info);
                if (retval != ERROR_OK)
                        return retval;
+
+               if (ejtag_info->pa_addr != MIPS32_PRACC_TEXT) {         /* LEXRA/BMIPS ?, shift out another NOP, max 2 */
+                       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
+                       mips_ejtag_drscan_32_out(ejtag_info, MIPS32_NOP);
+                       mips32_pracc_finish(ejtag_info);
+               } else
+                       break;
        }
 
        return ERROR_OK;
@@ -212,7 +193,7 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_info *ct
                if (ejtag_info->pa_ctrl & EJTAG_CTRL_PRNW) {                                            /* write/store access */
                        /* Check for pending store from a previous store instruction at dmseg */
                        if (store_pending == 0) {
-                               LOG_DEBUG("unexpected write at address %x", ejtag_info->pa_addr);
+                               LOG_DEBUG("unexpected write at address %" PRIx32, ejtag_info->pa_addr);
                                if (code_count < 2) {   /* allow for restart */
                                        restart = 1;
                                        continue;
@@ -222,7 +203,7 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_info *ct
                                /* check address */
                                if (ejtag_info->pa_addr < MIPS32_PRACC_PARAM_OUT || ejtag_info->pa_addr > max_store_addr) {
 
-                                       LOG_DEBUG("writing at unexpected address %x", ejtag_info->pa_addr);
+                                       LOG_DEBUG("writing at unexpected address %" PRIx32, ejtag_info->pa_addr);
                                        return ERROR_JTAG_DEVICE_ERROR;
                                }
                        }
@@ -241,7 +222,7 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_info *ct
                         if (!final_check) {                    /* executing function code */
                                /* check address */
                                if (ejtag_info->pa_addr != (MIPS32_PRACC_TEXT + code_count * 4)) {
-                                       LOG_DEBUG("reading at unexpected address %x, expected %x",
+                                       LOG_DEBUG("reading at unexpected address %" PRIx32 ", expected %x",
                                                        ejtag_info->pa_addr, MIPS32_PRACC_TEXT + code_count * 4);
 
                                        /* restart code execution only in some cases */
@@ -283,7 +264,7 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_info *ct
                                        }
                                } else {
                                        if (ejtag_info->pa_addr != (MIPS32_PRACC_TEXT + code_count * 4)) {
-                                               LOG_DEBUG("unexpected read address in final check: %x, expected: %x",
+                                               LOG_DEBUG("unexpected read address in final check: %" PRIx32 ", expected: %x",
                                                          ejtag_info->pa_addr, MIPS32_PRACC_TEXT + code_count * 4);
                                                return ERROR_JTAG_DEVICE_ERROR;
                                        }
@@ -307,12 +288,10 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_info *ct
                        mips_ejtag_drscan_32_out(ejtag_info, instr);
                }
                /* finish processor access, let the processor eat! */
-               retval = mips32_pracc_finish(ejtag_info);
-               if (retval != ERROR_OK)
-                       return retval;
+               mips32_pracc_finish(ejtag_info);
 
                if (instr == MIPS32_DRET)       /* after leaving debug mode nothing to do */
-                       return ERROR_OK;
+                       return jtag_execute_queue();
 
                if (store_pending == 0 && pass) {       /* store access done, but after passing pracc text */
                        LOG_DEBUG("warning: store access pass pracc text");
@@ -342,6 +321,18 @@ inline void pracc_add(struct pracc_queue_info *ctx, uint32_t addr, uint32_t inst
                ctx->store_count++;
 }
 
+inline void pracc_add_li32(struct pracc_queue_info *ctx, uint32_t reg_num, uint32_t data, bool optimize)
+{
+       if (LOWER16(data) == 0 && optimize)
+               pracc_add(ctx, 0, MIPS32_LUI(reg_num, UPPER16(data)));  /* load only upper value */
+       else if (UPPER16(data) == 0 && optimize)
+               pracc_add(ctx, 0, MIPS32_ORI(reg_num, 0, LOWER16(data)));       /* load only lower */
+       else {
+               pracc_add(ctx, 0, MIPS32_LUI(reg_num, UPPER16(data)));          /* load upper and lower */
+               pracc_add(ctx, 0, MIPS32_ORI(reg_num, reg_num, LOWER16(data)));
+       }
+}
+
 inline void pracc_queue_free(struct pracc_queue_info *ctx)
 {
        if (ctx->code_count > ctx->max_code)    /* Only for internal check, will be erased */
@@ -459,8 +450,7 @@ int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t
        pracc_add(&ctx, 0, MIPS32_LW(8, LOWER16(addr), 8));                             /* lw $8, LOWER16(addr)($8) */
        pracc_add(&ctx, MIPS32_PRACC_PARAM_OUT,
                                MIPS32_SW(8, PRACC_OUT_OFFSET, 15));                    /* sw $8,PRACC_OUT_OFFSET($15) */
-       pracc_add(&ctx, 0, MIPS32_LUI(8, UPPER16(ejtag_info->reg8)));           /* restore upper 16 of $8 */
-       pracc_add(&ctx, 0, MIPS32_ORI(8, 8, LOWER16(ejtag_info->reg8)));                /* restore lower 16 of $8 */
+       pracc_add_li32(&ctx, 8, ejtag_info->reg8, 0);                           /* restore $8 */
        pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                                        /* jump to start */
        pracc_add(&ctx, 0, MIPS32_MFC0(15, 31, 0));                                     /* move COP0 DeSave to $15 */
 
@@ -520,10 +510,8 @@ int mips32_pracc_read_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size
                                          MIPS32_SW(8, PRACC_OUT_OFFSET + i * 4, 15));          /* store $8 at param out */
                        addr += size;
                }
-               pracc_add(&ctx, 0, MIPS32_LUI(8, UPPER16(ejtag_info->reg8)));           /* restore upper 16 bits of reg 8 */
-               pracc_add(&ctx, 0, MIPS32_ORI(8, 8, LOWER16(ejtag_info->reg8)));        /* restore lower 16 bits of reg 8 */
-               pracc_add(&ctx, 0, MIPS32_LUI(9, UPPER16(ejtag_info->reg9)));           /* restore upper 16 bits of reg 9 */
-               pracc_add(&ctx, 0, MIPS32_ORI(9, 9, LOWER16(ejtag_info->reg9)));        /* restore lower 16 bits of reg 9 */
+               pracc_add_li32(&ctx, 8, ejtag_info->reg8, 0);                           /* restore $8 */
+               pracc_add_li32(&ctx, 9, ejtag_info->reg9, 0);                           /* restore $9 */
 
                pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                                /* jump to start */
                pracc_add(&ctx, 0, MIPS32_MFC0(15, 31, 0));                                     /* restore $15 from DeSave */
@@ -563,10 +551,10 @@ int mips32_cp0_read(struct mips_ejtag *ejtag_info, uint32_t *val, uint32_t cp0_r
                goto exit;
 
        pracc_add(&ctx, 0, MIPS32_LUI(15, PRACC_UPPER_BASE_ADDR));                      /* $15 = MIPS32_PRACC_BASE_ADDR */
-       pracc_add(&ctx, 0, MIPS32_MFC0(8, 0, 0) | (cp0_reg << 11) | cp0_sel);   /* move COP0 [cp0_reg select] to $8 */
+       pracc_add(&ctx, 0, MIPS32_MFC0(8, cp0_reg, cp0_sel));                   /* move cp0 reg / sel to $8 */
        pracc_add(&ctx, MIPS32_PRACC_PARAM_OUT,
                                MIPS32_SW(8, PRACC_OUT_OFFSET, 15));                    /* store $8 to pracc_out */
-       pracc_add(&ctx, 0, MIPS32_MFC0(15, 31, 0));                                     /* move COP0 DeSave to $15 */
+       pracc_add(&ctx, 0, MIPS32_MFC0(15, 31, 0));                                     /* restore $15 from DeSave */
        pracc_add(&ctx, 0, MIPS32_LUI(8, UPPER16(ejtag_info->reg8)));           /* restore upper 16 bits  of $8 */
        pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                                        /* jump to start */
        pracc_add(&ctx, 0, MIPS32_ORI(8, 8, LOWER16(ejtag_info->reg8)));                /* restore lower 16 bits of $8 */
@@ -575,23 +563,6 @@ int mips32_cp0_read(struct mips_ejtag *ejtag_info, uint32_t *val, uint32_t cp0_r
 exit:
        pracc_queue_free(&ctx);
        return ctx.retval;
-
-       /**
-        * Note that our input parametes cp0_reg and cp0_sel
-        * are numbers (not gprs) which make part of mfc0 instruction opcode.
-        *
-        * These are not fix, but can be different for each mips32_cp0_read() function call,
-        * and that is why we must insert them directly into opcode,
-        * i.e. we can not pass it on EJTAG microprogram stack (via param_in),
-        * and put them into the gprs later from MIPS32_PRACC_STACK
-        * because mfc0 do not use gpr as a parameter for the cp0_reg and select part,
-        * but plain (immediate) number.
-        *
-        * MIPS32_MTC0 is implemented via MIPS32_R_INST macro.
-        * In order to insert our parameters, we must change rd and funct fields.
-        *
-        * code[2] |= (cp0_reg << 11) | cp0_sel;   change rd and funct of MIPS32_R_INST macro
-        **/
 }
 
 int mips32_cp0_write(struct mips_ejtag *ejtag_info, uint32_t val, uint32_t cp0_reg, uint32_t cp0_sel)
@@ -601,24 +572,16 @@ int mips32_cp0_write(struct mips_ejtag *ejtag_info, uint32_t val, uint32_t cp0_r
        if (ctx.retval != ERROR_OK)
                goto exit;
 
-       pracc_add(&ctx, 0, MIPS32_LUI(15, UPPER16(val)));                               /* Load val to $15 */
-       pracc_add(&ctx, 0, MIPS32_ORI(15, 15, LOWER16(val)));
-
-       pracc_add(&ctx, 0, MIPS32_MTC0(15, 0, 0) | (cp0_reg << 11) | cp0_sel);  /* write cp0 reg / sel */
+       pracc_add_li32(&ctx, 15, val, 0);                               /* Load val to $15 */
 
-       pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                                        /* jump to start */
-       pracc_add(&ctx, 0, MIPS32_MFC0(15, 31, 0));                                     /* move COP0 DeSave to $15 */
+       pracc_add(&ctx, 0, MIPS32_MTC0(15, cp0_reg, cp0_sel));                  /* write $15 to cp0 reg / sel */
+       pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                /* jump to start */
+       pracc_add(&ctx, 0, MIPS32_MFC0(15, 31, 0));                             /* restore $15 from DeSave */
 
        ctx.retval = mips32_pracc_queue_exec(ejtag_info, &ctx, NULL);
 exit:
        pracc_queue_free(&ctx);
        return ctx.retval;
-
-       /**
-        * Note that MIPS32_MTC0 macro is implemented via MIPS32_R_INST macro.
-        * In order to insert our parameters, we must change rd and funct fields.
-        * code[3] |= (cp0_reg << 11) | cp0_sel;   change rd and funct fields of MIPS32_R_INST macro
-        **/
 }
 
 /**
@@ -665,8 +628,8 @@ static int mips32_pracc_synchronize_cache(struct mips_ejtag *ejtag_info,
                pracc_add(&ctx, MIPS32_PRACC_PARAM_OUT,
                                MIPS32_SW(8, PRACC_OUT_OFFSET, 15));                    /* store $8 to pracc_out */
 
-               pracc_add(&ctx, 0, MIPS32_LUI(8, UPPER16(ejtag_info->reg8)));                   /* restore upper 16 bits  of $8 */
-               pracc_add(&ctx, 0, MIPS32_ORI(8, 8, LOWER16(ejtag_info->reg8)));                /* restore lower 16 bits of $8 */
+               pracc_add_li32(&ctx, 8, ejtag_info->reg8, 0);                           /* restore $8 */
+
                pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                                        /* jump to start */
                pracc_add(&ctx, 0, MIPS32_MFC0(15, 31, 0));                                     /* move COP0 DeSave to $15 */
 
@@ -776,15 +739,8 @@ static int mips32_pracc_write_mem_generic(struct mips_ejtag *ejtag_info,
                                last_upper_base_addr = upper_base_addr;
                        }
 
-                       if (size == 4) {                        /* for word writes check if one half word is 0 and load it accordingly */
-                               if (LOWER16(*buf32) == 0)
-                                       pracc_add(&ctx, 0, MIPS32_LUI(8, UPPER16(*buf32)));             /* load only upper value */
-                               else if (UPPER16(*buf32) == 0)
-                                               pracc_add(&ctx, 0, MIPS32_ORI(8, 0, LOWER16(*buf32)));  /* load only lower */
-                               else {
-                                       pracc_add(&ctx, 0, MIPS32_LUI(8, UPPER16(*buf32)));             /* load upper and lower */
-                                       pracc_add(&ctx, 0, MIPS32_ORI(8, 8, LOWER16(*buf32)));
-                               }
+                       if (size == 4) {
+                               pracc_add_li32(&ctx, 8, *buf32, 1);                     /* load with li32, optimize */
                                pracc_add(&ctx, 0, MIPS32_SW(8, LOWER16(addr), 15));            /* store word to memory */
                                buf32++;
 
@@ -801,8 +757,7 @@ static int mips32_pracc_write_mem_generic(struct mips_ejtag *ejtag_info,
                        addr += size;
                }
 
-               pracc_add(&ctx, 0, MIPS32_LUI(8, UPPER16(ejtag_info->reg8)));           /* restore upper 16 bits of reg 8 */
-               pracc_add(&ctx, 0, MIPS32_ORI(8, 8, LOWER16(ejtag_info->reg8)));        /* restore lower 16 bits of reg 8 */
+               pracc_add_li32(&ctx, 8, ejtag_info->reg8, 0);                           /* restore $8 */
 
                pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                                /* jump to start */
                pracc_add(&ctx, 0, MIPS32_MFC0(15, 31, 0));                             /* restore $15 from DeSave */
@@ -888,26 +843,17 @@ int mips32_pracc_write_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
        if (ctx.retval != ERROR_OK)
                goto exit;
 
-       /* load registers 2 to 31 with lui and ori instructions, check if some instructions can be saved */
-       for (int i = 2; i < 32; i++) {
-               if (LOWER16((regs[i])) == 0)                                    /* if lower half word is 0, lui instruction only */
-                       pracc_add(&ctx, 0, MIPS32_LUI(i, UPPER16((regs[i]))));
-               else if (UPPER16((regs[i])) == 0)                                       /* if upper half word is 0, ori with $0 only*/
-                       pracc_add(&ctx, 0, MIPS32_ORI(i, 0, LOWER16((regs[i]))));
-               else {                                                                  /* default, load with lui and ori instructions */
-                       pracc_add(&ctx, 0, MIPS32_LUI(i, UPPER16((regs[i]))));
-                       pracc_add(&ctx, 0, MIPS32_ORI(i, i, LOWER16((regs[i]))));
-               }
-       }
+       /* load registers 2 to 31 with li32, optimize */
+       for (int i = 2; i < 32; i++)
+               pracc_add_li32(&ctx, i, regs[i], 1);
 
        for (int i = 0; i != 6; i++) {
-               pracc_add(&ctx, 0, MIPS32_LUI(1, UPPER16((regs[i + 32]))));             /* load CPO value in $1, with lui and ori */
-               pracc_add(&ctx, 0, MIPS32_ORI(1, 1, LOWER16((regs[i + 32]))));
-               pracc_add(&ctx, 0, cp0_write_code[i]);                                  /* write value from $1 to CPO register */
+               pracc_add_li32(&ctx, 1, regs[i + 32], 0);       /* load CPO value in $1 */
+               pracc_add(&ctx, 0, cp0_write_code[i]);                  /* write value from $1 to CPO register */
        }
        pracc_add(&ctx, 0, MIPS32_MTC0(15, 31, 0));                             /* load $15 in DeSave */
        pracc_add(&ctx, 0, MIPS32_LUI(1, UPPER16((regs[1]))));                  /* load upper half word in $1 */
-       pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                                        /* jump to start */
+       pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                                /* jump to start */
        pracc_add(&ctx, 0, MIPS32_ORI(1, 1, LOWER16((regs[1]))));               /* load lower half word in $1 */
 
        ctx.retval = mips32_pracc_queue_exec(ejtag_info, &ctx, NULL);
@@ -955,9 +901,6 @@ int mips32_pracc_read_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
        pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                                        /* jump to start */
        pracc_add(&ctx, 0, MIPS32_MTC0(15, 31, 0));                                     /* load $15 in DeSave */
 
-       if (ejtag_info->mode == 0)
-               ctx.store_count++;      /* Needed by legacy code, due to offset from reg0 */
-
        ctx.retval = mips32_pracc_queue_exec(ejtag_info, &ctx, regs);
 
        ejtag_info->reg8 = regs[8];     /* reg8 is saved but not restored, next called function should restore it */
@@ -1013,9 +956,6 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
                MIPS32_NOP,
        };
 
-       int retval, i;
-       uint32_t val, ejtag_ctrl, address;
-
        if (source->size < MIPS32_FASTDATA_HANDLER_SIZE)
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 
@@ -1034,13 +974,13 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
                ejtag_info->fast_access_save = write_t;
        }
 
-       LOG_DEBUG("%s using 0x%.8" PRIx32 " for write handler", __func__, source->address);
+       LOG_DEBUG("%s using 0x%.8" TARGET_PRIxADDR " for write handler", __func__, source->address);
 
        jmp_code[0] |= UPPER16(source->address);
        jmp_code[1] |= LOWER16(source->address);
 
-       for (i = 0; i < (int) ARRAY_SIZE(jmp_code); i++) {
-               retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl);
+       for (unsigned i = 0; i < ARRAY_SIZE(jmp_code); i++) {
+               int retval = wait_for_pracc_rw(ejtag_info);
                if (retval != ERROR_OK)
                        return retval;
 
@@ -1048,32 +988,24 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
                mips_ejtag_drscan_32_out(ejtag_info, jmp_code[i]);
 
                /* Clear the access pending bit (let the processor eat!) */
-               ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_PRACC;
-               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
-               mips_ejtag_drscan_32_out(ejtag_info, ejtag_ctrl);
+               mips32_pracc_finish(ejtag_info);
        }
 
-       /* wait PrAcc pending bit for FASTDATA write */
-       retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl);
+       /* wait PrAcc pending bit for FASTDATA write, read address */
+       int retval = mips32_pracc_read_ctrl_addr(ejtag_info);
        if (retval != ERROR_OK)
                return retval;
 
        /* next fetch to dmseg should be in FASTDATA_AREA, check */
-       address = 0;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS);
-       retval = mips_ejtag_drscan_32(ejtag_info, &address);
-       if (retval != ERROR_OK)
-               return retval;
-
-       if (address != MIPS32_PRACC_FASTDATA_AREA)
+       if (ejtag_info->pa_addr != MIPS32_PRACC_FASTDATA_AREA)
                return ERROR_FAIL;
 
        /* Send the load start address */
-       val = addr;
+       uint32_t val = addr;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_FASTDATA);
        mips_ejtag_fastdata_scan(ejtag_info, 1, &val);
 
-       retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl);
+       retval = wait_for_pracc_rw(ejtag_info);
        if (retval != ERROR_OK)
                return retval;
 
@@ -1086,7 +1018,7 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
        if (ejtag_info->mode != 0)
                num_clocks = ((uint64_t)(ejtag_info->scan_delay) * jtag_get_speed_khz() + 500000) / 1000000;
 
-       for (i = 0; i < count; i++) {
+       for (int i = 0; i < count; i++) {
                jtag_add_clocks(num_clocks);
                retval = mips_ejtag_fastdata_scan(ejtag_info, write_t, buf++);
                if (retval != ERROR_OK)
@@ -1099,17 +1031,11 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
                return retval;
        }
 
-       retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl);
-       if (retval != ERROR_OK)
-               return retval;
-
-       address = 0;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS);
-       retval = mips_ejtag_drscan_32(ejtag_info, &address);
+       retval = mips32_pracc_read_ctrl_addr(ejtag_info);
        if (retval != ERROR_OK)
                return retval;
 
-       if (address != MIPS32_PRACC_TEXT)
+       if (ejtag_info->pa_addr != MIPS32_PRACC_TEXT)
                LOG_ERROR("mini program did not return to start");
 
        return retval;

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)