Commit 70f743d1 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle

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: default avatarMaciej 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 27fe2200
...@@ -1142,7 +1142,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1142,7 +1142,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
case mfhc_op: case mfhc_op:
if (!cpu_has_mips_r2_r6) if (!cpu_has_mips_r2_r6)
goto sigill; return SIGILL;
/* copregister rd -> gpr[rt] */ /* copregister rd -> gpr[rt] */
if (MIPSInst_RT(ir) != 0) { if (MIPSInst_RT(ir) != 0) {
...@@ -1153,7 +1153,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1153,7 +1153,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
case mthc_op: case mthc_op:
if (!cpu_has_mips_r2_r6) if (!cpu_has_mips_r2_r6)
goto sigill; return SIGILL;
/* copregister rd <- gpr[rt] */ /* copregister rd <- gpr[rt] */
SITOHREG(xcp->regs[MIPSInst_RT(ir)], MIPSInst_RD(ir)); SITOHREG(xcp->regs[MIPSInst_RT(ir)], MIPSInst_RD(ir));
...@@ -1376,7 +1376,6 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1376,7 +1376,6 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
xcp->regs[MIPSInst_RS(ir)]; xcp->regs[MIPSInst_RS(ir)];
break; break;
default: default:
sigill:
return SIGILL; return SIGILL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment