leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MIPS: math-emu: dsemul: Reduce `get_isa16_mode' clutter

Browse Source 
Signed-off-by: Maciej W. Rozycki <macro@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/12178/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Maciej W. Rozycki 2016-01-22 05:21:47 +00:00 committed by Ralf Baechle
parent 29e2800348
commit 6d7b14151d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/mips/math-emu/dsemul.c
View File

@ -38,6 +38,7 @@ struct emuframe {
*/ */
int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc) int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
{ {
int isa16 = get_isa16_mode(regs->cp0_epc);
mips_instruction break_math; mips_instruction break_math;
struct emuframe __user *fr; struct emuframe __user *fr;
int err; int err;
@ -47,7 +48,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
return -1; return -1;
/* microMIPS instructions */ /* microMIPS instructions */
if (get_isa16_mode(regs->cp0_epc)) { if (isa16) {
union mips_instruction insn = { .word = ir }; union mips_instruction insn = { .word = ir };
/* NOP16 aka MOVE16 $0, $0 */ /* NOP16 aka MOVE16 $0, $0 */
@ -81,7 +82,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
* multiprocessor support. For Linux we use a BREAK 514 * multiprocessor support. For Linux we use a BREAK 514
* instruction causing a breakpoint exception. * instruction causing a breakpoint exception.
*/ */
break_math = BREAK_MATH(get_isa16_mode(regs->cp0_epc)); break_math = BREAK_MATH(isa16);
/* Ensure that the two instructions are in the same cache line */ /* Ensure that the two instructions are in the same cache line */
fr = (struct emuframe __user *) fr = (struct emuframe __user *)
@ -91,7 +92,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
if (unlikely(!access_ok(VERIFY_WRITE, fr, sizeof(struct emuframe)))) if (unlikely(!access_ok(VERIFY_WRITE, fr, sizeof(struct emuframe))))
return SIGBUS; return SIGBUS;
if (get_isa16_mode(regs->cp0_epc)) { if (isa16) {
err = __put_user(ir >> 16, err = __put_user(ir >> 16,
(u16 __user *)(&fr->emul)); (u16 __user *)(&fr->emul));
err |= __put_user(ir & 0xffff, err |= __put_user(ir & 0xffff,
@ -113,8 +114,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
return SIGBUS; return SIGBUS;
} }
regs->cp0_epc = ((unsigned long) &fr->emul) | regs->cp0_epc = (unsigned long)&fr->emul | isa16;
get_isa16_mode(regs->cp0_epc);
flush_cache_sigtramp((unsigned long)&fr->emul); flush_cache_sigtramp((unsigned long)&fr->emul);
@ -123,6 +123,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
int do_dsemulret(struct pt_regs *xcp) int do_dsemulret(struct pt_regs *xcp)
{ {
int isa16 = get_isa16_mode(xcp->cp0_epc);
struct emuframe __user *fr; struct emuframe __user *fr;
unsigned long epc; unsigned long epc;
u32 insn, cookie; u32 insn, cookie;
@ -145,7 +146,7 @@ int do_dsemulret(struct pt_regs *xcp)
* - Is the instruction pointed to by the EPC an BREAK_MATH? * - Is the instruction pointed to by the EPC an BREAK_MATH?
* - Is the following memory word the BD_COOKIE? * - Is the following memory word the BD_COOKIE?
*/ */
if (get_isa16_mode(xcp->cp0_epc)) { if (isa16) {
err = __get_user(instr[0], err = __get_user(instr[0],
(u16 __user *)(&fr->badinst)); (u16 __user *)(&fr->badinst));
err |= __get_user(instr[1], err |= __get_user(instr[1],
@ -156,8 +157,8 @@ int do_dsemulret(struct pt_regs *xcp)
} }
err |= __get_user(cookie, &fr->cookie); err |= __get_user(cookie, &fr->cookie);
if (unlikely(err || insn != BREAK_MATH(get_isa16_mode(xcp->cp0_epc)) || if (unlikely(err ||
cookie != BD_COOKIE)) { insn != BREAK_MATH(isa16) || cookie != BD_COOKIE)) {
MIPS_FPU_EMU_INC_STATS(errors); MIPS_FPU_EMU_INC_STATS(errors);
return 0; return 0;
} }