Corrected waiting on PrAcc in wait_for_pracc_rw(). Added necessary check that PrAcc...
[openocd.git] / src / target / mips32_pracc.c
index 8e17e05c71c71e157b2f9dc9e23b9cc9c348c90d..ef132fe3c49afbecf31014cc6b464f8bf1924f03 100644 (file)
@@ -4,6 +4,8 @@
  *                                                                         *
  *   Copyright (C) 2008 by David T.L. Wong                                 *
  *                                                                         *
+ *   Copyright (C) 2009 by David N. Claffey <dnclaffey@gmail.com>          *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
+/*
+This version has optimized assembly routines for 32 bit operations:
+- read word
+- write word
+- write array of words
+
+One thing to be aware of is that the MIPS32 cpu will execute the
+instruction after a branch instruction (one delay slot).
+
+For example:
+
+    LW $2, ($5 +10)
+    B foo
+    LW $1, ($2 +100)
+
+The LW $1, ($2 +100) instruction is also executed. If this is
+not wanted a NOP can be inserted:
+
+    LW $2, ($5 +10)
+    B foo
+    NOP
+    LW $1, ($2 +100)
+
+or the code can be changed to:
+
+    B foo
+    LW $2, ($5 +10)
+    LW $1, ($2 +100)
+
+The original code contained NOPs. I have removed these and moved
+the branches.
+
+I also moved the PRACC_STACK to 0xFF204000. This allows
+the use of 16 bits offsets to get pointers to the input
+and output area relative to the stack. Note that the stack
+isn't really a stack (the stack pointer is not 'moving')
+but a FIFO simulated in software.
+
+These changes result in a 35% speed increase when programming an
+external flash.
+
+More improvement could be gained if the registers do no need
+to be preserved but in that case the routines should be aware
+OpenOCD is used as a flash programmer or as a debug tool.
+
+Nico Coesel
+*/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <string.h>
-#include "log.h"
+#include <helper/time_support.h>
+
 #include "mips32.h"
 #include "mips32_pracc.h"
 
-typedef struct {
-       u32 *local_iparam;
+struct mips32_pracc_context
+{
+       uint32_t *local_iparam;
        int num_iparam;
-       u32 *local_oparam;
+       uint32_t *local_oparam;
        int num_oparam;
-       u32 *code;
+       const uint32_t *code;
        int code_len;
-       u32 stack[32];
+       uint32_t stack[32];
        int stack_offset;
-       mips_ejtag_t *ejtag_info;
-} mips32_pracc_context;
+       struct mips_ejtag *ejtag_info;
+};
 
-static int wait_for_pracc_rw(mips_ejtag_t *ejtag_info, u32 *ctrl)
+static int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint8_t *buf);
+static int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint16_t *buf);
+static int mips32_pracc_read_mem32(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint32_t *buf);
+static int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info,
+               uint32_t addr, uint32_t *buf);
+
+static int mips32_pracc_write_mem8(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint8_t *buf);
+static int mips32_pracc_write_mem16(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint16_t *buf);
+static int mips32_pracc_write_mem32(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint32_t *buf);
+static int mips32_pracc_write_u32(struct mips_ejtag *ejtag_info,
+               uint32_t addr, uint32_t *buf);
+
+static int wait_for_pracc_rw(struct mips_ejtag *ejtag_info, uint32_t *ctrl)
 {
-       u32 ejtag_ctrl;
-       
-       while (1) 
+       uint32_t ejtag_ctrl;
+       long long then = timeval_ms();
+       int timeout;
+
+       /* wait for the PrAcc to become "1" */
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
+       ejtag_ctrl = ejtag_info->ejtag_ctrl;
+
+       int retval;
+       if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
-               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
-               ejtag_ctrl = ejtag_info->ejtag_ctrl;
-               mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
+               LOG_ERROR("fastdata load failed");
+               return retval;
+       }
+
+       while (1)
+       {
+               retval = mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
+               if (retval != ERROR_OK)
+                       return retval;
+
                if (ejtag_ctrl & EJTAG_CTRL_PRACC)
                        break;
-               LOG_DEBUG("DEBUGMODULE: No memory access in progress!\n");
-               return ERROR_JTAG_DEVICE_ERROR;
+
+               if ( (timeout = timeval_ms()-then) > 1000 )
+               {
+                       LOG_DEBUG("DEBUGMODULE: No memory access in progress!");
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
        }
-       
+
        *ctrl = ejtag_ctrl;
        return ERROR_OK;
 }
 
-static int mips32_pracc_exec_read(mips32_pracc_context *ctx, u32 address)
+static int mips32_pracc_exec_read(struct mips32_pracc_context *ctx, uint32_t address)
 {
-       mips_ejtag_t *ejtag_info = ctx->ejtag_info;
+       struct mips_ejtag *ejtag_info = ctx->ejtag_info;
        int offset;
-       u32 ejtag_ctrl, data;
+       uint32_t ejtag_ctrl, data;
 
        if ((address >= MIPS32_PRACC_PARAM_IN)
                && (address <= MIPS32_PRACC_PARAM_IN + ctx->num_iparam * 4))
@@ -78,7 +166,7 @@ static int mips32_pracc_exec_read(mips32_pracc_context *ctx, u32 address)
                data = ctx->local_oparam[offset];
        }
        else if ((address >= MIPS32_PRACC_TEXT)
-               && (address <= MIPS32_PRACC_TEXT + ctx->code_len*4))
+               && (address <= MIPS32_PRACC_TEXT + ctx->code_len * 4))
        {
                offset = (address - MIPS32_PRACC_TEXT) / 4;
                data = ctx->code[offset];
@@ -92,45 +180,52 @@ static int mips32_pracc_exec_read(mips32_pracc_context *ctx, u32 address)
        {
                /* TODO: send JMP 0xFF200000 instruction. Hopefully processor jump back
                 * to start of debug vector */
-               
+
                data = 0;
-               LOG_ERROR("Error reading unexpected address");
+               LOG_ERROR("Error reading unexpected address 0x%8.8" PRIx32 "", address);
                return ERROR_JTAG_DEVICE_ERROR;
        }
-       
+
        /* Send the data out */
-       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_DATA, NULL);
+       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_DATA);
        mips_ejtag_drscan_32(ctx->ejtag_info, &data);
 
        /* Clear the access pending bit (let the processor eat!) */
        ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_PRACC;
-       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_CONTROL);
        mips_ejtag_drscan_32(ctx->ejtag_info, &ejtag_ctrl);
-       
-       return ERROR_OK;
+
+       return jtag_execute_queue();
 }
 
-static int mips32_pracc_exec_write(mips32_pracc_context *ctx, u32 address)
+static int mips32_pracc_exec_write(struct mips32_pracc_context *ctx, uint32_t address)
 {
-       u32 ejtag_ctrl,data;
+       uint32_t ejtag_ctrl,data;
        int offset;
-       mips_ejtag_t *ejtag_info = ctx->ejtag_info;
-       
-       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_DATA, NULL);
-       mips_ejtag_drscan_32(ctx->ejtag_info, &data);
-       
+       struct mips_ejtag *ejtag_info = ctx->ejtag_info;
+       int retval;
+
+       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_DATA);
+       retval = mips_ejtag_drscan_32(ctx->ejtag_info, &data);
+       if (retval != ERROR_OK)
+               return retval;
+
        /* Clear access pending bit */
        ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_PRACC;
