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;
static int mips32_pracc_exec_read(mips32_pracc_context *ctx, u32 address)
{
+ mips_ejtag_t *ejtag_info = ctx->ejtag_info;
int offset;
- u32 ctrl, data;
+ u32 ejtag_ctrl, data;
if ((address >= MIPS32_PRACC_PARAM_IN)
&& (address <= MIPS32_PRACC_PARAM_IN + ctx->num_iparam * 4))
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);
return ERROR_OK;
}
static int mips32_pracc_exec_write(mips32_pracc_context *ctx, u32 address)
{
- u32 ctrl,data;
+ u32 ejtag_ctrl,data;
int offset;
+ mips_ejtag_t *ejtag_info = ctx->ejtag_info;
mips_ejtag_set_instr(ctx->ejtag_info, EJTAG_INST_DATA, NULL);
mips_ejtag_drscan_32(ctx->ejtag_info, &data);
/* 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);
if ((address >= MIPS32_PRACC_PARAM_IN)
&& (address <= MIPS32_PRACC_PARAM_IN + ctx->num_iparam * 4))
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)
{
- u32 ctrl;
+ u32 ejtag_ctrl;
u32 address, data;
mips32_pracc_context ctx;
int retval;
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_drscan_32(ejtag_info, &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;
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_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=ERROR_OK;
+ int retval = ERROR_OK;
int blocksize;
int bytesread;
u32 param_in[2];
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_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 */
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_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_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_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_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_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_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_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 */
int mips32_pracc_write_regs(mips_ejtag_t *ejtag_info, u32 *regs)
{
- /* TODO restore all core registers */
-
u32 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) */
MIPS32_LW(12,12*4,1), /* lw $12,12*4($1) */
MIPS32_LW(13,13*4,1), /* lw $13,13*4($1) */
MIPS32_LW(14,14*4,1), /* lw $14,14*4($1) */
- MIPS32_LW(15,15*4,1), /* lw $15,15*4($1) */
MIPS32_LW(16,16*4,1), /* lw $16,16*4($1) */
MIPS32_LW(17,17*4,1), /* lw $17,17*4($1) */
MIPS32_LW(18,18*4,1), /* lw $18,18*4($1) */
MIPS32_LW(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;
}
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) */
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 */