Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Jan 2012 23:15:02 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r230667 - stable/9/sys/sparc64/include
Message-ID:  <201201282315.q0SNF2A6003188@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Sat Jan 28 23:15:02 2012
New Revision: 230667
URL: http://svn.freebsd.org/changeset/base/230667

Log:
  MFC: r225886
  
  - Right-justify backslashes as suggested by style(9).
  - Rename ATOMIC_INC_ULONG to ATOMIC_INC_LONG in order to be consistent with
    the names of the other macros in this file an adjust accordingly.

Modified:
  stable/9/sys/sparc64/include/asmacros.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/sparc64/include/asmacros.h
==============================================================================
--- stable/9/sys/sparc64/include/asmacros.h	Sat Jan 28 23:13:00 2012	(r230666)
+++ stable/9/sys/sparc64/include/asmacros.h	Sat Jan 28 23:15:02 2012	(r230667)
@@ -49,98 +49,98 @@
 /*
  * Atomically decrement an integer in memory.
  */
-#define	ATOMIC_DEC_INT(r1, r2, r3) \
-	lduw	[r1], r2 ; \
-9:	sub	r2, 1, r3 ; \
-	casa	[r1] ASI_N, r2, r3 ; \
-	cmp	r2, r3 ; \
-	bne,pn	%icc, 9b ; \
+#define	ATOMIC_DEC_INT(r1, r2, r3)					\
+	lduw	[r1], r2 ;						\
+9:	sub	r2, 1, r3 ;						\
+	casa	[r1] ASI_N, r2, r3 ;					\
+	cmp	r2, r3 ;						\
+	bne,pn	%icc, 9b ;						\
 	 mov	r3, r2
 
 /*
  * Atomically increment an integer in memory.
  */
-#define	ATOMIC_INC_INT(r1, r2, r3) \
-	lduw	[r1], r2 ; \
-9:	add	r2, 1, r3 ; \
-	casa	[r1] ASI_N, r2, r3 ; \
-	cmp	r2, r3 ; \
-	bne,pn	%icc, 9b ; \
+#define	ATOMIC_INC_INT(r1, r2, r3)					\
+	lduw	[r1], r2 ;						\
+9:	add	r2, 1, r3 ;						\
+	casa	[r1] ASI_N, r2, r3 ;					\
+	cmp	r2, r3 ;						\
+	bne,pn	%icc, 9b ;						\
 	 mov	r3, r2
 
 /*
- * Atomically increment an u_long in memory.
+ * Atomically increment a long in memory.
  */
-#define	ATOMIC_INC_ULONG(r1, r2, r3) \
-	ldx	[r1], r2 ; \
-9:	add	r2, 1, r3 ; \
-	casxa	[r1] ASI_N, r2, r3 ; \
-	cmp	r2, r3 ; \
-	bne,pn	%icc, 9b ; \
+#define	ATOMIC_INC_LONG(r1, r2, r3)					\
+	ldx	[r1], r2 ;						\
+9:	add	r2, 1, r3 ;						\
+	casxa	[r1] ASI_N, r2, r3 ;					\
+	cmp	r2, r3 ;						\
+	bne,pn	%icc, 9b ;						\
 	 mov	r3, r2
 
 /*
  * Atomically clear a number of bits of an integer in memory.
  */
-#define	ATOMIC_CLEAR_INT(r1, r2, r3, bits) \
-	lduw	[r1], r2 ; \
-9:	andn	r2, bits, r3 ; \
-	casa	[r1] ASI_N, r2, r3 ; \
-	cmp	r2, r3 ; \
-	bne,pn	%icc, 9b ; \
+#define	ATOMIC_CLEAR_INT(r1, r2, r3, bits)				\
+	lduw	[r1], r2 ;						\
+9:	andn	r2, bits, r3 ;						\
+	casa	[r1] ASI_N, r2, r3 ;					\
+	cmp	r2, r3 ;						\
+	bne,pn	%icc, 9b ;						\
 	 mov	r3, r2
 
 /*
- * Atomically clear a number of bits of an u_long in memory.
+ * Atomically clear a number of bits of a long in memory.
  */
-#define	ATOMIC_CLEAR_LONG(r1, r2, r3, bits) \
-	ldx	[r1], r2 ; \
-9:	andn	r2, bits, r3 ; \
-	casxa	[r1] ASI_N, r2, r3 ; \
-	cmp	r2, r3 ; \
-	bne,pn	%icc, 9b ; \
+#define	ATOMIC_CLEAR_LONG(r1, r2, r3, bits)				\
+	ldx	[r1], r2 ;						\
+9:	andn	r2, bits, r3 ;						\
+	casxa	[r1] ASI_N, r2, r3 ;					\
+	cmp	r2, r3 ;						\
+	bne,pn	%icc, 9b ;						\
 	 mov	r3, r2
 
 #define	PCPU(member)	PCPU_REG + PC_ ## member
-#define	PCPU_ADDR(member, reg) \
+#define	PCPU_ADDR(member, reg)						\
 	add	PCPU_REG, PC_ ## member, reg
 
-#define	DEBUGGER() \
+#define	DEBUGGER()							\
 	ta	%xcc, 1
 
-#define	PANIC(msg, r1) \
-	.sect	.rodata ; \
-9:	.asciz	msg ; \
-	.previous ; \
-	SET(9b, r1, %o0) ; \
-	call	panic ; \
+#define	PANIC(msg, r1)							\
+	.sect	.rodata ;						\
+9:	.asciz	msg ;							\
+	.previous ;							\
+	SET(9b, r1, %o0) ;						\
+	call	panic ;							\
 	 nop
 
 #ifdef INVARIANTS
-#define	KASSERT(r1, msg) \
-	brnz,pt	r1, 8f ; \
-	 nop ; \
-	PANIC(msg, r1) ; \
+#define	KASSERT(r1, msg)						\
+	brnz,pt	r1, 8f ;						\
+	 nop ;								\
+	PANIC(msg, r1) ;						\
 8:
 #else
 #define	KASSERT(r1, msg)
 #endif
 
-#define	PUTS(msg, r1) \
-	.sect	.rodata ; \
-9:	.asciz	msg ; \
-	.previous ; \
-	SET(9b, r1, %o0) ; \
-	call	printf ; \
+#define	PUTS(msg, r1)							\
+	.sect	.rodata ;						\
+9:	.asciz	msg ;							\
+	.previous ;							\
+	SET(9b, r1, %o0) ;						\
+	call	printf ;						\
 	 nop
 
 #define	_ALIGN_DATA	.align 8
 
-#define	DATA(name) \
-	.data ; \
-	_ALIGN_DATA ; \
-	.globl	name ; \
-	.type	name, @object ; \
+#define	DATA(name)							\
+	.data ;								\
+	_ALIGN_DATA ;							\
+	.globl	name ;							\
+	.type	name, @object ;						\
 name:
 
 #define	EMPTY



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201282315.q0SNF2A6003188>