Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 407 insertions, 407 deletions

diff --git a/mesalib/src/mesa/x86/x86_cliptest.S b/mesalib/src/mesa/x86/x86_cliptest.S
index 8556a887a..e413aee61 100644
--- a/mesalib/src/mesa/x86/x86_cliptest.S
+++ b/mesalib/src/mesa/x86/x86_cliptest.S
@@ -1,407 +1,407 @@
-

-/*

- * Mesa 3-D graphics library

- * Version:  3.5

- *

- * Copyright (C) 1999-2001  Brian Paul   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, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * 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.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-/*

- * NOTE: Avoid using spaces in between '(' ')' and arguments, especially

- * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces

- * in there will break the build on some platforms.

- */

-

-#include "assyntax.h"

-#include "matypes.h"

-#include "clip_args.h"

-

-#define SRC0		REGOFF(0, ESI)

-#define SRC1		REGOFF(4, ESI)

-#define SRC2		REGOFF(8, ESI)

-#define SRC3		REGOFF(12, ESI)

-#define DST0		REGOFF(0, EDI)

-#define DST1		REGOFF(4, EDI)

-#define DST2		REGOFF(8, EDI)

-#define DST3		REGOFF(12, EDI)

-#define MAT0		REGOFF(0, EDX)

-#define MAT1		REGOFF(4, EDX)

-#define MAT2		REGOFF(8, EDX)

-#define MAT3		REGOFF(12, EDX)

-

-

-/*

- * Table for clip test.

- *

- * 	bit6 = SRC3 < 0

- * 	bit5 = SRC2 < 0

- * 	bit4 = abs(S(2)) > abs(S(3))

- * 	bit3 = SRC1 < 0

- * 	bit2 = abs(S(1)) > abs(S(3))

- * 	bit1 = SRC0 < 0

- * 	bit0 = abs(S(0)) > abs(S(3))

- */

-

-	SEG_DATA

-

-clip_table:

-	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x04, 0x05, 0x04, 0x06

-	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x08, 0x09, 0x08, 0x0a

-	D_BYTE 0x20, 0x21, 0x20, 0x22, 0x24, 0x25, 0x24, 0x26

-	D_BYTE 0x20, 0x21, 0x20, 0x22, 0x28, 0x29, 0x28, 0x2a

-	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x04, 0x05, 0x04, 0x06

-	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x08, 0x09, 0x08, 0x0a

-	D_BYTE 0x10, 0x11, 0x10, 0x12, 0x14, 0x15, 0x14, 0x16

-	D_BYTE 0x10, 0x11, 0x10, 0x12, 0x18, 0x19, 0x18, 0x1a

-	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x37, 0x35, 0x37, 0x36

-	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x3b, 0x39, 0x3b, 0x3a

-	D_BYTE 0x2f, 0x2d, 0x2f, 0x2e, 0x27, 0x25, 0x27, 0x26

-	D_BYTE 0x2f, 0x2d, 0x2f, 0x2e, 0x2b, 0x29, 0x2b, 0x2a

-	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x37, 0x35, 0x37, 0x36

-	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x3b, 0x39, 0x3b, 0x3a

-	D_BYTE 0x1f, 0x1d, 0x1f, 0x1e, 0x17, 0x15, 0x17, 0x16

-	D_BYTE 0x1f, 0x1d, 0x1f, 0x1e, 0x1b, 0x19, 0x1b, 0x1a

-

-

-	SEG_TEXT

-

-/*

- * _mesa_x86_cliptest_points4

- *

- *   AL:  ormask

- *   AH:  andmask

- *   EBX: temp0

- *   ECX: temp1

- *   EDX: clipmask[]

- *   ESI: clip[]

- *   EDI: proj[]

- *   EBP: temp2

- */

-

-#if defined(__ELF__) && defined(__PIC__) && defined(GNU_ASSEMBLER) && !defined(ELFPIC)

