Commit 198a0a92 authored by Russell King's avatar Russell King
Browse files

ARM: entry: abort-macro: simplify do_ldrd_abort 



We can test bits 27:25 and 20 of the instruction at the same time;
there's no need to separate out the check of bit 20.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent be020f86

arch/arm/mm/abort-macro.S

+1 −3
Original line number Diff line number Diff line
@@ -30,12 +30,10 @@ not_thumb: 
 *    [20] == 0

 */

	.macro	do_ldrd_abort, tmp, insn

	tst	\insn, #0x0e000000		@ [27:25] == 0

	tst	\insn, #0x0e100000		@ [27:25,20] == 0

	bne	not_ldrd

	and	\tmp, \insn, #0x000000f0	@ [7:4] == 1101

	cmp	\tmp, #0x000000d0

	bne	not_ldrd

	tst	\insn, #1 << 20			@ [20] == 0

	moveq	pc, lr

not_ldrd:

	.endm

CRA Git | Maintained and supported by SUSTech CRA and CCSE