mips: m4k alternate pracc code. Patch 3
[openocd.git] / src / target / mips32_pracc.c
index 787daefe5a76c4ebb2c75f4f7a563795c2ae2b32..cab5555e563689ed3199d90bf37c4636f5276fcf 100644 (file)
@@ -81,6 +81,9 @@
 #include "mips32.h"
 #include "mips32_pracc.h"
 
+#define PRACC_FETCH 0
+#define PRACC_STORE 1
+
 struct mips32_pracc_context {
        uint32_t *local_iparam;
        int num_iparam;
@@ -194,11 +197,7 @@ static int mips32_pracc_exec_write(struct mips32_pracc_context *ctx, uint32_t ad
        if (retval != ERROR_OK)
                return retval;
 
-       if ((address >= MIPS32_PRACC_PARAM_IN)
-               && (address < MIPS32_PRACC_PARAM_IN + ctx->num_iparam * 4)) {
-               offset = (address - MIPS32_PRACC_PARAM_IN) / 4;
-               ctx->local_iparam[offset] = data;
-       } else if ((address >= MIPS32_PRACC_PARAM_OUT)
+       if ((address >= MIPS32_PRACC_PARAM_OUT)
                && (address < MIPS32_PRACC_PARAM_OUT + ctx->num_oparam * 4)) {
                offset = (address - MIPS32_PRACC_PARAM_OUT) / 4;
                ctx->local_oparam[offset] = data;
@@ -274,24 +273,154 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, int code_len, const uint32_
        return ERROR_OK;
 }
 
-static int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *buf)
+inline void pracc_queue_init(struct pracc_queue_info *ctx)
 {
-       uint32_t code[] = {
-                                                                                                               /* start: */
-               MIPS32_MTC0(15, 31, 0),                                         /* move $15 to COP0 DeSave */
-               MIPS32_LUI(15, PRACC_UPPER_BASE_ADDR),                          /* $15 = MIPS32_PRACC_BASE_ADDR */
-               MIPS32_SW(8, PRACC_STACK_OFFSET, 15),                           /* sw $8,PRACC_STACK_OFFSET($15) */
+       ctx->retval = ERROR_OK;
+       ctx->code_count = 0;
+       ctx->store_count = 0;
 
-               MIPS32_LUI(8, UPPER16((addr + 0x8000))),                        /* load  $8 with modified upper address */
-               MIPS32_LW(8, LOWER16(addr), 8),                                 /* lw $8, LOWER16(addr)($8) */
-               MIPS32_SW(8, PRACC_OUT_OFFSET, 15),                             /* sw $8,PRACC_OUT_OFFSET($15) */
+       ctx->pracc_list = malloc(2 * ctx->max_code * sizeof(uint32_t));
+       if (ctx->pracc_list == NULL) {
+               LOG_ERROR("Out of memory");
+               ctx->retval = ERROR_FAIL;
+       }
+}
 
-               MIPS32_LW(8, PRACC_STACK_OFFSET, 15),                           /* lw $8,PRACC_STACK_OFFSET($15) */
-               MIPS32_B(NEG16(8)),                                                     /* b start */
-               MIPS32_MFC0(15, 31, 0),                                         /* move COP0 DeSave to $15 */
-       };
+inline void pracc_add(struct pracc_queue_info *ctx, uint32_t addr, uint32_t instr)
+{
+       ctx->pracc_list[ctx->max_code + ctx->code_count] = addr;
+       ctx->pracc_list[ctx->code_count++] = instr;
+       if (addr)
+               ctx->store_count++;
+}
+
+inline void pracc_queue_free(struct pracc_queue_info *ctx)
+{
+       if (ctx->code_count > ctx->max_code)    /* Only for internal check, will be erased */
+               LOG_ERROR("Internal error, code count: %d > max code: %d", ctx->code_count, ctx->max_code);
+       if (ctx->pracc_list != NULL)
+               free(ctx->pracc_list);
+}
+
+int mips32_pracc_queue_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_info *ctx, uint32_t *buf)
+{
+       if (ejtag_info->mode == 0)
+               return mips32_pracc_exec(ejtag_info, ctx->code_count, ctx->pracc_list, 0, NULL,
+                                 ctx->store_count, buf, ctx->code_count - 1);
+
+       union scan_in {
+               uint8_t scan_96[12];
+               struct {
+                       uint8_t ctrl[4];
+                       uint8_t data[4];
+                       uint8_t addr[4];
+               } scan_32;
+
+       } *scan_in = malloc(sizeof(union scan_in) * (ctx->code_count + ctx->store_count));
+       if (scan_in == NULL) {
+               LOG_ERROR("Out of memory");
+               return ERROR_FAIL;
+       }
+
+       unsigned num_clocks =
+               ((uint64_t)(ejtag_info->scan_delay) * jtag_get_speed_khz() + 500000) / 1000000;
+
+       uint32_t ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_PRACC;
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ALL);
+
+       int scan_count = 0;
+       for (int i = 0; i != 2 * ctx->code_count; i++) {
+               uint32_t data = 0;
+               if (i & 1u) {                   /* Check store address from previous instruction, if not the first */
+                       if (i < 2 || 0 == ctx->pracc_list[ctx->max_code + (i / 2) - 1])
+                               continue;
+               } else
+                       data = ctx->pracc_list[i / 2];
+
+               jtag_add_clocks(num_clocks);
+               mips_ejtag_add_scan_96(ejtag_info, ejtag_ctrl, data, scan_in[scan_count++].scan_96);
+       }
+
+       int retval = jtag_execute_queue();              /* execute queued scans */
+       if (retval != ERROR_OK)
+               goto exit;
+
+       uint32_t fetch_addr = MIPS32_PRACC_TEXT;                /* start address */
+       scan_count = 0;
+       for (int i = 0; i != 2 * ctx->code_count; i++) {                                /* verify every pracc access */
+               uint32_t store_addr = 0;
+               if (i & 1u) {                   /* Read store addres from previous instruction, if not the first */
+                       store_addr = ctx->pracc_list[ctx->max_code + (i / 2) - 1];
+                       if (i < 2 || 0 == store_addr)
+                               continue;
+               }
+
+               ejtag_ctrl = buf_get_u32(scan_in[scan_count].scan_32.ctrl, 0, 32);
+               if (!(ejtag_ctrl & EJTAG_CTRL_PRACC)) {
+                       LOG_ERROR("Error: access not pending  count: %d", scan_count);
+                       retval = ERROR_FAIL;
+                       goto exit;
+               }
+
+               uint32_t addr = buf_get_u32(scan_in[scan_count].scan_32.addr, 0, 32);
+
+               if (store_addr != 0) {
+                       if (!(ejtag_ctrl & EJTAG_CTRL_PRNW)) {
+                               LOG_ERROR("Not a store/write access, count: %d", scan_count);
+                               retval = ERROR_FAIL;
+                               goto exit;
+                       }
+                       if (addr != store_addr) {
+                               LOG_ERROR("Store address mismatch, read: %x expected: %x count: %d",
+                                               addr, store_addr, scan_count);
+                               retval = ERROR_FAIL;
+                               goto exit;
+                       }
+                       int buf_index = (addr - MIPS32_PRACC_PARAM_OUT) / 4;
+                       buf[buf_index] = buf_get_u32(scan_in[scan_count].scan_32.data, 0, 32);
+
+               } else {
+                       if (ejtag_ctrl & EJTAG_CTRL_PRNW) {
+                               LOG_ERROR("Not a fetch/read access, count: %d", scan_count);
+                               retval = ERROR_FAIL;
+                               goto exit;
+                       }
+                       if (addr != fetch_addr) {
+                               LOG_ERROR("Fetch addr mismatch, read: %x expected: %x count: %d", addr, fetch_addr, scan_count);
+                               retval = ERROR_FAIL;
+                               goto exit;
+                       }
+                       fetch_addr += 4;
+               }
+               scan_count++;
+       }
+exit:
+       free(scan_in);
+       return retval;
+}
 
