mips32: Sync Caches to Make Instr Writes Effective
[fw/openocd] / src / target / mips32_pracc.c
index ac1d1b39860504921fd9122616a037016b53ad37..6b43479fccc601694b1c26afef71b7991498eacb 100644 (file)
@@ -6,6 +6,9 @@
  *                                                                         *
  *   Copyright (C) 2009 by David N. Claffey <dnclaffey@gmail.com>          *
  *                                                                         *
+ *   Copyright (C) 2011 by Drasko DRASKOVIC                                *
+ *   drasko.draskovic@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     *
@@ -74,6 +77,8 @@ Nico Coesel
 #include "config.h"
 #endif
 
+#include <helper/time_support.h>
+
 #include "mips32.h"
 #include "mips32_pracc.h"
 
@@ -90,19 +95,54 @@ struct mips32_pracc_context
        struct mips_ejtag *ejtag_info;
 };
 
+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 mips32_pracc_sync_cache(struct mips_ejtag *ejtag_info,
+               uint32_t start_addr, uint32_t end_addr);
+static int mips32_pracc_clean_invalidate_cache(struct mips_ejtag *ejtag_info,
+                                                                                                       uint32_t start_addr, uint32_t end_addr);
+
 static int wait_for_pracc_rw(struct mips_ejtag *ejtag_info, uint32_t *ctrl)
 {
        uint32_t ejtag_ctrl;
+       long long then = timeval_ms();
+       int timeout;
+       int retval;
+
+       /* wait for the PrAcc to become "1" */
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
+       ejtag_ctrl = ejtag_info->ejtag_ctrl;
 
        while (1)
        {
-               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
-               ejtag_ctrl = ejtag_info->ejtag_ctrl;
-               mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
+               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;
@@ -149,18 +189,15 @@ static int mips32_pracc_exec_read(struct mips32_pracc_context *ctx, uint32_t add
        }
 
        /* Send the data out */
-       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_DATA, NULL);
-       mips_ejtag_drscan_32(ctx->ejtag_info, &data);
+       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_DATA);
+       mips_ejtag_drscan_32_out(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_drscan_32(ctx->ejtag_info, &ejtag_ctrl);
-
-       jtag_add_clocks(5);
-       jtag_execute_queue();
+       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_CONTROL);
+       mips_ejtag_drscan_32_out(ctx->ejtag_info, ejtag_ctrl);
 
-       return ERROR_OK;
+       return jtag_execute_queue();
 }
 
 static int mips32_pracc_exec_write(struct mips32_pracc_context *ctx, uint32_t address)
@@ -168,17 +205,21 @@ static int mips32_pracc_exec_write(struct mips32_pracc_context *ctx, uint32_t ad
        uint32_t ejtag_ctrl,data;
        int offset;
        struct mips_ejtag *ejtag_info = ctx->ejtag_info;
+       int retval;
 
-       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_DATA, NULL);
-       mips_ejtag_drscan_32(ctx->ejtag_info, &data);
+       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_drscan_32(ctx->ejtag_info, &ejtag_ctrl);
+       mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_CONTROL);
+       mips_ejtag_drscan_32_out(ctx->ejtag_info, ejtag_ctrl);
 
-       jtag_add_clocks(5);
-       jtag_execute_queue();
+       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))
@@ -206,7 +247,8 @@ static int mips32_pracc_exec_write(struct mips32_pracc_context *ctx, uint32_t ad
        return ERROR_OK;
 }
 
-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)
+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)
 {
        uint32_t ejtag_ctrl;
        uint32_t address, data;
@@ -229,8 +271,10 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, int code_len, const uint32_
                        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)
@@ -283,42 +327,42 @@ int mips32_pracc_read_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size
        return ERROR_OK;
 }
 
-int mips32_pracc_read_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint32_t *buf)
+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 $11,($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_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
                                                                                                                        /* loop: */
                MIPS32_BEQ(0,10,8),                                                                     /* beq 0, $10, end */
                MIPS32_NOP,
 
-               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_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_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),                                                             /* 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_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 */
        };
