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

Commit 85519189 authored by Dave Martin's avatar Dave Martin Committed by Russell King
Browse files

ARM: 7030/1: entry: Remove unnecessary masking when decoding Thumb-2 instructions 



When testing whether a Thumb-2 instruction is 32 bits long or not,
the masking done in order to test bits 11-15 of the first
instruction halfword won't affect the result of the comparison, so
remove it.

Signed-off-by: default avatarDave Martin <dave.martin@linaro.org>
Reviewed-by: default avatarJon Medhurst <tixy@yxit.co.uk>
Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2ecccf90

arch/arm/kernel/entry-armv.S

+2 −4
Original line number Diff line number Diff line
@@ -262,8 +262,7 @@ __und_svc: 
	ldr	r0, [r4, #-4]

#else

	ldrh	r0, [r4, #-2]			@ Thumb instruction at LR - 2

	and	r9, r0, #0xf800

	cmp	r9, #0xe800			@ 32-bit instruction if xx >= 0

	cmp	r0, #0xe800			@ 32-bit instruction if xx >= 0

	ldrhhs	r9, [r4]			@ bottom 16 bits

	orrhs	r0, r9, r0, lsl #16

#endif
@@ -445,8 +444,7 @@ __und_usr: 
 ARM(	ldrht	r5, [r4], #2	)

 THUMB(	ldrht	r5, [r4]	)

 THUMB(	add	r4, r4, #2	)

	and	r0, r5, #0xf800			@ mask bits 111x x... .... ....

	cmp	r0, #0xe800			@ 32bit instruction if xx != 0

	cmp	r5, #0xe800			@ 32bit instruction if xx != 0

	blo	__und_usr_unknown

3:	ldrht	r0, [r4]

	add	r2, r2, #2			@ r2 is PC + 2, make it PC + 4