svn commit: r230852 - stable/7/sys/sun4v/include
Marius Strobl
marius at FreeBSD.org
Tue Jan 31 23:20:17 UTC 2012
Author: marius
Date: Tue Jan 31 23:20:17 2012
New Revision: 230852
URL: http://svn.freebsd.org/changeset/base/230852
Log:
Add more sparc64 compatibility macros for the shared loader.
This is a direct commit to stable/7 in order to unbreak the build with
224371 in place.
Modified:
stable/7/sys/sun4v/include/tlb.h
Modified: stable/7/sys/sun4v/include/tlb.h
==============================================================================
--- stable/7/sys/sun4v/include/tlb.h Tue Jan 31 23:20:14 2012 (r230851)
+++ stable/7/sys/sun4v/include/tlb.h Tue Jan 31 23:20:17 2012 (r230852)
@@ -43,7 +43,21 @@
(TD_V | TD_4M | (TLB_DIRECT_ADDRESS_MASK - TLB_DIRECT_PAGE_MASK))
#define TLB_DAR_SLOT_SHIFT (3)
-#define TLB_DAR_SLOT(slot) ((slot) << TLB_DAR_SLOT_SHIFT)
+
+/*
+ * sparc64 compatibility for the loader
+ */
+#define TLB_DAR_TLB_SHIFT (16)
+#define TLB_DAR_SLOT(tlb, slot) \
+ ((tlb) << TLB_DAR_TLB_SHIFT | (slot) << TLB_DAR_SLOT_SHIFT)
+#define TLB_DAR_T16 (0) /* US-III{,i,+}, IV{,+} */
+#define TLB_DAR_T32 (0) /* US-I, II{,e,i} */
+#define TLB_DAR_DT512_0 (2) /* US-III{,i,+}, IV{,+} */
+#define TLB_DAR_DT512_1 (3) /* US-III{,i,+}, IV{,+} */
+#define TLB_DAR_IT128 (2) /* US-III{,i,+}, IV */
+#define TLB_DAR_IT512 (2) /* US-IV+ */
+#define TLB_DAR_FTLB (0) /* SPARC64 V, VI, VII, VIIIfx */
+#define TLB_DAR_STLB (2) /* SPARC64 V, VI, VII, VIIIfx */
#define TAR_VPN_SHIFT (13)
#define TAR_CTX_MASK ((1 << TAR_VPN_SHIFT) - 1)
More information about the svn-src-stable-7
mailing list