@@ -353,21 +397,21 @@ int mips32_pracc_read_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int co
        return retval;
 }
 
-int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *buf)
+static int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info, uint32_t addr, 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(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_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_LW(8,0,15),                                                                      /* lw $8,($15) */
                MIPS32_B(NEG16(9)),                                                                     /* b start */
                MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
        };
@@ -386,17 +430,17 @@ int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t
        return retval;
 }
 
-int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint16_t *buf)
+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_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_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)),
@@ -405,22 +449,22 @@ int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int co
                MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
                                                                                                                        /* loop: */
-               MIPS32_BEQ(0,10,8),                                                             /* beq 0, $10, end */
+               MIPS32_BEQ(0,10,8),                                                                     /* beq 0, $10, end */
                MIPS32_NOP,
 
-               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_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_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_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 */
        };
@@ -429,13 +473,10 @@ int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int co
        uint32_t *param_out = malloc(count * sizeof(uint32_t));
        int i;
 
-//     int retval;
+       int retval = ERROR_OK;
        int blocksize;
-       int bytesread;
        uint32_t param_in[2];
 
-       bytesread = 0;
-
        //while (count > 0)
        {
                blocksize = count;
@@ -445,12 +486,11 @@ int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int co
                param_in[0] = addr;
                param_in[1] = blocksize;
 
-               mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, \
+               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++)
@@ -460,44 +500,44 @@ int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int co
 
        free(param_out);
 
-       return ERROR_OK;
+       return retval;
 }
 
-int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint8_t *buf)
+static int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint8_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 $11,($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_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)),
                                                                                                                        /* loop: */
-               MIPS32_BEQ(0,10,8),                                                             /* beq 0, $10, end */
+               MIPS32_BEQ(0,10,8),                                                                     /* beq 0, $10, end */
                MIPS32_NOP,
 
-               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_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_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),                                                             /* 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_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 */
        };
@@ -506,13 +546,10 @@ int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int cou
        uint32_t *param_out = malloc(count * sizeof(uint32_t));
        int i;
 
-//     int retval;
+       int retval = ERROR_OK;
        int blocksize;
-       int bytesread;
        uint32_t param_in[2];
 
-       bytesread = 0;
-
 //     while (count > 0)
        {
                blocksize = count;
@@ -522,12 +559,11 @@ int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int cou
                param_in[0] = addr;
                param_in[1] = blocksize;
 
-               mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, \
+               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++)
@@ -537,57 +573,373 @@ int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int cou
 
        free(param_out);
 
