diff options
| author | Markos Chandras <markos.chandras@imgtec.com> | 2015-01-08 11:55:20 +0000 |
|---|---|---|
| committer | Markos Chandras <markos.chandras@imgtec.com> | 2015-02-17 15:37:35 +0000 |
| commit | 28d6f93d201d20ce47a9e8414655569a78f0353c (patch) | |
| tree | 6e5465688702428258d063ab763a33f685d8dc1a /arch/mips/kernel/branch.c | |
| parent | 69b9a2fd05a308b9b1e1f282f3b772491603c582 (diff) | |
| download | op-kernel-dev-28d6f93d201d20ce47a9e8414655569a78f0353c.zip op-kernel-dev-28d6f93d201d20ce47a9e8414655569a78f0353c.tar.gz | |
MIPS: Emulate the new MIPS R6 BNEZC and JIALC instructions
MIPS R6 uses the <R6 sdc2 opcode for the new BNEZC and JIALC instructions
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Diffstat (limited to 'arch/mips/kernel/branch.c')
| -rw-r--r-- | arch/mips/kernel/branch.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index c61a41d..249c61c 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -807,6 +807,16 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, /* Compact branch: BEQZC || JIC */ regs->cp0_epc += 8; break; + case bnezcjialc_op: + if (!cpu_has_mips_r6) { + ret = -SIGILL; + break; + } + /* Compact branch: BNEZC || JIALC */ + if (insn.i_format.rs) + regs->regs[31] = epc + 4; + regs->cp0_epc += 8; + break; #endif case cbcond0_op: case cbcond1_op: |
