diff options
author | Markos Chandras <markos.chandras@imgtec.com> | 2014-11-26 10:43:11 -0500 |
---|---|---|
committer | Markos Chandras <markos.chandras@imgtec.com> | 2015-02-17 10:37:35 -0500 |
commit | 84fef630127aa90ef547ddd018d3dc47b1e79a1e (patch) | |
tree | 0331c9646f7c6b25aeb46e0fcece9046d420a1d1 /arch/mips/kernel | |
parent | 10d962d5342e84630b258dbd89668c359549b5b5 (diff) |
MIPS: Emulate the new MIPS R6 BALC instruction
MIPS R6 uses the <R6 swc2 opcode for the new BALC instructions.
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Diffstat (limited to 'arch/mips/kernel')
-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 37c752757346..1f28724d23e5 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c | |||
@@ -789,6 +789,16 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, | |||
789 | } | 789 | } |
790 | regs->cp0_epc += 8; | 790 | regs->cp0_epc += 8; |
791 | break; | 791 | break; |
792 | case balc6_op: | ||
793 | if (!cpu_has_mips_r6) { | ||
794 | ret = -SIGILL; | ||
795 | break; | ||
796 | } | ||
797 | /* Compact branch: BALC */ | ||
798 | regs->regs[31] = epc + 4; | ||
799 | epc += 4 + (insn.i_format.simmediate << 2); | ||
800 | regs->cp0_epc = epc; | ||
801 | break; | ||
792 | #endif | 802 | #endif |
793 | case cbcond0_op: | 803 | case cbcond0_op: |
794 | case cbcond1_op: | 804 | case cbcond1_op: |