-       return ERROR_OK;
+       return retval;
+}
+
+int mips32_cp0_read(struct mips_ejtag *ejtag_info, uint32_t *val, uint32_t cp0_reg, uint32_t cp0_sel)
+{
+       /**
+        * Do not make this code static, but regenerate it every time,
+        * as 5th element has to be changed to add parameters
+        */
+       uint32_t code[] = {
+                                                                                                                       /* start: */
+               MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
+               MIPS32_LUI(15,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) */
+
+               /* 5 */ MIPS32_MFC0(8,0,0),                                                     /* move COP0 [cp0_reg select] to $8 */
+
+               MIPS32_LUI(9,UPPER16(MIPS32_PRACC_PARAM_OUT)),          /* $11 = MIPS32_PRACC_PARAM_OUT */
+               MIPS32_ORI(9,9,LOWER16(MIPS32_PRACC_PARAM_OUT)),
+               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(12)),                                                            /* b start */
+               MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
+       };
+
+       /**
+        * Note that our input parametes cp0_reg and cp0_sel
+        * are numbers (not gprs) which make part of mfc0 instruction opcode.
+        *
+        * These are not fix, but can be different for each mips32_cp0_read() function call,
+        * and that is why we must insert them directly into opcode,
+        * i.e. we can not pass it on EJTAG microprogram stack (via param_in),
+        * and put them into the gprs later from MIPS32_PRACC_STACK
+        * because mfc0 do not use gpr as a parameter for the cp0_reg and select part,
+        * but plain (immediate) number.
+        *
+        * MIPS32_MTC0 is implemented via MIPS32_R_INST macro.
+        * In order to insert our parameters, we must change rd and funct fields.
+        */
+       code[5] |= (cp0_reg << 11) | cp0_sel;  /* change rd and funct of MIPS32_R_INST macro */
+
+       /* TODO remove array */
+       uint32_t *param_out = val;
+       int retval;
+
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, 0, NULL, 1, param_out, 1);
+
+       return retval;
+}
+
+int mips32_cp0_write(struct mips_ejtag *ejtag_info,
+                                                                                       uint32_t val, uint32_t cp0_reg, uint32_t cp0_sel)
+{
+       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_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 val to $9 */
+
+               /* 8 */ MIPS32_MTC0(9,0,0),                                                     /* move $9 to COP0 [cp0_reg select] */
+
+               MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
+               MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(12)),                                                            /* b start */
+               MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
+       };
+
+       /**
+        * Note that MIPS32_MTC0 macro is implemented via MIPS32_R_INST macro.
+        * In order to insert our parameters, we must change rd and funct fields.
+        */
+       code[8] |= (cp0_reg << 11) | cp0_sel;  /* change rd and funct fields of MIPS32_R_INST macro */
+
+       /* TODO remove array */
+       uint32_t *param_in = malloc(1 * sizeof(uint32_t));
+       int retval;
+       param_in[0] = val;
+
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, 1, param_in, 0, NULL, 1);
+
+       free(param_in);
+
+       return retval;
+}
+
+/**
+ * \b mips32_pracc_sync_cache
+ *
+ * Synchronize Caches to Make Instruction Writes Effective
+ * (ref. doc. MIPS32 Architecture For Programmers Volume II: The MIPS32 Instruction Set,
+ *  Document Number: MD00086, Revision 2.00, June 9, 2003)
+ *
+ * When the instruction stream is written, the SYNCI instruction should be used
+ * in conjunction with other instructions to make the newly-written instructions effective.
+ *
+ * Explanation :
+ * A program that loads another program into memory is actually writing the D- side cache.
+ * The instructions it has loaded can't be executed until they reach the I-cache.
+ *
+ * After the instructions have been written, the loader should arrange
+ * to write back any containing D-cache line and invalidate any locations
+ * already in the I-cache.
+ *
+ * You can do that with cache instructions, but those instructions are only available in kernel mode,
+ * and a loader writing instructions for the use of its own process need not be privileged software.
+ *
+ * In the latest MIPS32/64 CPUs, MIPS provides the synci instruction,
+ * which does the whole job for a cache-line-sized chunk of the memory you just loaded:
+ * That is, it arranges a D-cache write-back and an I-cache invalidate.
+ *
+ * To employ synci at user level, you need to know the size of a cache line,
+ * and that can be obtained with a rdhwr SYNCI_Step
+ * from one of the standard “hardware registers”.
+ */
+static int mips32_pracc_sync_cache(struct mips_ejtag *ejtag_info,
+                                                                                       uint32_t start_addr, uint32_t end_addr)
+{
+       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 start_addr to $9 */
+               MIPS32_LW(10,4,8),                                                                      /* Load write end_addr to $10 */
+
+               MIPS32_RDHWR(11, MIPS32_SYNCI_STEP),                            /* $11 = MIPS32_SYNCI_STEP */
+               MIPS32_BEQ(11,0,6),                                                                     /* beq $11, $0, end */
+               MIPS32_NOP,
+                                                                                                                       /* synci_loop : */
+               MIPS32_SYNCI(0,9),                                                                      /* synci 0($9) */
+               MIPS32_SLTU(8,10,9),                                                            /* sltu $8, $10, $9  # $8 = $10 < $9 ? 1 : 0 */
+               MIPS32_BNE(8,0,NEG16(3)),                                                       /* bne $8, $0, synci_loop */
+               MIPS32_ADDU(9, 9, 11),                                                          /* $9 += MIPS32_SYNCI_STEP */
+               MIPS32_SYNC,
+                                                                                                                       /* 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(24)),                                                            /* b start */
+               MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
+       };
+
+       /* TODO remove array */
+       uint32_t *param_in = malloc(2 * sizeof(uint32_t));
+       int retval;
+       param_in[0] = start_addr;
+       param_in[1] = end_addr;
+
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, 2, param_in, 0, NULL, 1);
+
+       free(param_in);
+
+       return retval;
+}
+
+/**
+ * \b mips32_pracc_clean_invalidate_cache
+ *
+ * Writeback D$ and Invalidate I$
+ * so that the instructions written can be visible to CPU
+ */
+static int mips32_pracc_clean_invalidate_cache(struct mips_ejtag *ejtag_info,
+                                                                                                       uint32_t start_addr, uint32_t end_addr)
+{
+       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 start_addr to $9 */
+               MIPS32_LW(10,4,8),                                                                      /* Load write end_addr to $10 */
+               MIPS32_LW(11,8,8),                                                                      /* Load write clsiz to $11 */
+
+                                                                                                                       /* cache_loop: */
+               MIPS32_SLTU(8,10,9),                                                            /* sltu $8, $10, $9  :  $8 <- $10 < $9 ? */
+               MIPS32_BGTZ(8,6),                                                                       /* bgtz $8, end */
+               MIPS32_NOP,
+
+               MIPS32_CACHE(MIPS32_CACHE_D_HIT_WRITEBACK,0,9),         /* cache Hit_Writeback_D, 0($9) */
+               MIPS32_CACHE(MIPS32_CACHE_I_HIT_INVALIDATE,0,9),        /* cache Hit_Invalidate_I, 0($9) */
+
+               MIPS32_ADDU(9,9,11),                                                            /* $9 += $11 */
+
+               MIPS32_B(NEG16(7)),                                                                     /* b cache_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(25)),                                                            /* b start */
+               MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
+       };
+
+       /**
+        * Find cache line size in bytes
+        */
+       uint32_t conf;
+       uint32_t dl, clsiz;
+
+       mips32_cp0_read(ejtag_info, &conf, 16, 1);
+       dl = (conf & MIPS32_CONFIG1_DL_MASK) >> MIPS32_CONFIG1_DL_SHIFT;
+
+       /* dl encoding : dl=1 => 4 bytes, dl=2 => 8 bytes, etc... */
+       clsiz = 0x2 << dl;
+
+       /* TODO remove array */
+       uint32_t *param_in = malloc(3 * sizeof(uint32_t));
+       int retval;
+       param_in[0] = start_addr;
+       param_in[1] = end_addr;
+       param_in[2] = clsiz;
+
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, 3, param_in, 0, NULL, 1);
+
+       free(param_in);
+
+       return retval;
 }
 
