diff options
author | Markos Chandras <markos.chandras@imgtec.com> | 2014-11-26 08:56:51 -0500 |
---|---|---|
committer | Markos Chandras <markos.chandras@imgtec.com> | 2015-02-17 10:37:34 -0500 |
commit | 8467ca0122e20f3f8e73d34907b8b30461af5d4e (patch) | |
tree | b2c543790a8035ff5bde5d8a93567459eca534c7 /arch/mips/math-emu | |
parent | f1b44067c19258b7614e3cd09dfe8d8e12ff5895 (diff) |
MIPS: Emulate the new MIPS R6 branch compact (BC) instruction
MIPS R6 uses the <R6 LWC2 opcode for the new BC instruction.
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 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c index d6d67e2a0434..7f373a2858b5 100644 --- a/arch/mips/math-emu/cp1emu.c +++ b/arch/mips/math-emu/cp1emu.c | |||
@@ -648,6 +648,19 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn, | |||
648 | else | 648 | else |
649 | *contpc = regs->cp0_epc + 8; | 649 | *contpc = regs->cp0_epc + 8; |
650 | return 1; | 650 | return 1; |
651 | #else | ||
652 | case bc6_op: | ||
653 | /* | ||
654 | * Only valid for MIPS R6 but we can still end up | ||
655 | * here from a broken userland so just tell emulator | ||
656 | * this is not a branch and let it break later on. | ||
657 | */ | ||
658 | if (!cpu_has_mips_r6) | ||
659 | break; | ||
660 | *contpc = regs->cp0_epc + dec_insn.pc_inc + | ||
661 | dec_insn.next_pc_inc; | ||
662 | |||
663 | return 1; | ||
651 | #endif | 664 | #endif |
652 | case cop0_op: | 665 | case cop0_op: |
653 | case cop1_op: | 666 | case cop1_op: |