. Updates to get X86, MXX and 3DNow assembler code working with Watcom

   C++ and NASM. This includes lots of _ASMAPI macros to ensure that
   assembler functions are prototyped as __cdecl, as Watcom C++ uses
   register calling conventions by default.
 . Misc fixes to files to remove warnings generated by Watcom C++.

4 files changed, 78 insertions, 71 deletions

diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c
index 212b6bffa5b..a32815bf625 100644
--- a/src/mesa/x86/3dnow.c
+++ b/src/mesa/x86/3dnow.c
@@ -1,4 +1,4 @@
-/* $Id: 3dnow.c,v 1.2 1999/10/19 18:37:06 keithw Exp $ */
+/* $Id: 3dnow.c,v 1.3 1999/11/12 04:57:22 kendallb Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -29,7 +29,7 @@
  * 3DNow! optimizations contributed by
  * Holger Waechtler <[email protected]>
  */
-#if defined(USE_3DNOW_ASM)
+#if defined(USE_3DNOW_ASM) && defined(USE_X86_ASM)
 #include "3dnow.h"
 
 #include <limits.h>
@@ -58,31 +58,31 @@
 
 
 #define DECLARE_XFORM_GROUP(pfx, v, masked) \
- extern void gl_##pfx##_transform_points##v##_general_##masked(XFORM_ARGS);    \
- extern void gl_##pfx##_transform_points##v##_identity_##masked(XFORM_ARGS);   \
- extern void gl_##pfx##_transform_points##v##_3d_no_rot_##masked(XFORM_ARGS);  \
- extern void gl_##pfx##_transform_points##v##_perspective_##masked(XFORM_ARGS);\
- extern void gl_##pfx##_transform_points##v##_2d_##masked(XFORM_ARGS);         \
- extern void gl_##pfx##_transform_points##v##_2d_no_rot_##masked(XFORM_ARGS);  \
- extern void gl_##pfx##_transform_points##v##_3d_##masked(XFORM_ARGS);
+ extern void _ASMAPI gl##pfx##_transform_points##v##_general_##masked(XFORM_ARGS);    \
+ extern void _ASMAPI gl##pfx##_transform_points##v##_identity_##masked(XFORM_ARGS);   \
+ extern void _ASMAPI gl##pfx##_transform_points##v##_3d_no_rot_##masked(XFORM_ARGS);  \
+ extern void _ASMAPI gl##pfx##_transform_points##v##_perspective_##masked(XFORM_ARGS);\
+ extern void _ASMAPI gl##pfx##_transform_points##v##_2d_##masked(XFORM_ARGS);         \
+ extern void _ASMAPI gl##pfx##_transform_points##v##_2d_no_rot_##masked(XFORM_ARGS);  \
+ extern void _ASMAPI gl##pfx##_transform_points##v##_3d_##masked(XFORM_ARGS);
 
 
 
 #define ASSIGN_XFORM_GROUP( pfx, cma, vsize, masked )           \
  gl_transform_tab[cma][vsize][MATRIX_GENERAL]                   \
-  = gl_##pfx##_transform_points##vsize##_general_##masked;      \
+  = gl##pfx##_transform_points##vsize##_general_##masked;      \
  gl_transform_tab[cma][vsize][MATRIX_IDENTITY]                  \
-  = gl_##pfx##_transform_points##vsize##_identity_##masked;     \
+  = gl##pfx##_transform_points##vsize##_identity_##masked;     \
  gl_transform_tab[cma][vsize][MATRIX_3D_NO_ROT]                 \
-  = gl_##pfx##_transform_points##vsize##_3d_no_rot_##masked;    \
+  = gl##pfx##_transform_points##vsize##_3d_no_rot_##masked;    \
  gl_transform_tab[cma][vsize][MATRIX_PERSPECTIVE]               \
-  = gl_##pfx##_transform_points##vsize##_perspective_##masked;  \
+  = gl##pfx##_transform_points##vsize##_perspective_##masked;  \
  gl_transform_tab[cma][vsize][MATRIX_2D]                        \
-  = gl_##pfx##_transform_points##vsize##_2d_##masked;           \
+  = gl##pfx##_transform_points##vsize##_2d_##masked;           \
  gl_transform_tab[cma][vsize][MATRIX_2D_NO_ROT]                 \
-  = gl_##pfx##_transform_points##vsize##_2d_no_rot_##masked;    \
+  = gl##pfx##_transform_points##vsize##_2d_no_rot_##masked;    \
  gl_transform_tab[cma][vsize][MATRIX_3D]                        \