+
 int mips32_pracc_write_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size, int count, void *buf)
 {
+       int retval;
+
        switch (size)
        {
                case 1:
-                       return mips32_pracc_write_mem8(ejtag_info, addr, count, (uint8_t*)buf);
+                       retval = mips32_pracc_write_mem8(ejtag_info, addr, count, (uint8_t*)buf);
+                       break;
                case 2:
-                       return mips32_pracc_write_mem16(ejtag_info, addr, count,(uint16_t*)buf);
+                       retval = mips32_pracc_write_mem16(ejtag_info, addr, count,(uint16_t*)buf);
+                       break;
                case 4:
                        if (count == 1)
-                               return mips32_pracc_write_u32(ejtag_info, addr, (uint32_t*)buf);
+                       {
+                               retval = mips32_pracc_write_u32(ejtag_info, addr, (uint32_t*)buf);
+                       }
                        else
-                               return mips32_pracc_write_mem32(ejtag_info, addr, count, (uint32_t*)buf);
+                       {
+                               retval = mips32_pracc_write_mem32(ejtag_info, addr, count, (uint32_t*)buf);
+                       }
+                       break;
+               default:
+                       retval = ERROR_FAIL;
        }
 
-       return ERROR_OK;
+       /**
+        * If we are in the cachable regoion and cache is activated,
+        * we must clean D$ + invalidate I$ after we did the write,
+        * so that changes do not continue to live only in D$, but to be
+        * replicated in I$ also (maybe we wrote the istructions)
+        */
+       uint32_t conf = 0;
+       int cached = 0;
+
+       mips32_cp0_read(ejtag_info, &conf, 16, 0);
+
+       switch (KSEGX(addr))
+       {
+               case KUSEG:
+                       cached = (conf & MIPS32_CONFIG0_KU_MASK) >> MIPS32_CONFIG0_KU_SHIFT;
+                       break;
+               case KSEG0 :
+                       cached = (conf & MIPS32_CONFIG0_K0_MASK) >> MIPS32_CONFIG0_K0_SHIFT;
+                       break;
+               case KSEG1:
+                       /* uncachable segment - nothing to do */
+                       break;
+               case KSEG2:
+               case KSEG3:
+                       cached = (conf & MIPS32_CONFIG0_K23_MASK) >> MIPS32_CONFIG0_K23_SHIFT;
+                       break;
+               default:
+                       /* what ? */
+                       break;
+       }
+
+       /**
+        * Check cachablitiy bits coherency algorithm -
+        * is the region cacheable or uncached.
+        * If cacheable we have to synchronize the cache
+        */
+       if (cached == 0x3)
+       {
+               uint32_t start_addr, end_addr;
+               uint32_t rel;
+
+               start_addr = addr;
+               end_addr = addr + count * size;
+
+               /** select cache synchronisation mechanism based on Architecture Release */
+               rel = (conf & MIPS32_CONFIG0_AR_MASK) >> MIPS32_CONFIG0_AR_SHIFT;
+               switch (rel)
+               {
+                       case MIPS32_ARCH_REL1 :
+                               /* MIPS32/64 Release 1 - we must use cache instruction */
+                               mips32_pracc_clean_invalidate_cache(ejtag_info, start_addr, end_addr);
+                               break;
+                       case MIPS32_ARCH_REL2 :
+                               /* MIPS32/64 Release 2 - we can use synci instruction */
+                               mips32_pracc_sync_cache(ejtag_info, start_addr, end_addr);
+                               break;
+                       default :
+                               /* what ? */
+                               break;
+               }
+       }
+
+       return retval;
 }
 
