diff options
| author | Markos Chandras <markos.chandras@imgtec.com> | 2014-11-26 15:08:52 +0100 |
|---|---|---|
| committer | Markos Chandras <markos.chandras@imgtec.com> | 2015-02-17 16:37:34 +0100 |
| commit | c893ce38b265d5787d03850b36221f595b224538 (patch) | |
| tree | 9ebc726517a4eb3aee5c3a07f0f531f0704fc97a /arch/mips/kernel | |
| parent | MIPS: Emulate the new MIPS R6 branch compact (BC) instruction (diff) | |
| download | linux-c893ce38b265d5787d03850b36221f595b224538.tar.xz linux-c893ce38b265d5787d03850b36221f595b224538.zip | |
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/kernel')
| -rw-r--r-- | arch/mips/kernel/branch.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 1a0a30e16684..80a073ced200 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -790,6 +790,17 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, regs->cp0_epc += 8; break; #endif + case cbcond0_op: + /* Only valid for MIPS R6 */ + if (!cpu_has_mips_r6) { + ret = -SIGILL; + break; + } + /* Compact branches: bovc, beqc, beqzalc */ + if (insn.i_format.rt && !insn.i_format.rs) + regs->regs[31] = epc + 4; + regs->cp0_epc += 8; + break; } return ret; |