-#define ELFPIC

-#endif

-

-ALIGNTEXT16

-GLOBL GLNAME( _mesa_x86_cliptest_points4 )

-HIDDEN(_mesa_x86_cliptest_points4)

-GLNAME( _mesa_x86_cliptest_points4 ):

-

-#ifdef ELFPIC

-#define FRAME_OFFSET 20

-#else

-#define FRAME_OFFSET 16

-#endif

-	PUSH_L( ESI )

-	PUSH_L( EDI )

-	PUSH_L( EBP )

-	PUSH_L( EBX )

-

-#ifdef ELFPIC

-	/* store pointer to clip_table on stack */

-	CALL( LLBL(ctp4_get_eip) )

-	ADD_L( CONST(_GLOBAL_OFFSET_TABLE_), EBX )

-	MOV_L( REGOFF(clip_table@GOT, EBX), EBX )

-	PUSH_L( EBX )

-	JMP( LLBL(ctp4_clip_table_ready) )

-

-LLBL(ctp4_get_eip):

-	/* store eip in ebx */

-	MOV_L( REGIND(ESP), EBX )

-	RET

-

-LLBL(ctp4_clip_table_ready):

-#endif

-

-	MOV_L( ARG_SOURCE, ESI )

-	MOV_L( ARG_DEST, EDI )

-

-	MOV_L( ARG_CLIP, EDX )

-	MOV_L( ARG_OR, EBX )

-

-	MOV_L( ARG_AND, EBP )

-	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

-

-	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

-	MOV_L( REGOFF(V4F_START, ESI), ESI )

-

-	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

-	MOV_L( EAX, ARG_SOURCE )	/* put stride in ARG_SOURCE */

-

-	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

-	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

-

-	MOV_L( REGOFF(V4F_START, EDI), EDI )

-	ADD_L( EDX, ECX )

-

-	MOV_L( ECX, ARG_CLIP )		/* put clipmask + count in ARG_CLIP */

-	CMP_L( ECX, EDX )

-

-	MOV_B( REGIND(EBX), AL )

-	MOV_B( REGIND(EBP), AH )

-

-	JZ( LLBL(ctp4_finish) )

-

-ALIGNTEXT16

-LLBL(ctp4_top):

-

-	FLD1				/* F3 */

-	FDIV_S( SRC3 )		/* GH: don't care about div-by-zero */

-

-	MOV_L( SRC3, EBP )

-	MOV_L( SRC2, EBX )

-

-	XOR_L( ECX, ECX )

-	ADD_L( EBP, EBP )	/* ebp = abs(S(3))*2 ; carry = sign of S(3) */

-

-	ADC_L( ECX, ECX )

-	ADD_L( EBX, EBX )	/* ebx = abs(S(2))*2 ; carry = sign of S(2) */

-

-	ADC_L( ECX, ECX )

-	CMP_L( EBX, EBP )	/* carry = abs(S(2))*2 > abs(S(3))*2 */

-

-	ADC_L( ECX, ECX )

-	MOV_L( SRC1, EBX )

-

-	ADD_L( EBX, EBX )	/* ebx = abs(S(1))*2 ; carry = sign of S(1) */

-

-	ADC_L( ECX, ECX )

-	CMP_L( EBX, EBP )	/* carry = abs(S(1))*2 > abs(S(3))*2 */

-

-	ADC_L( ECX, ECX )

-	MOV_L( SRC0, EBX )

-

-	ADD_L( EBX, EBX )	/* ebx = abs(S(0))*2 ; carry = sign of S(0) */

-

-	ADC_L( ECX, ECX )

-	CMP_L( EBX, EBP )	/* carry = abs(S(0))*2 > abs(S(3))*2 */

-

-	ADC_L( ECX, ECX )

-

-#ifdef ELFPIC

-	MOV_L( REGIND(ESP), EBP )	/* clip_table */

-

-	MOV_B( REGBI(EBP, ECX), CL )

