xc/programs/Xserver/hw/xfree86/loader/dixsym.c

xc/programs/Xserver/include/globals.h
xc/programs/Xserver/mi/miinitext.c
//bugs.freedesktop.org/show_bug.cgi?id=1361) attachment #894
    (https://bugs.freedesktop.org/attachment.cgi?id=894): Allow turning
    on/off most of the Xserver extensions (=all except server-specific
    extensions (e.g. DMX, XpExtension, etc.) via +extension/-extension

2 files changed, 252 insertions, 1 deletions

diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index e0b93926f..724c00d56 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.4 2004/08/09 03:40:50 krh Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.5 2004/08/19 04:08:40 kem Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03
  * 17:11:29 tsi Exp $ */
 
@@ -325,15 +325,122 @@ LOOKUP dixLookupTab[] = {
     SYMFUNC(AdjustWaitForDelay)
     SYMVAR(noTestExtensions)
     SYMFUNC(GiveUp)
+
+#ifdef BEZIER
+    SYMVAR(noBezierExtension)
+#endif
+#ifdef BIGREQS
+    SYMVAR(noBigReqExtension)
+#endif
 #ifdef COMPOSITE
     SYMVAR(noCompositeExtension)
 #endif
+#ifdef DAMAGE
+    SYMVAR(noDamageExtension)
+#endif
+#ifdef DBE
+    SYMVAR(noDbeExtension)
+#endif
+#ifdef DPSEXT
+    SYMVAR(noDPSExtension)
+#endif
+#ifdef DPMSExtension
+    SYMVAR(noDPMSExtension)
+#endif
+#ifdef EVI
+    SYMVAR(noEVIExtension)
+#endif
+#ifdef FONTCACHE
+    SYMVAR(noFontCacheExtension)
+#endif
+#ifdef GLXEXT
+    SYMVAR(noGlxExtension)
+#endif
+#ifdef LBX
+    SYMVAR(noLbxExtension)
+#endif
+#ifdef SCREENSAVER
+    SYMVAR(noScreenSaverExtension)
+#endif
+#ifdef MITSHM
+    SYMVAR(noMITShmExtension)
+#endif
+#ifdef MITMISC
+    SYMVAR(noMITMiscExtension)
+#endif
+#ifdef MULTIBUFFER
+    SYMVAR(noMultibufferExtension)
+#endif
+#ifdef RANDR
+    SYMVAR(noRRExtension)
+#endif
 #ifdef RENDER
     SYMVAR(noRenderExtension)
 #endif
+#ifdef SHAPE
+    SYMVAR(noShapeExtension)
+#endif
+#ifdef XCSECURITY
+    SYMVAR(noSecurityExtension)
+#endif
+#ifdef XSYNC
+    SYMVAR(noSyncExtension)
+#endif
+#ifdef TOGCUP
+    SYMVAR(noXcupExtension)
+#endif
+#ifdef PEXEXT
+    SYMVAR(noPexExtension)
+#endif
+#ifdef RES
+    SYMVAR(noResExtension)
+#endif
+#ifdef XAPPGROUP
+    SYMVAR(noXagExtension)
+#endif
+#ifdef XCMISC
+    SYMVAR(noXCMiscExtension)
+#endif
 #ifdef XEVIE
     SYMVAR(noXevieExtension)
 #endif
+#ifdef XIE
+    SYMVAR(noXie)
+#endif
+#ifdef XF86BIGFONT
+    SYMVAR(noXFree86BigfontExtension)
+#endif
+#ifdef XFreeXDGA
+    SYMVAR(noXFree86DGAExtension)
+#endif
+#ifdef XF86DRI
+    SYMVAR(noXFree86DRIExtension)
+#endif
+#ifdef XF86MISC
+    SYMVAR(noXFree86MiscExtension)
+#endif
+#ifdef XF86VIDMODE
+    SYMVAR(noXFree86VidModeExtension)
+#endif
+#ifdef XFIXES
+    SYMVAR(noXFixesExtension)
+#endif
+#ifdef XKB
+/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */
+    SYMVAR(noXkbExtension)
+#endif
+#ifdef PANORAMIX
+    SYMVAR(noPanoramiXExtension)
+#endif
+#ifdef XINPUT
+    SYMVAR(noXInputExtension)
+#endif
+#ifdef XIDLE
+    SYMVAR(noXIdleExtension)
+#endif
+#ifdef XV
+    SYMVAR(noXvExtension)
+#endif
 
     /* log.c */
     SYMFUNC(LogVWrite)
diff --git a/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S b/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
new file mode 100644
index 000000000..fb23942ef
--- /dev/null
+++ b/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
@@ -0,0 +1,144 @@
+/* Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */
+
+#ifdef INLINE_ASM
+#define FUNCTION_START(f,n)	.inline f,n
+#define FUNCTION_END(f)		.end
+#else
+#define _ASM
+#include <sys/asm_linkage.h>
+#define FUNCTION_START(f,n)	ENTRY(f)
+#define FUNCTION_END(f)		SET_SIZE(f)
+#endif
+
+/* Converted from common/compiler.h gcc inline format to Sun cc inline
+ * format by Kenjiro Tsuji	
+ *	
+ *	The value 0x88 means ASI_PRIMARY_LITTLE.
+ *	The store or load to/from the address space will be done
+ *	as little-endian. In the original xrog code, the value
+ *	is defined as the macro ASI_PL.
+ *
+ *	In the original xorg code, "membar #StoreStore|#StoreLoad"
+ *	is directly implemented as an instruction "0x8143e00a".
+ *
+ */
+
+	FUNCTION_START(outb, 0)
+	stba	%o1, [%o0] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(outb)
+
+	FUNCTION_START(outw, 0)
+	stha	%o1, [%o0] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(outw)
+
+	FUNCTION_START(outl, 0)
+	sta	%o1, [%o0] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(outl)
+
+	FUNCTION_START(inb, 0)
+	lduba	[%o0] 0x88, %o0
+	FUNCTION_END(inb)
+
+	FUNCTION_START(inw, 0)
+	lduha	[%o0] 0x88, %o0
+	FUNCTION_END(inw)
+
+	FUNCTION_START(inl, 0)
+	lda	[%o0] 0x88, %o0
+	FUNCTION_END(inl)
+
+	FUNCTION_START(xf86ReadMmio8, 0)
+	lduba	[%o0 + %o1] 0x88, %o0
+	FUNCTION_END(xf86ReadMmio8)
+
+	FUNCTION_START(xf86ReadMmio16Be, 0)
+	lduh	[%o0 + %o1], %o0
+	FUNCTION_END(xf86ReadMmio16Be)
+
+	FUNCTION_START(xf86ReadMmio16Le, 0)
+	lduha	[%o0 + %o1] 0x88, %o0
+	FUNCTION_END(xf86ReadMmio16Le)
+
+	FUNCTION_START(xf86ReadMmio32Be, 0)
+	ld	[%o0 + %o1], %o0
+	FUNCTION_END(xf86ReadMmio32Be)
+
+	FUNCTION_START(xf86ReadMmio32Le, 0)
+	lda	[%o0 + %o1] 0x88, %o0
+	FUNCTION_END(xf86ReadMmio32Le)
+
+	FUNCTION_START(xf86WriteMmio8, 0)
+	stba	%o2, [%o0 + %o1] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(xf86WriteMmio8)
+
+	FUNCTION_START(xf86WriteMmio16Be, 0)
+	sth	%o2, [%o0 + %o1]
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(xf86WriteMmio16Be)
+
+	FUNCTION_START(xf86WriteMmio16Le, 0)
+	stha	%o2, [%o0 + %o1] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(xf86WriteMmio16Le)
+
+	FUNCTION_START(xf86WriteMmio32Be, 0)
+	st	%o2, [%o0 + %o1]
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(xf86WriteMmio32Be)
+
+	FUNCTION_START(xf86WriteMmio32Le, 0)
+	sta	%o2, [%o0 + %o1] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(xf86WriteMmio32Le)
+
+	FUNCTION_START(xf86WriteMmio8NB, 0)
+	add	%o0, %o1, %o0
+	stba	%o2, [%o0] 0x88
+	FUNCTION_END(xf86WriteMmio8NB)
+
+	FUNCTION_START(xf86WriteMmio16BeNB, 0)
+	sth	%o2, [%o0 + %o1]
+	FUNCTION_END(xf86WriteMmio16BeNB)
+
+	FUNCTION_START(xf86WriteMmio16LeNB, 0)
+	stha	%o2, [%o0 + %o1] 0x88
+	FUNCTION_END(xf86WriteMmio16LeNB)
+
+	FUNCTION_START(xf86WriteMmio32BeNB, 0)
+	st	%o2, [%o0 + %o1]
+	FUNCTION_END(xf86WriteMmio32BeNB)
+
+	FUNCTION_START(xf86WriteMmio32LeNB, 0)
+	sta	%o2, [%o0 + %o1] 0x88
+	FUNCTION_END(xf86WriteMmio32LeNB)
+