Commit 9ab4471c authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files

MIPS: math-emu: Correct delay-slot exception propagation 



Restore EPC at the branch whose delay slot is emulated if the delay-slot
instruction signals.  This is so that code in `fpu_emulator_cop1Handler'
does not see EPC having advanced and mistakenly successfully resume
userland execution from the location at the branch target in that case.
Restoring EPC guarantees an immediate exit from the emulation loop and
if EPC hasn't advanced at all since entering the loop, also issuing the
signal reported by the delay-slot instruction.

Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9701/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 2d83fea7

arch/mips/math-emu/cp1emu.c

+29 −5
Original line number Diff line number Diff line
@@ -1134,6 +1134,14 @@ emul: 
				/*

				 * Branch taken: emulate dslot instruction

				 */

				unsigned long bcpc;



				/*

				 * Remember EPC at the branch to point back

				 * at so that any delay-slot instruction

				 * signal is not silently ignored.

				 */

				bcpc = xcp->cp0_epc;

				xcp->cp0_epc += dec_insn.pc_inc;



				contpc = MIPSInst_SIMM(ir);
@@ -1159,7 +1167,15 @@ emul: 
						 * Single step the non-CP1

						 * instruction in the dslot.

						 */

						return mips_dsemul(xcp, ir, contpc);

						sig = mips_dsemul(xcp, ir,

								  contpc);

						if (sig)

							xcp->cp0_epc = bcpc;

						/*

						 * SIGILL forces out of

						 * the emulation loop.

						 */

						return sig ? sig : SIGILL;

					}

				} else

					contpc = (xcp->cp0_epc + (contpc << 2));
@@ -1174,7 +1190,7 @@ emul: 
					if (cpu_has_mips_2_3_4_5_r)

						goto emul;



					return SIGILL;

					goto bc_sigill;



				case cop1_op:

					goto emul;
@@ -1184,7 +1200,7 @@ emul: 
						/* its one of ours */

						goto emul;



					return SIGILL;

					goto bc_sigill;



				case spec_op:

					switch (MIPSInst_FUNC(ir)) {
@@ -1192,16 +1208,24 @@ emul: 
						if (cpu_has_mips_4_5_r)

							goto emul;



						return SIGILL;

						goto bc_sigill;

					}

					break;



				bc_sigill:

					xcp->cp0_epc = bcpc;

					return SIGILL;

				}



				/*

				 * Single step the non-cp1

				 * instruction in the dslot

				 */

				return mips_dsemul(xcp, ir, contpc);

				sig = mips_dsemul(xcp, ir, contpc);

				if (sig)

					xcp->cp0_epc = bcpc;

				/* SIGILL forces out of the emulation loop.  */

				return sig ? sig : SIGILL;

			} else if (likely) {	/* branch not taken */

				/*

				 * branch likely nullifies

arch/mips/math-emu/dsemul.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc) 


	flush_cache_sigtramp((unsigned long)&fr->emul);



	return SIGILL;		/* force out of emulation loop */

	return 0;

}



int do_dsemulret(struct pt_regs *xcp)

CRA Git | Maintained and supported by SUSTech CRA and CCSE