-       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_CONTROL);
        mips_ejtag_drscan_32(ctx->ejtag_info, &ejtag_ctrl);
-       
+
+       retval = jtag_execute_queue();
+       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 )
+       else if ((address >= MIPS32_PRACC_PARAM_OUT)
                && (address <= MIPS32_PRACC_PARAM_OUT + ctx->num_oparam * 4))
        {
                offset = (address - MIPS32_PRACC_PARAM_OUT) / 4;
@@ -143,21 +238,22 @@ static int mips32_pracc_exec_write(mips32_pracc_context *ctx, u32 address)
        }
        else
        {
-               LOG_ERROR("Error writing unexpected address");
+               LOG_ERROR("Error writing unexpected address 0x%8.8" PRIx32 "", address);
                return ERROR_JTAG_DEVICE_ERROR;
        }
-       
+
        return ERROR_OK;
 }
 
-int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, u32 *code, int num_param_in, u32 *param_in, int num_param_out, u32 *param_out, int cycle)
+int mips32_pracc_exec(struct mips_ejtag *ejtag_info, int code_len, const uint32_t *code,
+               int num_param_in, uint32_t *param_in, int num_param_out, uint32_t *param_out, int cycle)
 {
-       u32 ejtag_ctrl;
-       u32 address, data;
-       mips32_pracc_context ctx;
+       uint32_t ejtag_ctrl;
+       uint32_t address, data;
+       struct mips32_pracc_context ctx;
        int retval;
        int pass = 0;
-       
+
        ctx.local_iparam = param_in;
        ctx.local_oparam = param_out;
        ctx.num_iparam = num_param_in;
@@ -166,16 +262,18 @@ int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, u32 *code, int nu
        ctx.code_len = code_len;
        ctx.ejtag_info = ejtag_info;
        ctx.stack_offset = 0;
-       
+
        while (1)
        {
                if ((retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl)) != ERROR_OK)
                        return retval;
-               
+
                address = data = 0;
-               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
-               mips_ejtag_drscan_32(ejtag_info, &address);
-               
+               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS);
+               retval = mips_ejtag_drscan_32(ejtag_info, &address);
+               if (retval != ERROR_OK)
+                       return retval;
+
                /* Check for read or write */
                if (ejtag_ctrl & EJTAG_CTRL_PRNW)
                {
@@ -191,105 +289,104 @@ int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, u32 *code, int nu
                        {
                                break;
                        }
-                       
+
                        if ((retval = mips32_pracc_exec_read(&ctx, address)) != ERROR_OK)
                                return retval;
                }
-               
+
                if (cycle == 0)
                        break;
        }
-       
+
        /* stack sanity check */
        if (ctx.stack_offset != 0)
        {
                LOG_DEBUG("Pracc Stack not zero");
        }
-       
+
        return ERROR_OK;
 }
 
-int mips32_pracc_read_mem(mips_ejtag_t *ejtag_info, u32 addr, int size, int count, void *buf)
+int mips32_pracc_read_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size, int count, void *buf)
 {
        switch (size)
        {
                case 1:
-                       return mips32_pracc_read_mem8(ejtag_info, addr, count, (u8*)buf);
+                       return mips32_pracc_read_mem8(ejtag_info, addr, count, (uint8_t*)buf);
                case 2:
-                       return mips32_pracc_read_mem16(ejtag_info, addr, count, (u16*)buf);
+                       return mips32_pracc_read_mem16(ejtag_info, addr, count, (uint16_t*)buf);
                case 4:
-                       return mips32_pracc_read_mem32(ejtag_info, addr, count, (u32*)buf);
+                       if (count == 1)
+                               return mips32_pracc_read_u32(ejtag_info, addr, (uint32_t*)buf);
+                       else
+                               return mips32_pracc_read_mem32(ejtag_info, addr, count, (uint32_t*)buf);
        }
-       
+
        return ERROR_OK;
 }
 
-int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *buf)
-{      
-       u32 code[] = {
+static int mips32_pracc_read_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint32_t *buf)
+{
+       static const uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
-               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),                     /* $15 = MIPS32_PRACC_STACK */
                MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
-               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
-               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
-                       
+               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
+               MIPS32_SW(10,0,15),                                                                     /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                                     /* sw $11,($15) */
+
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* $9=mem[$8]; read addr */
-               MIPS32_LW(10,4,8),                                                                      /* $10=mem[$8+4]; read count */
-               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11=MIPS32_PRACC_PARAM_OUT */
+               MIPS32_LW(9,0,8),                                                                       /* $9 = mem[$8]; read addr */
+               MIPS32_LW(10,4,8),                                                                      /* $10 = mem[$8 + 4]; read count */
+               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
-               MIPS32_NOP,
                                                                                                                        /* loop: */
-               MIPS32_BEQ(0,10,9),                                                                     /* beq 0, $10, end */
+               MIPS32_BEQ(0,10,8),                                                                     /* beq 0, $10, end */
                MIPS32_NOP,
-               
-               MIPS32_LW(12,0,9),                                                                      /* lw $12,0($9), Load $12 with the word @mem[$9] */
-               MIPS32_SW(12,0,11),                                                             /* sw $12,0($11) */
-               
-               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,4),                                                             /* $1+=4 */
-               MIPS32_ADDI(11,11,4),                                                           /* $11+=4 */
-               
-               MIPS32_NOP,
-               MIPS32_B(NEG16(9)),                                                                     /* b loop */
+
+               MIPS32_LW(8,0,9),                                                                       /* lw $8,0($9), Load $8 with the word @mem[$9] */
+               MIPS32_SW(8,0,11),                                                                      /* sw $8,0($11) */
+
+               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
+               MIPS32_ADDI(9,9,4),                                                                     /* $1 += 4 */
+               MIPS32_ADDI(11,11,4),                                                           /* $11 += 4 */
+
+               MIPS32_B(NEG16(8)),                                                                     /* b loop */
                MIPS32_NOP,
                                                                                                                        /* end: */
-               MIPS32_LW(11,0,15),                                                             /* sw $11,($15) */
-               MIPS32_LW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_LW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_LW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_LW(11,0,15),                                                                     /* lw $11,($15) */
+               MIPS32_LW(10,0,15),                                                                     /* lw $10,($15) */
+               MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
+               MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(27)),                                                            /* b start */
                MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(31)),                                                            /* b start */
-               MIPS32_NOP,
        };
-       
-       int retval=ERROR_OK;
+
+       int retval = ERROR_OK;
        int blocksize;
        int bytesread;
-       u32 param_in[2];
-       
+       uint32_t param_in[2];
+
        bytesread = 0;
-       
+
        while (count > 0)
-       {       
+       {
                blocksize = count;
                if (count > 0x400)
                        blocksize = 0x400;
-               
+
                param_in[0] = addr;
                param_in[1] = blocksize;
-               
-               if ((retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, 
-                       sizeof(param_in)/sizeof(param_in[0]), param_in, blocksize, &buf[bytesread], 1)) != ERROR_OK)
+
+               if ((retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
+                       ARRAY_SIZE(param_in), param_in, blocksize, &buf[bytesread], 1)) != ERROR_OK)
                {
                        return retval;
                }
-               
+
                count -= blocksize;
                addr += blocksize;
                bytesread += blocksize;
@@ -298,489 +395,694 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *
        return retval;
 }
 
