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

Commit ab9e4fa0 authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle
Browse files

MIPS: uasm: Add wsbh uasm instruction 



It will be used later on by bpf-jit

[ralf@linux-mips.org: Resolved conflict.]

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/6732/


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

arch/mips/include/asm/uasm.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ Ip_0(_tlbr); 
Ip_0(_tlbwi);

Ip_0(_tlbwr);

Ip_u1(_wait);

Ip_u2u1(_wsbh);

Ip_u3u1u2(_xor);

Ip_u2u1u3(_xori);

Ip_u2u1(_yield);

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

+11 −0
Original line number Diff line number Diff line
@@ -205,6 +205,16 @@ enum lx_func { 
	lbx_op	= 0x16,

};



/*

 * BSHFL opcodes

 */

enum bshfl_func {

	wsbh_op = 0x2,

	dshd_op = 0x5,

	seb_op  = 0x10,

	seh_op  = 0x18,

};



/*

 * (microMIPS) Major opcodes.

 */
@@ -258,6 +268,7 @@ enum mm_32a_minor_op { 
	mm_lwxs_op = 0x118,

	mm_addu32_op = 0x150,

	mm_subu32_op = 0x1d0,

	mm_wsbh_op = 0x1ec,

	mm_and_op = 0x250,

	mm_or32_op = 0x290,

	mm_xor32_op = 0x310,

arch/mips/mm/uasm-micromips.c

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ static struct insn insn_table_MM[] = { 
	{ insn_tlbwi, M(mm_pool32a_op, 0, 0, 0, mm_tlbwi_op, mm_pool32axf_op), 0 },

	{ insn_tlbwr, M(mm_pool32a_op, 0, 0, 0, mm_tlbwr_op, mm_pool32axf_op), 0 },

	{ insn_wait, M(mm_pool32a_op, 0, 0, 0, mm_wait_op, mm_pool32axf_op), SCIMM },

	{ insn_wsbh, M(mm_pool32a_op, 0, 0, 0, mm_wsbh_op, mm_pool32axf_op), RT | RS },

	{ insn_xor, M(mm_pool32a_op, 0, 0, 0, 0, mm_xor32_op), RT | RS | RD },

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

	{ insn_dins, 0, 0 },

arch/mips/mm/uasm-mips.c

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static struct insn insn_table[] = { 
	{ insn_tlbwi,  M(cop0_op, cop_op, 0, 0, 0, tlbwi_op),  0 },

	{ insn_tlbwr,  M(cop0_op, cop_op, 0, 0, 0, tlbwr_op),  0 },

	{ insn_wait, M(cop0_op, cop_op, 0, 0, 0, wait_op), SCIMM },

	{ insn_wsbh, M(spec3_op, 0, 0, 0, wsbh_op, bshfl_op), RT | RD },

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

	{ insn_xor,  M(spec_op, 0, 0, 0, 0, xor_op),  RS | RT | RD },

	{ insn_yield, M(spec3_op, 0, 0, 0, 0, yield_op), RS | RD },

arch/mips/mm/uasm.c

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ enum opcode { 
	insn_rotr, insn_sc, insn_scd, insn_sd, insn_sll, insn_sllv, insn_sltiu,

	insn_sltu, insn_sra, insn_srl, insn_srlv, insn_subu, insn_sw, insn_sync,

	insn_syscall, insn_tlbp, insn_tlbr, insn_tlbwi, insn_tlbwr, insn_wait,

	insn_xor, insn_xori, insn_yield,

	insn_wsbh, insn_xor, insn_xori, insn_yield,

};



struct insn {
@@ -298,6 +298,7 @@ I_0(_tlbr) 
I_0(_tlbwi)

I_0(_tlbwr)

I_u1(_wait);

I_u2u1(_wsbh)

I_u3u1u2(_xor)

I_u2u1u3(_xori)

I_u2u1(_yield)