Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b492600 authored Jul 04, 2016 by Paul Burton Committed by Paolo Bonzini Jul 05, 2016

MIPS: inst.h: Rename cbcond{0,1}_op to pop{1,3}0_op



The opcodes currently defined in inst.h as cbcond0_op & cbcond1_op are
actually defined in the MIPS base instruction set manuals as pop10 &
pop30 respectively. Rename them as such, for consistency with the
documentation.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 1c66b79b

arch/mips/include/uapi/asm/inst.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,11 +21,11 @@
	enum major_op {		enum major_op {
	spec_op, bcond_op, j_op, jal_op,		spec_op, bcond_op, j_op, jal_op,
	beq_op, bne_op, blez_op, bgtz_op,		beq_op, bne_op, blez_op, bgtz_op,
	addi_op, cbcond0_op = addi_op, addiu_op, slti_op, sltiu_op,		addi_op, pop10_op = addi_op, addiu_op, slti_op, sltiu_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, cbcond1_op = daddi_op, daddiu_op, ldl_op, ldr_op,		daddi_op, pop30_op = daddi_op, daddiu_op, ldl_op, ldr_op,
	spec2_op, jalx_op, mdmx_op, msa_op = mdmx_op, spec3_op,		spec2_op, jalx_op, mdmx_op, msa_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,

arch/mips/kernel/branch.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -809,8 +809,8 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
	regs->cp0_epc += 8;		regs->cp0_epc += 8;
	break;		break;
	#endif		#endif
	case cbcond0_op:		case pop10_op:
	case cbcond1_op:		case pop30_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;

arch/mips/math-emu/cp1emu.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -627,8 +627,8 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
	dec_insn.pc_inc +		dec_insn.pc_inc +
	dec_insn.next_pc_inc;		dec_insn.next_pc_inc;
	return 1;		return 1;
	case cbcond0_op:		case pop10_op:
	case cbcond1_op:		case pop30_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)