Consolidation of asm code in 3.5

1 files changed, 55 insertions, 91 deletions

diff --git a/Make-config b/Make-config
index d83f79c5686..3226209644e 100644
--- a/Make-config
+++ b/Make-config
@@ -1,4 +1,4 @@
-# $Id: Make-config,v 1.40 2001/03/29 03:41:39 gareth Exp $
+# $Id: Make-config,v 1.41 2001/03/29 06:46:15 gareth Exp $
 
 MESA_MAJOR=3
 MESA_MINOR=5
@@ -220,9 +220,7 @@ freebsd-386:
 	"MAKELIB = ../bin/mklib.freebsd" \
 	"APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S"
 
 gcc:
@@ -556,26 +554,22 @@ linux-x86:
 	"OSMESA_LIB = libOSMesa.so" \
 	"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
 	"CPLUSPLUS = g++" \
-	"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
+	"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \
 	"MAKELIB = ../bin/mklib.linux" \
 	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
 	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
 	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
 	"APP_LIB_DEPS = -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S \
 		X86/mmx_blend.S \
-		X86/3dnow_xform_raw2.S X86/3dnow_xform_masked2.S \
-		X86/3dnow_xform_raw3.S X86/3dnow_xform_masked3.S \
-		X86/3dnow_xform_raw4.S X86/3dnow_xform_masked4.S \
-		X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
-		X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-		X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-		X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-		X86/katmai_norm_raw.S X86/katmai_vertex.S"
+		X86/3dnow_xform1.S X86/3dnow_xform2.S \
+		X86/3dnow_xform3.S X86/3dnow_xform4.S \
+		X86/3dnow_normal.S X86/3dnow_vertex.S \
+		X86/sse_xform1.S X86/sse_xform2.S \
+		X86/sse_xform3.S X86/sse_xform4.S \
+		X86/sse_normal.S X86/sse_vertex.S"
 
 linux-x86-static:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -586,26 +580,22 @@ linux-x86-static:
 	"OSMESA_LIB = libOSMesa.a" \
 	"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
 	"CPLUSPLUS = g++" \
-	"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
+	"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \
 	"MAKELIB = ../bin/mklib.ar-ruv" \
 	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
 	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
 	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
 	"APP_LIB_DEPS = -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform_raw4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S \
 		X86/mmx_blend.S \
-		X86/3dnow_xform_raw2.S X86/3dnow_xform_masked2.S \
-		X86/3dnow_xform_raw3.S X86/3dnow_xform_masked3.S \
-		X86/3dnow_xform_raw4.S X86/3dnow_xform_masked4.S \
-		X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
-		X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-		X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-		X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-		X86/katmai_norm_raw.S X86/katmai_vertex.S"
+		X86/3dnow_xform1.S X86/3dnow_xform2.S \
+		X86/3dnow_xform3.S X86/3dnow_xform4.S \
+		X86/3dnow_normal.S X86/3dnow_vertex.S \
+		X86/sse_xform1.S X86/sse_xform2.S \
+		X86/sse_xform3.S X86/sse_xform4.S \
+		X86/sse_normal.S X86/sse_vertex.S"
 
 # Contributed by [email protected]
 linux-ggi:
@@ -637,9 +627,7 @@ linux-386-ggi:
 	"MAKELIB = ../bin/mklib.ggi" \
 	"APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S"
 
 linux-glide:
@@ -676,9 +664,7 @@ linux-386-glide:
 	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
 	"APP_LIB_DEPS = -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S"
 
 linux-386-opt-glide:
@@ -698,9 +684,7 @@ linux-386-opt-glide:
 	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
 	"APP_LIB_DEPS = -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S"
 
 linux-386-opt-V2-glide:
@@ -720,9 +704,7 @@ linux-386-opt-V2-glide:
 	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
 	"APP_LIB_DEPS = -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S"
 
 linux-x86-glide:
@@ -734,27 +716,23 @@ linux-x86-glide:
 	"OSMESA_LIB = libOSMesa.so" \
 	"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
 	"CPLUSPLUS = g++" \
-	"CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
+	"CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
 	"MAKELIB = ../bin/mklib.linux" \
 	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
 	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
 	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
 	"APP_LIB_DEPS = -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S \
 		X86/mmx_blend.S \
-		X86/3dnow_xform_raw2.S X86/3dnow_xform_raw2.S \
-		X86/3dnow_xform_raw3.S X86/3dnow_xform_raw3.S \
-		X86/3dnow_xform_raw4.S X86/3dnow_xform_raw4.S \
-		X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
+		X86/3dnow_xform1.S X86/3dnow_xform2.S \
+		X86/3dnow_xform3.S X86/3dnow_xform4.S \
+		X86/3dnow_normal.S X86/3dnow_vertex.S \
 		FX/X86/fx_3dnow_fastpath.S \