-int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *buf)
+static int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *buf)
 {
-       u32 code[] = {
+       static const uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
-               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),                     /* $15 = MIPS32_PRACC_STACK */
                MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
-               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
-               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
-                       
+               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
+
+               MIPS32_LW(8,NEG16(MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_IN),15), /* load R8 @ param_in[0] = address */
+
+               MIPS32_LW(8,0,8),                                                                       /* lw $8,0($8), Load $8 with the word @mem[$8] */
+               MIPS32_SW(8,NEG16(MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_OUT),15), /* store R8 @ param_out[0] */
+
+               MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(9)),                                                                     /* b start */
+               MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
+       };
+
+       int retval = ERROR_OK;
+       uint32_t param_in[1];
+
+       param_in[0] = addr;
+
+       if ((retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
+               ARRAY_SIZE(param_in), param_in, 1, buf, 1)) != ERROR_OK)
+       {
+               return retval;
+       }
+
+       return retval;
+}
+
+static int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint16_t *buf)
+{
+       static const uint32_t code[] = {
+                                                                                                                       /* start: */
+               MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),                     /* $15 = MIPS32_PRACC_STACK */
+               MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
+               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
+               MIPS32_SW(10,0,15),                                                                     /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                                     /* sw $11,($15) */
+
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* $9=mem[$8]; read addr */
-               MIPS32_LW(10,4,8),                                                                      /* $10=mem[$8+4]; read count */
-               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11=MIPS32_PRACC_PARAM_OUT */
+               MIPS32_LW(9,0,8),                                                                       /* $9 = mem[$8]; read addr */
+               MIPS32_LW(10,4,8),                                                                      /* $10 = mem[$8 + 4]; read count */
+               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
-               MIPS32_NOP,
                                                                                                                        /* loop: */
-               MIPS32_BEQ(0,10,9),                                                             /* beq 0, $10, end */
-               MIPS32_NOP,
-               
-               MIPS32_LHU(12,0,9),                                                             /* lw $12,0($9), Load $12 with the halfword @mem[$9] */
-               MIPS32_SW(12,0,11),                                                             /* sw $12,0($11) */
-               
-               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,2),                                                             /* $9+=2 */
-               MIPS32_ADDI(11,11,4),                                                           /* $11+=4 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(9)),                                                                     /* b loop */
+               MIPS32_BEQ(0,10,8),                                                                     /* beq 0, $10, end */
                MIPS32_NOP,
 
-               MIPS32_LW(11,0,15),                                                             /* sw $11,($15) */
-               MIPS32_LW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_LW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_LW(8,0,15),                                                                      /* sw $8,($15) */
-               MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(31)),                                                            /* b start */
+               MIPS32_LHU(8,0,9),                                                                      /* lw $8,0($9), Load $8 with the halfword @mem[$9] */
+               MIPS32_SW(8,0,11),                                                                      /* sw $8,0($11) */
+
+               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
+               MIPS32_ADDI(9,9,2),                                                                     /* $9 += 2 */
+               MIPS32_ADDI(11,11,4),                                                           /* $11 += 4 */
+               MIPS32_B(NEG16(8)),                                                                     /* b loop */
                MIPS32_NOP,
+                                                                                                                       /* end: */
+               MIPS32_LW(11,0,15),                                                                     /* lw $11,($15) */
+               MIPS32_LW(10,0,15),                                                                     /* lw $10,($15) */
+               MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
+               MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(27)),                                                            /* b start */
+               MIPS32_MFC0(15,30,0),                                                           /* move COP0 DeSave to $15 */
        };
 
-//     /* TODO remove array */
-       u32 param_out[count];
+       /* TODO remove array */
+       uint32_t *param_out = malloc(count * sizeof(uint32_t));
        int i;
-       
-//     int retval;
+
+       int retval = ERROR_OK;
        int blocksize;
        int bytesread;
-       u32 param_in[2];
-       
+       uint32_t param_in[2];
+
        bytesread = 0;
-       
+
        //while (count > 0)
-       {       
+       {
                blocksize = count;
                if (count > 0x400)
                        blocksize = 0x400;
-               
+
                param_in[0] = addr;
                param_in[1] = blocksize;
-               
-               mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
-                       sizeof(param_in)/sizeof(param_in[0]), param_in, count, param_out, 1);
-               
+
+               retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
+                       ARRAY_SIZE(param_in), param_in, count, param_out, 1);
+
 //             count -= blocksize;
 //             addr += blocksize;
 //             bytesread += blocksize;
        }
-       
+
        for (i = 0; i < count; i++)
        {
                buf[i] = param_out[i];
        }
-       
-       return ERROR_OK;
+
+       free(param_out);
+
+       return retval;
 }
 
-int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *buf)
+static int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint8_t *buf)
 {
-       u32 code[] = {
+       static const uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
-               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),                     /* $15 = MIPS32_PRACC_STACK */
                MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
-               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
-               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
-                       
-               MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
+               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
+               MIPS32_SW(10,0,15),                                                                     /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                                     /* sw $11,($15) */
+
+               MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* $9=mem[$8]; read addr */
-               MIPS32_LW(10,4,8),                                                                      /* $10=mem[$8+4]; read count */
-               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11=MIPS32_PRACC_PARAM_OUT */
+               MIPS32_LW(9,0,8),                                                                       /* $9 = mem[$8]; read addr */
+               MIPS32_LW(10,4,8),                                                                      /* $10 = mem[$8 + 4]; read count */
+               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
-               MIPS32_NOP,
                                                                                                                        /* loop: */
-               MIPS32_BEQ(0,10,9),                                                             /* beq 0, $10, end */
+               MIPS32_BEQ(0,10,8),                                                                     /* beq 0, $10, end */
                MIPS32_NOP,
-               
-               MIPS32_LBU(12,0,9),                                                             /* lw $12,0($9), Load t4 with the byte @mem[t1] */
-               MIPS32_SW(12,0,11),                                                             /* sw $12,0($11) */
-               
-               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,1),                                                             /* $9+=1 */
-               MIPS32_ADDI(11,11,4),                                                           /* $11+=4 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(9)),                                                                     /* b loop */
+
+               MIPS32_LBU(8,0,9),                                                                      /* lw $8,0($9), Load t4 with the byte @mem[t1] */
+               MIPS32_SW(8,0,11),                                                                      /* sw $8,0($11) */
+
+               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
+               MIPS32_ADDI(9,9,1),                                                                     /* $9 += 1 */
+               MIPS32_ADDI(11,11,4),                                                           /* $11 += 4 */
+               MIPS32_B(NEG16(8)),                                                                     /* b loop */
                MIPS32_NOP,
                                                                                                                        /* end: */
-               MIPS32_LW(11,0,15),                                                             /* sw $11,($15) */
-               MIPS32_LW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_LW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_LW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_LW(11,0,15),                                                                     /* lw $11,($15) */
+               MIPS32_LW(10,0,15),                                                                     /* lw $10,($15) */
+               MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
+               MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(27)),                                                            /* b start */
                MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(31)),                                                            /* b start */
-               MIPS32_NOP,
        };
-       
-//     /* TODO remove array */
-       u32 param_out[count];
+
+       /* TODO remove array */
+       uint32_t *param_out = malloc(count * sizeof(uint32_t));
        int i;
-       
-//     int retval;
+
+       int retval = ERROR_OK;
        int blocksize;
        int bytesread;
-       u32 param_in[2];
-       
+       uint32_t param_in[2];
+
        bytesread = 0;
