Index: head/sys/sparc64/include/asmacros.h
===================================================================
--- head/sys/sparc64/include/asmacros.h	(revision 89031)
+++ head/sys/sparc64/include/asmacros.h	(revision 89032)
@@ -1,111 +1,141 @@
 /*-
  * Copyright (c) 2001 Jake Burkholder.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 #ifndef	_MACHINE_ASMACROS_H_
 #define	_MACHINE_ASMACROS_H_
 
 #ifdef _KERNEL
 
 /*
- * Normal and alternate %g7 point to per-cpu data.
+ * Normal and alternate %g6 point to the pcb of the current process.  Normal,
+ & alternate and interrupt %g7 point to per-cpu data.
  */
+#define	PCB_REG		%g6
 #define	PCPU_REG	%g7
 
 /*
- * Alternate %g5 points to a per-cpu stack for temporarily saving alternate
- * globals, alternate %g6 points to the pcb of the current process.
+ * Alternate %g5 points to a per-cpu panic stack, which is used as a last
+ * resort, and for temporarily saving alternate globals.
  */
 #define	ASP_REG		%g5
-#define	PCB_REG		%g6
 
 /*
- * Interrupt %g6 points to a per-cpu interrupt queue, %g7 points to the
- * interrupt vector table.
+ * MMU %g7 points to the user tsb.
  */
-#define	IQ_REG		%g6
-#define	IV_REG		%g7
+#define	TSB_REG		%g7
 
+#ifdef LOCORE
+
 /*
- * MMU %g7 points to the user tsb.
+ * Atomically decrement an integer in memory.
  */
-#define	TSB_REG		%g7
+#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	%xcc, 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	%xcc, 9b ; \
+	 mov	r3, r2
+
 #define	PCPU(member)	%g7 + PC_ ## member
 #define	PCPU_ADDR(member, reg) add %g7, PC_ ## member, reg
 
 #define	DEBUGGER()	ta %xcc, 1
 
 #define	PANIC(msg, r1) \
 	.sect	.rodata ; \
 9:	.asciz	msg ; \
 	.previous ; \
 	SET(9b, r1, %o0) ; \
 	call	panic ; \
 	 nop
 
+#ifdef INVARIANTS
+#define	KASSERT(r1, msg) \
+	brnz	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 ; \
 	 nop
 
+/*
+ * If the kernel can be located above 4G, setx needs to be used to load
+ * symbol values, otherwise set is sufficient.
+ */
+#ifdef HIGH_KERNEL
+#define	SET(sym, tmp, dst) \
+	setx	sym, tmp, dst
+#else
+#define	SET(sym, tmp, dst) \
+	set	sym, dst
 #endif
 
+#endif /* LOCORE */
+
+#endif /* _KERNEL */
+
 #define	DATA(name) \
 	.data ; \
 	.globl	name ; \
 	.type	name, @object ; \
 name ## :
 
 #define	EMPTY
 
 #define	ENTRY(name) \
 	.text ; \
 	.align	16 ; \
 	.globl	name ; \
 	.type	name, @function ; \
 name ## :
 
 #define	END(name) \
 	.size	name, . - name
-
-/*
- * If the kernel can be located above 4G, setx needs to be used to load
- * symbol values, otherwise set is sufficient.
- */
-#ifdef HIGH_KERNEL
-#define	SET(sym, tmp, dst) \
-	setx sym, tmp, dst
-#else
-#define	SET(sym, tmp, dst) \
-	set sym, dst
-#endif
 
 #endif /* !_MACHINE_ASMACROS_H_ */