-		X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-		X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-		X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-		X86/katmai_norm_raw.S X86/katmai_vertex.S"
+		X86/sse_xform1.S X86/sse_xform2.S \
+		X86/sse_xform3.S X86/sse_xform4.S \
+		X86/sse_normal.S X86/sse_vertex.S"
 
 linux-alpha:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -999,9 +977,7 @@ os2-x11:
 	"MAKELIB = ..\\bin\\mklib-emx.cmd " \
 	"APP_LIB_DEPS = -Zmt -Zcrtdll -Zexe -L$(X11ROOT)/XFree86/lib -lXt -lX11 -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S"
 
 osf1:
@@ -1503,26 +1479,22 @@ linux-x86-debug:
 	"OSMESA_LIB = libOSMesa.so" \
 	"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
 	"CPLUSPLUS = g++" \
-	"CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include -DDEBUG -DMESA_DEBUG" \
+	"CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DDEBUG -DMESA_DEBUG" \
 	"MAKELIB = ../bin/mklib.linux" \
 	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
 	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
 	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
 	"APP_LIB_DEPS = -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S \
 		X86/mmx_blend.S \
-		X86/3dnow_xform_raw2.S X86/3dnow_xform_masked2.S \
-		X86/3dnow_xform_raw3.S X86/3dnow_xform_masked3.S \
-		X86/3dnow_xform_raw4.S X86/3dnow_xform_masked4.S \
-		X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
-		X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-		X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-		X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-		X86/katmai_norm_raw.S X86/katmai_vertex.S"
+		X86/3dnow_xform1.S X86/3dnow_xform2.S \
+		X86/3dnow_xform3.S X86/3dnow_xform4.S \
+		X86/3dnow_normal.S X86/3dnow_vertex.S \
+		X86/sse_xform1.S X86/sse_xform2.S \
+		X86/sse_xform3.S X86/sse_xform4.S \
+		X86/sse_normal.S X86/sse_vertex.S"
 
 linux-glide-debug:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1548,25 +1520,21 @@ linux-prof:
 	"OSMESA_LIB = libOSMesa.a" \
 	"CC = gcc" \
 	"CPLUSPLUS = g++" \
-	"CFLAGS = -Wall -O2 -pg -ansi -pedantic -ffast-math -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM" \
+	"CFLAGS = -Wall -O2 -pg -ansi -pedantic -ffast-math -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM" \
 	"CCFLAGS = $(CFLAGS)" \
 	"MAKELIB = ../bin/mklib.ar-ruv" \
 	"APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S \
 		X86/mmx_blend.S \
-		X86/3dnow_xform_raw2.S X86/3dnow_xform_masked2.S \
-		X86/3dnow_xform_raw3.S X86/3dnow_xform_masked3.S \
-		X86/3dnow_xform_raw4.S X86/3dnow_xform_masked4.S \
-		X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
+		X86/3dnow_xform1.S X86/3dnow_xform2.S \
+		X86/3dnow_xform3.S X86/3dnow_xform4.S \
+		X86/3dnow_normal.S X86/3dnow_vertex.S \
 		FX/X86/fx_3dnow_fastpath.S \
-		X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-		X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-		X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-		X86/katmai_norm_raw.S X86/katmai_vertex.S"
+		X86/sse_xform1.S X86/sse_xform2.S \
+		X86/sse_xform3.S X86/sse_xform4.S \
+		X86/sse_normal.S X86/sse_vertex.S"
 
 linux-glide-prof:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1577,22 +1545,18 @@ linux-glide-prof:
 	"OSMESA_LIB = libOSMesa.a" \
 	"CC = gcc" \
 	"CPLUSPLUS = g++" \
-	"CFLAGS = -O2 -pg -ansi -pedantic -Wall -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -I/usr/include/glide -I/usr/local/glide/include" \
+	"CFLAGS = -O2 -pg -ansi -pedantic -Wall -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -I/usr/include/glide -I/usr/local/glide/include" \
 	"CCFLAGS = $(CFLAGS)" \
 	"MAKELIB = ../bin/mklib.ar-ruv" \
 	"APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
 	"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-		X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-		X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-		X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
+		X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
 		X86/x86_cliptest.S X86/x86_vertex.S \
 		X86/mmx_blend.S \
-		X86/3dnow_xform_raw2.S X86/3dnow_xform_masked2.S \
-		X86/3dnow_xform_raw3.S X86/3dnow_xform_masked3.S \
-		X86/3dnow_xform_raw4.S X86/3dnow_xform_masked4.S \
-		X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
+		X86/3dnow_xform1.S X86/3dnow_xform2.S \
+		X86/3dnow_xform3.S X86/3dnow_xform4.S \
+		X86/3dnow_normal.S X86/3dnow_vertex.S \
 		FX/X86/fx_3dnow_fastpath.S \
-		X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-		X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-		X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-		X86/katmai_norm_raw.S X86/katmai_vertex.S"
+		X86/sse_xform1.S X86/sse_xform2.S \
+		X86/sse_xform3.S X86/sse_xform4.S \
+		X86/sse_normal.S X86/sse_vertex.S"