Commit 10d962d5 authored by Markos Chandras's avatar Markos Chandras

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: default avatarMarkos Chandras <markos.chandras@imgtec.com>
parent c893ce38
...@@ -25,7 +25,7 @@ enum major_op { ...@@ -25,7 +25,7 @@ enum major_op {
andi_op, ori_op, xori_op, lui_op, andi_op, ori_op, xori_op, lui_op,
cop0_op, cop1_op, cop2_op, cop1x_op, cop0_op, cop1_op, cop2_op, cop1x_op,
beql_op, bnel_op, blezl_op, bgtzl_op, beql_op, bnel_op, blezl_op, bgtzl_op,
daddi_op, daddiu_op, ldl_op, ldr_op, daddi_op, cbcond1_op = daddi_op, daddiu_op, ldl_op, ldr_op,
spec2_op, jalx_op, mdmx_op, spec3_op, spec2_op, jalx_op, mdmx_op, spec3_op,
lb_op, lh_op, lwl_op, lw_op, lb_op, lh_op, lwl_op, lw_op,
lbu_op, lhu_op, lwr_op, lwu_op, lbu_op, lhu_op, lwr_op, lwu_op,
......
...@@ -791,12 +791,16 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, ...@@ -791,12 +791,16 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
break; break;
#endif #endif
case cbcond0_op: case cbcond0_op:
case cbcond1_op:
/* Only valid for MIPS R6 */ /* Only valid for MIPS R6 */
if (!cpu_has_mips_r6) { if (!cpu_has_mips_r6) {
ret = -SIGILL; ret = -SIGILL;
break; break;
} }
/* Compact branches: bovc, beqc, beqzalc */ /*
* Compact branches:
* bovc, beqc, beqzalc, bnvc, bnec, bnezlac
*/
if (insn.i_format.rt && !insn.i_format.rs) if (insn.i_format.rt && !insn.i_format.rs)
regs->regs[31] = epc + 4; regs->regs[31] = epc + 4;
regs->cp0_epc += 8; regs->cp0_epc += 8;
......
...@@ -624,6 +624,7 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn, ...@@ -624,6 +624,7 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
dec_insn.next_pc_inc; dec_insn.next_pc_inc;
return 1; return 1;
case cbcond0_op: case cbcond0_op:
case cbcond1_op:
if (!cpu_has_mips_r6) if (!cpu_has_mips_r6)
break; break;
if (insn.i_format.rt && !insn.i_format.rs) if (insn.i_format.rt && !insn.i_format.rs)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment