aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/math-emu
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2014-11-26 09:08:52 -0500
committerMarkos Chandras <markos.chandras@imgtec.com>2015-02-17 10:37:34 -0500
commitc893ce38b265d5787d03850b36221f595b224538 (patch)
tree9ebc726517a4eb3aee5c3a07f0f531f0704fc97a /arch/mips/math-emu
parent8467ca0122e20f3f8e73d34907b8b30461af5d4e (diff)
MIPS: Emulate the new MIPS R6 BOVC, BEQC and BEQZALC instructions
MIPS R6 uses the <R6 ADDI opcode for the new BOVC, BEQC and BEQZALC instructions. Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Diffstat (limited to 'arch/mips/math-emu')
-rw-r--r--arch/mips/math-emu/cp1emu.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index 7f373a2858b5..c115d969664b 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -623,6 +623,15 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
623 dec_insn.pc_inc + 623 dec_insn.pc_inc +
624 dec_insn.next_pc_inc; 624 dec_insn.next_pc_inc;
625 return 1; 625 return 1;
626 case cbcond0_op:
627 if (!cpu_has_mips_r6)
628 break;
629 if (insn.i_format.rt && !insn.i_format.rs)
630 regs->regs[31] = regs->cp0_epc + 4;
631 *contpc = regs->cp0_epc + dec_insn.pc_inc +
632 dec_insn.next_pc_inc;
633
634 return 1;
626#ifdef CONFIG_CPU_CAVIUM_OCTEON 635#ifdef CONFIG_CPU_CAVIUM_OCTEON
627 case lwc2_op: /* This is bbit0 on Octeon */ 636 case lwc2_op: /* This is bbit0 on Octeon */
628 if ((regs->regs[insn.i_format.rs] & (1ull<<insn.i_format.rt)) == 0) 637 if ((regs->regs[insn.i_format.rs] & (1ull<<insn.i_format.rt)) == 0)