Move %ver definitions from pstate.h to ver.h. Add definitions for normal

kernel pstate values, which include a memory store order override.

2 files changed, 67 insertions, 26 deletions

diff --git a/sys/sparc64/include/pstate.h b/sys/sparc64/include/pstate.h
index fe69bfe..7d95b33 100644
--- a/sys/sparc64/include/pstate.h
+++ b/sys/sparc64/include/pstate.h
@@ -47,33 +47,13 @@
 #define	PSTATE_MG		(1<<10)
 #define	PSTATE_IG		(1<<11)
 
-#define	VER_MANUF_SHIFT		(48)
-#define	VER_IMPL_SHIFT		(32)
-#define	VER_MASK_SHIFT		(24)
-#define	VER_MAXTL_SHIFT		(8)
-#define	VER_MAXWIN_SHIFT	(0)
+#define	PSTATE_MM		PSTATE_MM_TSO
 
-#define	VER_MANUF_SIZE		(16)
-#define	VER_IMPL_SIZE		(16)
-#define	VER_MASK_SIZE		(8)
-#define	VER_MAXTL_SIZE		(8)
-#define	VER_MAXWIN_SIZE		(5)
+#define	PSTATE_NORMAL		(PSTATE_MM | PSTATE_PEF | PSTATE_PRIV)
+#define	PSTATE_ALT		(PSTATE_NORMAL | PSTATE_AG)
+#define	PSTATE_INTR		(PSTATE_NORMAL | PSTATE_IG)
+#define	PSTATE_MMU		(PSTATE_NORMAL | PSTATE_MG)
 
-#define	VER_MANUF_MASK		(((1L<<VER_MANUF_SIZE)-1)<<VER_MANUF_SHIFT)
-#define	VER_IMPL_MASK		(((1L<<VER_IMPL_SIZE)-1)<<VER_IMPL_SHIFT)
-#define	VER_MASK_MASK		(((1L<<VER_MASK_SIZE)-1)<<VER_MASK_SHIFT)
-#define	VER_MAXTL_MASK		(((1L<<VER_MAXTL_SIZE)-1)<<VER_MAXTL_SHIFT)
-#define	VER_MAXWIN_MASK		(((1L<<VER_MAXWIN_SIZE)-1)<<VER_MAXWIN_SHIFT)
-
-#define	VER_MANUF(ver) \
-	(((ver) & VER_MANUF_MASK) >> VER_MANUF_SHIFT)
-#define	VER_IMPL(ver) \
-	(((ver) & VER_IMPL_MASK) >> VER_IMPL_SHIFT)
-#define	VER_MASK(ver) \
-	(((ver) & VER_MASK_MASK) >> VER_MASK_SHIFT)
-#define	VER_MAXTL(ver) \
-	(((ver) & VER_MAXTL_MASK) >> VER_MAXTL_SHIFT)
-#define	VER_MAXWIN(ver) \
-	(((ver) & VER_MAXWIN_MASK) >> VER_MAXWIN_SHIFT)
+#define	PSTATE_KERNEL		(PSTATE_NORMAL | PSTATE_IE)
 
 #endif /* !_MACHINE_PSTATE_H_ */
diff --git a/sys/sparc64/include/ver.h b/sys/sparc64/include/ver.h
new file mode 100644
index 0000000..4d98355
--- /dev/null
+++ b/sys/sparc64/include/ver.h
@@ -0,0 +1,61 @@
+/*-
+ * 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_VER_H_
+#define	_MACHINE_VER_H_
+
+#define	VER_MANUF_SHIFT		(48)
+#define	VER_IMPL_SHIFT		(32)
+#define	VER_MASK_SHIFT		(24)
+#define	VER_MAXTL_SHIFT		(8)
+#define	VER_MAXWIN_SHIFT	(0)
+
+#define	VER_MANUF_SIZE		(16)
+#define	VER_IMPL_SIZE		(16)
+#define	VER_MASK_SIZE		(8)
+#define	VER_MAXTL_SIZE		(8)
+#define	VER_MAXWIN_SIZE		(5)
+
+#define	VER_MANUF_MASK		(((1L<<VER_MANUF_SIZE)-1)<<VER_MANUF_SHIFT)
+#define	VER_IMPL_MASK		(((1L<<VER_IMPL_SIZE)-1)<<VER_IMPL_SHIFT)
+#define	VER_MASK_MASK		(((1L<<VER_MASK_SIZE)-1)<<VER_MASK_SHIFT)
+#define	VER_MAXTL_MASK		(((1L<<VER_MAXTL_SIZE)-1)<<VER_MAXTL_SHIFT)
+#define	VER_MAXWIN_MASK		(((1L<<VER_MAXWIN_SIZE)-1)<<VER_MAXWIN_SHIFT)
+
+#define	VER_MANUF(ver) \
+	(((ver) & VER_MANUF_MASK) >> VER_MANUF_SHIFT)
+#define	VER_IMPL(ver) \
+	(((ver) & VER_IMPL_MASK) >> VER_IMPL_SHIFT)
+#define	VER_MASK(ver) \
+	(((ver) & VER_MASK_MASK) >> VER_MASK_SHIFT)
+#define	VER_MAXTL(ver) \
+	(((ver) & VER_MAXTL_MASK) >> VER_MAXTL_SHIFT)
+#define	VER_MAXWIN(ver) \
+	(((ver) & VER_MAXWIN_MASK) >> VER_MAXWIN_SHIFT)
+
+#endif /* !_MACHINE_VER_H_ */