diff options
| author |   Markos Chandras <markos.chandras@imgtec.com> | 2014-11-25 15:54:14 +0000 |
|---|---|---|
| committer | Markos Chandras <markos.chandras@imgtec.com> | 2015-02-17 15:37:31 +0000 |
| commit | 5f9f41c474befb4ebbc40b27f65bb7d649241581 (patch) | |
| tree | 26108ad80ca556ac12466aac3f03fc29d0a8a4ca /arch/mips/math-emu | |
| parent | MIPS: mm: scache: Add secondary cache support for MIPS R6 cores (diff) | |
| download | linux-dev-5f9f41c474befb4ebbc40b27f65bb7d649241581.tar.xz linux-dev-5f9f41c474befb4ebbc40b27f65bb7d649241581.zip | |
MIPS: kernel: Prepare the JR instruction for emulation on MIPS R6
The MIPS R6 JR instruction is an alias to the JALR one, so it may
need emulation for non-R6 userlands.
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Diffstat (limited to 'arch/mips/math-emu')
| -rw-r--r-- | arch/mips/math-emu/cp1emu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c index 9dfcd7fc1bc3..9bf82117b4f2 100644 --- a/arch/mips/math-emu/cp1emu.c +++ b/arch/mips/math-emu/cp1emu.c @@ -448,6 +448,9 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn, dec_insn.next_pc_inc; /* Fall through */ case jr_op: + /* For R6, JR already emulated in jalr_op */ + if (NO_R6EMU && insn.r_format.opcode == jr_op) + break; *contpc = regs->regs[insn.r_format.rs]; return 1; } |