-       
+
 //     while (count > 0)
-       {       
+       {
                blocksize = count;
                if (count > 0x400)
                        blocksize = 0x400;
-               
+
                param_in[0] = addr;
                param_in[1] = blocksize;
-               
-               mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
-                       sizeof(param_in)/sizeof(param_in[0]), param_in, count, param_out, 1);
-               
+
+               retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
+                       ARRAY_SIZE(param_in), param_in, count, param_out, 1);
+
 //             count -= blocksize;
 //             addr += blocksize;
 //             bytesread += blocksize;
        }
-       
+
        for (i = 0; i < count; i++)
        {
                buf[i] = param_out[i];
        }
 
-       return ERROR_OK;
+       free(param_out);
+
+       return retval;
 }
 
-int mips32_pracc_write_mem(mips_ejtag_t *ejtag_info, u32 addr, int size, int count, void *buf)
+int mips32_pracc_write_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size, int count, void *buf)
 {
        switch (size)
        {
                case 1:
-                       return mips32_pracc_write_mem8(ejtag_info, addr, count, (u8*)buf);
+                       return mips32_pracc_write_mem8(ejtag_info, addr, count, (uint8_t*)buf);
                case 2:
-                       return mips32_pracc_write_mem16(ejtag_info, addr, count,(u16*)buf);
+                       return mips32_pracc_write_mem16(ejtag_info, addr, count,(uint16_t*)buf);
                case 4:
-                       return mips32_pracc_write_mem32(ejtag_info, addr, count, (u32*)buf);
+                       if (count == 1)
+                               return mips32_pracc_write_u32(ejtag_info, addr, (uint32_t*)buf);
+                       else
+                               return mips32_pracc_write_mem32(ejtag_info, addr, count, (uint32_t*)buf);
        }
-       
+
        return ERROR_OK;
 }
 
-int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *buf)
+static int mips32_pracc_write_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint32_t *buf)
 {
-       u32 code[] = {
+       static const uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
-               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),                     /* $15 = MIPS32_PRACC_STACK */
                MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
-               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
-               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
-               
-               MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
-               MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
-               MIPS32_LW(10,4,8),                                                                      /* Load write count to $10 */
-               MIPS32_ADDI(8,8,8),                                                             /* $8+=8 */
-               MIPS32_NOP,
+               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
+               MIPS32_SW(10,0,15),                                                                     /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                                     /* sw $11,($15) */
+
+               MIPS32_ADDI(8,15,NEG16(MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_IN)),  /* $8= MIPS32_PRACC_PARAM_IN */
+               MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
+               MIPS32_LW(10,4,8),                                                                      /* Load write count to $10 */
+               MIPS32_ADDI(8,8,8),                                                                     /* $8 += 8 beginning of data */
+
                                                                                                                        /* loop: */
-               MIPS32_BEQ(0,10,9),                                                                     /* beq $0, $10, end */
-               MIPS32_NOP,
-               
-               MIPS32_LW(11,0,8),                                                                      /* lw $11,0($8), Load $11 with the word @mem[$8] */
-               MIPS32_SW(11,0,9),                                                                      /* sw $11,0($9) */
-               
-               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,4),                                                             /* $9+=4 */
-               MIPS32_ADDI(8,8,4),                                                             /* $8+=4 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(9)),                                                                     /* b loop */
-               MIPS32_NOP,
+               MIPS32_LW(11,0,8),                                                                      /* lw $11,0($8), Load $11 with the word @mem[$8] */
+               MIPS32_SW(11,0,9),                                                                      /* sw $11,0($9) */
+
+               MIPS32_ADDI(9,9,4),                                                                     /* $9 += 4 */
+               MIPS32_BNE(10,9,NEG16(4)),                                                      /* bne $10, $9, loop */
+               MIPS32_ADDI(8,8,4),                                                                     /* $8 += 4 */
+
                                                                                                                        /* end: */
-               MIPS32_LW(11,0,15),                                                             /* sw $11,($15) */
-               MIPS32_LW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_LW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_LW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_LW(11,0,15),                                                                     /* lw $11,($15) */
+               MIPS32_LW(10,0,15),                                                                     /* lw $10,($15) */
+               MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
+               MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(21)),                                                            /* b start */
                MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(30)),                                                            /* b start */
-               MIPS32_NOP,
        };
-       
+
        /* TODO remove array */
-       u32 param_in[count+2];
+       uint32_t *param_in = malloc((count + 2) * sizeof(uint32_t));
        param_in[0] = addr;
-       param_in[1] = count;
-       
-       memcpy(&param_in[2], buf, count * sizeof(u32));
-       
-       mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
-               sizeof(param_in)/sizeof(param_in[0]),param_in, 0, NULL, 1);
+       param_in[1] = addr + (count * sizeof(uint32_t));        /* last address */
 
-       return ERROR_OK;
+       memcpy(&param_in[2], buf, count * sizeof(uint32_t));
+
+       int retval;
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
+               count + 2, param_in, 0, NULL, 1);
+
+       free(param_in);
+
+       return retval;
 }
 
-int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *buf)
+static int mips32_pracc_write_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *buf)
 {
-       u32 code[] = {
+       static const uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
-               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),                     /* $15 = MIPS32_PRACC_STACK */
                MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
-               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
-               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
-               
-               MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
+               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
+
+               MIPS32_LW(8,NEG16((MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_IN)-4), 15),   /* load R8 @ param_in[1] = data */
+               MIPS32_LW(9,NEG16(MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_IN), 15),               /* load R9 @ param_in[0] = address */
+
+               MIPS32_SW(8,0,9),                                                                       /* sw $8,0($9) */
+
+               MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
+               MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(11)),                                                            /* b start */
+               MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
+       };
+
+       /* TODO remove array */
+       uint32_t param_in[1 + 1];
+       param_in[0] = addr;
+       param_in[1] = *buf;
+
+       return mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
+               ARRAY_SIZE(param_in), param_in, 0, NULL, 1);
+}
+
+static int mips32_pracc_write_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint16_t *buf)
+{
+       static const uint32_t code[] = {
+                                                                                                                       /* start: */
+               MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),                     /* $15 = MIPS32_PRACC_STACK */
+               MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
+               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
+               MIPS32_SW(10,0,15),                                                                     /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                                     /* sw $11,($15) */
+
+               MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
-               MIPS32_LW(10,4,8),                                                                      /* Load write count to $10 */
-               MIPS32_ADDI(8,8,8),                                                             /* $8+=8 */
-               MIPS32_NOP,
+               MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
+               MIPS32_LW(10,4,8),                                                                      /* Load write count to $10 */
+               MIPS32_ADDI(8,8,8),                                                                     /* $8 += 8 */
                                                                                                                        /* loop: */
-               MIPS32_BEQ(0,10,9),                                                                     /* beq $0, $10, end */
-               MIPS32_NOP,
-               
-               MIPS32_LW(11,0,8),                                                                      /* lw $11,0($8), Load $11 with the word @mem[$8] */
-               MIPS32_SH(11,0,9),                                                                      /* sh $11,0($9) */
-               
-               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,2),                                                             /* $9+=2 */
-               MIPS32_ADDI(8,8,4),                                                             /* $8+=4 */
-               
+               MIPS32_BEQ(0,10,8),                                                                     /* beq $0, $10, end */
                MIPS32_NOP,