-       return mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, 0, NULL, 1, buf, 1);
+int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *buf)
+{
+       struct pracc_queue_info ctx = {.max_code = 9};
+       pracc_queue_init(&ctx);
+       if (ctx.retval != ERROR_OK)
+               goto exit;
+
+       pracc_add(&ctx, 0, MIPS32_MTC0(15, 31, 0));                                     /* move $15 to COP0 DeSave */
+       pracc_add(&ctx, 0, MIPS32_LUI(15, PRACC_UPPER_BASE_ADDR));                      /* $15 = MIPS32_PRACC_BASE_ADDR */
+       pracc_add(&ctx, 0, MIPS32_LUI(8, UPPER16((addr + 0x8000))));            /* load  $8 with modified upper address */
+       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(&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 */
+
+       ctx.retval = mips32_pracc_queue_exec(ejtag_info, &ctx, buf);
+exit:
+       pracc_queue_free(&ctx);
+       return ctx.retval;
 }
 
 int mips32_pracc_read_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size, int count, void *buf)
@@ -299,16 +428,11 @@ int mips32_pracc_read_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size
        if (count == 1 && size == 4)
                return mips32_pracc_read_u32(ejtag_info, addr, (uint32_t *)buf);
 
-       int retval = ERROR_FAIL;
-
-       uint32_t *code = NULL;
        uint32_t *data = NULL;
