X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fmips32_pracc.c;h=4f597a5e56090ef76ba710864f1bb6c655b9f9b3;hp=d6351f9ec958df159e0b3072036ddaa4ae381939;hb=f4e03e3b902104f5cf8aab1ea3cd5db2bb36890e;hpb=f370d70670bd5e30befe6fbfbc8d472e760f032b diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c index d6351f9ec9..4f597a5e56 100644 --- a/src/target/mips32_pracc.c +++ b/src/target/mips32_pracc.c @@ -19,50 +19,100 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + +/* +This version has optimized assembly routines for 32 bit operations: +- read word +- write word +- write array of words + +One thing to be aware of is that the MIPS32 cpu will execute the +instruction after a branch instruction (one delay slot). + +For example: + + + LW $2, ($5 +10) + B foo + LW $1, ($2 +100) + +The LW $1, ($2 +100) instruction is also executed. If this is +not wanted a NOP can be inserted: + + LW $2, ($5 +10) + B foo + NOP + LW $1, ($2 +100) + +or the code can be changed to: + + B foo + LW $2, ($5 +10) + LW $1, ($2 +100) + +The original code contained NOPs. I have removed these and moved +the branches. + +I also moved the PRACC_STACK to 0xFF204000. This allows +the use of 16 bits offsets to get pointers to the input +and output area relative to the stack. Note that the stack +isn't really a stack (the stack pointer is not 'moving') +but a FIFO simulated in software. + +These changes result in a 35% speed increase when programming an +external flash. + +More improvement could be gained if the registers do no need +to be preserved but in that case the routines should be aware +OpenOCD is used as a flash programmer or as a debug tool. + +Nico Coesel +*/ + + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include "log.h" #include "mips32.h" #include "mips32_pracc.h" typedef struct { - u32 *local_iparam; + uint32_t *local_iparam; int num_iparam; - u32 *local_oparam; + uint32_t *local_oparam; int num_oparam; - u32 *code; + uint32_t *code; int code_len; - u32 stack[32]; + uint32_t stack[32]; int stack_offset; - mips_ejtag_t *ejtag_info; + struct mips_ejtag *ejtag_info; } mips32_pracc_context; -static int wait_for_pracc_rw(mips_ejtag_t *ejtag_info, u32 *ctrl) +static int wait_for_pracc_rw(struct mips_ejtag *ejtag_info, uint32_t *ctrl) { - u32 ejtag_ctrl; - - while (1) + uint32_t ejtag_ctrl; + + while (1) { mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL); - ejtag_ctrl = EJTAG_CTRL_ROCC | EJTAG_CTRL_PRACC | EJTAG_CTRL_PROBEN | EJTAG_CTRL_SETDEV; + ejtag_ctrl = ejtag_info->ejtag_ctrl; mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl); if (ejtag_ctrl & EJTAG_CTRL_PRACC) break; LOG_DEBUG("DEBUGMODULE: No memory access in progress!\n"); return ERROR_JTAG_DEVICE_ERROR; } - + *ctrl = ejtag_ctrl; return ERROR_OK; } -static int mips32_pracc_exec_read(mips32_pracc_context *ctx, u32 address) +static int mips32_pracc_exec_read(mips32_pracc_context *ctx, uint32_t address) { + struct mips_ejtag *ejtag_info = ctx->ejtag_info; int offset; - u32 ctrl, data; + uint32_t ejtag_ctrl, data; if ((address >= MIPS32_PRACC_PARAM_IN) && (address <= MIPS32_PRACC_PARAM_IN + ctx->num_iparam * 4)) @@ -91,44 +141,53 @@ static int mips32_pracc_exec_read(mips32_pracc_context *ctx, u32 address) { /* TODO: send JMP 0xFF200000 instruction. Hopefully processor jump back * to start of debug vector */ - + data = 0; - LOG_ERROR("Error reading unexpected address"); + LOG_ERROR("Error reading unexpected address %8.8" PRIx32 "", address); return ERROR_JTAG_DEVICE_ERROR; } - + /* Send the data out */ mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_DATA, NULL); mips_ejtag_drscan_32(ctx->ejtag_info, &data); /* Clear the access pending bit (let the processor eat!) */ - ctrl = EJTAG_CTRL_ROCC | EJTAG_CTRL_PROBEN | EJTAG_CTRL_SETDEV; + + 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, &ctrl); - + mips_ejtag_drscan_32(ctx->ejtag_info, &ejtag_ctrl); + + jtag_add_clocks(5); + jtag_execute_queue(); + + return ERROR_OK; } -static int mips32_pracc_exec_write(mips32_pracc_context *ctx, u32 address) +static int mips32_pracc_exec_write(mips32_pracc_context *ctx, uint32_t address) { - u32 ctrl,data; + uint32_t ejtag_ctrl,data; int offset; - + struct mips_ejtag *ejtag_info = ctx->ejtag_info; + mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_DATA, NULL); mips_ejtag_drscan_32(ctx->ejtag_info, &data); - + /* Clear access pending bit */ - ctrl = EJTAG_CTRL_ROCC | EJTAG_CTRL_PROBEN | EJTAG_CTRL_SETDEV; + 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, &ctrl); - + mips_ejtag_drscan_32(ctx->ejtag_info, &ejtag_ctrl); + + jtag_add_clocks(5); + jtag_execute_queue(); + if ((address >= MIPS32_PRACC_PARAM_IN) && (address <= MIPS32_PRACC_PARAM_IN + ctx->num_iparam * 4)) { offset = (address - MIPS32_PRACC_PARAM_IN) / 4; ctx->local_iparam[offset] = data; } - else if ((address >= MIPS32_PRACC_PARAM_OUT ) + else if ((address >= MIPS32_PRACC_PARAM_OUT) && (address <= MIPS32_PRACC_PARAM_OUT + ctx->num_oparam * 4)) { offset = (address - MIPS32_PRACC_PARAM_OUT) / 4; @@ -141,21 +200,21 @@ static int mips32_pracc_exec_write(mips32_pracc_context *ctx, u32 address) } else { - LOG_ERROR("Error writing unexpected address"); + LOG_ERROR("Error writing unexpected address %8.8" PRIx32 "", address); return ERROR_JTAG_DEVICE_ERROR; } - + return ERROR_OK; } -int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, u32 *code, int num_param_in, u32 *param_in, int num_param_out, u32 *param_out, int cycle) +int mips32_pracc_exec(struct mips_ejtag *ejtag_info, int code_len, uint32_t *code, int num_param_in, uint32_t *param_in, int num_param_out, uint32_t *param_out, int cycle) { - u32 ctrl; - u32 address, data; + uint32_t ejtag_ctrl; + uint32_t address, data; mips32_pracc_context ctx; int retval; int pass = 0; - + ctx.local_iparam = param_in; ctx.local_oparam = param_out; ctx.num_iparam = num_param_in; @@ -164,18 +223,20 @@ int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, u32 *code, int nu ctx.code_len = code_len; ctx.ejtag_info = ejtag_info; ctx.stack_offset = 0; - + while (1) { - if ((retval = wait_for_pracc_rw(ejtag_info, &ctrl)) != ERROR_OK) + if ((retval = wait_for_pracc_rw(ejtag_info, &ejtag_ctrl)) != ERROR_OK) return retval; - + address = data = 0; mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL); mips_ejtag_drscan_32(ejtag_info, &address); - + +// printf("Adres: %.8x\n", address); + /* Check for read or write */ - if (ctrl & EJTAG_CTRL_PRNW) + if (ejtag_ctrl & EJTAG_CTRL_PRNW) { if ((retval = mips32_pracc_exec_write(&ctx, address)) != ERROR_OK) return retval; @@ -189,42 +250,46 @@ int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, u32 *code, int nu { break; } - + if ((retval = mips32_pracc_exec_read(&ctx, address)) != ERROR_OK) return retval; + } - + if (cycle == 0) break; } - + /* stack sanity check */ if (ctx.stack_offset != 0) { LOG_DEBUG("Pracc Stack not zero"); } - + return ERROR_OK; } -int mips32_pracc_read_mem(mips_ejtag_t *ejtag_info, u32 addr, int size, int count, void *buf) +int mips32_pracc_read_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size, int count, void *buf) { switch (size) { case 1: - return mips32_pracc_read_mem8(ejtag_info, addr, count, (u8*)buf); + return mips32_pracc_read_mem8(ejtag_info, addr, count, (uint8_t*)buf); case 2: - return mips32_pracc_read_mem16(ejtag_info, addr, count, (u16*)buf); + return mips32_pracc_read_mem16(ejtag_info, addr, count, (uint16_t*)buf); case 4: - return mips32_pracc_read_mem32(ejtag_info, addr, count, (u32*)buf); + if (count == 1) + return mips32_pracc_read_u32(ejtag_info, addr, (uint32_t*)buf); + else + return mips32_pracc_read_mem32(ejtag_info, addr, count, (uint32_t*)buf); } - + return ERROR_OK; } -int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *buf) -{ - u32 code[] = { +int mips32_pracc_read_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint32_t *buf) +{ + 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 */ @@ -232,60 +297,62 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 * MIPS32_SW(8,0,15), /* sw $8,($15) */ MIPS32_SW(9,0,15), /* sw $9,($15) */ MIPS32_SW(10,0,15), /* sw $10,($15) */ - MIPS32_SW(11,0,15), /* sw $10,($15) */ - + MIPS32_SW(11,0,15), /* sw $11,($15) */ + MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)), /* $8 = MIPS32_PRACC_PARAM_IN */ MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)), - MIPS32_LW(9,0,8), /* $9=mem[$8]; read addr */ - MIPS32_LW(10,4,8), /* $10=mem[$8+4]; read count */ - MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)), /* $11=MIPS32_PRACC_PARAM_OUT */ + MIPS32_LW(9,0,8), /* $9 = mem[$8]; read addr */ + MIPS32_LW(10,4,8), /* $10 = mem[$8 + 4]; read count */ + MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)), /* $11 = MIPS32_PRACC_PARAM_OUT */ MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)), MIPS32_NOP, /* loop: */ MIPS32_BEQ(0,10,9), /* beq 0, $10, end */ MIPS32_NOP, - - MIPS32_LW(12,0,9), /* lw $12,0($9), Load $12 with the word @mem[$9] */ - MIPS32_SW(12,0,11), /* sw $12,0($11) */ - + + MIPS32_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(9,9,4), /* $1 += 4 */ + MIPS32_ADDI(11,11,4), /* $11 += 4 */ + MIPS32_NOP, MIPS32_B(NEG16(9)), /* b loop */ MIPS32_NOP, /* end: */ - MIPS32_LW(11,0,15), /* sw $11,($15) */ - MIPS32_LW(10,0,15), /* sw $10,($15) */ - MIPS32_LW(9,0,15), /* sw $9,($15) */ - MIPS32_LW(8,0,15), /* sw $8,($15) */ + MIPS32_LW(11,0,15), /* lw $11,($15) */ + MIPS32_LW(10,0,15), /* lw $10,($15) */ + MIPS32_LW(9,0,15), /* lw $9,($15) */ + MIPS32_LW(8,0,15), /* lw $8,($15) */ MIPS32_MFC0(15,31,0), /* move COP0 DeSave to $15 */ MIPS32_NOP, MIPS32_B(NEG16(31)), /* b start */ MIPS32_NOP, }; - - int retval; + + int retval = ERROR_OK; int blocksize; int bytesread; - u32 param_in[2]; - + uint32_t param_in[2]; + bytesread = 0; - + while (count > 0) - { + { blocksize = count; if (count > 0x400) blocksize = 0x400; - + param_in[0] = addr; param_in[1] = blocksize; - - if ((retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \ + + if ((retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, sizeof(param_in)/sizeof(param_in[0]), param_in, blocksize, &buf[bytesread], 1)) != ERROR_OK) + { return retval; - + } + count -= blocksize; addr += blocksize; bytesread += blocksize; @@ -294,9 +361,43 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 * return retval; } -int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *buf) +int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *buf) { - u32 code[] = { + 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_LW(8,NEG16(MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_IN), 15), //load R8 @ param_in[0] = address + + MIPS32_LW(8,0,8), /* lw $8,0($8), Load $8 with the word @mem[$8] */ + MIPS32_SW(8,NEG16(MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_OUT),15), /* sw $8,0($9) */ + + MIPS32_LW(8,0,15), /* lw $8,($15) */ + MIPS32_B(NEG16(9)), //was 17 /* b start */ + MIPS32_MFC0(15,31,0), //this instruction will be executed (MIPS executes instruction after jump) /* move COP0 DeSave to $15 */ + MIPS32_NOP, + }; + + int retval = ERROR_OK; + uint32_t param_in[1]; + + param_in[0] = addr; + + if ((retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, + sizeof(param_in)/sizeof(param_in[0]), param_in, sizeof(uint32_t), buf, 1)) != ERROR_OK) + { + return retval; + } + + return retval; +} + +int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint16_t *buf) +{ + 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 */ @@ -304,33 +405,33 @@ int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 * MIPS32_SW(8,0,15), /* sw $8,($15) */ MIPS32_SW(9,0,15), /* sw $9,($15) */ MIPS32_SW(10,0,15), /* sw $10,($15) */ - MIPS32_SW(11,0,15), /* sw $10,($15) */ - + MIPS32_SW(11,0,15), /* sw $11,($15) */ + MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)), /* $8 = MIPS32_PRACC_PARAM_IN */ MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)), - MIPS32_LW(9,0,8), /* $9=mem[$8]; read addr */ - MIPS32_LW(10,4,8), /* $10=mem[$8+4]; read count */ - MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)), /* $11=MIPS32_PRACC_PARAM_OUT */ + MIPS32_LW(9,0,8), /* $9 = mem[$8]; read addr */ + MIPS32_LW(10,4,8), /* $10 = mem[$8 + 4]; read count */ + MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)), /* $11 = MIPS32_PRACC_PARAM_OUT */ MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)), MIPS32_NOP, /* loop: */ MIPS32_BEQ(0,10,9), /* beq 0, $10, end */ MIPS32_NOP, - - MIPS32_LHU(12,0,9), /* lw $12,0($9), Load $12 with the halfword @mem[$9] */ - MIPS32_SW(12,0,11), /* sw $12,0($11) */ - + + MIPS32_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(9,9,2), /* $9 += 2 */ + MIPS32_ADDI(11,11,4), /* $11 += 4 */ MIPS32_NOP, MIPS32_B(NEG16(9)), /* b loop */ MIPS32_NOP, - MIPS32_LW(11,0,15), /* sw $11,($15) */ - MIPS32_LW(10,0,15), /* sw $10,($15) */ - MIPS32_LW(9,0,15), /* sw $9,($15) */ - MIPS32_LW(8,0,15), /* sw $8,($15) */ + MIPS32_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_MFC0(15,31,0), /* move COP0 DeSave to $15 */ MIPS32_NOP, MIPS32_B(NEG16(31)), /* b start */ @@ -338,44 +439,44 @@ int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 * }; // /* TODO remove array */ - u32 param_out[count]; + uint32_t param_out[count]; int i; - + // int retval; int blocksize; int bytesread; - u32 param_in[2]; - + uint32_t param_in[2]; + bytesread = 0; - + //while (count > 0) - { + { blocksize = count; if (count > 0x400) blocksize = 0x400; - + param_in[0] = addr; param_in[1] = blocksize; - + mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \ sizeof(param_in)/sizeof(param_in[0]), param_in, count, param_out, 1); - + // count -= blocksize; // addr += blocksize; // bytesread += blocksize; } - + for (i = 0; i < count; i++) { buf[i] = param_out[i]; } - + return ERROR_OK; } -int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *buf) +int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint8_t *buf) { - u32 code[] = { + 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 */ @@ -383,67 +484,67 @@ int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *bu MIPS32_SW(8,0,15), /* sw $8,($15) */ MIPS32_SW(9,0,15), /* sw $9,($15) */ MIPS32_SW(10,0,15), /* sw $10,($15) */ - MIPS32_SW(11,0,15), /* sw $10,($15) */ - + MIPS32_SW(11,0,15), /* sw $11,($15) */ + MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)), /* $8 = MIPS32_PRACC_PARAM_IN */ MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)), - MIPS32_LW(9,0,8), /* $9=mem[$8]; read addr */ - MIPS32_LW(10,4,8), /* $10=mem[$8+4]; read count */ - MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)), /* $11=MIPS32_PRACC_PARAM_OUT */ + MIPS32_LW(9,0,8), /* $9 = mem[$8]; read addr */ + MIPS32_LW(10,4,8), /* $10 = mem[$8 + 4]; read count */ + MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)), /* $11 = MIPS32_PRACC_PARAM_OUT */ MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)), MIPS32_NOP, /* loop: */ MIPS32_BEQ(0,10,9), /* beq 0, $10, end */ MIPS32_NOP, - - MIPS32_LBU(12,0,9), /* lw $12,0($9), Load t4 with the byte @mem[t1] */ - MIPS32_SW(12,0,11), /* sw $12,0($11) */ - + + MIPS32_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(9,9,1), /* $9 += 1 */ + MIPS32_ADDI(11,11,4), /* $11 += 4 */ MIPS32_NOP, MIPS32_B(NEG16(9)), /* b loop */ MIPS32_NOP, /* end: */ - MIPS32_LW(11,0,15), /* sw $11,($15) */ - MIPS32_LW(10,0,15), /* sw $10,($15) */ - MIPS32_LW(9,0,15), /* sw $9,($15) */ - MIPS32_LW(8,0,15), /* sw $8,($15) */ + MIPS32_LW(11,0,15), /* lw $11,($15) */ + MIPS32_LW(10,0,15), /* lw $10,($15) */ + MIPS32_LW(9,0,15), /* lw $9,($15) */ + MIPS32_LW(8,0,15), /* lw $8,($15) */ MIPS32_MFC0(15,31,0), /* move COP0 DeSave to $15 */ MIPS32_NOP, MIPS32_B(NEG16(31)), /* b start */ MIPS32_NOP, }; - + // /* TODO remove array */ - u32 param_out[count]; + uint32_t param_out[count]; int i; - + // int retval; int blocksize; int bytesread; - u32 param_in[2]; - + uint32_t param_in[2]; + bytesread = 0; - + // while (count > 0) - { + { blocksize = count; if (count > 0x400) blocksize = 0x400; - + param_in[0] = addr; param_in[1] = blocksize; - + mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \ sizeof(param_in)/sizeof(param_in[0]), param_in, count, param_out, 1); - + // count -= blocksize; // addr += blocksize; // bytesread += blocksize; } - + for (i = 0; i < count; i++) { buf[i] = param_out[i]; @@ -452,24 +553,29 @@ int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *bu return ERROR_OK; } -int mips32_pracc_write_mem(mips_ejtag_t *ejtag_info, u32 addr, int size, int count, void *buf) +int mips32_pracc_write_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size, int count, void *buf) { switch (size) { case 1: - return mips32_pracc_write_mem8(ejtag_info, addr, count, (u8*)buf); + return mips32_pracc_write_mem8(ejtag_info, addr, count, (uint8_t*)buf); case 2: - return mips32_pracc_write_mem16(ejtag_info, addr, count,(u16*)buf); + return mips32_pracc_write_mem16(ejtag_info, addr, count,(uint16_t*)buf); case 4: - return mips32_pracc_write_mem32(ejtag_info, addr, count, (u32*)buf); + if (count == 1) + return mips32_pracc_write_u32(ejtag_info, addr, (uint32_t*)buf); + else + return mips32_pracc_write_mem32(ejtag_info, addr, count, (uint32_t*)buf); } - + return ERROR_OK; } -int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *buf) +int mips32_pracc_write_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint32_t *buf) { - u32 code[] = { + +//NC: use destination pointer as loop counter (last address is in $10) + 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 */ @@ -477,54 +583,79 @@ int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 MIPS32_SW(8,0,15), /* sw $8,($15) */ MIPS32_SW(9,0,15), /* sw $9,($15) */ MIPS32_SW(10,0,15), /* sw $10,($15) */ - MIPS32_SW(11,0,15), /* sw $10,($15) */ - - MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)), /* $8 = MIPS32_PRACC_PARAM_IN */ - MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)), + MIPS32_SW(11,0,15), /* sw $11,($15) */ + + MIPS32_ADDI(8,15,NEG16(MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_IN)), //$8= MIPS32_PRACC_PARAM_IN MIPS32_LW(9,0,8), /* Load write addr to $9 */ - MIPS32_LW(10,4,8), /* Load write count to $10 */ - MIPS32_ADDI(8,8,8), /* $8+=8 */ - MIPS32_NOP, - /* loop: */ - MIPS32_BEQ(0,10,9), /* beq $0, $10, end */ - MIPS32_NOP, - + MIPS32_LW(10,4,8), //last address /* 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_ADDI(10,10,NEG16(1)), /* $10-- */ - MIPS32_ADDI(9,9,4), /* $9+=4 */ - MIPS32_ADDI(8,8,4), /* $8+=4 */ - MIPS32_NOP, - MIPS32_B(NEG16(9)), /* b loop */ - MIPS32_NOP, + + MIPS32_ADDI(9,9,4), /* $9 += 4 */ + MIPS32_BNE(10,9,NEG16(4)), //was 9 BNE $10, 9, loop /* b loop */ + MIPS32_ADDI(8,8,4), //this instruction is part of the loop (one delay slot)! /* $8 += 4 */ /* end: */ - MIPS32_LW(11,0,15), /* sw $11,($15) */ - MIPS32_LW(10,0,15), /* sw $10,($15) */ - MIPS32_LW(9,0,15), /* sw $9,($15) */ - MIPS32_LW(8,0,15), /* sw $8,($15) */ + MIPS32_LW(11,0,15), /* lw $11,($15) */ + MIPS32_LW(10,0,15), /* lw $10,($15) */ + MIPS32_LW(9,0,15), /* lw $9,($15) */ + MIPS32_LW(8,0,15), /* lw $8,($15) */ + MIPS32_B(NEG16(21)), //was 30 /* b start */ MIPS32_MFC0(15,31,0), /* move COP0 DeSave to $15 */ - MIPS32_NOP, - MIPS32_B(NEG16(30)), /* b start */ + MIPS32_NOP, //this one will not be executed + }; + + /* TODO remove array */ + uint32_t param_in[count + 2]; + param_in[0] = addr; + param_in[1] = addr + count * sizeof(uint32_t); //last address + + memcpy(¶m_in[2], buf, count * sizeof(uint32_t)); + + mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \ + sizeof(param_in)/sizeof(param_in[0]),param_in, 0, NULL, 1); + + return ERROR_OK; +} + +int mips32_pracc_write_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *buf) +{ + 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_LW(8,NEG16((MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_IN)-4), 15), //load R8 @ param_in[1] = data + MIPS32_LW(9,NEG16(MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_IN), 15), //load R9 @ param_in[0] = address + + MIPS32_SW(8,0,9), /* sw $8,0($9) */ + + MIPS32_LW(9,0,15), /* lw $9,($15) */ + MIPS32_LW(8,0,15), /* lw $8,($15) */ + MIPS32_B(NEG16(11)), /* b start */ + MIPS32_MFC0(15,31,0), /* move COP0 DeSave to $15 */ MIPS32_NOP, }; - + /* TODO remove array */ - u32 param_in[count+2]; + uint32_t param_in[1 + 1]; param_in[0] = addr; - param_in[1] = count; - - memcpy(¶m_in[2], buf, count * sizeof(u32)); - + param_in[1] = *buf; + mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \ sizeof(param_in)/sizeof(param_in[0]),param_in, 0, NULL, 1); return ERROR_OK; } -int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *buf) +int mips32_pracc_write_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint16_t *buf) { - u32 code[] = { + 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 */ @@ -532,59 +663,59 @@ int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 MIPS32_SW(8,0,15), /* sw $8,($15) */ MIPS32_SW(9,0,15), /* sw $9,($15) */ MIPS32_SW(10,0,15), /* sw $10,($15) */ - MIPS32_SW(11,0,15), /* sw $10,($15) */ - + MIPS32_SW(11,0,15), /* sw $11,($15) */ + MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)), /* $8 = MIPS32_PRACC_PARAM_IN */ MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)), MIPS32_LW(9,0,8), /* Load write addr to $9 */ MIPS32_LW(10,4,8), /* Load write count to $10 */ - MIPS32_ADDI(8,8,8), /* $8+=8 */ + MIPS32_ADDI(8,8,8), /* $8 += 8 */ MIPS32_NOP, /* loop: */ MIPS32_BEQ(0,10,9), /* beq $0, $10, end */ MIPS32_NOP, - + MIPS32_LW(11,0,8), /* lw $11,0($8), Load $11 with the word @mem[$8] */ MIPS32_SH(11,0,9), /* sh $11,0($9) */ - + MIPS32_ADDI(10,10,NEG16(1)), /* $10-- */ - MIPS32_ADDI(9,9,2), /* $9+=2 */ - MIPS32_ADDI(8,8,4), /* $8+=4 */ - + MIPS32_ADDI(9,9,2), /* $9 += 2 */ + MIPS32_ADDI(8,8,4), /* $8 += 4 */ + MIPS32_NOP, MIPS32_B(NEG16(9)), /* b loop */ MIPS32_NOP, /* end: */ - MIPS32_LW(11,0,15), /* sw $11,($15) */ - MIPS32_LW(10,0,15), /* sw $10,($15) */ - MIPS32_LW(9,0,15), /* sw $9,($15) */ - MIPS32_LW(8,0,15), /* sw $8,($15) */ + MIPS32_LW(11,0,15), /* lw $11,($15) */ + MIPS32_LW(10,0,15), /* lw $10,($15) */ + MIPS32_LW(9,0,15), /* lw $9,($15) */ + MIPS32_LW(8,0,15), /* lw $8,($15) */ MIPS32_MFC0(15,31,0), /* move COP0 DeSave to $15 */ MIPS32_NOP, MIPS32_B(NEG16(30)), /* b start */ MIPS32_NOP, }; - + /* TODO remove array */ - u32 param_in[count+2]; + uint32_t param_in[count + 2]; int i; param_in[0] = addr; param_in[1] = count; - + for (i = 0; i < count; i++) { - param_in[i+2] = buf[i]; + param_in[i + 2] = buf[i]; } - + mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \ sizeof(param_in)/sizeof(param_in[0]), param_in, 0, NULL, 1); return ERROR_OK; } -int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *buf) +int mips32_pracc_write_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint8_t *buf) { - u32 code[] = { + 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 */ @@ -592,74 +723,71 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *b MIPS32_SW(8,0,15), /* sw $8,($15) */ MIPS32_SW(9,0,15), /* sw $9,($15) */ MIPS32_SW(10,0,15), /* sw $10,($15) */ - MIPS32_SW(11,0,15), /* sw $10,($15) */ - + MIPS32_SW(11,0,15), /* sw $11,($15) */ + MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)), /* $8 = MIPS32_PRACC_PARAM_IN */ MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)), MIPS32_LW(9,0,8), /* Load write addr to $9 */ MIPS32_LW(10,4,8), /* Load write count to $10 */ - MIPS32_ADDI(8,8,8), /* $8+=8 */ + MIPS32_ADDI(8,8,8), /* $8 += 8 */ MIPS32_NOP, /* loop: */ MIPS32_BEQ(0,10,9), /* beq $0, $10, end */ MIPS32_NOP, - + MIPS32_LW(11,0,8), /* lw $11,0($8), Load $11 with the word @mem[$8] */ MIPS32_SB(11,0,9), /* sb $11,0($9) */ - + MIPS32_ADDI(10,10,NEG16(1)), /* $10-- */ - MIPS32_ADDI(9,9,1), /* $9+=1 */ - MIPS32_ADDI(8,8,4), /* $8+=4 */ - + MIPS32_ADDI(9,9,1), /* $9 += 1 */ + MIPS32_ADDI(8,8,4), /* $8 += 4 */ + MIPS32_NOP, MIPS32_B(NEG16(9)), /* b loop */ MIPS32_NOP, /* end: */ - MIPS32_LW(11,0,15), /* sw $11,($15) */ - MIPS32_LW(10,0,15), /* sw $10,($15) */ - MIPS32_LW(9,0,15), /* sw $9,($15) */ - MIPS32_LW(8,0,15), /* sw $8,($15) */ + MIPS32_LW(11,0,15), /* lw $11,($15) */ + MIPS32_LW(10,0,15), /* lw $10,($15) */ + MIPS32_LW(9,0,15), /* lw $9,($15) */ + MIPS32_LW(8,0,15), /* lw $8,($15) */ MIPS32_MFC0(15,31,0), /* move COP0 DeSave to $15 */ MIPS32_NOP, MIPS32_B(NEG16(30)), /* b start */ MIPS32_NOP, }; - + /* TODO remove array */ - u32 param_in[count+2]; + uint32_t param_in[count + 2]; int retval; int i; param_in[0] = addr; param_in[1] = count; - + for (i = 0; i < count; i++) { - param_in[i+2] = buf[i]; + param_in[i + 2] = buf[i]; } - + retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \ sizeof(param_in)/sizeof(param_in[0]), param_in, 0, NULL, 1); return retval; } -int mips32_pracc_write_regs(mips_ejtag_t *ejtag_info, u32 *regs) +int mips32_pracc_write_regs(struct mips_ejtag *ejtag_info, uint32_t *regs) { - /* TODO restore all core registers */ - - u32 code[] = { + uint32_t code[] = { /* start: */ - MIPS32_MTC0(2,31,0), /* move $2 to COP0 DeSave */ MIPS32_LUI(2,UPPER16(MIPS32_PRACC_PARAM_IN)), /* $2 = MIPS32_PRACC_PARAM_IN */ MIPS32_ORI(2,2,LOWER16(MIPS32_PRACC_PARAM_IN)), - /*MIPS32_LW(0,0*4,2),*/ /* lw $0,0*4($2) */ MIPS32_LW(1,1*4,2), /* lw $1,1*4($2) */ - MIPS32_MFC0(2,31,0), /* move COP0 DeSave to $2 */ - - MIPS32_MTC0(1,31,0), /* move $1 to COP0 DeSave */ + MIPS32_LW(15,15*4,2), /* lw $15,15*4($2) */ + MIPS32_MTC0(15,31,0), /* move $15 to COP0 DeSave */ + MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)), /* $15 = MIPS32_PRACC_STACK */ + MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)), + MIPS32_SW(1,0,15), /* sw $1,($15) */ MIPS32_LUI(1,UPPER16(MIPS32_PRACC_PARAM_IN)), /* $1 = MIPS32_PRACC_PARAM_IN */ MIPS32_ORI(1,1,LOWER16(MIPS32_PRACC_PARAM_IN)), - MIPS32_LW(2,2*4,1), /* lw $2,2*4($1) */ MIPS32_LW(3,3*4,1), /* lw $3,3*4($1) */ MIPS32_LW(4,4*4,1), /* lw $4,4*4($1) */ MIPS32_LW(5,5*4,1), /* lw $5,5*4($1) */ @@ -672,7 +800,6 @@ int mips32_pracc_write_regs(mips_ejtag_t *ejtag_info, u32 *regs) MIPS32_LW(12,12*4,1), /* lw $12,12*4($1) */ MIPS32_LW(13,13*4,1), /* lw $13,13*4($1) */ MIPS32_LW(14,14*4,1), /* lw $14,14*4($1) */ - MIPS32_LW(15,15*4,1), /* lw $15,15*4($1) */ MIPS32_LW(16,16*4,1), /* lw $16,16*4($1) */ MIPS32_LW(17,17*4,1), /* lw $17,17*4($1) */ MIPS32_LW(18,18*4,1), /* lw $18,18*4($1) */ @@ -689,24 +816,39 @@ int mips32_pracc_write_regs(mips_ejtag_t *ejtag_info, u32 *regs) MIPS32_LW(29,29*4,1), /* lw $29,29*4($1) */ MIPS32_LW(30,30*4,1), /* lw $30,30*4($1) */ MIPS32_LW(31,31*4,1), /* lw $31,31*4($1) */ - - MIPS32_MFC0(1,31,0), /* move COP0 DeSave to $1 */ + + MIPS32_LW(2,32*4,1), /* lw $2,32*4($1) */ + MIPS32_MTC0(2,12,0), /* move $2 to status */ + MIPS32_LW(2,33*4,1), /* lw $2,33*4($1) */ + MIPS32_MTLO(2), /* move $2 to lo */ + MIPS32_LW(2,34*4,1), /* lw $2,34*4($1) */ + MIPS32_MTHI(2), /* move $2 to hi */ + MIPS32_LW(2,35*4,1), /* lw $2,35*4($1) */ + MIPS32_MTC0(2,8,0), /* move $2 to badvaddr */ + MIPS32_LW(2,36*4,1), /* lw $2,36*4($1) */ + MIPS32_MTC0(2,13,0), /* move $2 to cause*/ + MIPS32_LW(2,37*4,1), /* lw $2,37*4($1) */ + MIPS32_MTC0(2,24,0), /* move $2 to pc */ + + MIPS32_LW(2,2*4,1), /* lw $2,2*4($1) */ + MIPS32_LW(1,0,15), /* lw $1,($15) */ + MIPS32_MFC0(15,31,0), /* move COP0 DeSave to $15 */ MIPS32_NOP, - MIPS32_B(NEG16(41)), /* b start */ + MIPS32_B(NEG16(55)), /* b start */ MIPS32_NOP, }; - + int retval; - + retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \ - 32, regs, 0, NULL, 1); - + 38, regs, 0, NULL, 1); + return retval; } -int mips32_pracc_read_regs(mips_ejtag_t *ejtag_info, u32 *regs) +int mips32_pracc_read_regs(struct mips_ejtag *ejtag_info, uint32_t *regs) { - u32 code[] = { + 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 */ @@ -751,12 +893,12 @@ int mips32_pracc_read_regs(mips_ejtag_t *ejtag_info, u32 *regs) MIPS32_SW(29,29*4,1), /* sw $29,29*4($1) */ MIPS32_SW(30,30*4,1), /* sw $30,30*4($1) */ MIPS32_SW(31,31*4,1), /* sw $31,31*4($1) */ - + MIPS32_MFC0(2,12,0), /* move status to $2 */ MIPS32_SW(2,32*4,1), /* sw $2,32*4($1) */ - MIPS32_LO(2), /* move lo to $2 */ + MIPS32_MFLO(2), /* move lo to $2 */ MIPS32_SW(2,33*4,1), /* sw $2,33*4($1) */ - MIPS32_HI(2), /* move hi to $2 */ + MIPS32_MFHI(2), /* move hi to $2 */ MIPS32_SW(2,34*4,1), /* sw $2,34*4($1) */ MIPS32_MFC0(2,8,0), /* move badvaddr to $2 */ MIPS32_SW(2,35*4,1), /* sw $2,35*4($1) */ @@ -764,19 +906,19 @@ int mips32_pracc_read_regs(mips_ejtag_t *ejtag_info, u32 *regs) MIPS32_SW(2,36*4,1), /* sw $2,36*4($1) */ MIPS32_MFC0(2,24,0), /* move pc to $2 */ MIPS32_SW(2,37*4,1), /* sw $2,37*4($1) */ - - MIPS32_LW(2,0,15), /* sw $2,($15) */ - MIPS32_LW(1,0,15), /* sw $1,($15) */ + + MIPS32_LW(2,0,15), /* lw $2,($15) */ + MIPS32_LW(1,0,15), /* lw $1,($15) */ MIPS32_MFC0(15,31,0), /* move COP0 DeSave to $15 */ MIPS32_NOP, MIPS32_B(NEG16(60)), /* b start */ MIPS32_NOP, }; - + int retval; - + retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \ 0, NULL, 38, regs, 1); - + return retval; }