diff options
author | Markos Chandras <markos.chandras@imgtec.com> | 2015-01-08 06:55:20 -0500 |
---|---|---|
committer | Markos Chandras <markos.chandras@imgtec.com> | 2015-02-17 10:37:35 -0500 |
commit | 28d6f93d201d20ce47a9e8414655569a78f0353c (patch) | |
tree | 6e5465688702428258d063ab763a33f685d8dc1a /arch/mips/kernel/branch.c | |
parent | 69b9a2fd05a308b9b1e1f282f3b772491603c582 (diff) |
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 c61a41df3363..249c61c9acf1 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, | |||
807 | /* Compact branch: BEQZC || JIC */ | 807 | /* Compact branch: BEQZC || JIC */ |
808 | regs->cp0_epc += 8; | 808 | regs->cp0_epc += 8; |
809 | break; | 809 | break; |
810 | case bnezcjialc_op: | ||
811 | if (!cpu_has_mips_r6) { | ||
812 | ret = -SIGILL; | ||
813 | break; | ||
814 | } | ||
815 | /* Compact branch: BNEZC || JIALC */ | ||
816 | if (insn.i_format.rs) | ||
817 | regs->regs[31] = epc + 4; | ||
818 | regs->cp0_epc += 8; | ||
819 | break; | ||
810 | #endif | 820 | #endif |
811 | case cbcond0_op: | 821 | case cbcond0_op: |
812 | case cbcond1_op: | 822 | case cbcond1_op: |