-int mips32_pracc_write_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint32_t *buf)
+static int mips32_pracc_write_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 $11,($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_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(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_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_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_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),                                                             /* 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_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 */
        };
@@ -599,31 +951,32 @@ int mips32_pracc_write_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int c
 
        memcpy(&param_in[2], buf, count * sizeof(uint32_t));
 
-       mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, \
+       int retval;
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
                count + 2, param_in, 0, NULL, 1);
 
        free(param_in);
 
-       return ERROR_OK;
+       return retval;
 }
 
-int mips32_pracc_write_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *buf)
+static int mips32_pracc_write_u32(struct mips_ejtag *ejtag_info, uint32_t addr, 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(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_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_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 */
        };
@@ -633,47 +986,45 @@ int mips32_pracc_write_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_
        param_in[0] = addr;
        param_in[1] = *buf;
 
-       mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, \
+       return mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
                ARRAY_SIZE(param_in), param_in, 0, NULL, 1);
-
-       return ERROR_OK;
 }
 
-int mips32_pracc_write_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint16_t *buf)
+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_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_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_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_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,8),                                                                     /* 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_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_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),                                                             /* 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_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 */
        };
@@ -689,49 +1040,50 @@ int mips32_pracc_write_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int c
                param_in[i + 2] = buf[i];
        }
 
