Index: head/sys/sparc64/include/ccr.h
===================================================================
--- head/sys/sparc64/include/ccr.h	(revision 88617)
+++ head/sys/sparc64/include/ccr.h	(revision 88618)
@@ -1,40 +1,46 @@
 /*-
  * Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>.  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 ``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_CCR_H_
 #define	_MACHINE_CCR_H_
 
-#define	ICC_C	(1UL << 0)
-#define	ICC_V	(1UL << 1)
-#define	ICC_Z	(1UL << 2)
-#define	ICC_N	(1UL << 3)
+#define	ICC_SHIFT	0
+#define	ICC_BITS	4
+#define	ICC_MASK	((1UL << ICC_BITS) - 1)
+#define	ICC_C		(1UL << 0)
+#define	ICC_V		(1UL << 1)
+#define	ICC_Z		(1UL << 2)
+#define	ICC_N		(1UL << 3)
 
-#define	XCC_C	(1UL << 4)
-#define	XCC_V	(1UL << 5)
-#define	XCC_Z	(1UL << 6)
-#define	XCC_N	(1UL << 7)
+#define	XCC_SHIFT	4
+#define	XCC_BITS	4
+#define	XCC_MASK	(((1UL << XCC_BITS) - 1) << XCC_SHIFT)
+#define	XCC_C		(1UL << 4)
+#define	XCC_V		(1UL << 5)
+#define	XCC_Z		(1UL << 6)
+#define	XCC_N		(1UL << 7)
 
 #endif /* !_MACHINE_CCR_H_ */