diff options
| author | Markos Chandras <markos.chandras@imgtec.com> | 2014-11-26 16:03:54 +0100 |
|---|---|---|
| committer | Markos Chandras <markos.chandras@imgtec.com> | 2015-02-17 16:37:34 +0100 |
| commit | 10d962d5342e84630b258dbd89668c359549b5b5 (patch) | |
| tree | 29488974d8863b6ee17bef9fc639b978c56e19e7 /arch/mips/kernel | |
| parent | MIPS: Emulate the new MIPS R6 BOVC, BEQC and BEQZALC instructions (diff) | |
| download | linux-10d962d5342e84630b258dbd89668c359549b5b5.tar.xz linux-10d962d5342e84630b258dbd89668c359549b5b5.zip | |
MIPS: Emulate the new MIPS R6 BNVC, BNEC and BNEZLAC instructions
MIPS R6 uses the <R6 DADDI opcode for the new BNVC, BNEC and
BNEZLAC instructions.
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/branch.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 80a073ced200..37c752757346 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -791,12 +791,16 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, break; #endif case cbcond0_op: + case cbcond1_op: /* Only valid for MIPS R6 */ if (!cpu_has_mips_r6) { ret = -SIGILL; break; } - /* Compact branches: bovc, beqc, beqzalc */ + /* + * Compact branches: + * bovc, beqc, beqzalc, bnvc, bnec, bnezlac + */ if (insn.i_format.rt && !insn.i_format.rs) regs->regs[31] = epc + 4; regs->cp0_epc += 8; |