Commit 70f743d1 authored Jun 16, 2017 by Maciej W. Rozycki Committed by Ralf Baechle Jun 29, 2017

MIPS: math-emu: For MFHC1/MTHC1 also return SIGILL right away

Update commit 1ac94400 ("MIPS: math-emu: Add mfhc1 & mthc1
support.") and like done throughout `cop1Emulate' for other cases also
for the MFHC1 and MTHC1 instructions return SIGILL right away rather
than jumping to a single `return' statement.

Signed-off-by: Maciej W. Rozycki <macro@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/16401/

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 27fe2200

arch/mips/math-emu/cp1emu.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1142,7 +1142,7 @@ emul:

		case mfhc_op:
		if (!cpu_has_mips_r2_r6)
		goto sigill;
		return SIGILL;

		/* copregister rd -> gpr[rt] */
		if (MIPSInst_RT(ir) != 0) {
		@@ -1153,7 +1153,7 @@ emul:

		case mthc_op:
		if (!cpu_has_mips_r2_r6)
		goto sigill;
		return SIGILL;

		/* copregister rd <- gpr[rt] */
		SITOHREG(xcp->regs[MIPSInst_RT(ir)], MIPSInst_RD(ir));
		@@ -1376,7 +1376,6 @@ branch_common:
		xcp->regs[MIPSInst_RS(ir)];
		break;
		default:
		sigill:
		return SIGILL;
		}

Admin message