-               MIPS32_B(NEG16(9)),                                                                     /* b loop */
+
+               MIPS32_LW(11,0,8),                                                                      /* lw $11,0($8), Load $11 with the word @mem[$8] */
+               MIPS32_SH(11,0,9),                                                                      /* sh $11,0($9) */
+
+               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
+               MIPS32_ADDI(9,9,2),                                                                     /* $9 += 2 */
+               MIPS32_ADDI(8,8,4),                                                                     /* $8 += 4 */
+
+               MIPS32_B(NEG16(8)),                                                                     /* b loop */
                MIPS32_NOP,
                                                                                                                        /* end: */
-               MIPS32_LW(11,0,15),                                                             /* sw $11,($15) */
-               MIPS32_LW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_LW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_LW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_LW(11,0,15),                                                                     /* lw $11,($15) */
+               MIPS32_LW(10,0,15),                                                                     /* lw $10,($15) */
+               MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
+               MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(26)),                                                            /* b start */
                MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(30)),                                                            /* b start */
-               MIPS32_NOP,
        };
-       
+
        /* TODO remove array */
-       u32 param_in[count+2];
+       uint32_t *param_in = malloc((count + 2) * sizeof(uint32_t));
        int i;
        param_in[0] = addr;
        param_in[1] = count;
-       
+
        for (i = 0; i < count; i++)
        {
-               param_in[i+2] = buf[i];
+               param_in[i + 2] = buf[i];
        }
-       
-       mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
-               sizeof(param_in)/sizeof(param_in[0]), param_in, 0, NULL, 1);
 
-       return ERROR_OK;
+       int retval;
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
+               count + 2, param_in, 0, NULL, 1);
+
+       free(param_in);
+
+       return retval;
 }
 
-int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *buf)
+static int mips32_pracc_write_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint8_t *buf)
 {
-       u32 code[] = {
+       static const uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
-               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),                     /* $15 = MIPS32_PRACC_STACK */
                MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
-               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
-               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
-               
-               MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
+               MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
+               MIPS32_SW(10,0,15),                                                                     /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                                     /* sw $11,($15) */
+
+               MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
-               MIPS32_LW(10,4,8),                                                                      /* Load write count to $10 */
-               MIPS32_ADDI(8,8,8),                                                             /* $8+=8 */
-               MIPS32_NOP,
+               MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
+               MIPS32_LW(10,4,8),                                                                      /* Load write count to $10 */
+               MIPS32_ADDI(8,8,8),                                                                     /* $8 += 8 */
                                                                                                                        /* loop: */
-               MIPS32_BEQ(0,10,9),                                                                     /* beq $0, $10, end */
-               MIPS32_NOP,
-               
-               MIPS32_LW(11,0,8),                                                                      /* lw $11,0($8), Load $11 with the word @mem[$8] */
-               MIPS32_SB(11,0,9),                                                                      /* sb $11,0($9) */
-               
-               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,1),                                                             /* $9+=1 */
-               MIPS32_ADDI(8,8,4),                                                             /* $8+=4 */
-               
+               MIPS32_BEQ(0,10,8),                                                                     /* beq $0, $10, end */
                MIPS32_NOP,
-               MIPS32_B(NEG16(9)),                                                                     /* b loop */
+
+               MIPS32_LW(11,0,8),                                                                      /* lw $11,0($8), Load $11 with the word @mem[$8] */
+               MIPS32_SB(11,0,9),                                                                      /* sb $11,0($9) */
+
+               MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
+               MIPS32_ADDI(9,9,1),                                                                     /* $9 += 1 */
+               MIPS32_ADDI(8,8,4),                                                                     /* $8 += 4 */
+
+               MIPS32_B(NEG16(8)),                                                                     /* b loop */
                MIPS32_NOP,
                                                                                                                        /* end: */
-               MIPS32_LW(11,0,15),                                                             /* sw $11,($15) */
-               MIPS32_LW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_LW(9,0,15),                                                                      /* sw $9,($15) */
-               MIPS32_LW(8,0,15),                                                                      /* sw $8,($15) */
+               MIPS32_LW(11,0,15),                                                                     /* lw $11,($15) */
+               MIPS32_LW(10,0,15),                                                                     /* lw $10,($15) */
+               MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
+               MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(26)),                                                            /* b start */
                MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(30)),                                                            /* b start */
-               MIPS32_NOP,
        };
-       
+
        /* TODO remove array */
-       u32 param_in[count+2];
+       uint32_t *param_in = malloc((count + 2) * sizeof(uint32_t));
        int retval;
        int i;
        param_in[0] = addr;
        param_in[1] = count;
-       
+
        for (i = 0; i < count; i++)
        {
-               param_in[i+2] = buf[i];
+               param_in[i + 2] = buf[i];
        }
-       
-       retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
-               sizeof(param_in)/sizeof(param_in[0]), param_in, 0, NULL, 1);
+
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
+               count + 2, param_in, 0, NULL, 1);
+
+       free(param_in);
 
        return retval;
 }
 
