X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fmips32_pracc.c;h=d641956d113d1b6d4ff792f39a5f2f287dcad7d4;hp=d6351f9ec958df159e0b3072036ddaa4ae381939;hb=503bb08f9993c59a4b3206600555a42fd18459b6;hpb=f370d70670bd5e30befe6fbfbc8d472e760f032b

diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c
index d6351f9ec9..d641956d11 100644
--- a/src/target/mips32_pracc.c
+++ b/src/target/mips32_pracc.c
@@ -47,7 +47,7 @@ static int wait_for_pracc_rw(mips_ejtag_t *ejtag_info, u32 *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;
@@ -61,8 +61,9 @@ static int wait_for_pracc_rw(mips_ejtag_t *ejtag_info, u32 *ctrl)
 
 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))
@@ -102,25 +103,26 @@ static int mips32_pracc_exec_read(mips32_pracc_context *ctx, u32 address)
 	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))
@@ -150,7 +152,7 @@ static int mips32_pracc_exec_write(mips32_pracc_context *ctx, u32 address)
 
 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;
@@ -167,7 +169,7 @@ int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, u32 *code, int nu
 	
 	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;
@@ -175,7 +177,7 @@ int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, u32 *code, int nu
 		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;
@@ -232,7 +234,7 @@ 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)),
@@ -256,17 +258,17 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *
 		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];
@@ -282,9 +284,11 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *
 		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;
@@ -304,7 +308,7 @@ 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)),
@@ -327,10 +331,10 @@ int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *
 		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 */
@@ -383,7 +387,7 @@ 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)),
@@ -406,10 +410,10 @@ int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *bu
 		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 */
@@ -477,7 +481,7 @@ 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_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)),
@@ -499,10 +503,10 @@ int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32
 		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 */
@@ -532,7 +536,7 @@ 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)),
@@ -555,10 +559,10 @@ int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16
 		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 */
@@ -592,7 +596,7 @@ 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)),
@@ -615,10 +619,10 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *b
 		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 */
@@ -645,21 +649,18 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *b
 
 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) */
@@ -672,7 +673,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) */
@@ -690,16 +690,31 @@ int mips32_pracc_write_regs(mips_ejtag_t *ejtag_info, u32 *regs)
 		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;
 }
@@ -754,9 +769,9 @@ int mips32_pracc_read_regs(mips_ejtag_t *ejtag_info, u32 *regs)
 		
 		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) */
@@ -765,8 +780,8 @@ int mips32_pracc_read_regs(mips_ejtag_t *ejtag_info, u32 *regs)
 		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 */