commit 10d962d5342e84630b258dbd89668c359549b5b5
author Markos Chandras <markos.chandras@imgtec.com> Wed Nov 26 15:03:54 2014 +0000
committer Markos Chandras <markos.chandras@imgtec.com> Tue Feb 17 15:37:34 2015 +0000
tree 29488974d8863b6ee17bef9fc639b978c56e19e7
parent c893ce38b265d5787d03850b36221f595b224538

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>

arch/mips/kernel/branch.c

diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index 80a073c..37c7527 100644
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -791,12 +791,16 @@
 		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;