-       mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, \
+       int retval;
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
                count + 2, param_in, 0, NULL, 1);
 
        free(param_in);
 
-       return ERROR_OK;
+       return retval;
 }
 
-int mips32_pracc_write_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint8_t *buf)
+static int mips32_pracc_write_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint8_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 $11,($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_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_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,8),                                                                     /* 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_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_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),                                                             /* 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_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 */
        };
@@ -748,7 +1100,7 @@ int mips32_pracc_write_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int co
                param_in[i + 2] = buf[i];
        }
 
-       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, \
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
                count + 2, param_in, 0, NULL, 1);
 
        free(param_in);
@@ -760,67 +1112,67 @@ int mips32_pracc_write_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
 {
        static const uint32_t code[] = {
                                                                                                                /* start: */
-               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(1,1*4,2),                                                     /* lw $1,1*4($2) */
-               MIPS32_LW(15,15*4,2),                                                   /* lw $15,15*4($2) */
+               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_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_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(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_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_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_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_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_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 pc */
+               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_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, ARRAY_SIZE(code), code, \
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
                        MIPS32NUMCOREREGS, regs, 0, NULL, 1);
 
        return retval;
@@ -831,71 +1183,71 @@ int mips32_pracc_read_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
        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_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_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_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_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_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 */
        };
 
        int retval;
 
-       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, \
+       retval = mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
                0, NULL, MIPS32NUMCOREREGS, regs, 1);
 
        return retval;
@@ -909,7 +1261,7 @@ int mips32_pracc_read_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
  * 3. data ...
  */
 int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_area *source,
-                                                               int write, uint32_t addr, int count, uint32_t *buf)
+                                                               int write_t, uint32_t addr, int count, uint32_t *buf)
 {
        uint32_t handler_code[] = {
                /* caution when editing, table is modified below */
@@ -954,7 +1306,7 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
        if (source->size < MIPS32_FASTDATA_HANDLER_SIZE)
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 
-       if (write)
+       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 */
@@ -966,9 +1318,14 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
        }
 
        /* write program into RAM */
-       mips32_pracc_write_mem32(ejtag_info, source->address, ARRAY_SIZE(handler_code), handler_code);
+       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%.8x for write handler\n", __func__, source->address);
+       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);
@@ -978,13 +1335,13 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
                if ((retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl)) != ERROR_OK)
                        return retval;
 
-               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
-               mips_ejtag_drscan_32(ejtag_info, &jmp_code[i]);
+               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
+               mips_ejtag_drscan_32_out(ejtag_info, jmp_code[i]);
 
                /* Clear the access pending bit (let the processor eat!) */
                ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_PRACC;
-               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
-               mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
+               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
+               mips_ejtag_drscan_32_out(ejtag_info, ejtag_ctrl);
        }
 
        if ((retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl)) != ERROR_OK)
@@ -992,26 +1349,30 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
 
        /* next fetch to dmseg should be in FASTDATA_AREA, check */
        address = 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;
 
        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, NULL);
+       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_set_instr(ejtag_info, EJTAG_INST_FASTDATA, NULL);
        mips_ejtag_fastdata_scan(ejtag_info, 1, &val);
 
        for (i = 0; i < count; i++)
        {
-               /* Send the data out using fastdata (clears the access pending bit) */
-               if ((retval = mips_ejtag_fastdata_scan(ejtag_info, write, buf++)) != ERROR_OK)
+               if ((retval = mips_ejtag_fastdata_scan(ejtag_info, write_t, buf++)) != ERROR_OK)
                        return retval;
        }
 
@@ -1025,11 +1386,13 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
                return retval;
 
        address = 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;
 
        if (address != MIPS32_PRACC_TEXT)
-               LOG_ERROR("mini program did not return to start\n");
+               LOG_ERROR("mini program did not return to start");
 
        return retval;
 }