-#else

-	MOV_B( REGOFF(clip_table,ECX), CL )

-#endif

-

-	OR_B( CL, AL )

-	AND_B( CL, AH )

-

-	TEST_B( CL, CL )

-	MOV_B( CL, REGIND(EDX) )

-

-	JZ( LLBL(ctp4_proj) )

-

-LLBL(ctp4_noproj):

-

-	FSTP( ST(0) )			/* */

-

-	MOV_L( CONST(0), DST0 )

-	MOV_L( CONST(0), DST1 )

-	MOV_L( CONST(0), DST2 )

-	MOV_L( CONST(0x3f800000), DST3 )

-

-	JMP( LLBL(ctp4_next) )

-

-LLBL(ctp4_proj):

-

-	FLD_S( SRC0 )			/* F0 F3 */

-	FMUL2( ST(1), ST0 )

-

-	FLD_S( SRC1 )			/* F1 F0 F3 */

-	FMUL2( ST(2), ST0 )

-

-	FLD_S( SRC2 )			/* F2 F1 F0 F3 */

-	FMUL2( ST(3), ST0 )

-

-	FXCH( ST(2) )			/* F0 F1 F2 F3 */

-	FSTP_S( DST0 )		/* F1 F2 F3 */

-	FSTP_S( DST1 )		/* F2 F3 */

-	FSTP_S( DST2 )		/* F3 */

-	FSTP_S( DST3 )		/* */

-

-LLBL(ctp4_next):

-

-	INC_L( EDX )

-	ADD_L( CONST(16), EDI )

-

-	ADD_L( ARG_SOURCE, ESI )

-	CMP_L( EDX, ARG_CLIP )

-

-	JNZ( LLBL(ctp4_top) )

-

-	MOV_L( ARG_OR, ECX )

-	MOV_L( ARG_AND, EDX )

-

-	MOV_B( AL, REGIND(ECX) )

-	MOV_B( AH, REGIND(EDX) )

-

-LLBL(ctp4_finish):

-

-	MOV_L( ARG_DEST, EAX )

-#ifdef ELFPIC

-	POP_L( ESI )			/* discard ptr to clip_table */

-#endif

-	POP_L( EBX )

-	POP_L( EBP )

-	POP_L( EDI )

-	POP_L( ESI )

-

-	RET

-

-

-

-

-

-

-

-ALIGNTEXT16

-GLOBL GLNAME( _mesa_x86_cliptest_points4_np )

-HIDDEN(_mesa_x86_cliptest_points4_np)

-GLNAME( _mesa_x86_cliptest_points4_np ):

-

-#ifdef ELFPIC

-#define FRAME_OFFSET 20

-#else

-#define FRAME_OFFSET 16

-#endif

-	PUSH_L( ESI )

-	PUSH_L( EDI )

-	PUSH_L( EBP )

-	PUSH_L( EBX )

-

-#ifdef ELFPIC

-	/* store pointer to clip_table on stack */

-	CALL( LLBL(ctp4_np_get_eip) )

-	ADD_L( CONST(_GLOBAL_OFFSET_TABLE_), EBX )

-	MOV_L( REGOFF(clip_table@GOT, EBX), EBX )

-	PUSH_L( EBX )

-	JMP( LLBL(ctp4_np_clip_table_ready) )

-

-LLBL(ctp4_np_get_eip):

-	/* store eip in ebx */

-	MOV_L( REGIND(ESP), EBX )

-	RET

-

-LLBL(ctp4_np_clip_table_ready):

-#endif

-

-	MOV_L( ARG_SOURCE, ESI )

-	/* slot */

-

-	MOV_L( ARG_CLIP, EDX )

-	MOV_L( ARG_OR, EBX )

-

-	MOV_L( ARG_AND, EBP )

-	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

-

-	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

-	MOV_L( REGOFF(V4F_START, ESI), ESI )

-

