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

Commit 684f970e authored by Russell King's avatar Russell King
Browse files

[PATCH] ARM: bitops 



Convert ARM bitop assembly to a macro.  All bitops follow the same
format, so it's silly duplicating the code when only one or two
instructions are different.

Signed-off-by: default avatarRussell King <rmk@arm.linux.org.uk>
parent 652a12ef

arch/arm/lib/changebit.S

+2 −9
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */

#include <linux/linkage.h>

#include <asm/assembler.h>

#include "bitops.h"

                .text



/* Purpose  : Function to change a bit
@@ -17,12 +18,4 @@ 
ENTRY(_change_bit_be)

		eor	r0, r0, #0x18		@ big endian byte ordering

ENTRY(_change_bit_le)

		and	r2, r0, #7

		mov	r3, #1

		mov	r3, r3, lsl r2

		save_and_disable_irqs ip, r2

		ldrb	r2, [r1, r0, lsr #3]

		eor	r2, r2, r3

		strb	r2, [r1, r0, lsr #3]

		restore_irqs ip

		RETINSTR(mov,pc,lr)
 
	bitop	eor

arch/arm/lib/clearbit.S

+2 −11
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */

#include <linux/linkage.h>

#include <asm/assembler.h>

#include "bitops.h"

                .text



/*
@@ -18,14 +19,4 @@ 
ENTRY(_clear_bit_be)

		eor	r0, r0, #0x18		@ big endian byte ordering

ENTRY(_clear_bit_le)

		and	r2, r0, #7

		mov	r3, #1

		mov	r3, r3, lsl r2

		save_and_disable_irqs ip, r2

		ldrb	r2, [r1, r0, lsr #3]

		bic	r2, r2, r3

		strb	r2, [r1, r0, lsr #3]

		restore_irqs ip

		RETINSTR(mov,pc,lr)



	bitop	bic

arch/arm/lib/setbit.S

+2 −9
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */

#include <linux/linkage.h>

#include <asm/assembler.h>

#include "bitops.h"

		.text



/*
@@ -18,12 +19,4 @@ 
ENTRY(_set_bit_be)

		eor	r0, r0, #0x18		@ big endian byte ordering

ENTRY(_set_bit_le)

		and	r2, r0, #7

		mov	r3, #1

		mov	r3, r3, lsl r2

		save_and_disable_irqs ip, r2

		ldrb	r2, [r1, r0, lsr #3]

		orr	r2, r2, r3

		strb	r2, [r1, r0, lsr #3]

		restore_irqs ip

		RETINSTR(mov,pc,lr)
 
	bitop	orr

arch/arm/lib/testchangebit.S

+2 −13
Original line number Diff line number Diff line
@@ -9,21 +9,10 @@ 
 */

#include <linux/linkage.h>

#include <asm/assembler.h>

#include "bitops.h"

                .text



ENTRY(_test_and_change_bit_be)

		eor	r0, r0, #0x18		@ big endian byte ordering

ENTRY(_test_and_change_bit_le)

		add	r1, r1, r0, lsr #3

		and	r3, r0, #7

		mov	r0, #1

		save_and_disable_irqs ip, r2

		ldrb	r2, [r1]

		tst	r2, r0, lsl r3

		eor	r2, r2, r0, lsl r3

		strb	r2, [r1]

		restore_irqs ip

		moveq	r0, #0

		RETINSTR(mov,pc,lr)



	testop	eor, strb

arch/arm/lib/testclearbit.S

+2 −13
Original line number Diff line number Diff line
@@ -9,21 +9,10 @@ 
 */

#include <linux/linkage.h>

#include <asm/assembler.h>

#include "bitops.h"

                .text



ENTRY(_test_and_clear_bit_be)

		eor	r0, r0, #0x18		@ big endian byte ordering

ENTRY(_test_and_clear_bit_le)

		add	r1, r1, r0, lsr #3	@ Get byte offset

		and	r3, r0, #7		@ Get bit offset

		mov	r0, #1

		save_and_disable_irqs ip, r2

		ldrb	r2, [r1]

		tst	r2, r0, lsl r3

		bic	r2, r2, r0, lsl r3

		strb	r2, [r1]

		restore_irqs ip

		moveq	r0, #0

		RETINSTR(mov,pc,lr)



	testop	bicne, strneb