-  = gl_##pfx##_transform_points##vsize##_3d_##masked;
+  = gl##pfx##_transform_points##vsize##_3d_##masked;
 
 
 
@@ -97,48 +97,48 @@
 
 
 #define DECLARE_NORM_GROUP(pfx, masked)                                        \
- extern void gl_##pfx##_rescale_normals_##masked## (NORM_ARGS);                \
- extern void gl_##pfx##_normalize_normals_##masked## (NORM_ARGS);              \
- extern void gl_##pfx##_transform_normals_##masked## (NORM_ARGS);              \
- extern void gl_##pfx##_transform_normals_no_rot_##masked## (NORM_ARGS);       \
- extern void gl_##pfx##_transform_rescale_normals_##masked## (NORM_ARGS);      \
- extern void gl_##pfx##_transform_rescale_normals_no_rot_##masked## (NORM_ARGS); \
- extern void gl_##pfx##_transform_normalize_normals_##masked## (NORM_ARGS);    \
- extern void gl_##pfx##_transform_normalize_normals_no_rot_##masked## (NORM_ARGS);
+ extern void _ASMAPI gl##pfx##_rescale_normals_##masked## (NORM_ARGS);                \
+ extern void _ASMAPI gl##pfx##_normalize_normals_##masked## (NORM_ARGS);              \
+ extern void _ASMAPI gl##pfx##_transform_normals_##masked## (NORM_ARGS);              \
+ extern void _ASMAPI gl##pfx##_transform_normals_no_rot_##masked## (NORM_ARGS);       \
+ extern void _ASMAPI gl##pfx##_transform_rescale_normals_##masked## (NORM_ARGS);      \
+ extern void _ASMAPI gl##pfx##_transform_rescale_normals_no_rot_##masked## (NORM_ARGS); \
+ extern void _ASMAPI gl##pfx##_transform_normalize_normals_##masked## (NORM_ARGS);    \
+ extern void _ASMAPI gl##pfx##_transform_normalize_normals_no_rot_##masked## (NORM_ARGS);
 
 
 
 #define ASSIGN_NORM_GROUP( pfx, cma, masked )                                 \
    gl_normal_tab[NORM_RESCALE][cma]   =                                       \
-      gl_##pfx##_rescale_normals_##masked##;                                  \
+      gl##pfx##_rescale_normals_##masked##;                                  \
    gl_normal_tab[NORM_NORMALIZE][cma] =                                       \
-      gl_##pfx##_normalize_normals_##masked##;                                \
+      gl##pfx##_normalize_normals_##masked##;                                \
    gl_normal_tab[NORM_TRANSFORM][cma] =                                       \
-      gl_##pfx##_transform_normals_##masked##;                                \
+      gl##pfx##_transform_normals_##masked##;                                \
    gl_normal_tab[NORM_TRANSFORM_NO_ROT][cma] =                                \
-      gl_##pfx##_transform_normals_no_rot_##masked##;                         \
+      gl##pfx##_transform_normals_no_rot_##masked##;                         \
    gl_normal_tab[NORM_TRANSFORM | NORM_RESCALE][cma] =                        \
-      gl_##pfx##_transform_rescale_normals_##masked##;                        \
+      gl##pfx##_transform_rescale_normals_##masked##;                        \
    gl_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE][cma] =                 \
-      gl_##pfx##_transform_rescale_normals_no_rot_##masked##;                 \
+      gl##pfx##_transform_rescale_normals_no_rot_##masked##;                 \
    gl_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE][cma] =                      \
-      gl_##pfx##_transform_normalize_normals_##masked##;                      \
+      gl##pfx##_transform_normalize_normals_##masked##;                      \
    gl_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE][cma] =               \