-	MOV_L( EAX, ARG_DEST )   	/* put stride in ARG_DEST */

-	ADD_L( EDX, ECX )

-

-	MOV_L( ECX, EDI )		/* put clipmask + count in EDI */

-	CMP_L( ECX, EDX )

-

-	MOV_B( REGIND(EBX), AL )

-	MOV_B( REGIND(EBP), AH )

-

-	JZ( LLBL(ctp4_np_finish) )

-

-ALIGNTEXT16

-LLBL(ctp4_np_top):

-

-	MOV_L( SRC3, EBP )

-	MOV_L( SRC2, EBX )

-

-	XOR_L( ECX, ECX )

-	ADD_L( EBP, EBP )	/* ebp = abs(S(3))*2 ; carry = sign of S(3) */

-

-	ADC_L( ECX, ECX )

-	ADD_L( EBX, EBX )	/* ebx = abs(S(2))*2 ; carry = sign of S(2) */

-

-	ADC_L( ECX, ECX )

-	CMP_L( EBX, EBP )	/* carry = abs(S(2))*2 > abs(S(3))*2 */

-

-	ADC_L( ECX, ECX )

-	MOV_L( SRC1, EBX )

-

-	ADD_L( EBX, EBX )	/* ebx = abs(S(1))*2 ; carry = sign of S(1) */

-

-	ADC_L( ECX, ECX )

-	CMP_L( EBX, EBP )	/* carry = abs(S(1))*2 > abs(S(3))*2 */

-

-	ADC_L( ECX, ECX )

-	MOV_L( SRC0, EBX )

-

-	ADD_L( EBX, EBX )	/* ebx = abs(S(0))*2 ; carry = sign of S(0) */

-

-	ADC_L( ECX, ECX )

-	CMP_L( EBX, EBP )	/* carry = abs(S(0))*2 > abs(S(3))*2 */

-

-	ADC_L( ECX, ECX )

-

-#ifdef ELFPIC

-	MOV_L( REGIND(ESP), EBP )	/* clip_table */

-

-	MOV_B( REGBI(EBP, ECX), CL )

-#else

-	MOV_B( REGOFF(clip_table,ECX), CL )

-#endif

-

-	OR_B( CL, AL )

-	AND_B( CL, AH )

-

-	TEST_B( CL, CL )

-	MOV_B( CL, REGIND(EDX) )

-

-	INC_L( EDX )

-	/* slot */

-

-	ADD_L( ARG_DEST, ESI )

-	CMP_L( EDX, EDI )

-

-	JNZ( LLBL(ctp4_np_top) )

-

-	MOV_L( ARG_OR, ECX )

-	MOV_L( ARG_AND, EDX )

-

-	MOV_B( AL, REGIND(ECX) )

-	MOV_B( AH, REGIND(EDX) )

-

-LLBL(ctp4_np_finish):

-

-	MOV_L( ARG_SOURCE, EAX )

-#ifdef ELFPIC

-	POP_L( ESI )			/* discard ptr to clip_table */

-#endif

-	POP_L( EBX )

-	POP_L( EBP )

-	POP_L( EDI )

-	POP_L( ESI )

-

-	RET

-	

-#if defined (__ELF__) && defined (__linux__)

-	.section .note.GNU-stack,"",%progbits

-#endif