-
-       code = malloc((256 * 2 + 10) * sizeof(uint32_t));
-       if (code == NULL) {
-               LOG_ERROR("Out of memory");
+       struct pracc_queue_info ctx = {.max_code = 256 * 3 + 9 + 1};    /* alloc memory for the worst case */
+       pracc_queue_init(&ctx);
+       if (ctx.retval != ERROR_OK)
                goto exit;
-       }
 
        if (size != 4) {
                data = malloc(256 * sizeof(uint32_t));
@@ -322,62 +446,54 @@ int mips32_pracc_read_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size
        uint16_t *buf16 = buf;
        uint8_t *buf8 = buf;
 
-       int i;
-       uint32_t upper_base_addr, last_upper_base_addr;
-       int this_round_count;
-       int code_len;
-
        while (count) {
-               this_round_count = (count > 256) ? 256 : count;
-               last_upper_base_addr = UPPER16((addr + 0x8000));
-               uint32_t *code_p = code;
-
-               *code_p++ = MIPS32_MTC0(15, 31, 0);                                     /* save $15 in DeSave */
-               *code_p++ = MIPS32_LUI(15, PRACC_UPPER_BASE_ADDR);                      /* $15 = MIPS32_PRACC_BASE_ADDR */
-               *code_p++ = MIPS32_SW(8, PRACC_STACK_OFFSET, 15);                       /* save $8 and $9 to pracc stack */
-               *code_p++ = MIPS32_SW(9, PRACC_STACK_OFFSET, 15);
-               *code_p++ = MIPS32_LUI(9, last_upper_base_addr);                        /* load the upper memory address in $9*/
-               code_len = 5;
-
-               for (i = 0; i != this_round_count; i++) {               /* Main code loop */
-                       upper_base_addr = UPPER16((addr + 0x8000));
-                       if (last_upper_base_addr != upper_base_addr) {
-                               *code_p++ = MIPS32_LUI(9, upper_base_addr);             /* if needed, change upper address in $9*/
-                               code_len++;
+               ctx.code_count = 0;
+               ctx.store_count = 0;
+               int this_round_count = (count > 256) ? 256 : count;
+               uint32_t last_upper_base_addr = UPPER16((addr + 0x8000));
+
+               pracc_add(&ctx, 0, MIPS32_MTC0(15, 31, 0));                                     /* save $15 in DeSave */
+               pracc_add(&ctx, 0, MIPS32_LUI(15, PRACC_UPPER_BASE_ADDR));                      /* $15 = MIPS32_PRACC_BASE_ADDR */
+               pracc_add(&ctx, 0, MIPS32_LUI(9, last_upper_base_addr));                /* load the upper memory address in $9 */
+
+               for (int i = 0; i != this_round_count; i++) {                   /* Main code loop */
+                       uint32_t upper_base_addr = UPPER16((addr + 0x8000));
+                       if (last_upper_base_addr != upper_base_addr) {                  /* if needed, change upper address in $9 */
+                               pracc_add(&ctx, 0, MIPS32_LUI(9, upper_base_addr));
                                last_upper_base_addr = upper_base_addr;
                        }
 
                        if (size == 4)
-                               *code_p++ = MIPS32_LW(8, LOWER16(addr), 9);             /* load from memory to $8 */
+                               pracc_add(&ctx, 0, MIPS32_LW(8, LOWER16(addr), 9));             /* load from memory to $8 */
                        else if (size == 2)
-                               *code_p++ = MIPS32_LHU(8, LOWER16(addr), 9);
+                               pracc_add(&ctx, 0, MIPS32_LHU(8, LOWER16(addr), 9));
                        else
-                               *code_p++ = MIPS32_LBU(8, LOWER16(addr), 9);
-
-                       *code_p++ = MIPS32_SW(8, PRACC_OUT_OFFSET + i * 4, 15);         /* store $8 at param out */
+                               pracc_add(&ctx, 0, MIPS32_LBU(8, LOWER16(addr), 9));
 
-                       code_len += 2;
+                       pracc_add(&ctx, MIPS32_PRACC_PARAM_OUT + i * 4,
+                                         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 */
 
-               *code_p++ = MIPS32_LW(9, PRACC_STACK_OFFSET, 15);                       /* restore $8 and $9 from pracc stack */
-               *code_p++ = MIPS32_LW(8, PRACC_STACK_OFFSET, 15);
-
-               code_len += 4;
-               *code_p++ = MIPS32_B(NEG16(code_len - 1));                                      /* jump to start */
-               *code_p = MIPS32_MFC0(15, 31, 0);                                       /* restore $15 from DeSave */
+               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 */
 
                if (size == 4) {
-                       retval = mips32_pracc_exec(ejtag_info, code_len, code, 0, NULL, this_round_count, buf32, 1);
-                       if (retval != ERROR_OK)
+                       ctx.retval = mips32_pracc_queue_exec(ejtag_info, &ctx, buf32);
+                       if (ctx.retval != ERROR_OK)
                                goto exit;
                        buf32 += this_round_count;
                } else {
-                       retval = mips32_pracc_exec(ejtag_info, code_len, code, 0, NULL, this_round_count, data, 1);
-                       if (retval != ERROR_OK)
+                       ctx.retval = mips32_pracc_queue_exec(ejtag_info, &ctx, data);
+                       if (ctx.retval != ERROR_OK)
                                goto exit;
+
                        uint32_t *data_p = data;
-                       for (i = 0; i != this_round_count; i++) {
+                       for (int i = 0; i != this_round_count; i++) {
                                if (size == 2)
                                        *buf16++ = *data_p++;
                                else
@@ -386,34 +502,34 @@ int mips32_pracc_read_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size
                }
                count -= this_round_count;
        }
-
 exit:
-       if (code)
-               free(code);
-       if (data)
+       pracc_queue_free(&ctx);
+       if (data != NULL)
                free(data);
-       return retval;
+       return ctx.retval;
 }
 
 int mips32_cp0_read(struct mips_ejtag *ejtag_info, uint32_t *val, uint32_t cp0_reg, uint32_t cp0_sel)
 {
-       /**
-        * Do not make this code static, but regenerate it every time,
-        * as 3th element has to be changed to add parameters
-        */
-       uint32_t code[] = {
-                                                                                                               /* start: */
-               MIPS32_MTC0(15, 31, 0),                                                 /* move $15 to COP0 DeSave */
-               MIPS32_LUI(15, PRACC_UPPER_BASE_ADDR),                                  /* $15 = MIPS32_PRACC_BASE_ADDR */
-               MIPS32_SW(8, PRACC_STACK_OFFSET, 15),                                   /* sw $8,PRACC_STACK_OFFSET($15) */
-
-               /* 3 */ MIPS32_MFC0(8, 0, 0),                                           /* move COP0 [cp0_reg select] to $8 */
-               MIPS32_SW(8, PRACC_OUT_OFFSET, 15),                                     /* sw $8,PRACC_OUT_OFFSET($15) */
+       struct pracc_queue_info ctx = {.max_code = 8};
+       pracc_queue_init(&ctx);
+       if (ctx.retval != ERROR_OK)
+               goto exit;
 
-               MIPS32_LW(8, PRACC_STACK_OFFSET, 15),                                   /* lw $8,PRACC_STACK_OFFSET($15) */
-               MIPS32_B(NEG16(7)),                                                     /* b start */
-               MIPS32_MFC0(15, 31, 0),                                                 /* move COP0 DeSave to $15 */
-       };
+       pracc_add(&ctx, 0, MIPS32_MTC0(15, 31, 0));                                     /* move $15 to COP0 DeSave */
+       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, 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_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 */
+
+       ctx.retval = mips32_pracc_queue_exec(ejtag_info, &ctx, val);
+exit:
+       pracc_queue_free(&ctx);
+       return ctx.retval;
 
        /**
         * Note that our input parametes cp0_reg and cp0_sel
@@ -428,10 +544,9 @@ int mips32_cp0_read(struct mips_ejtag *ejtag_info, uint32_t *val, uint32_t cp0_r
         *
         * MIPS32_MTC0 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 of MIPS32_R_INST macro */
-
-       return mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, 0, NULL, 1, val, 1);
+        *
+        * 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)
@@ -633,10 +748,8 @@ static int mips32_pracc_write_mem_generic(struct mips_ejtag *ejtag_info, uint32_
                code_p = code;
 
                *code_p++ = MIPS32_MTC0(15, 31, 0);                                     /* save $15 in DeSave */
-               *code_p++ = MIPS32_LUI(15, PRACC_UPPER_BASE_ADDR);                      /* $15 = MIPS32_PRACC_BASE_ADDR */
-               *code_p++ = MIPS32_SW(8, PRACC_STACK_OFFSET, 15);                       /* save $8 to pracc stack */
-               *code_p++ = MIPS32_LUI(15, last_upper_base_addr);                       /* reuse $15 as memory base address */
-               code_len = 4;
+               *code_p++ = MIPS32_LUI(15, last_upper_base_addr);                       /* load $15 with memory base address */
+               code_len = 2;
 
                for (i = 0; i != this_round_count; i++) {
                        upper_base_addr = UPPER16((addr + 0x8000));
@@ -678,8 +791,8 @@ static int mips32_pracc_write_mem_generic(struct mips_ejtag *ejtag_info, uint32_
                        addr += size;
                }
 
-               *code_p++ = MIPS32_LUI(15, PRACC_UPPER_BASE_ADDR);                      /* $15 = MIPS32_PRACC_BASE_ADDR */
-               *code_p++ = MIPS32_LW(8, PRACC_STACK_OFFSET, 15);                       /* restore $8 from pracc stack */
+               *code_p++ = MIPS32_LUI(8, UPPER16(ejtag_info->reg8)),                   /* restore upper 16 bits of reg 8 */
+               *code_p++ = MIPS32_ORI(8, 8, LOWER16(ejtag_info->reg8)),                /* restore lower 16 bits of reg 8 */
 
                code_len += 4;
                *code_p++ = MIPS32_B(NEG16(code_len - 1));                                      /* jump to start */
@@ -814,51 +927,57 @@ int mips32_pracc_write_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
 
        int retval = mips32_pracc_exec(ejtag_info, code_len, code, 0, NULL, 0, NULL, 1);
        free(code);
+
+       ejtag_info->reg8 = regs[8];
+       ejtag_info->reg9 = regs[9];
        return retval;
 }
 
 int mips32_pracc_read_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
 {
        static int cp0_read_code[] = {
-               MIPS32_MFC0(2, 12, 0),                                                  /* move status to $2 */
-               MIPS32_MFLO(2),                                                                 /* move lo to $2 */
-               MIPS32_MFHI(2),                                                                 /* move hi to $2 */
-               MIPS32_MFC0(2, 8, 0),                                                   /* move badvaddr to $2 */
-               MIPS32_MFC0(2, 13, 0),                                                  /* move cause to $2 */
-               MIPS32_MFC0(2, 24, 0),                                                  /* move depc (pc) to $2 */
+               MIPS32_MFC0(8, 12, 0),                                                  /* move status to $8 */
+               MIPS32_MFLO(8),                                                                 /* move lo to $8 */
+               MIPS32_MFHI(8),                                                                 /* move hi to $8 */
+               MIPS32_MFC0(8, 8, 0),                                                   /* move badvaddr to $8 */
+               MIPS32_MFC0(8, 13, 0),                                                  /* move cause to $8 */
+               MIPS32_MFC0(8, 24, 0),                                                  /* move depc (pc) to $8 */
        };
 
-       uint32_t *code;
-       code = malloc(49 * sizeof(uint32_t));
-       if (code == NULL) {
-               LOG_ERROR("Out of memory");
-               return ERROR_FAIL;
-       }
-
-       uint32_t *code_p = code;
+       struct pracc_queue_info ctx = {.max_code = 48};
+       pracc_queue_init(&ctx);
+       if (ctx.retval != ERROR_OK)
+               goto exit;
 
-       *code_p++ = MIPS32_MTC0(1, 31, 0),                                              /* move $1 to COP0 DeSave */
-       *code_p++ = MIPS32_LUI(1, PRACC_UPPER_BASE_ADDR);                               /* $1 = MIP32_PRACC_BASE_ADDR */
+       pracc_add(&ctx, 0, MIPS32_MTC0(1, 31, 0));                                              /* move $1 to COP0 DeSave */
+       pracc_add(&ctx, 0, MIPS32_LUI(1, PRACC_UPPER_BASE_ADDR));                               /* $1 = MIP32_PRACC_BASE_ADDR */
 
-       for (int i = 2; i != 32; i++)
-               *code_p++ = MIPS32_SW(i, PRACC_OUT_OFFSET + (i * 4), 1);                /* store GPR's 2 to 31 */
+       for (int i = 2; i != 32; i++)                                   /* store GPR's 2 to 31 */
+               pracc_add(&ctx, MIPS32_PRACC_PARAM_OUT + (i * 4),
+                                 MIPS32_SW(i, PRACC_OUT_OFFSET + (i * 4), 1));
 
        for (int i = 0; i != 6; i++) {
-               *code_p++ = cp0_read_code[i];                                           /* load COP0 needed registers to $2 */
-               *code_p++ = MIPS32_SW(2, PRACC_OUT_OFFSET + (i + 32) * 4, 1);   /* store COP0 registers from $2 to param out */
+               pracc_add(&ctx, 0, cp0_read_code[i]);                           /* load COP0 needed registers to $8 */
+               pracc_add(&ctx, MIPS32_PRACC_PARAM_OUT + (i + 32) * 4,                  /* store $8 at PARAM OUT */
+                                 MIPS32_SW(8, PRACC_OUT_OFFSET + (i + 32) * 4, 1));
        }
+       pracc_add(&ctx, 0, MIPS32_MFC0(8, 31, 0));                                      /* move DeSave to $8, reg1 value */
+       pracc_add(&ctx, MIPS32_PRACC_PARAM_OUT + 4,                                     /* store reg1 value from $8 to param out */
+                         MIPS32_SW(8, PRACC_OUT_OFFSET + 4, 1));
 
-       *code_p++ = MIPS32_MFC0(2, 31, 0),                                              /* move DeSave to $2, reg1 value */
-       *code_p++ = MIPS32_SW(2, PRACC_OUT_OFFSET + 4, 1);                              /* store reg1 value from $2 to param out */
+       pracc_add(&ctx, 0, MIPS32_B(NEG16(ctx.code_count + 1)));                                        /* jump to start */
+       pracc_add(&ctx, 0, MIPS32_MFC0(1, 31, 0));                                      /* move COP0 DeSave to $1, restore reg1 */
 
-       *code_p++ = MIPS32_LW(2, PRACC_OUT_OFFSET + 8, 1);                              /* restore $2 from param out (singularity) */
-       *code_p++ = MIPS32_B(NEG16(48));                                                /* b start */
-       *code_p = MIPS32_MFC0(1, 31, 0);                                                /* move COP0 DeSave to $1 */
+       if (ejtag_info->mode == 0)
+               ctx.store_count++;      /* Needed by legacy code, due to offset from reg0 */
 
-       int retval = mips32_pracc_exec(ejtag_info, 49, code, 0, NULL, MIPS32NUMCOREREGS, regs, 1);
+       ctx.retval = mips32_pracc_queue_exec(ejtag_info, &ctx, regs);
 
-       free(code);
-       return retval;
+       ejtag_info->reg8 = regs[8];     /* reg8 is saved but not restored, next called function should restore it */
+       ejtag_info->reg9 = regs[9];
+exit:
+       pracc_queue_free(&ctx);
+       return ctx.retval;
 }
 
 /* fastdata upload/download requires an initialized working area
@@ -948,6 +1067,7 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
                mips_ejtag_drscan_32_out(ejtag_info, ejtag_ctrl);
        }
 
+       /* wait PrAcc pending bit for FASTDATA write */
        retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl);
        if (retval != ERROR_OK)
                return retval;
@@ -962,18 +1082,18 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
        if (address != MIPS32_PRACC_FASTDATA_AREA)
                return ERROR_FAIL;
 
-       /* wait PrAcc pending bit for FASTDATA write */
-       retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl);
-       if (retval != ERROR_OK)
-               return retval;
-
        /* Send the load start address */
        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);
+       if (retval != ERROR_OK)
+               return retval;
+
        /* Send the load end address */
        val = addr + (count - 1) * 4;
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_FASTDATA);
        mips_ejtag_fastdata_scan(ejtag_info, 1, &val);
 
        for (i = 0; i < count; i++) {

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)