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

Commit 0e384ed1 authored by Jon Medhurst's avatar Jon Medhurst Committed by Nicolas Pitre
Browse files

ARM: kprobes: Add emulation of RBIT instruction 



The v6T2 RBIT instruction was accidentally being emulated correctly,
this patch adds correct decoding for the instruction.

Signed-off-by: default avatarJon Medhurst <tixy@yxit.co.uk>
Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent 81ff5720

arch/arm/kernel/kprobes-decode.c

+2 −1
Original line number Diff line number Diff line
@@ -1320,9 +1320,10 @@ space_cccc_0110__1(kprobe_opcode_t insn, struct arch_specific_insn *asi) 


	/* REV    : cccc 0110 1011 xxxx xxxx xxxx 0011 xxxx */

	/* REV16  : cccc 0110 1011 xxxx xxxx xxxx 1011 xxxx */

	/* RBIT   : cccc 0110 1111 xxxx xxxx xxxx 0011 xxxx */

	/* REVSH  : cccc 0110 1111 xxxx xxxx xxxx 1011 xxxx */

	if ((insn & 0x0ff00070) == 0x06b00030 ||

	    (insn & 0x0ff000f0) == 0x06f000b0)

	    (insn & 0x0ff00070) == 0x06f00030)

		return prep_emulate_rd12rm0(insn, asi);



	/* SADD16    : cccc 0110 0001 xxxx xxxx xxxx 0001 xxxx :GE */