-      gl_##pfx##_transform_normalize_normals_no_rot_##masked##;
+	  gl##pfx##_transform_normalize_normals_no_rot_##masked##;
 
 
-extern void gl_3dnow_project_vertices( GLfloat *first,
+extern void _ASMAPI gl_3dnow_project_vertices( GLfloat *first,
 				       GLfloat *last,
 				       const GLfloat *m,
 				       GLuint stride );
 
-extern void gl_3dnow_project_clipped_vertices( GLfloat *first,
+extern void _ASMAPI gl_3dnow_project_clipped_vertices( GLfloat *first,
 					       GLfloat *last,
 					       const GLfloat *m,
 					       GLuint stride,
 					       const GLubyte *clipmask );
 
-extern void gl_v16_3dnow_general_xform( GLfloat *first_vert,
+extern void _ASMAPI gl_v16_3dnow_general_xform( GLfloat *first_vert,
 					const GLfloat *m,
 					const GLfloat *src,
 					GLuint src_stride,
@@ -146,32 +146,32 @@ extern void gl_v16_3dnow_general_xform( GLfloat *first_vert,
 
 void gl_init_3dnow_asm_transforms (void)
 {
-   DECLARE_XFORM_GROUP( 3dnow, 1, raw )
-   DECLARE_XFORM_GROUP( 3dnow, 2, raw )
-   DECLARE_XFORM_GROUP( 3dnow, 3, raw )
-   DECLARE_XFORM_GROUP( 3dnow, 4, raw )
-
-   DECLARE_XFORM_GROUP( 3dnow, 1, masked )
-   DECLARE_XFORM_GROUP( 3dnow, 2, masked )
-   DECLARE_XFORM_GROUP( 3dnow, 3, masked )
-   DECLARE_XFORM_GROUP( 3dnow, 4, masked )
-
-   DECLARE_NORM_GROUP( 3dnow, raw )
-/* DECLARE_NORM_GROUP( 3dnow, masked )
+   DECLARE_XFORM_GROUP( _3dnow, 1, raw )
+   DECLARE_XFORM_GROUP( _3dnow, 2, raw )
+   DECLARE_XFORM_GROUP( _3dnow, 3, raw )
+   DECLARE_XFORM_GROUP( _3dnow, 4, raw )
+
+   DECLARE_XFORM_GROUP( _3dnow, 1, masked )
+   DECLARE_XFORM_GROUP( _3dnow, 2, masked )
+   DECLARE_XFORM_GROUP( _3dnow, 3, masked )
+   DECLARE_XFORM_GROUP( _3dnow, 4, masked )
+
+   DECLARE_NORM_GROUP( _3dnow, raw )
+/* DECLARE_NORM_GROUP( _3dnow, masked )
 */
 
-   ASSIGN_XFORM_GROUP( 3dnow, 0, 1, raw )
-   ASSIGN_XFORM_GROUP( 3dnow, 0, 2, raw )
-   ASSIGN_XFORM_GROUP( 3dnow, 0, 3, raw )
-   ASSIGN_XFORM_GROUP( 3dnow, 0, 4, raw )
+   ASSIGN_XFORM_GROUP( _3dnow, 0, 1, raw )
+   ASSIGN_XFORM_GROUP( _3dnow, 0, 2, raw )
+   ASSIGN_XFORM_GROUP( _3dnow, 0, 3, raw )
+   ASSIGN_XFORM_GROUP( _3dnow, 0, 4, raw )
 
-   ASSIGN_XFORM_GROUP( 3dnow, CULL_MASK_ACTIVE, 1, masked )
-   ASSIGN_XFORM_GROUP( 3dnow, CULL_MASK_ACTIVE, 2, masked )
-   ASSIGN_XFORM_GROUP( 3dnow, CULL_MASK_ACTIVE, 3, masked )
-   ASSIGN_XFORM_GROUP( 3dnow, CULL_MASK_ACTIVE, 4, masked )
+   ASSIGN_XFORM_GROUP( _3dnow, CULL_MASK_ACTIVE, 1, masked )
+   ASSIGN_XFORM_GROUP( _3dnow, CULL_MASK_ACTIVE, 2, masked )
+   ASSIGN_XFORM_GROUP( _3dnow, CULL_MASK_ACTIVE, 3, masked )
+   ASSIGN_XFORM_GROUP( _3dnow, CULL_MASK_ACTIVE, 4, masked )
 
-   ASSIGN_NORM_GROUP( 3dnow, 0, raw )
-/* ASSIGN_NORM_GROUP( 3dnow, CULL_MASK_ACTIVE, masked )
+   ASSIGN_NORM_GROUP( _3dnow, 0, raw )
+/* ASSIGN_NORM_GROUP( _3dnow, CULL_MASK_ACTIVE, masked )
 */
 
 #ifdef DEBUG
@@ -187,4 +187,3 @@ void gl_init_3dnow_asm_transforms (void)
 } 
 
 #endif
-
diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h
index 1d476ce49b0..30105073b1d 100644
--- a/src/mesa/x86/assyntax.h
+++ b/src/mesa/x86/assyntax.h
@@ -876,9 +876,17 @@
 #define D_BYTE db
 /* #define SPACE */
 /* #define COMM */
+#if defined(__WATCOMC__)
+SECTION _TEXT public align=16 class=CODE use32 flat
+SECTION _DATA public align=16 class=DATA use32 flat
+#define SEG_TEXT SECTION _TEXT
+#define SEG_DATA SECTION _DATA
+#define SEG_BSS SECTION .bss
+#else
 #define SEG_DATA SECTION .data
 #define SEG_TEXT SECTION .text
 #define SEG_BSS SECTION .bss
+#endif
 
 #define D_SPACE(n) db n REP 0
 
diff --git a/src/mesa/x86/mmx.h b/src/mesa/x86/mmx.h
index c8c5eff3023..f0e05cf06d2 100644
--- a/src/mesa/x86/mmx.h
+++ b/src/mesa/x86/mmx.h
@@ -31,9 +31,9 @@
 #define ASM_MMX_H
 
 
-extern void
+extern void _ASMAPI
 gl_mmx_blend_transparency( GLcontext *ctx, GLuint n, const GLubyte mask[],
-                           GLubyte rgba[][4], const GLubyte dest[][4] );
+						   GLubyte rgba[][4], const GLubyte dest[][4] );
 
 
 void gl_mmx_set_blend_function( GLcontext *ctx )
diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c
index 610ec15ea64..02465fa14df 100644
--- a/src/mesa/x86/x86.c
+++ b/src/mesa/x86/x86.c
@@ -1,4 +1,4 @@
-/* $Id: x86.c,v 1.2 1999/10/19 18:37:07 keithw Exp $ */
+/* $Id: x86.c,v 1.3 1999/11/12 04:57:23 kendallb Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -40,14 +40,14 @@
 #include "xform.h"
 #include "x86.h"
 
-extern void gl_v16_x86_cliptest_points4(GLfloat *first_vert,
+extern void _ASMAPI gl_v16_x86_cliptest_points4(GLfloat *first_vert,
 					GLfloat *last_vert,
 					GLubyte *or_mask,
 					GLubyte *and_mask,
 					GLubyte *clip_mask );
 
   
-extern void gl_v16_x86_general_xform(GLfloat *dest,
+extern void _ASMAPI gl_v16_x86_general_xform(GLfloat *dest,
 				     const GLfloat *m,
 				     const GLfloat *src,
 				     GLuint src_stride,
@@ -62,13 +62,13 @@ extern void gl_v16_x86_general_xform(GLfloat *dest,
 			const GLubyte flag
 
 #define DECLARE_XFORM_GROUP(pfx, vsize, masked) \
- extern void gl_##pfx##_transform_points##vsize##_general_##masked(XFORM_ARGS); 	\
- extern void gl_##pfx##_transform_points##vsize##_identity_##masked(XFORM_ARGS); 	\
- extern void gl_##pfx##_transform_points##vsize##_3d_no_rot_##masked(XFORM_ARGS); 	\
- extern void gl_##pfx##_transform_points##vsize##_perspective_##masked(XFORM_ARGS); 	\
- extern void gl_##pfx##_transform_points##vsize##_2d_##masked(XFORM_ARGS); 		\
- extern void gl_##pfx##_transform_points##vsize##_2d_no_rot_##masked(XFORM_ARGS); 	\
- extern void gl_##pfx##_transform_points##vsize##_3d_##masked(XFORM_ARGS);
+ extern void _ASMAPI gl_##pfx##_transform_points##vsize##_general_##masked(XFORM_ARGS);     \
+ extern void _ASMAPI gl_##pfx##_transform_points##vsize##_identity_##masked(XFORM_ARGS);    \
+ extern void _ASMAPI gl_##pfx##_transform_points##vsize##_3d_no_rot_##masked(XFORM_ARGS);   \
+ extern void _ASMAPI gl_##pfx##_transform_points##vsize##_perspective_##masked(XFORM_ARGS);     \
+ extern void _ASMAPI gl_##pfx##_transform_points##vsize##_2d_##masked(XFORM_ARGS);      \
+ extern void _ASMAPI gl_##pfx##_transform_points##vsize##_2d_no_rot_##masked(XFORM_ARGS);   \
+ extern void _ASMAPI gl_##pfx##_transform_points##vsize##_3d_##masked(XFORM_ARGS);
 
 #define ASSIGN_XFORM_GROUP( pfx, cma, vsize, masked ) 		\
  gl_transform_tab[cma][vsize][MATRIX_GENERAL] 			\
@@ -96,7 +96,7 @@ void gl_init_x86_asm_transforms( void )
    DECLARE_XFORM_GROUP( x86, 3, masked )
    DECLARE_XFORM_GROUP( x86, 4, masked )
 
-   extern GLvector4f *gl_x86_cliptest_points4( GLvector4f *clip_vec, 
+   extern GLvector4f  * _ASMAPI gl_x86_cliptest_points4( GLvector4f *clip_vec, 
                                                GLvector4f *proj_vec, 
                                                GLubyte clipMask[],
                                                GLubyte *orMask,