-int mips32_pracc_write_regs(mips_ejtag_t *ejtag_info, u32 *regs)
+int mips32_pracc_write_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
 {
-       /* TODO restore all core registers */
-       
-       u32 code[] = {
+       static const uint32_t code[] = {
                                                                                                                /* start: */
-               MIPS32_MTC0(2,31,0),                                                    /* move $2 to COP0 DeSave */
-               MIPS32_LUI(2,UPPER16(MIPS32_PRACC_PARAM_IN)),   /* $2 = MIPS32_PRACC_PARAM_IN */
+               MIPS32_LUI(2,UPPER16(MIPS32_PRACC_PARAM_IN)),   /* $2 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(2,2,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               /*MIPS32_LW(0,0*4,2),*/                                                 /* lw $0,0*4($2) */
-               MIPS32_LW(1,1*4,2),                                                     /* lw $1,1*4($2) */
-               MIPS32_MFC0(2,31,0),                                                    /* move COP0 DeSave to $2 */
-               
-               MIPS32_MTC0(1,31,0),                                                    /* move $1 to COP0 DeSave */
-               MIPS32_LUI(1,UPPER16(MIPS32_PRACC_PARAM_IN)),   /* $1 = MIPS32_PRACC_PARAM_IN */
+               MIPS32_LW(1,1*4,2),                                                             /* lw $1,1*4($2) */
+               MIPS32_LW(15,15*4,2),                                                   /* lw $15,15*4($2) */
+               MIPS32_MTC0(15,31,0),                                                   /* move $15 to COP0 DeSave */
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
+               MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
+               MIPS32_SW(1,0,15),                                                              /* sw $1,($15) */
+               MIPS32_LUI(1,UPPER16(MIPS32_PRACC_PARAM_IN)),   /* $1 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(1,1,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(2,2*4,1),                                                     /* lw $2,2*4($1) */
-               MIPS32_LW(3,3*4,1),                                                     /* lw $3,3*4($1) */
-               MIPS32_LW(4,4*4,1),                                                     /* lw $4,4*4($1) */
-               MIPS32_LW(5,5*4,1),                                                     /* lw $5,5*4($1) */
-               MIPS32_LW(6,6*4,1),                                                     /* lw $6,6*4($1) */
-               MIPS32_LW(7,7*4,1),                                                     /* lw $7,7*4($1) */
-               MIPS32_LW(8,8*4,1),                                                     /* lw $8,8*4($1) */
-               MIPS32_LW(9,9*4,1),                                                     /* lw $9,9*4($1) */
-               MIPS32_LW(10,10*4,1),                                                   /* lw $10,10*4($1) */
-               MIPS32_LW(11,11*4,1),                                                   /* lw $11,11*4($1) */
-               MIPS32_LW(12,12*4,1),                                                   /* lw $12,12*4($1) */
-               MIPS32_LW(13,13*4,1),                                                   /* lw $13,13*4($1) */
-               MIPS32_LW(14,14*4,1),                                                   /* lw $14,14*4($1) */
-               MIPS32_LW(15,15*4,1),                                                   /* lw $15,15*4($1) */
-               MIPS32_LW(16,16*4,1),                                                   /* lw $16,16*4($1) */
-               MIPS32_LW(17,17*4,1),                                                   /* lw $17,17*4($1) */
-               MIPS32_LW(18,18*4,1),                                                   /* lw $18,18*4($1) */
-               MIPS32_LW(19,19*4,1),                                                   /* lw $19,19*4($1) */
-               MIPS32_LW(20,20*4,1),                                                   /* lw $20,20*4($1) */
-               MIPS32_LW(21,21*4,1),                                                   /* lw $21,21*4($1) */
-               MIPS32_LW(22,22*4,1),                                                   /* lw $22,22*4($1) */
-               MIPS32_LW(23,23*4,1),                                                   /* lw $23,23*4($1) */
-               MIPS32_LW(24,24*4,1),                                                   /* lw $24,24*4($1) */
-               MIPS32_LW(25,25*4,1),                                                   /* lw $25,25*4($1) */
-               MIPS32_LW(26,26*4,1),                                                   /* lw $26,26*4($1) */
-               MIPS32_LW(27,27*4,1),                                                   /* lw $27,27*4($1) */
-               MIPS32_LW(28,28*4,1),                                                   /* lw $28,28*4($1) */
-               MIPS32_LW(29,29*4,1),                                                   /* lw $29,29*4($1) */
-               MIPS32_LW(30,30*4,1),                                                   /* lw $30,30*4($1) */
-               MIPS32_LW(31,31*4,1),                                                   /* lw $31,31*4($1) */
-               
-               MIPS32_MFC0(1,31,0),                                                    /* move COP0 DeSave to $1 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(41)),                                                    /* b start */
-               MIPS32_NOP,
+               MIPS32_LW(3,3*4,1),                                                             /* lw $3,3*4($1) */
+               MIPS32_LW(4,4*4,1),                                                             /* lw $4,4*4($1) */
+               MIPS32_LW(5,5*4,1),                                                             /* lw $5,5*4($1) */
+               MIPS32_LW(6,6*4,1),                                                             /* lw $6,6*4($1) */
+               MIPS32_LW(7,7*4,1),                                                             /* lw $7,7*4($1) */
+               MIPS32_LW(8,8*4,1),                                                             /* lw $8,8*4($1) */
+               MIPS32_LW(9,9*4,1),                                                             /* lw $9,9*4($1) */
+               MIPS32_LW(10,10*4,1),                                                   /* lw $10,10*4($1) */
+               MIPS32_LW(11,11*4,1),                                                   /* lw $11,11*4($1) */
+               MIPS32_LW(12,12*4,1),                                                   /* lw $12,12*4($1) */
+               MIPS32_LW(13,13*4,1),                                                   /* lw $13,13*4($1) */
+               MIPS32_LW(14,14*4,1),                                                   /* lw $14,14*4($1) */
+               MIPS32_LW(16,16*4,1),                                                   /* lw $16,16*4($1) */
+               MIPS32_LW(17,17*4,1),                                                   /* lw $17,17*4($1) */
+               MIPS32_LW(18,18*4,1),                                                   /* lw $18,18*4($1) */
+               MIPS32_LW(19,19*4,1),                                                   /* lw $19,19*4($1) */
+               MIPS32_LW(20,20*4,1),                                                   /* lw $20,20*4($1) */
+               MIPS32_LW(21,21*4,1),                                                   /* lw $21,21*4($1) */
+               MIPS32_LW(22,22*4,1),                                                   /* lw $22,22*4($1) */
+               MIPS32_LW(23,23*4,1),                                                   /* lw $23,23*4($1) */
+               MIPS32_LW(24,24*4,1),                                                   /* lw $24,24*4($1) */
+               MIPS32_LW(25,25*4,1),                                                   /* lw $25,25*4($1) */
+               MIPS32_LW(26,26*4,1),                                                   /* lw $26,26*4($1) */
+               MIPS32_LW(27,27*4,1),                                                   /* lw $27,27*4($1) */
+               MIPS32_LW(28,28*4,1),                                                   /* lw $28,28*4($1) */
+               MIPS32_LW(29,29*4,1),                                                   /* lw $29,29*4($1) */
+               MIPS32_LW(30,30*4,1),                                                   /* lw $30,30*4($1) */
+               MIPS32_LW(31,31*4,1),                                                   /* lw $31,31*4($1) */
+
+               MIPS32_LW(2,32*4,1),                                                    /* lw $2,32*4($1) */
+               MIPS32_MTC0(2,12,0),                                                    /* move $2 to status */
+               MIPS32_LW(2,33*4,1),                                                    /* lw $2,33*4($1) */
+               MIPS32_MTLO(2),                                                                 /* move $2 to lo */
+               MIPS32_LW(2,34*4,1),                                                    /* lw $2,34*4($1) */
+               MIPS32_MTHI(2),                                                                 /* move $2 to hi */
+               MIPS32_LW(2,35*4,1),                                                    /* lw $2,35*4($1) */
+               MIPS32_MTC0(2,8,0),                                                             /* move $2 to badvaddr */
+               MIPS32_LW(2,36*4,1),                                                    /* lw $2,36*4($1) */
+               MIPS32_MTC0(2,13,0),                                                    /* move $2 to cause*/
+               MIPS32_LW(2,37*4,1),                                                    /* lw $2,37*4($1) */
+               MIPS32_MTC0(2,24,0),                                                    /* move $2 to depc (pc) */
+
+               MIPS32_LW(2,2*4,1),                                                             /* lw $2,2*4($1) */
+               MIPS32_LW(1,0,15),                                                              /* lw $1,($15) */
+               MIPS32_B(NEG16(53)),                                                    /* b start */
+               MIPS32_MFC0(15,31,0),                                                   /* move COP0 DeSave to $15 */
        };
-       
+
        int retval;
-       
-       retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
-               32, regs, 0, NULL, 1);
-       
+
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
+                       MIPS32NUMCOREREGS, regs, 0, NULL, 1);
+
        return retval;
 }
 
