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

Commit c42aef09 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Add DINSM to uasm. 



Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1875/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e77c32fe

arch/mips/include/asm/uasm.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ Ip_0(_tlbwr); 
Ip_u3u1u2(_xor);

Ip_u2u1u3(_xori);

Ip_u2u1msbu3(_dins);

Ip_u2u1msbu3(_dinsm);

Ip_u1(_syscall);



/* Handle labels. */

arch/mips/mm/uasm.c

+10 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ enum opcode { 
	insn_pref, insn_rfe, insn_sc, insn_scd, insn_sd, insn_sll,

	insn_sra, insn_srl, insn_rotr, insn_subu, insn_sw, insn_tlbp,

	insn_tlbr, insn_tlbwi, insn_tlbwr, insn_xor, insn_xori,

	insn_dins, insn_syscall, insn_bbit0, insn_bbit1

	insn_dins, insn_dinsm, insn_syscall, insn_bbit0, insn_bbit1

};



struct insn {
@@ -142,6 +142,7 @@ static struct insn insn_table[] __uasminitdata = { 
	{ insn_xor,  M(spec_op, 0, 0, 0, 0, xor_op),  RS | RT | RD },

	{ insn_xori,  M(xori_op, 0, 0, 0, 0, 0),  RS | RT | UIMM },

	{ insn_dins, M(spec3_op, 0, 0, 0, 0, dins_op), RS | RT | RD | RE },

	{ insn_dinsm, M(spec3_op, 0, 0, 0, 0, dinsm_op), RS | RT | RD | RE },

	{ insn_syscall, M(spec_op, 0, 0, 0, 0, syscall_op), SCIMM},

	{ insn_bbit0, M(lwc2_op, 0, 0, 0, 0, 0), RS | RT | BIMM },

	{ insn_bbit1, M(swc2_op, 0, 0, 0, 0, 0), RS | RT | BIMM },
@@ -340,6 +341,13 @@ Ip_u2u1msbu3(op) \ 
}							\

UASM_EXPORT_SYMBOL(uasm_i##op);



#define I_u2u1msb32u3(op)				\

Ip_u2u1msbu3(op)					\

{							\

	build_insn(buf, insn##op, b, a, c+d-33, c);	\

}							\

UASM_EXPORT_SYMBOL(uasm_i##op);



#define I_u1u2(op)					\

Ip_u1u2(op)						\

{							\
@@ -422,6 +430,7 @@ I_0(_tlbwr) 
I_u3u1u2(_xor)

I_u2u1u3(_xori)

I_u2u1msbu3(_dins);

I_u2u1msb32u3(_dinsm);

I_u1(_syscall);

I_u1u2s3(_bbit0);

I_u1u2s3(_bbit1);