patch-2.4.8 linux/include/asm-sparc/bitops.h

• Lines: 117
• Date: Sat Jul 28 12:12:38 2001
• Orig file: v2.4.7/linux/include/asm-sparc/bitops.h
• Orig date: Wed Jul 25 17:10:25 2001

diff -u --recursive --new-file v2.4.7/linux/include/asm-sparc/bitops.h linux/include/asm-sparc/bitops.h
@@ -1,4 +1,4 @@
-/* $Id: bitops.h,v 1.63 2001/07/17 16:17:33 anton Exp $
+/* $Id: bitops.h,v 1.64 2001/07/18 13:48:23 anton Exp $
  * bitops.h: Bit string operations on the Sparc.
  *
  * Copyright 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -25,22 +25,36 @@
 {
 	register unsigned long mask asm("g2");
 	register unsigned long *ADDR asm("g1");
+
 	ADDR = ((unsigned long *) addr) + (nr >> 5);
 	mask = 1 << (nr & 31);
+
 	__asm__ __volatile__("
 	mov	%%o7, %%g4
 	call	___set_bit
 	 add	%%o7, 8, %%o7
 "	: "=&r" (mask)
 	: "0" (mask), "r" (ADDR)
-	: "g3", "g4", "g5", "g7", "cc");
+	: "g3", "g4", "g5", "g7", "memory", "cc");
 
 	return mask != 0;
 }
 
 static __inline__ void set_bit(unsigned long nr, volatile void *addr)
 {
-	(void) test_and_set_bit(nr, addr);
+	register unsigned long mask asm("g2");
+	register unsigned long *ADDR asm("g1");
+
+	ADDR = ((unsigned long *) addr) + (nr >> 5);
+	mask = 1 << (nr & 31);
+
+	__asm__ __volatile__("
+	mov	%%o7, %%g4
+	call	___set_bit
+	 add	%%o7, 8, %%o7
+"	: "=&r" (mask)
+	: "0" (mask), "r" (ADDR)
+	: "g3", "g4", "g5", "g7", "cc");
 }
 
 static __inline__ int test_and_clear_bit(unsigned long nr, volatile void *addr)
@@ -50,20 +64,33 @@
 
 	ADDR = ((unsigned long *) addr) + (nr >> 5);
 	mask = 1 << (nr & 31);
+
 	__asm__ __volatile__("
 	mov	%%o7, %%g4
 	call	___clear_bit
 	 add	%%o7, 8, %%o7
 "	: "=&r" (mask)
 	: "0" (mask), "r" (ADDR)
-	: "g3", "g4", "g5", "g7", "cc");
+	: "g3", "g4", "g5", "g7", "memory", "cc");
 
 	return mask != 0;
 }
 
 static __inline__ void clear_bit(unsigned long nr, volatile void *addr)
 {
-	(void) test_and_clear_bit(nr, addr);
+	register unsigned long mask asm("g2");
+	register unsigned long *ADDR asm("g1");
+
+	ADDR = ((unsigned long *) addr) + (nr >> 5);
+	mask = 1 << (nr & 31);
+
+	__asm__ __volatile__("
+	mov	%%o7, %%g4
+	call	___clear_bit
+	 add	%%o7, 8, %%o7
+"	: "=&r" (mask)
+	: "0" (mask), "r" (ADDR)
+	: "g3", "g4", "g5", "g7", "cc");
 }
 
 static __inline__ int test_and_change_bit(unsigned long nr, volatile void *addr)
@@ -73,20 +100,33 @@
 
 	ADDR = ((unsigned long *) addr) + (nr >> 5);
 	mask = 1 << (nr & 31);
+
 	__asm__ __volatile__("
 	mov	%%o7, %%g4
 	call	___change_bit
 	 add	%%o7, 8, %%o7
 "	: "=&r" (mask)
 	: "0" (mask), "r" (ADDR)
-	: "g3", "g4", "g5", "g7", "cc");
+	: "g3", "g4", "g5", "g7", "memory", "cc");
 
 	return mask != 0;
 }
 
 static __inline__ void change_bit(unsigned long nr, volatile void *addr)
 {
-	(void) test_and_change_bit(nr, addr);
+	register unsigned long mask asm("g2");
+	register unsigned long *ADDR asm("g1");
+
+	ADDR = ((unsigned long *) addr) + (nr >> 5);
+	mask = 1 << (nr & 31);
+
+	__asm__ __volatile__("
+	mov	%%o7, %%g4
+	call	___change_bit
+	 add	%%o7, 8, %%o7
+"	: "=&r" (mask)
+	: "0" (mask), "r" (ADDR)
+	: "g3", "g4", "g5", "g7", "cc");
 }
 
 /*