-int mips32_pracc_read_regs(mips_ejtag_t *ejtag_info, u32 *regs)
+int mips32_pracc_read_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
 {
-       u32 code[] = {
+       static const uint32_t code[] = {
                                                                                                                /* start: */
                MIPS32_MTC0(2,31,0),                                                    /* move $2 to COP0 DeSave */
-               MIPS32_LUI(2,UPPER16(MIPS32_PRACC_PARAM_OUT)),  /* $2 = MIPS32_PRACC_PARAM_OUT */
+               MIPS32_LUI(2,UPPER16(MIPS32_PRACC_PARAM_OUT)),  /* $2 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(2,2,LOWER16(MIPS32_PRACC_PARAM_OUT)),
                MIPS32_SW(0,0*4,2),                                                             /* sw $0,0*4($2) */
-               MIPS32_SW(1,1*4,2),                                                     /* sw $1,1*4($2) */
-               MIPS32_SW(15,15*4,2),                                                   /* sw $15,15*4($2) */
+               MIPS32_SW(1,1*4,2),                                                             /* sw $1,1*4($2) */
+               MIPS32_SW(15,15*4,2),                                                   /* sw $15,15*4($2) */
                MIPS32_MFC0(2,31,0),                                                    /* move COP0 DeSave to $2 */
                MIPS32_MTC0(15,31,0),                                                   /* move $15 to COP0 DeSave */
-               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),     /* $15 = MIPS32_PRACC_STACK */
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
                MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
-               MIPS32_SW(1,0,15),                                                              /* sw $1,($15) */
-               MIPS32_SW(2,0,15),                                                              /* sw $2,($15) */
-               MIPS32_LUI(1,UPPER16(MIPS32_PRACC_PARAM_OUT)),  /* $1 = MIPS32_PRACC_PARAM_OUT */
+               MIPS32_SW(1,0,15),                                                              /* sw $1,($15) */
+               MIPS32_SW(2,0,15),                                                              /* sw $2,($15) */
+               MIPS32_LUI(1,UPPER16(MIPS32_PRACC_PARAM_OUT)),  /* $1 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(1,1,LOWER16(MIPS32_PRACC_PARAM_OUT)),
-               MIPS32_SW(2,2*4,1),                                                     /* sw $2,2*4($1) */
-               MIPS32_SW(3,3*4,1),                                                     /* sw $3,3*4($1) */
-               MIPS32_SW(4,4*4,1),                                                     /* sw $4,4*4($1) */
-               MIPS32_SW(5,5*4,1),                                                     /* sw $5,5*4($1) */
-               MIPS32_SW(6,6*4,1),                                                     /* sw $6,6*4($1) */
-               MIPS32_SW(7,7*4,1),                                                     /* sw $7,7*4($1) */
-               MIPS32_SW(8,8*4,1),                                                     /* sw $8,8*4($1) */
-               MIPS32_SW(9,9*4,1),                                                     /* sw $9,9*4($1) */
-               MIPS32_SW(10,10*4,1),                                                   /* sw $10,10*4($1) */
-               MIPS32_SW(11,11*4,1),                                                   /* sw $11,11*4($1) */
-               MIPS32_SW(12,12*4,1),                                                   /* sw $12,12*4($1) */
-               MIPS32_SW(13,13*4,1),                                                   /* sw $13,13*4($1) */
-               MIPS32_SW(14,14*4,1),                                                   /* sw $14,14*4($1) */
-               MIPS32_SW(16,16*4,1),                                                   /* sw $16,16*4($1) */
-               MIPS32_SW(17,17*4,1),                                                   /* sw $17,17*4($1) */
-               MIPS32_SW(18,18*4,1),                                                   /* sw $18,18*4($1) */
-               MIPS32_SW(19,19*4,1),                                                   /* sw $19,19*4($1) */
-               MIPS32_SW(20,20*4,1),                                                   /* sw $20,20*4($1) */
-               MIPS32_SW(21,21*4,1),                                                   /* sw $21,21*4($1) */
-               MIPS32_SW(22,22*4,1),                                                   /* sw $22,22*4($1) */
-               MIPS32_SW(23,23*4,1),                                                   /* sw $23,23*4($1) */
-               MIPS32_SW(24,24*4,1),                                                   /* sw $24,24*4($1) */
-               MIPS32_SW(25,25*4,1),                                                   /* sw $25,25*4($1) */
-               MIPS32_SW(26,26*4,1),                                                   /* sw $26,26*4($1) */
-               MIPS32_SW(27,27*4,1),                                                   /* sw $27,27*4($1) */
-               MIPS32_SW(28,28*4,1),                                                   /* sw $28,28*4($1) */
-               MIPS32_SW(29,29*4,1),                                                   /* sw $29,29*4($1) */
-               MIPS32_SW(30,30*4,1),                                                   /* sw $30,30*4($1) */
-               MIPS32_SW(31,31*4,1),                                                   /* sw $31,31*4($1) */
-               
+               MIPS32_SW(2,2*4,1),                                                             /* sw $2,2*4($1) */
+               MIPS32_SW(3,3*4,1),                                                             /* sw $3,3*4($1) */
+               MIPS32_SW(4,4*4,1),                                                             /* sw $4,4*4($1) */
+               MIPS32_SW(5,5*4,1),                                                             /* sw $5,5*4($1) */
+               MIPS32_SW(6,6*4,1),                                                             /* sw $6,6*4($1) */
+               MIPS32_SW(7,7*4,1),                                                             /* sw $7,7*4($1) */
+               MIPS32_SW(8,8*4,1),                                                             /* sw $8,8*4($1) */
+               MIPS32_SW(9,9*4,1),                                                             /* sw $9,9*4($1) */
+               MIPS32_SW(10,10*4,1),                                                   /* sw $10,10*4($1) */
+               MIPS32_SW(11,11*4,1),                                                   /* sw $11,11*4($1) */
+               MIPS32_SW(12,12*4,1),                                                   /* sw $12,12*4($1) */
+               MIPS32_SW(13,13*4,1),                                                   /* sw $13,13*4($1) */
+               MIPS32_SW(14,14*4,1),                                                   /* sw $14,14*4($1) */
+               MIPS32_SW(16,16*4,1),                                                   /* sw $16,16*4($1) */
+               MIPS32_SW(17,17*4,1),                                                   /* sw $17,17*4($1) */
+               MIPS32_SW(18,18*4,1),                                                   /* sw $18,18*4($1) */
+               MIPS32_SW(19,19*4,1),                                                   /* sw $19,19*4($1) */
+               MIPS32_SW(20,20*4,1),                                                   /* sw $20,20*4($1) */
+               MIPS32_SW(21,21*4,1),                                                   /* sw $21,21*4($1) */
+               MIPS32_SW(22,22*4,1),                                                   /* sw $22,22*4($1) */
+               MIPS32_SW(23,23*4,1),                                                   /* sw $23,23*4($1) */
+               MIPS32_SW(24,24*4,1),                                                   /* sw $24,24*4($1) */
+               MIPS32_SW(25,25*4,1),                                                   /* sw $25,25*4($1) */
+               MIPS32_SW(26,26*4,1),                                                   /* sw $26,26*4($1) */
+               MIPS32_SW(27,27*4,1),                                                   /* sw $27,27*4($1) */
+               MIPS32_SW(28,28*4,1),                                                   /* sw $28,28*4($1) */
+               MIPS32_SW(29,29*4,1),                                                   /* sw $29,29*4($1) */
+               MIPS32_SW(30,30*4,1),                                                   /* sw $30,30*4($1) */
+               MIPS32_SW(31,31*4,1),                                                   /* sw $31,31*4($1) */
+
                MIPS32_MFC0(2,12,0),                                                    /* move status to $2 */
-               MIPS32_SW(2,32*4,1),                                                    /* sw $2,32*4($1) */
-               MIPS32_LO(2),                                                                   /* move lo to $2 */
-               MIPS32_SW(2,33*4,1),                                                    /* sw $2,33*4($1) */
-               MIPS32_HI(2),                                                                   /* move hi to $2 */
-               MIPS32_SW(2,34*4,1),                                                    /* sw $2,34*4($1) */
+               MIPS32_SW(2,32*4,1),                                                    /* sw $2,32*4($1) */
+               MIPS32_MFLO(2),                                                                 /* move lo to $2 */
+               MIPS32_SW(2,33*4,1),                                                    /* sw $2,33*4($1) */
+               MIPS32_MFHI(2),                                                                 /* move hi to $2 */
+               MIPS32_SW(2,34*4,1),                                                    /* sw $2,34*4($1) */
                MIPS32_MFC0(2,8,0),                                                             /* move badvaddr to $2 */
-               MIPS32_SW(2,35*4,1),                                                    /* sw $2,35*4($1) */
+               MIPS32_SW(2,35*4,1),                                                    /* sw $2,35*4($1) */
                MIPS32_MFC0(2,13,0),                                                    /* move cause to $2 */
-               MIPS32_SW(2,36*4,1),                                                    /* sw $2,36*4($1) */
-               MIPS32_MFC0(2,24,0),                                                    /* move pc to $2 */
-               MIPS32_SW(2,37*4,1),                                                    /* sw $2,37*4($1) */
-               
-               MIPS32_LW(2,0,15),                                                              /* sw $2,($15) */
-               MIPS32_LW(1,0,15),                                                              /* sw $1,($15) */
+               MIPS32_SW(2,36*4,1),                                                    /* sw $2,36*4($1) */
+               MIPS32_MFC0(2,24,0),                                                    /* move depc (pc) to $2 */
+               MIPS32_SW(2,37*4,1),                                                    /* sw $2,37*4($1) */
+
+               MIPS32_LW(2,0,15),                                                              /* lw $2,($15) */
+               MIPS32_LW(1,0,15),                                                              /* lw $1,($15) */
+               MIPS32_B(NEG16(58)),                                                    /* b start */
                MIPS32_MFC0(15,31,0),                                                   /* move COP0 DeSave to $15 */
-               MIPS32_NOP,
-               MIPS32_B(NEG16(60)),                                                    /* b start */
-               MIPS32_NOP,
        };
-       
+
        int retval;
-       
-       retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
-               0, NULL, 38, regs, 1);
-       
+
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
+               0, NULL, MIPS32NUMCOREREGS, regs, 1);
+
+       return retval;
+}
+
+/* fastdata upload/download requires an initialized working area
+ * to load the download code; it should not be called otherwise
+ * fetch order from the fastdata area
+ * 1. start addr
+ * 2. end addr
+ * 3. data ...
+ */
+int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_area *source,
+                                                               int write_t, uint32_t addr, int count, uint32_t *buf)
+{
+       uint32_t handler_code[] = {
+               /* caution when editing, table is modified below */
+               /* r15 points to the start of this code */
+               MIPS32_SW(8,MIPS32_FASTDATA_HANDLER_SIZE - 4,15),
+               MIPS32_SW(9,MIPS32_FASTDATA_HANDLER_SIZE - 8,15),
+               MIPS32_SW(10,MIPS32_FASTDATA_HANDLER_SIZE - 12,15),
+               MIPS32_SW(11,MIPS32_FASTDATA_HANDLER_SIZE - 16,15),
+               /* start of fastdata area in t0 */
+               MIPS32_LUI(8,UPPER16(MIPS32_PRACC_FASTDATA_AREA)),
+               MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_FASTDATA_AREA)),
+               MIPS32_LW(9,0,8),                                                               /* start addr in t1 */
+               MIPS32_LW(10,0,8),                                                              /* end addr to t2 */
+                                                                                                               /* loop: */
+               /* 8 */ MIPS32_LW(11,0,0),                                              /* lw t3,[t8 | r9] */
+               /* 9 */ MIPS32_SW(11,0,0),                                              /* sw t3,[r9 | r8] */
+               MIPS32_BNE(10,9,NEG16(3)),                                              /* bne $t2,t1,loop */
+               MIPS32_ADDI(9,9,4),                                                             /* addi t1,t1,4 */
+
+               MIPS32_LW(8,MIPS32_FASTDATA_HANDLER_SIZE - 4,15),
+               MIPS32_LW(9,MIPS32_FASTDATA_HANDLER_SIZE - 8,15),
+               MIPS32_LW(10,MIPS32_FASTDATA_HANDLER_SIZE - 12,15),
+               MIPS32_LW(11,MIPS32_FASTDATA_HANDLER_SIZE - 16,15),
+
+               MIPS32_LUI(15,UPPER16(MIPS32_PRACC_TEXT)),
+               MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_TEXT)),
+               MIPS32_JR(15),                                                                  /* jr start */
+               MIPS32_MFC0(15,31,0),                                                   /* move COP0 DeSave to $15 */
+       };
+
+       uint32_t jmp_code[] = {
+               MIPS32_MTC0(15,31,0),                   /* move $15 to COP0 DeSave */
+               /* 1 */ MIPS32_LUI(15,0),               /* addr of working area added below */
+               /* 2 */ MIPS32_ORI(15,15,0),    /* addr of working area added below */
+               MIPS32_JR(15),                                  /* jump to ram program */
+               MIPS32_NOP,
+       };
+
+       int retval, i;
+       uint32_t val, ejtag_ctrl, address;
+
+       if (source->size < MIPS32_FASTDATA_HANDLER_SIZE)
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+
+       if (write_t)
+       {
+               handler_code[8] = MIPS32_LW(11,0,8);    /* load data from probe at fastdata area */
+               handler_code[9] = MIPS32_SW(11,0,9);    /* store data to RAM @ r9 */
+       }
+       else
+       {
+               handler_code[8] = MIPS32_LW(11,0,9);    /* load data from RAM @ r9 */
+               handler_code[9] = MIPS32_SW(11,0,8);    /* store data to probe at fastdata area */
+       }
+
+       /* write program into RAM */
+       if (write_t != ejtag_info->fast_access_save)
+       {
+               mips32_pracc_write_mem32(ejtag_info, source->address, ARRAY_SIZE(handler_code), handler_code);
+               /* save previous operation to speed to any consecutive read/writes */
+               ejtag_info->fast_access_save = write_t;
+       }
+
+       LOG_DEBUG("%s using 0x%.8" PRIx32 " for write handler", __func__, source->address);
+
+       jmp_code[1] |= UPPER16(source->address);
+       jmp_code[2] |= LOWER16(source->address);
+
+       for (i = 0; i < (int) ARRAY_SIZE(jmp_code); i++)
+       {
+               if ((retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl)) != ERROR_OK)
+                       return retval;
+
+               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
+               mips_ejtag_drscan_32(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(ejtag_info, &ejtag_ctrl);
+       }
+
+       if ((retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl)) != 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)
+               return ERROR_FAIL;
+
+       /* wait PrAcc pending bit for FASTDATA write */
+       if ((retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl)) != 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);
+
+       /* Send the load end address */
+       val = addr + (count - 1) * 4;
+       mips_ejtag_fastdata_scan(ejtag_info, 1, &val);
+
+       for (i = 0; i < count; i++)
+       {
+               if ((retval = mips_ejtag_fastdata_scan(ejtag_info, write_t, buf++)) != ERROR_OK)
+                       return retval;
+       }
+
+       if ((retval = jtag_execute_queue()) != ERROR_OK)
+       {
+               LOG_ERROR("fastdata load failed");
+               return retval;
+       }
+
+       if ((retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl)) != ERROR_OK)
+               return retval;
+
+       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_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)