+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   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, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * 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.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially
+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces
+ * in there will break the build on some platforms.
+ */
+
+#include "assyntax.h"
+#include "matypes.h"
+#include "clip_args.h"
+
+#define SRC0		REGOFF(0, ESI)
+#define SRC1		REGOFF(4, ESI)
+#define SRC2		REGOFF(8, ESI)
+#define SRC3		REGOFF(12, ESI)
+#define DST0		REGOFF(0, EDI)
+#define DST1		REGOFF(4, EDI)
+#define DST2		REGOFF(8, EDI)
+#define DST3		REGOFF(12, EDI)
+#define MAT0		REGOFF(0, EDX)
+#define MAT1		REGOFF(4, EDX)
+#define MAT2		REGOFF(8, EDX)
+#define MAT3		REGOFF(12, EDX)
+
+
+/*
+ * Table for clip test.
+ *
+ * 	bit6 = SRC3 < 0
+ * 	bit5 = SRC2 < 0
+ * 	bit4 = abs(S(2)) > abs(S(3))
+ * 	bit3 = SRC1 < 0
+ * 	bit2 = abs(S(1)) > abs(S(3))
+ * 	bit1 = SRC0 < 0
+ * 	bit0 = abs(S(0)) > abs(S(3))
+ */
+
+	SEG_DATA
+
+clip_table:
+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x04, 0x05, 0x04, 0x06
+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x08, 0x09, 0x08, 0x0a
+	D_BYTE 0x20, 0x21, 0x20, 0x22, 0x24, 0x25, 0x24, 0x26
+	D_BYTE 0x20, 0x21, 0x20, 0x22, 0x28, 0x29, 0x28, 0x2a
+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x04, 0x05, 0x04, 0x06
+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x08, 0x09, 0x08, 0x0a
+	D_BYTE 0x10, 0x11, 0x10, 0x12, 0x14, 0x15, 0x14, 0x16
+	D_BYTE 0x10, 0x11, 0x10, 0x12, 0x18, 0x19, 0x18, 0x1a
+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x37, 0x35, 0x37, 0x36
+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x3b, 0x39, 0x3b, 0x3a
+	D_BYTE 0x2f, 0x2d, 0x2f, 0x2e, 0x27, 0x25, 0x27, 0x26
+	D_BYTE 0x2f, 0x2d, 0x2f, 0x2e, 0x2b, 0x29, 0x2b, 0x2a
+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x37, 0x35, 0x37, 0x36
+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x3b, 0x39, 0x3b, 0x3a
+	D_BYTE 0x1f, 0x1d, 0x1f, 0x1e, 0x17, 0x15, 0x17, 0x16
+	D_BYTE 0x1f, 0x1d, 0x1f, 0x1e, 0x1b, 0x19, 0x1b, 0x1a
+
+
+	SEG_TEXT
+
+/*
+ * _mesa_x86_cliptest_points4
+ *
+ *   AL:  ormask
+ *   AH:  andmask
+ *   EBX: temp0
+ *   ECX: temp1
+ *   EDX: clipmask[]
+ *   ESI: clip[]
+ *   EDI: proj[]
+ *   EBP: temp2
+ */
+
+#if defined(__ELF__) && defined(__PIC__) && defined(GNU_ASSEMBLER) && !defined(ELFPIC)
+#define ELFPIC
+#endif
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_cliptest_points4 )
+HIDDEN(_mesa_x86_cliptest_points4)
+GLNAME( _mesa_x86_cliptest_points4 ):
+
+#ifdef ELFPIC
+#define FRAME_OFFSET 20
+#else
+#define FRAME_OFFSET 16
+#endif
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBP )
+	PUSH_L( EBX )
+
+#ifdef ELFPIC
+	/* store pointer to clip_table on stack */
+	CALL( LLBL(ctp4_get_eip) )
+	ADD_L( CONST(_GLOBAL_OFFSET_TABLE_), EBX )
+	MOV_L( REGOFF(clip_table@GOT, EBX), EBX )
+	PUSH_L( EBX )
+	JMP( LLBL(ctp4_clip_table_ready) )
+
+LLBL(ctp4_get_eip):
+	/* store eip in ebx */
+	MOV_L( REGIND(ESP), EBX )
+	RET
+
+LLBL(ctp4_clip_table_ready):
+#endif
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_CLIP, EDX )
+	MOV_L( ARG_OR, EBX )
+
+	MOV_L( ARG_AND, EBP )
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+	MOV_L( EAX, ARG_SOURCE )	/* put stride in ARG_SOURCE */
+
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDX, ECX )
+
+	MOV_L( ECX, ARG_CLIP )		/* put clipmask + count in ARG_CLIP */
+	CMP_L( ECX, EDX )
+
+	MOV_B( REGIND(EBX), AL )
+	MOV_B( REGIND(EBP), AH )
+
+	JZ( LLBL(ctp4_finish) )
+
+ALIGNTEXT16
+LLBL(ctp4_top):
+
+	FLD1				/* F3 */
+	FDIV_S( SRC3 )		/* GH: don't care about div-by-zero */
+
+	MOV_L( SRC3, EBP )
+	MOV_L( SRC2, EBX )
+
+	XOR_L( ECX, ECX )
+	ADD_L( EBP, EBP )	/* ebp = abs(S(3))*2 ; carry = sign of S(3) */
+
+	ADC_L( ECX, ECX )
+	ADD_L( EBX, EBX )	/* ebx = abs(S(2))*2 ; carry = sign of S(2) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(2))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+	MOV_L( SRC1, EBX )
+
+	ADD_L( EBX, EBX )	/* ebx = abs(S(1))*2 ; carry = sign of S(1) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(1))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+	MOV_L( SRC0, EBX )
+
+	ADD_L( EBX, EBX )	/* ebx = abs(S(0))*2 ; carry = sign of S(0) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(0))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+
+#ifdef ELFPIC
+	MOV_L( REGIND(ESP), EBP )	/* clip_table */
+
+	MOV_B( REGBI(EBP, ECX), CL )
+#else
+	MOV_B( REGOFF(clip_table,ECX), CL )
+#endif
+
+	OR_B( CL, AL )
+	AND_B( CL, AH )
+
+	TEST_B( CL, CL )
+	MOV_B( CL, REGIND(EDX) )
+
+	JZ( LLBL(ctp4_proj) )
+
+LLBL(ctp4_noproj):
+
+	FSTP( ST(0) )			/* */
+
+	MOV_L( CONST(0), DST0 )
+	MOV_L( CONST(0), DST1 )
+	MOV_L( CONST(0), DST2 )
+	MOV_L( CONST(0x3f800000), DST3 )
+
+	JMP( LLBL(ctp4_next) )
+
+LLBL(ctp4_proj):
+
+	FLD_S( SRC0 )			/* F0 F3 */
+	FMUL2( ST(1), ST0 )
+
+	FLD_S( SRC1 )			/* F1 F0 F3 */
+	FMUL2( ST(2), ST0 )
+
+	FLD_S( SRC2 )			/* F2 F1 F0 F3 */
+	FMUL2( ST(3), ST0 )
+
+	FXCH( ST(2) )			/* F0 F1 F2 F3 */
+	FSTP_S( DST0 )		/* F1 F2 F3 */
+	FSTP_S( DST1 )		/* F2 F3 */
+	FSTP_S( DST2 )		/* F3 */
+	FSTP_S( DST3 )		/* */
+
+LLBL(ctp4_next):
+
+	INC_L( EDX )
+	ADD_L( CONST(16), EDI )
+
+	ADD_L( ARG_SOURCE, ESI )
+	CMP_L( EDX, ARG_CLIP )
+
+	JNZ( LLBL(ctp4_top) )
+
+	MOV_L( ARG_OR, ECX )
+	MOV_L( ARG_AND, EDX )
+
+	MOV_B( AL, REGIND(ECX) )
+	MOV_B( AH, REGIND(EDX) )
+
+LLBL(ctp4_finish):
+
+	MOV_L( ARG_DEST, EAX )
+#ifdef ELFPIC
+	POP_L( ESI )			/* discard ptr to clip_table */
+#endif
+	POP_L( EBX )
+	POP_L( EBP )
+	POP_L( EDI )
+	POP_L( ESI )
+
+	RET
+
+
+
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_cliptest_points4_np )
+HIDDEN(_mesa_x86_cliptest_points4_np)
+GLNAME( _mesa_x86_cliptest_points4_np ):
+
+#ifdef ELFPIC
+#define FRAME_OFFSET 20
+#else
+#define FRAME_OFFSET 16
+#endif
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBP )
+	PUSH_L( EBX )
+
+#ifdef ELFPIC
+	/* store pointer to clip_table on stack */
+	CALL( LLBL(ctp4_np_get_eip) )
+	ADD_L( CONST(_GLOBAL_OFFSET_TABLE_), EBX )
+	MOV_L( REGOFF(clip_table@GOT, EBX), EBX )
+	PUSH_L( EBX )
+	JMP( LLBL(ctp4_np_clip_table_ready) )
+
+LLBL(ctp4_np_get_eip):
+	/* store eip in ebx */
+	MOV_L( REGIND(ESP), EBX )
+	RET
+
+LLBL(ctp4_np_clip_table_ready):
+#endif
+
+	MOV_L( ARG_SOURCE, ESI )
+	/* slot */
+
+	MOV_L( ARG_CLIP, EDX )
+	MOV_L( ARG_OR, EBX )
+
+	MOV_L( ARG_AND, EBP )
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( EAX, ARG_DEST )   	/* put stride in ARG_DEST */
+	ADD_L( EDX, ECX )
+
+	MOV_L( ECX, EDI )		/* put clipmask + count in EDI */
+	CMP_L( ECX, EDX )
+
+	MOV_B( REGIND(EBX), AL )
+	MOV_B( REGIND(EBP), AH )
+
+	JZ( LLBL(ctp4_np_finish) )
+
+ALIGNTEXT16
+LLBL(ctp4_np_top):
+
+	MOV_L( SRC3, EBP )
+	MOV_L( SRC2, EBX )
+
+	XOR_L( ECX, ECX )
+	ADD_L( EBP, EBP )	/* ebp = abs(S(3))*2 ; carry = sign of S(3) */
+
+	ADC_L( ECX, ECX )
+	ADD_L( EBX, EBX )	/* ebx = abs(S(2))*2 ; carry = sign of S(2) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(2))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+	MOV_L( SRC1, EBX )
+
+	ADD_L( EBX, EBX )	/* ebx = abs(S(1))*2 ; carry = sign of S(1) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(1))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+	MOV_L( SRC0, EBX )
+
+	ADD_L( EBX, EBX )	/* ebx = abs(S(0))*2 ; carry = sign of S(0) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(0))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+
+#ifdef ELFPIC
+	MOV_L( REGIND(ESP), EBP )	/* clip_table */
+
+	MOV_B( REGBI(EBP, ECX), CL )
+#else
+	MOV_B( REGOFF(clip_table,ECX), CL )
+#endif
+
+	OR_B( CL, AL )
+	AND_B( CL, AH )
+
+	TEST_B( CL, CL )
+	MOV_B( CL, REGIND(EDX) )
+
+	INC_L( EDX )
+	/* slot */
+
+	ADD_L( ARG_DEST, ESI )
+	CMP_L( EDX, EDI )
+
+	JNZ( LLBL(ctp4_np_top) )
+
+	MOV_L( ARG_OR, ECX )
+	MOV_L( ARG_AND, EDX )
+
+	MOV_B( AL, REGIND(ECX) )
+	MOV_B( AH, REGIND(EDX) )
+
+LLBL(ctp4_np_finish):
+
+	MOV_L( ARG_SOURCE, EAX )
+#ifdef ELFPIC
+	POP_L( ESI )			/* discard ptr to clip_table */
+#endif
+	POP_L( EBX )
+	POP_L( EBP )
+	POP_L( EDI )
+	POP_L( ESI )
+
+	RET
+	
+#if defined (__ELF__) && defined (__linux__)
+	.section .note.GNU-stack,"",%progbits
+#endif