diff options
| author | brianp <brianp> | 2000-06-15 02:02:55 +0000 |
|---|---|---|
| committer | brianp <brianp> | 2000-06-15 02:02:55 +0000 |
| commit | 0779387abc10e0eaf1bc9ae6489ff0955624b607 (patch) | |
| tree | d9f5596b357236ffaf6fb098e08a2c71eefb831b | |
| parent | 24c4007b74c5bcc3a1c19fd8f8f7ec56fb4495bc (diff) | |
Moved LLBL macro definition into assyntax.h, removed it from .S files.
Removed spaces from LLBL macro invocations to fix FreeBSD problem.
Added some dummy functions to silence compiler warnings.
27 files changed, 363 insertions, 506 deletions
diff --git a/xc/extras/Mesa/src/X86/3dnow.c b/xc/extras/Mesa/src/X86/3dnow.c index b7823db9f..5255a8c7f 100644 --- a/xc/extras/Mesa/src/X86/3dnow.c +++ b/xc/extras/Mesa/src/X86/3dnow.c @@ -1,9 +1,9 @@ /* * Mesa 3-D graphics library - * Version: 3.1 + * Version: 3.3 * - * Copyright (C) 1999 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2000 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"), @@ -185,4 +185,13 @@ void gl_init_3dnow_asm_transforms (void) gl_project_clipped_v16 = gl_3dnow_project_clipped_vertices; } +#else + + +/* silence compiler warning */ +extern void _mesa_3dnow_dummy_function(void); +void _mesa_3dnow_dummy_function(void) +{ +} + #endif diff --git a/xc/extras/Mesa/src/X86/3dnow_norm_raw.S b/xc/extras/Mesa/src/X86/3dnow_norm_raw.S index 16843ff50..7d4eed85b 100644 --- a/xc/extras/Mesa/src/X86/3dnow_norm_raw.S +++ b/xc/extras/Mesa/src/X86/3dnow_norm_raw.S @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 3.1 + * Version: 3.3 * - * Copyright (C) 1999 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2000 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"), @@ -31,12 +31,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - /* diff --git a/xc/extras/Mesa/src/X86/3dnow_xform_masked1.S b/xc/extras/Mesa/src/X86/3dnow_xform_masked1.S index 7a9da94f6..622edd9dd 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform_masked1.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform_masked1.S @@ -3,16 +3,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - - - - - ALIGNTEXT16 GLOBL GLNAME(gl_3dnow_transform_points1_general_masked) GLNAME( gl_3dnow_transform_points1_general_masked ): @@ -51,13 +41,13 @@ ALIGNTEXT32 MOVQ ( REGOFF(56, ECX), MM3 ) /* m33 | m32 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPGM_4 ) ) + JE ( LLBL(G3TPGM_4) ) ALIGNTEXT32 -LLBL( G3TPGM_2 ): +LLBL(G3TPGM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPGM_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TPGM_3) ) /* skip vertex */ MOVD ( REGIND(EAX), MM4 ) /* | x0 */ PUNPCKLDQ ( MM4, MM4 ) /* x0 | x0 */ @@ -73,16 +63,16 @@ LLBL( G3TPGM_2 ): MOVQ ( MM5, REGOFF(8, EDX) ) /* write r3, r2 */ -LLBL( G3TPGM_3 ): +LLBL(G3TPGM_3): ADD_L ( EDI, EAX ) /* next vertex */ INC_L ( EBP ) /* next clipmask */ ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPGM_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPGM_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPGM_4 ): +LLBL(G3TPGM_4): FEMMS POP_L ( EBP ) @@ -128,23 +118,23 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TPIM_2 ): +LLBL(G3TPIM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPIM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TPIM_3) /* skip vertex */ ) MOVD ( REGIND(EAX), MM0 ) /* | x0 */ MOVD ( MM0, REGIND(EDX) ) /* | r0 */ -LLBL( G3TPIM_3 ): +LLBL(G3TPIM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPIM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TPIM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TPIM_4 ): +LLBL(G3TPIM_4): FEMMS POP_L ( EBP ) @@ -192,14 +182,14 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2M_4 ) ) + JE ( LLBL(G3TP2M_4) ) ALIGNTEXT32 -LLBL( G3TP2M_2 ): +LLBL(G3TP2M_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP2M_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TP2M_3) ) /* skip vertex */ MOVD ( REGIND(EAX), MM4 ) /* | x0 */ PUNPCKLDQ ( MM4, MM4 ) /* x0 | x0 */ @@ -209,16 +199,16 @@ LLBL( G3TP2M_2 ): MOVQ ( MM4, REGIND(EDX) ) /* write r1, r0 */ -LLBL( G3TP2M_3 ): +LLBL(G3TP2M_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2M_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP2M_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP2M_4 ): +LLBL(G3TP2M_4): FEMMS POP_L ( EBP ) @@ -267,14 +257,14 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2NRM_4 ) ) + JE ( LLBL(G3TP2NRM_4) ) ALIGNTEXT32 -LLBL( G3TP2NRM_2 ): +LLBL(G3TP2NRM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP2NRM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TP2NRM_3) /* skip vertex */ ) MOVD ( REGIND(EAX), MM4 ) /* | x0 */ PFMUL ( MM0, MM4 ) /* | x0*m00 */ @@ -282,16 +272,16 @@ LLBL( G3TP2NRM_2 ): PFADD ( MM2, MM4 ) /* m31 | x0*m00+m30 */ MOVQ ( MM4, REGIND(EDX) ) /* write r1, r0 */ -LLBL( G3TP2NRM_3 ): +LLBL(G3TP2NRM_3): ADD_L ( CONST(16), EDX ) /* next r */ ADD_L ( EDI, EAX ) /* next vertex */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2NRM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP2NRM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP2NRM_4 ): +LLBL(G3TP2NRM_4): FEMMS POP_L ( EBP ) @@ -342,13 +332,13 @@ ALIGNTEXT32 MOVD ( REGOFF(56, ECX), MM3 ) /* | m32 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3M_4 ) ) + JE ( LLBL(G3TP3M_4) ) ALIGNTEXT32 -LLBL( G3TP3M_2 ): +LLBL(G3TP3M_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP3M_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TP3M_3) /* skip vertex */ ) MOVD ( REGIND(EAX), MM4 ) /* | x0 */ PUNPCKLDQ ( MM4, MM4 ) /* x0 | x0 */ @@ -364,16 +354,16 @@ LLBL( G3TP3M_2 ): MOVD ( MM5, REGOFF(8, EDX) ) /* write r2 */ -LLBL( G3TP3M_3 ): +LLBL(G3TP3M_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3M_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP3M_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP3M_4 ): +LLBL(G3TP3M_4): FEMMS POP_L ( EBP ) @@ -423,13 +413,13 @@ ALIGNTEXT32 MOVD ( REGOFF(56, ECX), MM3 ) /* | m32 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3NRM_4 ) ) + JE ( LLBL(G3TP3NRM_4) ) ALIGNTEXT32 -LLBL( G3TP3NRM_2 ): +LLBL(G3TP3NRM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP3NRM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TP3NRM_3) /* skip vertex */ ) MOVD ( REGIND(EAX), MM4 ) /* | x0 */ PFMUL ( MM0, MM4 ) /* | x0*m00 */ @@ -439,16 +429,16 @@ LLBL( G3TP3NRM_2 ): MOVD ( MM3, REGOFF(8, EDX) ) /* write r2 */ -LLBL( G3TP3NRM_3 ): +LLBL(G3TP3NRM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3NRM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP3NRM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP3NRM_4 ): +LLBL(G3TP3NRM_4): FEMMS POP_L ( EBP ) @@ -496,13 +486,13 @@ ALIGNTEXT32 MOVD ( REGOFF(56, ECX), MM3 ) /* | m32 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPPM_4 ) ) + JE ( LLBL(G3TPPM_4) ) ALIGNTEXT32 -LLBL( G3TPPM_2 ): +LLBL(G3TPPM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPPM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TPPM_3) /* skip vertex */ ) MOVD ( REGIND(EAX), MM4 ) /* 0 | x0 */ PFMUL ( MM0, MM4 ) /* 0 | x0*m00 */ @@ -510,16 +500,16 @@ LLBL( G3TPPM_2 ): MOVQ ( MM4, REGIND(EDX) ) /* write r1, r0 */ MOVQ ( MM3, REGOFF(8, EDX) ) /* write r2 (=m32), r3 (=0) */ -LLBL( G3TPPM_3 ): +LLBL(G3TPPM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPPM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TPPM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TPPM_4 ): +LLBL(G3TPPM_4): FEMMS POP_L ( EBP ) diff --git a/xc/extras/Mesa/src/X86/3dnow_xform_masked2.S b/xc/extras/Mesa/src/X86/3dnow_xform_masked2.S index 5876752b4..8ea66549f 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform_masked2.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform_masked2.S @@ -2,13 +2,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - - ALIGNTEXT16 GLOBL GLNAME(gl_3dnow_transform_points2_general_masked) @@ -64,13 +57,13 @@ ALIGNTEXT32 MOVQ ( REGOFF(56, ECX), MM5 ) /* m33 | m32 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPGM_4 ) ) + JE ( LLBL(G3TPGM_4) ) ALIGNTEXT32 -LLBL( G3TPGM_2 ): +LLBL(G3TPGM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPGM_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TPGM_3) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM6 ) /* x1 | x0 */ MOVQ ( MM6, MM7 ) /* x1 | x0 */ @@ -93,16 +86,16 @@ LLBL( G3TPGM_2 ): PFADD ( MM5, MM6 ) /* x0*...*m13+m33| x0*x02+x1*m12+m32 */ MOVQ ( MM6, REGOFF(8, EDX) ) /* write r3, r2 */ -LLBL( G3TPGM_3 ): +LLBL(G3TPGM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPGM_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPGM_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPGM_4 ): +LLBL(G3TPGM_4): FEMMS POP_L ( EBP ) @@ -149,23 +142,23 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TPIM_2 ): +LLBL(G3TPIM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPIM_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TPIM_3) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM0 ) /* x1 | x0 */ MOVQ ( MM0, REGIND(EDX) ) /* r1 | r0 */ -LLBL( G3TPIM_3 ): +LLBL(G3TPIM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPIM_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPIM_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPIM_4 ): +LLBL(G3TPIM_4): FEMMS POP_L ( EBP ) @@ -214,13 +207,13 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2M_4 ) ) + JE ( LLBL(G3TP2M_4) ) ALIGNTEXT32 -LLBL( G3TP2M_2 ): +LLBL(G3TP2M_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP2M_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TP2M_3) ) /* skip vertex */ MOVD ( REGIND(EAX), MM4 ) /* | x0 */ MOVD ( REGOFF(4, EAX), MM5 ) /* | x1 */ @@ -236,16 +229,16 @@ LLBL( G3TP2M_2 ): MOVQ ( MM4, REGIND(EDX) ) /* write r1, r0 */ -LLBL( G3TP2M_3 ): +LLBL(G3TP2M_3): ADD_L ( EDI, EAX ) /* next vertex */ INC_L ( EBP ) /* next clipmask */ ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2M_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP2M_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP2M_4 ): +LLBL(G3TP2M_4): FEMMS POP_L ( EBP ) @@ -298,13 +291,13 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2NRM_4 ) ) + JE ( LLBL(G3TP2NRM_4) ) ALIGNTEXT32 -LLBL( G3TP2NRM_2 ): +LLBL(G3TP2NRM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP2NRM_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TP2NRM_3) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ PFMUL ( MM0, MM4 ) /* x1*m11 | x0*m00 */ @@ -312,16 +305,16 @@ LLBL( G3TP2NRM_2 ): PFADD ( MM2, MM4 ) /* m31 | x0*m00+m30 */ MOVQ ( MM4, REGIND(EDX) ) /* write r1, r0 */ -LLBL( G3TP2NRM_3 ): +LLBL(G3TP2NRM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2NRM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP2NRM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP2NRM_4 ): +LLBL(G3TP2NRM_4): FEMMS POP_L ( EBP ) @@ -385,13 +378,13 @@ ALIGNTEXT32 MOVD ( REGOFF(56, ECX), MM5 ) /* | m32 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3M_4 ) ) + JE ( LLBL(G3TP3M_4) ) ALIGNTEXT32 -LLBL( G3TP3M_2 ): +LLBL(G3TP3M_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP3M_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TP3M_3) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM6 ) /* x1 | x0 */ MOVQ ( MM6, MM7 ) /* x1 | x0 */ @@ -413,16 +406,16 @@ LLBL( G3TP3M_2 ): PFADD ( MM5, MM6 ) /* ***trash*** | x0*x02+x1*m12+m32 */ MOVD ( MM6, REGOFF(8, EDX) ) /* write r2 */ -LLBL( G3TP3M_3 ): +LLBL(G3TP3M_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3M_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3M_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP3M_4 ): +LLBL(G3TP3M_4): FEMMS POP_L ( EBP ) @@ -476,13 +469,13 @@ ALIGNTEXT32 MOVD ( REGOFF(56, ECX), MM3 ) /* | m32 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3NRM_4 ) ) + JE ( LLBL(G3TP3NRM_4) ) ALIGNTEXT32 -LLBL( G3TP3NRM_2 ): +LLBL(G3TP3NRM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP3NRM_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TP3NRM_3) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ PFMUL ( MM0, MM4 ) /* x1*m11 | x0*m00 */ @@ -492,16 +485,16 @@ LLBL( G3TP3NRM_2 ): MOVD ( MM3, REGOFF(8, EDX) ) /* write r2 */ -LLBL( G3TP3NRM_3 ): +LLBL(G3TP3NRM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3NRM_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3NRM_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP3NRM_4 ): +LLBL(G3TP3NRM_4): FEMMS @@ -554,14 +547,14 @@ ALIGNTEXT32 MOVD ( REGOFF(56, ECX), MM3 ) /* | m32 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPPM_4 ) ) + JE ( LLBL(G3TPPM_4) ) ALIGNTEXT32 -LLBL( G3TPPM_2 ): +LLBL(G3TPPM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPPM_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TPPM_3) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ PFMUL ( MM0, MM4 ) /* x1*m11 | x0*m00 */ @@ -569,16 +562,16 @@ LLBL( G3TPPM_2 ): MOVQ ( MM4, REGIND(EDX) ) /* write r1, r0 */ MOVQ ( MM3, REGOFF(8, EDX) ) /* write r2 (=m32), r3 (=0) */ -LLBL( G3TPPM_3 ): +LLBL(G3TPPM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPPM_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPPM_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPPM_4 ): +LLBL(G3TPPM_4): FEMMS POP_L ( EBP ) diff --git a/xc/extras/Mesa/src/X86/3dnow_xform_masked3.S b/xc/extras/Mesa/src/X86/3dnow_xform_masked3.S index 88361d82c..fbc66c34b 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform_masked3.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform_masked3.S @@ -3,17 +3,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - - - - - - ALIGNTEXT16 GLOBL GLNAME(gl_3dnow_transform_points3_general_masked) GLNAME( gl_3dnow_transform_points3_general_masked ): @@ -60,7 +49,7 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM3 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPGM_6 ) ) + JE ( LLBL(G3TPGM_6) ) PUSH_L ( EBP ) PUSH_L ( EAX ) @@ -69,10 +58,10 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TPGM_2 ): +LLBL(G3TPGM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPGM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TPGM_3) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVD ( REGOFF(8, EAX), MM6 ) /* | x2 */ @@ -91,14 +80,14 @@ LLBL( G3TPGM_2 ): MOVQ ( MM6, REGIND(EDX) ) /* write r0, r1 */ -LLBL( G3TPGM_3 ): +LLBL(G3TPGM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPGM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TPGM_2) /* cnt > 0 ? -> process next vertex */ ) /* and now the second stripe ... */ POP_L ( ESI ) /* reset counter & pointers */ @@ -123,9 +112,9 @@ LLBL( G3TPGM_3 ): ALIGNTEXT32 -LLBL( G3TPGM_4 ): +LLBL(G3TPGM_4): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPGM_5 ) /* skip vertex */ ) + JNZ ( LLBL(G3TPGM_5) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVD ( REGOFF(8, EAX), MM6 ) /* | x2 */ @@ -144,16 +133,16 @@ LLBL( G3TPGM_4 ): MOVQ ( MM6, REGOFF(8, EDX) ) /* write r2, r3 */ -LLBL( G3TPGM_5 ): +LLBL(G3TPGM_5): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPGM_4 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TPGM_4) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TPGM_6 ): +LLBL(G3TPGM_6): FEMMS @@ -202,10 +191,10 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TPIM_2 ): +LLBL(G3TPIM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPIM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TPIM_3) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM0 ) /* x1 | x0 */ MOVD ( REGOFF(8, EAX), MM1 ) /* | x2 */ @@ -213,16 +202,16 @@ LLBL( G3TPIM_2 ): MOVQ ( MM0, REGIND(EDX) ) /* r1 | r0 */ MOVD ( MM1, REGOFF(8, EDX) ) /* | r2 */ -LLBL( G3TPIM_3 ): +LLBL(G3TPIM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPIM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TPIM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TPIM_4 ): +LLBL(G3TPIM_4): FEMMS POP_L ( EBP ) @@ -279,14 +268,14 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2M_4 ) ) + JE ( LLBL(G3TP2M_4) ) ALIGNTEXT32 -LLBL( G3TP2M_2 ): +LLBL(G3TP2M_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP2M_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TP2M_3) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM3 ) /* x1 | x0 */ MOVQ ( MM3, MM4 ) /* x1 | x0 */ @@ -302,16 +291,16 @@ LLBL( G3TP2M_2 ): MOVD ( MM5, REGOFF(8, EDX) ) /* write r2 (=x2) */ -LLBL( G3TP2M_3 ): +LLBL(G3TP2M_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2M_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP2M_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP2M_4 ): +LLBL(G3TP2M_4): FEMMS POP_L ( EBP ) @@ -363,14 +352,14 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM1 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2NRM_4 ) ) + JE ( LLBL(G3TP2NRM_4) ) ALIGNTEXT32 -LLBL( G3TP2NRM_2 ): +LLBL(G3TP2NRM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP2NRM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TP2NRM_3) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVD ( REGOFF(8, EAX), MM5 ) /* | x2 */ @@ -381,16 +370,16 @@ LLBL( G3TP2NRM_2 ): PFADD ( MM1, MM4 ) /* x1*m11+m31 | x0*m00+m30 */ MOVQ ( MM4, REGIND(EDX) ) /* write r0, r1 */ -LLBL( G3TP2NRM_3 ): +LLBL(G3TP2NRM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2NRM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP2NRM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP2NRM_4 ): +LLBL(G3TP2NRM_4): FEMMS POP_L ( EBP ) @@ -450,7 +439,7 @@ ALIGNTEXT32 MOVQ ( REGOFF(32, ECX), MM2 ) /* m21 | m20 */ MOVQ ( REGOFF(48, ECX), MM3 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3M_6 ) ) + JE ( LLBL(G3TP3M_6) ) PUSH_L ( EBP ) PUSH_L ( EAX ) @@ -459,10 +448,10 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TP3M_2 ): +LLBL(G3TP3M_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP3M_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TP3M_3) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVQ ( MM4, MM5 ) /* x1 | x0 */ @@ -481,14 +470,14 @@ LLBL( G3TP3M_2 ): MOVQ ( MM6, REGIND(EDX) ) /* write r0, r1 */ -LLBL( G3TP3M_3 ): +LLBL(G3TP3M_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3M_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP3M_2) /* cnt > 0 ? -> process next vertex */ ) /* and now the second stripe ... */ MOVD ( REGOFF(8, ECX), MM0 ) /* | m02 */ @@ -508,10 +497,10 @@ LLBL( G3TP3M_3 ): ALIGNTEXT32 -LLBL( G3TP3M_4 ): +LLBL(G3TP3M_4): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP3M_5 ) /* skip vertex */ ) + JNZ ( LLBL(G3TP3M_5) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVQ ( MM4, MM5 ) /* x1 | x0 */ @@ -528,16 +517,16 @@ LLBL( G3TP3M_4 ): PFADD ( MM4, MM6 ) /* | r2 */ MOVD ( MM6, REGOFF(8, EDX) ) /* write r2 */ -LLBL( G3TP3M_5 ): +LLBL(G3TP3M_5): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3M_4 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP3M_4) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP3M_6 ): +LLBL(G3TP3M_6): FEMMS POP_L ( EBP ) @@ -597,14 +586,14 @@ ALIGNTEXT32 PUNPCKLDQ ( MM3, MM3 ) /* m32 | m32 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3NRM_4 ) ) + JE ( LLBL(G3TP3NRM_4) ) ALIGNTEXT32 -LLBL( G3TP3NRM_2 ): +LLBL(G3TP3NRM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP3NRM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TP3NRM_3) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVD ( REGOFF(8, EAX), MM5 ) /* | x2 */ @@ -618,16 +607,16 @@ LLBL( G3TP3NRM_2 ): MOVQ ( MM4, REGIND(EDX) ) /* write r0, r1 */ MOVD ( MM5, REGOFF(8, EDX) ) /* write r2 */ -LLBL( G3TP3NRM_3 ): +LLBL(G3TP3NRM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3NRM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP3NRM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP3NRM_4 ): +LLBL(G3TP3NRM_4): FEMMS POP_L ( EBP ) @@ -682,14 +671,14 @@ ALIGNTEXT32 MOVD ( REGOFF(56, ECX), MM3 ) /* | m32 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPPM_4 ) ) + JE ( LLBL(G3TPPM_4) ) ALIGNTEXT32 -LLBL( G3TPPM_2 ): +LLBL(G3TPPM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPPM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TPPM_3) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVD ( REGOFF(8, EAX), MM5 ) /* | x2 */ @@ -712,16 +701,16 @@ LLBL( G3TPPM_2 ): MOVD ( MM5, REGOFF(8, EDX) ) /* write r2 */ MOVD ( MM6, REGOFF(12, EDX) ) /* write r3 */ -LLBL( G3TPPM_3 ): +LLBL(G3TPPM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPPM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TPPM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TPPM_4 ): +LLBL(G3TPPM_4): FEMMS POP_L ( EBP ) diff --git a/xc/extras/Mesa/src/X86/3dnow_xform_masked4.S b/xc/extras/Mesa/src/X86/3dnow_xform_masked4.S index 464e03c92..6c09efa21 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform_masked4.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform_masked4.S @@ -2,16 +2,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - - - - - ALIGNTEXT16 GLOBL GLNAME(gl_3dnow_transform_points4_general_masked) GLNAME( gl_3dnow_transform_points4_general_masked ): @@ -67,7 +57,7 @@ ALIGNTEXT32 POR ( MM7, MM3 ) /* m31 | m21 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPGM_6 ) ) + JE ( LLBL(G3TPGM_6) ) PUSH_L ( EBP ) PUSH_L ( EAX ) @@ -76,9 +66,9 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TPGM_2 ): +LLBL(G3TPGM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPGM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TPGM_3) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVQ ( MM4, MM5 ) /* x1 | x0 */ @@ -98,14 +88,14 @@ LLBL( G3TPGM_2 ): PFADD ( MM4, MM6 ) /* r1 | r0 */ MOVQ ( MM6, REGIND(EDX) ) /* write r0, r1 */ -LLBL( G3TPGM_3 ): +LLBL(G3TPGM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPGM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TPGM_2) /* cnt > 0 ? -> process next vertex */ ) /* and now the second stripe ... */ MOVD ( REGOFF(8, ECX), MM0 ) /* | m02 */ MOVD ( REGOFF(24, ECX), MM7 ) /* | m12 */ @@ -138,9 +128,9 @@ LLBL( G3TPGM_3 ): ALIGNTEXT32 -LLBL( G3TPGM_4 ): +LLBL(G3TPGM_4): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPGM_5 ) /* skip vertex */ ) + JNZ ( LLBL(G3TPGM_5) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVQ ( MM4, MM5 ) /* x1 | x0 */ @@ -160,16 +150,16 @@ LLBL( G3TPGM_4 ): PFADD ( MM4, MM6 ) /* r3 | r2 */ MOVQ ( MM6, REGOFF(8, EDX) ) /* write r2, r3 */ -LLBL( G3TPGM_5 ): +LLBL(G3TPGM_5): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPGM_4 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TPGM_4) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TPGM_6 ): +LLBL(G3TPGM_6): FEMMS POP_L ( EBP ) @@ -216,9 +206,9 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TPIM_2 ): +LLBL(G3TPIM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPIM_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TPIM_3) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM0 ) /* x1 | x0 */ MOVQ ( MM0, REGIND(EDX) ) /* r1 | r0 */ @@ -226,16 +216,16 @@ LLBL( G3TPIM_2 ): MOVQ ( REGOFF(8, EAX), MM1 ) /* x3 | x2 */ MOVQ ( MM1, REGOFF(8, EDX) ) /* r3 | r2 */ -LLBL( G3TPIM_3 ): +LLBL(G3TPIM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPIM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TPIM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TPIM_4 ): +LLBL(G3TPIM_4): FEMMS POP_L ( EBP ) @@ -293,13 +283,13 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2M_4 ) ) + JE ( LLBL(G3TP2M_4) ) ALIGNTEXT32 -LLBL( G3TP2M_2 ): +LLBL(G3TP2M_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP2M_3 ) /* skip vertex */ ) + JNZ ( LLBL(G3TP2M_3) /* skip vertex */ ) MOVQ ( REGIND(EAX), MM3 ) /* x1 | x0 */ MOVQ ( MM3, MM4 ) /* x1 | x0 */ @@ -319,16 +309,16 @@ LLBL( G3TP2M_2 ): MOVQ ( MM3, REGIND(EDX) ) /* write r0, r1 */ MOVQ ( MM5, REGOFF(8, EDX) ) /* write r2, r3 */ -LLBL( G3TP2M_3 ): +LLBL(G3TP2M_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2M_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP2M_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP2M_4 ): +LLBL(G3TP2M_4): FEMMS POP_L ( EBP ) @@ -380,13 +370,13 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM1 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2NRM_4 ) ) + JE ( LLBL(G3TP2NRM_4) ) ALIGNTEXT32 -LLBL( G3TP2NRM_2 ): +LLBL(G3TP2NRM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP2NRM_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TP2NRM_3) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVQ ( REGOFF(8, EAX), MM5 ) /* x3 | x2 */ @@ -402,16 +392,16 @@ LLBL( G3TP2NRM_2 ): MOVQ ( MM5, REGOFF(8, EDX) ) /* write r2, r3 */ -LLBL( G3TP2NRM_3 ): +LLBL(G3TP2NRM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2NRM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP2NRM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP2NRM_4 ): +LLBL(G3TP2NRM_4): FEMMS POP_L ( EBP ) @@ -478,7 +468,7 @@ ALIGNTEXT32 POR ( MM7, MM3 ) /* m31 | m21 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3M_6 ) ) + JE ( LLBL(G3TP3M_6) ) PUSH_L ( EBP ) PUSH_L ( EAX ) @@ -487,9 +477,9 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TP3M_2 ): +LLBL(G3TP3M_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP3M_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TP3M_3) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVQ ( MM4, MM5 ) /* x1 | x0 */ @@ -509,14 +499,14 @@ LLBL( G3TP3M_2 ): PFADD ( MM4, MM6 ) /* r1 | r0 */ MOVQ ( MM6, REGIND(EDX) ) /* write r0, r1 */ -LLBL( G3TP3M_3 ): +LLBL(G3TP3M_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3M_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3M_2) ) /* cnt > 0 ? -> process next vertex */ /* and now the second stripe ... */ MOVD ( REGOFF(8, ECX), MM0 ) /* | m02 */ MOVD ( REGOFF(24, ECX), MM7 ) /* | m12 */ @@ -538,9 +528,9 @@ LLBL( G3TP3M_3 ): ALIGNTEXT32 -LLBL( G3TP3M_4 ): +LLBL(G3TP3M_4): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP3M_5 ) ) /* skip vertex */ + JNZ ( LLBL(G3TP3M_5) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVQ ( REGOFF(8, EAX), MM6 ) /* x3 | x2 */ @@ -554,16 +544,16 @@ LLBL( G3TP3M_4 ): PFACC ( MM7, MM6 ) /* x3 | x2*m22+x3*m32 */ MOVQ ( MM6, REGOFF(8, EDX) ) /* write r2, r3 */ -LLBL( G3TP3M_5 ): +LLBL(G3TP3M_5): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3M_4 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3M_4) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP3M_6 ): +LLBL(G3TP3M_6): FEMMS POP_L ( EBP ) @@ -623,13 +613,13 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM1 ) /* m31 | m30 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3NRM_4 ) ) + JE ( LLBL(G3TP3NRM_4) ) ALIGNTEXT32 -LLBL( G3TP3NRM_2 ): +LLBL(G3TP3NRM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TP3NRM_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TP3NRM_3) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVQ ( REGOFF(8, EAX), MM5 ) /* x3 | x2 */ @@ -649,16 +639,16 @@ LLBL( G3TP3NRM_2 ): MOVQ ( MM4, REGIND(EDX) ) /* write r0, r1 */ MOVQ ( MM5, REGOFF(8, EDX) ) /* write r2, r3 */ -LLBL( G3TP3NRM_3 ): +LLBL(G3TP3NRM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3NRM_2 ) /* cnt > 0 ? -> process next vertex */ ) + JA ( LLBL(G3TP3NRM_2) /* cnt > 0 ? -> process next vertex */ ) -LLBL( G3TP3NRM_4 ): +LLBL(G3TP3NRM_4): FEMMS POP_L ( EBP ) @@ -718,13 +708,13 @@ ALIGNTEXT32 PUNPCKLDQ ( MM7, MM7 ) /* 0 | 0 */ CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPPM_4 ) ) + JE ( LLBL(G3TPPM_4) ) ALIGNTEXT32 -LLBL( G3TPPM_2 ): +LLBL(G3TPPM_2): TEST_B ( BL, REGIND(EBP) ) /* mask [i] != clip flag ?? */ - JNZ ( LLBL( G3TPPM_3 ) ) /* skip vertex */ + JNZ ( LLBL(G3TPPM_3) ) /* skip vertex */ MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVQ ( REGOFF(8, EAX), MM5 ) /* x3 | x2 */ @@ -746,16 +736,16 @@ LLBL( G3TPPM_2 ): MOVQ ( MM6, REGOFF(8, EDX) ) /* write r2, r3 */ -LLBL( G3TPPM_3 ): +LLBL(G3TPPM_3): ADD_L ( EDI, EAX ) /* next vertex */ ADD_L ( CONST(16), EDX ) /* next r */ INC_L ( EBP ) /* next clipmask */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPPM_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPPM_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPPM_4 ): +LLBL(G3TPPM_4): FEMMS POP_L ( EBP ) diff --git a/xc/extras/Mesa/src/X86/3dnow_xform_raw1.S b/xc/extras/Mesa/src/X86/3dnow_xform_raw1.S index 0f366658e..4095fe558 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform_raw1.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform_raw1.S @@ -3,15 +3,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - - - - ALIGNTEXT16 GLOBL GLNAME(gl_3dnow_transform_points1_general_raw) GLNAME(gl_3dnow_transform_points1_general_raw): @@ -39,7 +30,7 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPGR_3 ) ) + JE ( LLBL(G3TPGR_3) ) MOVQ ( REGIND(ECX), MM0 ) /* m01 | m00 */ MOVQ ( REGOFF(8, ECX), MM1 ) /* m03 | m02 */ @@ -48,7 +39,7 @@ ALIGNTEXT32 MOVQ ( REGOFF(56, ECX), MM3 ) /* m33 | m32 */ ALIGNTEXT32 -LLBL( G3TPGR_2 ): +LLBL(G3TPGR_2): MOVD ( REGIND(EAX), MM4 ) /* | x0 */ PUNPCKLDQ ( MM4, MM4 ) /* x0 | x0 */ @@ -68,9 +59,9 @@ LLBL( G3TPGR_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPGR_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPGR_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPGR_3 ): +LLBL(G3TPGR_3): FEMMS POP_L ( ESI ) @@ -110,9 +101,9 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPIR_4 ) ) + JE ( LLBL(G3TPIR_4) ) -LLBL( G3TPIR_3 ): +LLBL(G3TPIR_3): MOVD ( REGIND(EAX), MM0 ) /* | x0 */ ADD_L ( EDI, EAX ) /* next vertex */ @@ -121,9 +112,9 @@ LLBL( G3TPIR_3 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPIR_3 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPIR_3) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPIR_4 ): +LLBL(G3TPIR_4): FEMMS POP_L ( ESI ) @@ -162,14 +153,14 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2R_3 ) ) + JE ( LLBL(G3TP2R_3) ) MOVQ ( REGIND(ECX), MM0 ) /* m01 | m00 */ MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ ALIGNTEXT32 -LLBL( G3TP2R_2 ): +LLBL(G3TP2R_2): MOVD ( REGIND(EAX), MM4 ) /* | x0 */ PUNPCKLDQ ( MM4, MM4 ) /* x0 | x0 */ @@ -183,9 +174,9 @@ LLBL( G3TP2R_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2R_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP2R_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP2R_3 ): +LLBL(G3TP2R_3): FEMMS POP_L ( ESI ) @@ -225,14 +216,14 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2NRR_3 ) ) + JE ( LLBL(G3TP2NRR_3) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ ALIGNTEXT32 -LLBL( G3TP2NRR_2 ): +LLBL(G3TP2NRR_2): MOVD ( REGIND(EAX), MM4 ) /* | x0 */ ADD_L ( EDI, EAX ) /* next vertex */ @@ -244,9 +235,9 @@ LLBL( G3TP2NRR_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2NRR_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP2NRR_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP2NRR_3 ): +LLBL(G3TP2NRR_3): FEMMS POP_L ( ESI ) @@ -286,7 +277,7 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3R_3 ) ) + JE ( LLBL(G3TP3R_3) ) MOVQ ( REGIND(ECX), MM0 ) /* m01 | m00 */ MOVD ( REGOFF(8, ECX), MM1 ) /* | m02 */ @@ -296,7 +287,7 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TP3R_2 ): +LLBL(G3TP3R_2): MOVD ( REGIND(EAX), MM4 ) /* | x0 */ PUNPCKLDQ ( MM4, MM4 ) /* x0 | x0 */ @@ -316,9 +307,9 @@ LLBL( G3TP3R_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3R_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3R_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP3R_3 ): +LLBL(G3TP3R_3): FEMMS POP_L ( ESI ) @@ -358,7 +349,7 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3NRR_3 ) ) + JE ( LLBL(G3TP3NRR_3) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ @@ -366,7 +357,7 @@ ALIGNTEXT32 MOVD ( REGOFF(56, ECX), MM3 ) /* | m32 */ ALIGNTEXT32 -LLBL( G3TP3NRR_2 ): +LLBL(G3TP3NRR_2): MOVD ( REGIND(EAX), MM4 ) /* | x0 */ PFMUL ( MM0, MM4 ) /* | x0*m00 */ @@ -380,9 +371,9 @@ LLBL( G3TP3NRR_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3NRR_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3NRR_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP3NRR_3 ): +LLBL(G3TP3NRR_3): FEMMS POP_L ( ESI ) @@ -422,13 +413,13 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPPR_3 ) ) + JE ( LLBL(G3TPPR_3) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ MOVD ( REGOFF(56, ECX), MM3 ) /* | m32 */ ALIGNTEXT32 -LLBL( G3TPPR_2 ): +LLBL(G3TPPR_2): MOVD ( REGIND(EAX), MM4 ) /* 0 | x0 */ PFMUL ( MM0, MM4 ) /* 0 | x0*m00 */ @@ -439,9 +430,9 @@ LLBL( G3TPPR_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPPR_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPPR_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPPR_3 ): +LLBL(G3TPPR_3): FEMMS POP_L ( ESI ) diff --git a/xc/extras/Mesa/src/X86/3dnow_xform_raw2.S b/xc/extras/Mesa/src/X86/3dnow_xform_raw2.S index ad597c875..5355a16b9 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform_raw2.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform_raw2.S @@ -3,15 +3,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - - - - ALIGNTEXT16 GLOBL GLNAME(gl_3dnow_transform_points2_general_raw) GLNAME(gl_3dnow_transform_points2_general_raw): @@ -39,7 +30,7 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPGR_3 ) ) + JE ( LLBL(G3TPGR_3) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ PUNPCKLDQ ( REGOFF(16, ECX), MM0 ) /* m10 | m00 */ @@ -58,7 +49,7 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TPGR_2 ): +LLBL(G3TPGR_2): MOVQ ( REGIND(EAX), MM6 ) /* x1 | x0 */ MOVQ ( MM6, MM7 ) /* x1 | x0 */ @@ -85,9 +76,9 @@ LLBL( G3TPGR_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPGR_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPGR_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPGR_3 ): +LLBL(G3TPGR_3): FEMMS POP_L ( ESI ) @@ -128,9 +119,9 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPIR_3 ) ) + JE ( LLBL(G3TPIR_3) ) -LLBL( G3TPIR_3 ): +LLBL(G3TPIR_3): MOVQ ( REGIND(EAX), MM0 ) /* x1 | x0 */ ADD_L ( EDI, EAX ) /* next vertex */ @@ -138,9 +129,9 @@ LLBL( G3TPIR_3 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPIR_3 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPIR_3) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPIR_4 ): +LLBL(G3TPIR_4): FEMMS POP_L ( ESI ) @@ -179,7 +170,7 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2R_3 ) ) + JE ( LLBL(G3TP2R_3) ) MOVQ ( REGIND(ECX), MM0 ) /* m01 | m00 */ MOVQ ( REGOFF(16, ECX), MM1 ) /* m11 | m10 */ @@ -187,7 +178,7 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ ALIGNTEXT32 -LLBL( G3TP2R_2 ): +LLBL(G3TP2R_2): MOVD ( REGIND(EAX), MM4 ) /* | x0 */ MOVD ( REGOFF(4, EAX), MM5 ) /* | x1 */ @@ -207,9 +198,9 @@ LLBL( G3TP2R_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2R_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP2R_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP2R_3 ): +LLBL(G3TP2R_3): FEMMS POP_L ( ESI ) @@ -248,7 +239,7 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2NRR_3 ) ) + JE ( LLBL(G3TP2NRR_3) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ PUNPCKLDQ ( REGOFF(20, ECX), MM0 ) /* m11 | m00 */ @@ -256,7 +247,7 @@ ALIGNTEXT32 MOVQ ( REGOFF(48, ECX), MM2 ) /* m31 | m30 */ ALIGNTEXT32 -LLBL( G3TP2NRR_2 ): +LLBL(G3TP2NRR_2): MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ ADD_L ( EDI, EAX ) /* next vertex */ @@ -268,9 +259,9 @@ LLBL( G3TP2NRR_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2NRR_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP2NRR_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP2NRR_3 ): +LLBL(G3TP2NRR_3): FEMMS POP_L ( ESI ) @@ -310,7 +301,7 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3R_3 ) ) + JE ( LLBL(G3TP3R_3) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ PUNPCKLDQ ( REGOFF(16, ECX), MM0 ) /* m10 | m00 */ @@ -326,7 +317,7 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TP3R_2 ): +LLBL(G3TP3R_2): MOVQ ( REGIND(EAX), MM6 ) /* x1 | x0 */ MOVQ ( MM6, MM7 ) /* x1 | x0 */ @@ -352,9 +343,9 @@ LLBL( G3TP3R_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3R_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3R_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP3R_3 ): +LLBL(G3TP3R_3): FEMMS POP_L ( ESI ) @@ -393,7 +384,7 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3NRR_3 ) ) + JE ( LLBL(G3TP3NRR_3) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ PUNPCKLDQ ( REGOFF(20, ECX), MM0 ) /* m11 | m00 */ @@ -403,7 +394,7 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( G3TP3NRR_2 ): +LLBL(G3TP3NRR_2): MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ PFMUL ( MM0, MM4 ) /* x1*m11 | x0*m00 */ @@ -417,9 +408,9 @@ LLBL( G3TP3NRR_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3NRR_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3NRR_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TP3NRR_3 ): +LLBL(G3TP3NRR_3): FEMMS POP_L ( ESI ) @@ -459,7 +450,7 @@ ALIGNTEXT32 FEMMS CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPPR_3 ) ) + JE ( LLBL(G3TPPR_3) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ PUNPCKLDQ ( REGOFF(20, ECX), MM0 ) /* m11 | m00 */ @@ -467,7 +458,7 @@ ALIGNTEXT32 MOVD ( REGOFF(56, ECX), MM3 ) /* | m32 */ ALIGNTEXT32 -LLBL( G3TPPR_2 ): +LLBL(G3TPPR_2): MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ PFMUL ( MM0, MM4 ) /* x1*m11 | x0*m00 */ @@ -479,9 +470,9 @@ LLBL( G3TPPR_2 ): ADD_L ( CONST(16), EDX ) /* next r */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPPR_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPPR_2) ) /* cnt > 0 ? -> process next vertex */ -LLBL( G3TPPR_3 ): +LLBL(G3TPPR_3): FEMMS POP_L ( ESI ) diff --git a/xc/extras/Mesa/src/X86/3dnow_xform_raw3.S b/xc/extras/Mesa/src/X86/3dnow_xform_raw3.S index 93c8ed390..dc4105d9f 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform_raw3.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform_raw3.S @@ -3,14 +3,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - - - #define VEC_SIZE_1 1 #define VEC_SIZE_2 3 #define VEC_SIZE_3 7 @@ -41,7 +33,7 @@ GLNAME( gl_3dnow_transform_points3_general_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPGR_2 ) ) + JE ( LLBL(G3TPGR_2) ) PREFETCHW ( REGIND(EDX) ) @@ -51,7 +43,7 @@ GLNAME( gl_3dnow_transform_points3_general_raw ): ADD_L ( EDI, EAX ) /* next vertex */ ALIGNTEXT32 -LLBL( G3TPGR_1 ): +LLBL(G3TPGR_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -95,10 +87,10 @@ LLBL( G3TPGR_1 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPGR_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPGR_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TPGR_2 ): +LLBL(G3TPGR_2): FEMMS POP_L ( EDI ) @@ -131,7 +123,7 @@ GLNAME( gl_3dnow_transform_points3_identity_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPIR_2 ) ) + JE ( LLBL(G3TPIR_2) ) PREFETCHW ( REGIND(EDX) ) @@ -139,7 +131,7 @@ GLNAME( gl_3dnow_transform_points3_identity_raw ): MOVD ( REGOFF(8, EAX), MM1 ) /* | x2 */ ALIGNTEXT32 -LLBL( G3TPIR_1 ): +LLBL(G3TPIR_1): PREFETCHW ( REGOFF(32, EDX) ) @@ -153,10 +145,10 @@ LLBL( G3TPIR_1 ): MOVQ ( REGIND(EAX), MM0 ) /* x1 | x0 */ MOVD ( REGOFF(8, EAX), MM1 ) /* | x2 */ - JA ( LLBL( G3TPIR_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPIR_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TPIR_2 ): +LLBL(G3TPIR_2): FEMMS POP_L ( EDI ) @@ -188,7 +180,7 @@ GLNAME( gl_3dnow_transform_points3_2d_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2R_3 ) ) + JE ( LLBL(G3TP2R_3) ) PREFETCH ( REGIND(EAX) ) @@ -207,7 +199,7 @@ GLNAME( gl_3dnow_transform_points3_2d_raw ): ADD_L ( EDI, EAX ) /* next vertex */ ALIGNTEXT32 -LLBL( G3TP2R_2 ): +LLBL(G3TP2R_2): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -230,10 +222,10 @@ LLBL( G3TP2R_2 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2R_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP2R_2) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TP2R_3 ): +LLBL(G3TP2R_3): FEMMS POP_L ( EDI ) @@ -266,7 +258,7 @@ GLNAME( gl_3dnow_transform_points3_2d_no_rot_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2NRR_2 ) ) + JE ( LLBL(G3TP2NRR_2) ) PREFETCH ( REGIND(EAX) ) @@ -283,7 +275,7 @@ GLNAME( gl_3dnow_transform_points3_2d_no_rot_raw ): ALIGNTEXT32 -LLBL( G3TP2NRR_1 ): +LLBL(G3TP2NRR_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -303,10 +295,10 @@ LLBL( G3TP2NRR_1 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2NRR_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP2NRR_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TP2NRR_2 ): +LLBL(G3TP2NRR_2): FEMMS POP_L ( EDI ) @@ -338,7 +330,7 @@ GLNAME( gl_3dnow_transform_points3_3d_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3R_2 ) ) + JE ( LLBL(G3TP3R_2) ) PREFETCH ( REGIND(EAX) ) @@ -353,7 +345,7 @@ GLNAME( gl_3dnow_transform_points3_3d_raw ): ADD_L ( EDI, EAX ) /* next vertex */ ALIGNTEXT32 -LLBL( G3TP3R_1 ): +LLBL(G3TP3R_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -395,10 +387,10 @@ LLBL( G3TP3R_1 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3R_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3R_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TP3R_2 ): +LLBL(G3TP3R_2): FEMMS POP_L ( EDI ) @@ -430,7 +422,7 @@ GLNAME( gl_3dnow_transform_points3_3d_no_rot_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3NRR_2 ) ) + JE ( LLBL(G3TP3NRR_2) ) PREFETCH ( REGIND(EAX) ) @@ -452,7 +444,7 @@ GLNAME( gl_3dnow_transform_points3_3d_no_rot_raw ): ALIGNTEXT32 -LLBL( G3TP3NRR_1 ): +LLBL(G3TP3NRR_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ ADD_L ( EDI, EAX ) /* next vertex */ @@ -472,10 +464,10 @@ LLBL( G3TP3NRR_1 ): MOVQ ( REGIND(EAX), MM4 ) /* x1 | x0 */ MOVD ( REGOFF(8, EAX), MM5 ) /* | x2 */ - JA ( LLBL( G3TP3NRR_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3NRR_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TP3NRR_2 ): +LLBL(G3TP3NRR_2): FEMMS POP_L ( EDI ) @@ -507,7 +499,7 @@ GLNAME( gl_3dnow_transform_points3_perspective_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPPR_2 ) ) + JE ( LLBL(G3TPPR_2) ) PREFETCH ( REGIND(EAX) ) @@ -527,7 +519,7 @@ GLNAME( gl_3dnow_transform_points3_perspective_raw ): ADD_L ( EDI, EAX ) /* next vertex */ ALIGNTEXT32 -LLBL( G3TPPR_1 ): +LLBL(G3TPPR_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -558,10 +550,10 @@ LLBL( G3TPPR_1 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPPR_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPPR_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TPPR_2 ): +LLBL(G3TPPR_2): FEMMS POP_L ( EDI ) diff --git a/xc/extras/Mesa/src/X86/3dnow_xform_raw4.S b/xc/extras/Mesa/src/X86/3dnow_xform_raw4.S index dedbb8931..17f584f75 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform_raw4.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform_raw4.S @@ -3,13 +3,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - - #define VEC_SIZE_1 1 #define VEC_SIZE_2 3 @@ -41,7 +34,7 @@ GLNAME( gl_3dnow_transform_points4_general_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPGR_2 ) ) + JE ( LLBL(G3TPGR_2) ) PREFETCHW ( REGIND(EDX) ) @@ -51,7 +44,7 @@ GLNAME( gl_3dnow_transform_points4_general_raw ): ADD_L ( EDI, EAX ) /* next vertex */ ALIGNTEXT32 -LLBL( G3TPGR_1 ): +LLBL(G3TPGR_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -103,11 +96,11 @@ LLBL( G3TPGR_1 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPGR_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPGR_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TPGR_2 ): +LLBL(G3TPGR_2): FEMMS POP_L ( EDI ) @@ -140,7 +133,7 @@ GLNAME( gl_3dnow_transform_points4_identity_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPIR_2 ) ) + JE ( LLBL(G3TPIR_2) ) MOVQ ( REGIND(EAX), MM0 ) /* x1 | x0 */ MOVQ ( REGOFF(8, EAX), MM1 ) /* x3 | x2 */ @@ -148,7 +141,7 @@ GLNAME( gl_3dnow_transform_points4_identity_raw ): ADD_L ( EDI, EAX ) /* next vertex */ ALIGNTEXT32 -LLBL( G3TPIR_1 ): +LLBL(G3TPIR_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -164,10 +157,10 @@ LLBL( G3TPIR_1 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPIR_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPIR_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TPIR_2 ): +LLBL(G3TPIR_2): FEMMS POP_L ( EDI ) @@ -200,7 +193,7 @@ GLNAME( gl_3dnow_transform_points4_2d_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2R_2 ) ) + JE ( LLBL(G3TP2R_2) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ PUNPCKLDQ ( REGOFF(16, ECX), MM0 ) /* m10 | m00 */ @@ -216,7 +209,7 @@ GLNAME( gl_3dnow_transform_points4_2d_raw ): ADD_L ( EDI, EAX ) /* next vertex */ ALIGNTEXT32 -LLBL( G3TP2R_1 ): +LLBL(G3TP2R_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -244,10 +237,10 @@ LLBL( G3TP2R_1 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2R_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP2R_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TP2R_2 ): +LLBL(G3TP2R_2): FEMMS POP_L ( EDI ) @@ -280,7 +273,7 @@ GLNAME( gl_3dnow_transform_points4_2d_no_rot_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP2NRR_3 ) ) + JE ( LLBL(G3TP2NRR_3) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ PUNPCKLDQ ( REGOFF(20, ECX), MM0 ) /* m11 | m00 */ @@ -293,7 +286,7 @@ GLNAME( gl_3dnow_transform_points4_2d_no_rot_raw ): ADD_L ( EDI, EAX ) /* next vertex */ ALIGNTEXT32 -LLBL( G3TP2NRR_2 ): +LLBL(G3TP2NRR_2): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -317,10 +310,10 @@ LLBL( G3TP2NRR_2 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP2NRR_2 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP2NRR_2) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TP2NRR_3 ): +LLBL(G3TP2NRR_3): FEMMS POP_L ( EDI ) @@ -353,7 +346,7 @@ GLNAME( gl_3dnow_transform_points4_3d_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3R_2 ) ) + JE ( LLBL(G3TP3R_2) ) MOVD ( REGOFF(8, ECX), MM6 ) /* | m2 */ PUNPCKLDQ ( REGOFF(24, ECX), MM6 ) /* m6 | m2 */ @@ -365,7 +358,7 @@ GLNAME( gl_3dnow_transform_points4_3d_raw ): MOVQ ( REGOFF(8, EAX), MM3 ) /* x3 | x2 */ ALIGNTEXT32 -LLBL( G3TP3R_1 ): +LLBL(G3TP3R_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -411,11 +404,11 @@ LLBL( G3TP3R_1 ): MOVQ ( REGOFF(8, EAX), MM3 ) /* x3 | x2 */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3R_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3R_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TP3R_2 ): +LLBL(G3TP3R_2): FEMMS POP_L ( EDI ) @@ -448,7 +441,7 @@ GLNAME( gl_3dnow_transform_points4_3d_no_rot_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TP3NRR_2 ) ) + JE ( LLBL(G3TP3NRR_2) ) MOVD ( REGIND(ECX), MM0 ) /* | m00 */ PUNPCKLDQ ( REGOFF(20, ECX), MM0 ) /* m11 | m00 */ @@ -465,7 +458,7 @@ GLNAME( gl_3dnow_transform_points4_3d_no_rot_raw ): ADD_L ( EDI, EAX ) /* next vertex */ ALIGNTEXT32 -LLBL( G3TP3NRR_1 ): +LLBL(G3TP3NRR_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -493,10 +486,10 @@ LLBL( G3TP3NRR_1 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TP3NRR_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TP3NRR_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TP3NRR_2 ): +LLBL(G3TP3NRR_2): FEMMS POP_L ( EDI ) @@ -528,7 +521,7 @@ GLNAME( gl_3dnow_transform_points4_perspective_raw ): MOV_L ( REGOFF(4, EAX), EAX ) CMP_L ( CONST(0), ESI ) - JE ( LLBL( G3TPPR_2 ) ) + JE ( LLBL(G3TPPR_2) ) PREFETCH ( REGIND(EAX) ) @@ -550,7 +543,7 @@ GLNAME( gl_3dnow_transform_points4_perspective_raw ): ADD_L ( EDI, EAX ) /* next vertex */ ALIGNTEXT32 -LLBL( G3TPPR_1 ): +LLBL(G3TPPR_1): PREFETCHW ( REGOFF(32, EDX) ) /* prefetch 2 vertices ahead */ @@ -580,10 +573,10 @@ LLBL( G3TPPR_1 ): ADD_L ( EDI, EAX ) /* next vertex */ DEC_L ( ESI ) /* decrement vertex counter */ - JA ( LLBL( G3TPPR_1 ) ) /* cnt > 0 ? -> process next vertex */ + JA ( LLBL(G3TPPR_1) ) /* cnt > 0 ? -> process next vertex */ ALIGNTEXT32 -LLBL( G3TPPR_2 ): +LLBL(G3TPPR_2): FEMMS POP_L ( EDI ) diff --git a/xc/extras/Mesa/src/X86/assyntax.h b/xc/extras/Mesa/src/X86/assyntax.h index 2a1034870..dfd1c4fe3 100644 --- a/xc/extras/Mesa/src/X86/assyntax.h +++ b/xc/extras/Mesa/src/X86/assyntax.h @@ -1645,4 +1645,12 @@ SECTION _DATA public align=16 class=DATA use32 flat #define XORPS(a, b) xorps P_ARG2(a, b) +/* Added by BrianP for FreeBSD (per David Dawes) */ +#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) +#define LLBL(a) CONCAT(.L,a) +#else +#define LLBL(a) a +#endif + + #endif /* __ASSYNTAX_H__ */ diff --git a/xc/extras/Mesa/src/X86/common_x86asm.S b/xc/extras/Mesa/src/X86/common_x86asm.S index bcd128244..26b4f4ebf 100644 --- a/xc/extras/Mesa/src/X86/common_x86asm.S +++ b/xc/extras/Mesa/src/X86/common_x86asm.S @@ -1,9 +1,8 @@ - /* * Mesa 3-D graphics library - * Version: 3.1 + * Version: 3.3 * - * Copyright (C) 1999 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2000 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"), @@ -36,12 +35,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define GL_CPU_GenuineIntel CONST(1) #define GL_CPU_MMX CONST(2) diff --git a/xc/extras/Mesa/src/X86/katmai.c b/xc/extras/Mesa/src/X86/katmai.c index c14fc27b5..1dfa0f7fc 100644 --- a/xc/extras/Mesa/src/X86/katmai.c +++ b/xc/extras/Mesa/src/X86/katmai.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 3.1 + * Version: 3.3 * - * Copyright (C) 1999 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2000 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"), @@ -222,4 +222,14 @@ void gl_init_katmai_asm_transforms (void) gl_project_clipped_v16 = gl_katmai_project_clipped_vertices; } +#else + + +/* silence compiler warning */ +extern void _mesa_katmai_dummy_function(void); +void _mesa_katmai_dummy_function(void) +{ +} + + #endif diff --git a/xc/extras/Mesa/src/X86/katmai_norm_raw.S b/xc/extras/Mesa/src/X86/katmai_norm_raw.S index 6ac046d5f..fdd720de7 100644 --- a/xc/extras/Mesa/src/X86/katmai_norm_raw.S +++ b/xc/extras/Mesa/src/X86/katmai_norm_raw.S @@ -9,12 +9,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define OFFSET_MAT 4 #define OFFSET_SCALE 8 #define OFFSET_IN 12 diff --git a/xc/extras/Mesa/src/X86/katmai_xform_masked1.S b/xc/extras/Mesa/src/X86/katmai_xform_masked1.S index 5e45f09c4..f3e11c803 100644 --- a/xc/extras/Mesa/src/X86/katmai_xform_masked1.S +++ b/xc/extras/Mesa/src/X86/katmai_xform_masked1.S @@ -9,12 +9,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define S(i) REGOFF(i * 4, ESI) #define D(i) REGOFF(i * 4, EDI) #define M(i) REGOFF(i * 4, EDX) @@ -76,7 +70,7 @@ GLNAME( gl_katmai_transform_points1_general_masked ): MOV_B( ARG_FLAG, BL ) /* clip mask flags */ TEST_L( ECX, ECX ) /* count was zero ? */ - JZ( LLBL( K_GTP1GM_finish ) ) /* yes -> nothing to do. */ + JZ( LLBL(K_GTP1GM_finish) ) /* yes -> nothing to do. */ MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) /* stride */ OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */ @@ -96,7 +90,7 @@ ALIGNTEXT32 MOVUPS( M(12), XMM1 ) /* m15 | m14 | m13 | m12 */ ALIGNTEXT32 -LLBL( K_GTP1GM_top ): +LLBL(K_GTP1GM_top): TEST_B( BL, REGIND(EBP) ) JNZ( LLBL(K_GTP1GM_skip) ) @@ -160,7 +154,7 @@ GLNAME( gl_katmai_transform_points1_identity_masked ): JE( LLBL(K_GTP1IM_finish) ) ALIGNTEXT32 -LLBL( K_GTP1IM_top ): +LLBL(K_GTP1IM_top): TEST_B( BL, REGIND(EBP) ) JNZ( LLBL(K_GTP1IM_skip) ) diff --git a/xc/extras/Mesa/src/X86/katmai_xform_masked2.S b/xc/extras/Mesa/src/X86/katmai_xform_masked2.S index f6d30fba1..a4936fa6a 100644 --- a/xc/extras/Mesa/src/X86/katmai_xform_masked2.S +++ b/xc/extras/Mesa/src/X86/katmai_xform_masked2.S @@ -9,12 +9,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define S(i) REGOFF(i * 4, ESI) #define D(i) REGOFF(i * 4, EDI) #define M(i) REGOFF(i * 4, EDX) @@ -97,7 +91,7 @@ ALIGNTEXT32 MOVUPS( M(12), XMM2 ) /* m15 | m14 | m13 | m12 */ ALIGNTEXT32 -LLBL( K_GTP2GM_top ): +LLBL(K_GTP2GM_top): TEST_B( BL, REGIND(EBP) ) JNZ( LLBL(K_GTP2GM_skip) ) @@ -165,7 +159,7 @@ GLNAME( gl_katmai_transform_points2_identity_masked ): JE( LLBL(K_GTP2IM_finish) ) ALIGNTEXT32 -LLBL( K_GTP2IM_top ): +LLBL(K_GTP2IM_top): TEST_B( BL, REGIND(EBP) ) JNZ( LLBL(K_GTP2IM_skip) ) diff --git a/xc/extras/Mesa/src/X86/katmai_xform_masked3.S b/xc/extras/Mesa/src/X86/katmai_xform_masked3.S index b88109a57..10f3c41b5 100644 --- a/xc/extras/Mesa/src/X86/katmai_xform_masked3.S +++ b/xc/extras/Mesa/src/X86/katmai_xform_masked3.S @@ -9,12 +9,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define S(i) REGOFF(i * 4, ESI) #define D(i) REGOFF(i * 4, EDI) #define M(i) REGOFF(i * 4, EDX) @@ -98,7 +92,7 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( K_GTPGM_top ): +LLBL(K_GTPGM_top): TEST_B ( BL, REGIND(EBP) ) JNZ ( LLBL(K_GTPGM_skip) ) @@ -173,7 +167,7 @@ GLNAME( gl_katmai_transform_points3_identity_masked ): ALIGNTEXT32 -LLBL( K_GTPIM_top ): +LLBL(K_GTPIM_top): TEST_B( BL, REGIND(EBP) ) JNZ( LLBL(K_GTPIM_skip) ) diff --git a/xc/extras/Mesa/src/X86/katmai_xform_masked4.S b/xc/extras/Mesa/src/X86/katmai_xform_masked4.S index b10736226..4a0bf5c05 100644 --- a/xc/extras/Mesa/src/X86/katmai_xform_masked4.S +++ b/xc/extras/Mesa/src/X86/katmai_xform_masked4.S @@ -9,12 +9,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define S(i) REGOFF(i * 4, ESI) #define D(i) REGOFF(i * 4, EDI) #define M(i) REGOFF(i * 4, EDX) @@ -76,7 +70,7 @@ GLNAME( gl_katmai_transform_points4_general_masked ): MOV_B( ARG_FLAG, BL ) /* clip mask flags */ TEST_L( ECX, ECX ) /* count was zero ? */ - JZ( LLBL( K_GTP4GM_finish ) ) /* yes -> nothing to do. */ + JZ( LLBL(K_GTP4GM_finish) ) /* yes -> nothing to do. */ MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) /* stride */ OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */ @@ -97,7 +91,7 @@ ALIGNTEXT32 MOVUPS( M(12), XMM3 ) /* m15 | m14 | m13 | m12 */ ALIGNTEXT32 -LLBL( K_GTP4GM_top ): +LLBL(K_GTP4GM_top): TEST_B( BL, REGIND(EBP) ) JNZ( LLBL(K_GTP4GM_skip) ) @@ -177,7 +171,7 @@ GLNAME( gl_katmai_transform_points4_identity_masked ): JE( LLBL(K_GTP4IM_finish) ) ALIGNTEXT16 -LLBL( K_GTP4IM_top ): +LLBL(K_GTP4IM_top): TEST_B( BL, REGIND(EBP) ) JNZ( LLBL(K_GTP4IM_skip) ) diff --git a/xc/extras/Mesa/src/X86/katmai_xform_raw1.S b/xc/extras/Mesa/src/X86/katmai_xform_raw1.S index a36ea3783..4ca992d2c 100644 --- a/xc/extras/Mesa/src/X86/katmai_xform_raw1.S +++ b/xc/extras/Mesa/src/X86/katmai_xform_raw1.S @@ -9,12 +9,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define S(i) REGOFF(i * 4, ESI) #define D(i) REGOFF(i * 4, EDI) #define M(i) REGOFF(i * 4, EDX) @@ -71,7 +65,7 @@ GLNAME( gl_katmai_transform_points1_general_raw ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) /* source count */ CMP_L( CONST(0), ECX ) /* count == 0 ? */ - JE( LLBL( K_GTP1GR_finish ) ) /* yes -> nothing to do. */ + JE( LLBL(K_GTP1GR_finish) ) /* yes -> nothing to do. */ MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) /* stride */ OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */ @@ -91,7 +85,7 @@ ALIGNTEXT32 MOVUPS( M(12), XMM1 ) /* m15 | m14 | m13 | m12 */ ALIGNTEXT32 -LLBL( K_GTP1GR_top ): +LLBL(K_GTP1GR_top): MOVSS( S(0), XMM2 ) /* ox */ SHUFPS( CONST(0x0), XMM2, XMM2 ) /* ox | ox | ox | ox */ MULPS( XMM0, XMM2 ) /* ox*m3 | ox*m2 | ox*m1 | ox*m0 */ @@ -145,7 +139,7 @@ GLNAME( gl_katmai_transform_points1_identity_raw ): ALIGNTEXT32 -LLBL( K_GTP1IR_top ): +LLBL(K_GTP1IR_top): MOV_L( S(0), EDX ) MOV_L( EDX, D(0) ) diff --git a/xc/extras/Mesa/src/X86/katmai_xform_raw2.S b/xc/extras/Mesa/src/X86/katmai_xform_raw2.S index ffe658c9b..61845034c 100644 --- a/xc/extras/Mesa/src/X86/katmai_xform_raw2.S +++ b/xc/extras/Mesa/src/X86/katmai_xform_raw2.S @@ -9,12 +9,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define S(i) REGOFF(i * 4, ESI) #define D(i) REGOFF(i * 4, EDI) #define M(i) REGOFF(i * 4, EDX) @@ -91,7 +85,7 @@ ALIGNTEXT32 MOVUPS( M(12), XMM2 ) /* m15 | m14 | m13 | m12 */ ALIGNTEXT32 -LLBL( K_GTP2GR_top ): +LLBL(K_GTP2GR_top): MOVSS( S(0), XMM3 ) /* ox */ SHUFPS( CONST(0x0), XMM3, XMM3 ) /* ox | ox | ox | ox */ MULPS( XMM0, XMM3 ) /* ox*m3 | ox*m2 | ox*m1 | ox*m0 */ @@ -149,7 +143,7 @@ GLNAME( gl_katmai_transform_points2_identity_raw ): ALIGNTEXT32 -LLBL( K_GTP2IR_top ): +LLBL(K_GTP2IR_top): MOV_L ( S(0), EDX ) MOV_L ( EDX, D(0) ) MOV_L ( S(1), EDX ) diff --git a/xc/extras/Mesa/src/X86/katmai_xform_raw3.S b/xc/extras/Mesa/src/X86/katmai_xform_raw3.S index 44f7bb517..49918de95 100644 --- a/xc/extras/Mesa/src/X86/katmai_xform_raw3.S +++ b/xc/extras/Mesa/src/X86/katmai_xform_raw3.S @@ -9,12 +9,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define S(i) REGOFF(i * 4, ESI) #define D(i) REGOFF(i * 4, EDI) #define M(i) REGOFF(i * 4, EDX) @@ -71,7 +65,7 @@ GLNAME( gl_katmai_transform_points3_general_raw ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) /* source count */ CMP_L ( CONST(0), ECX ) /* count == 0 ? */ - JE ( LLBL( K_GTPGR_finish ) ) /* yes -> nothing to do. */ + JE ( LLBL(K_GTPGR_finish) ) /* yes -> nothing to do. */ MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) /* stride */ OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */ @@ -94,7 +88,7 @@ ALIGNTEXT32 ALIGNTEXT32 -LLBL( K_GTPGR_top ): +LLBL(K_GTPGR_top): MOVSS ( REGOFF(0, ESI), XMM4 ) /* | | | ox */ SHUFPS ( CONST(0x0), XMM4, XMM4 ) /* ox | ox | ox | ox */ MOVSS ( REGOFF(4, ESI), XMM5 ) /* | | | oy */ @@ -158,7 +152,7 @@ GLNAME( gl_katmai_transform_points3_identity_raw ): ALIGNTEXT32 -LLBL( K_GTPIR_top ): +LLBL(K_GTPIR_top): MOVLPS ( S(0), XMM0 ) MOVLPS ( XMM0, D(0) ) MOVSS ( S(2), XMM0 ) diff --git a/xc/extras/Mesa/src/X86/katmai_xform_raw4.S b/xc/extras/Mesa/src/X86/katmai_xform_raw4.S index 0d776ee1e..d0867da7c 100644 --- a/xc/extras/Mesa/src/X86/katmai_xform_raw4.S +++ b/xc/extras/Mesa/src/X86/katmai_xform_raw4.S @@ -9,12 +9,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define S(i) REGOFF(i * 4, ESI) #define D(i) REGOFF(i * 4, EDI) #define M(i) REGOFF(i * 4, EDX) @@ -71,7 +65,7 @@ GLNAME( gl_katmai_transform_points4_general_raw ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) /* source count */ CMP_L( CONST(0), ECX ) /* count == 0 ? */ - JE( LLBL( K_GTP4GR_finish ) ) /* yes -> nothing to do. */ + JE( LLBL(K_GTP4GR_finish) ) /* yes -> nothing to do. */ MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) /* stride */ OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */ @@ -92,7 +86,7 @@ ALIGNTEXT32 MOVUPS( M(12), XMM3 ) /* m15 | m14 | m13 | m12 */ ALIGNTEXT32 -LLBL( K_GTP4GR_top ): +LLBL(K_GTP4GR_top): MOVSS( S(0), XMM4 ) /* ox */ SHUFPS( CONST(0x0), XMM4, XMM4 ) /* ox | ox | ox | ox */ MULPS( XMM0, XMM4 ) /* ox*m3 | ox*m2 | ox*m1 | ox*m0 */ diff --git a/xc/extras/Mesa/src/X86/mmx_blend.S b/xc/extras/Mesa/src/X86/mmx_blend.S index 7bd9ec3d2..e7d6e118c 100644 --- a/xc/extras/Mesa/src/X86/mmx_blend.S +++ b/xc/extras/Mesa/src/X86/mmx_blend.S @@ -1,13 +1,6 @@ #include "assyntax.h" -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - - SEG_TEXT @@ -123,13 +116,13 @@ GLNAME( gl_mmx_blend_transparency ): ADD_L ( CONST(4), REGOFF(20, EBP) ) ADD_L ( CONST(4), REGOFF(24, EBP) ) DEC_L ( REGOFF(12, EBP) ) -LLBL( GMBT_2 ): +LLBL(GMBT_2): CMP_L ( CONST(0), REGOFF(12, EBP) ) JE ( LLBL(GMBT_3) ) MOV_L ( CONST(0), REGOFF(-28, EBP) ) ALIGNTEXT4 -LLBL( GMBT_4 ): +LLBL(GMBT_4): MOV_L ( REGOFF(12, EBP), EDX ) MOV_L ( EDX, EAX ) @@ -138,7 +131,7 @@ LLBL( GMBT_4 ): JB ( LLBL(GMBT_7) ) JMP ( LLBL(GMBT_5) ) ALIGNTEXT16 -LLBL( GMBT_7 ): +LLBL(GMBT_7): MOV_L ( REGOFF(-28, EBP), EAX ) LEA_L ( REGDIS(0,EAX,2), EDX ) @@ -203,19 +196,19 @@ LLBL( GMBT_7 ): MOVQ ( MM4, REGIND(EAX) ) -LLBL( GMBT_8 ): +LLBL(GMBT_8): -LLBL( GMBT_6 ): +LLBL(GMBT_6): INC_L ( REGOFF(-28, EBP) ) JMP ( LLBL(GMBT_4) ) ALIGNTEXT16 -LLBL( GMBT_5 ): +LLBL(GMBT_5): EMMS -LLBL( GMBT_3 ): +LLBL(GMBT_3): MOV_L ( REGOFF(12, EBP), EAX ) AND_L ( CONST(1), EAX ) @@ -349,9 +342,9 @@ LLBL( GMBT_3 ): LEA_L ( REGOFF(-1, EAX), EDX ) MOV_B ( REGOFF(-32, EBP), AL ) MOV_B ( AL, REGIND(EDX) ) -LLBL( GMBT_9 ): +LLBL(GMBT_9): -LLBL( GMBT_1 ): +LLBL(GMBT_1): MOV_L ( REGOFF(-56, EBP), EBX ) MOV_L ( EBP, ESP ) diff --git a/xc/extras/Mesa/src/X86/vertex.S b/xc/extras/Mesa/src/X86/vertex.S index 9f295fdab..0326c6392 100644 --- a/xc/extras/Mesa/src/X86/vertex.S +++ b/xc/extras/Mesa/src/X86/vertex.S @@ -3,12 +3,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L##a -#else -#define LLBL(a) a -#endif - /*#define MAT_SX 0*/ /* accessed by REGIND !! */ #define MAT_SY 20 #define MAT_SZ 40 diff --git a/xc/extras/Mesa/src/X86/vertex_3dnow.S b/xc/extras/Mesa/src/X86/vertex_3dnow.S index 2c0060362..693ac0812 100644 --- a/xc/extras/Mesa/src/X86/vertex_3dnow.S +++ b/xc/extras/Mesa/src/X86/vertex_3dnow.S @@ -3,13 +3,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L##a -#else -#define LLBL(a) a -#endif - - /*#define MAT_SX 0 accessed by REGIND !! */ #define MAT_SY 20 diff --git a/xc/extras/Mesa/src/X86/vertex_katmai.S b/xc/extras/Mesa/src/X86/vertex_katmai.S index eb51413d7..a8b08902a 100644 --- a/xc/extras/Mesa/src/X86/vertex_katmai.S +++ b/xc/extras/Mesa/src/X86/vertex_katmai.S @@ -9,12 +9,6 @@ SEG_TEXT -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L##a -#else -#define LLBL(a) a -#endif - /* * void gl_v16_katmai_general_xform (GLfloat *dest, @@ -44,7 +38,7 @@ GLNAME( gl_v16_katmai_general_xform ): MOVUPS( REGOFF(48, ESI), XMM7 ) /* x44, x43, x42, x41 => xmm7 */ ALIGNTEXT32 -LLBL( loop1 ): +LLBL(loop1): MOVSS( REGOFF(0, EDX), XMM0 ) /* s1 => xmm0 */ SHUFPS( CONST(0x0), XMM0, XMM0 ) /* xmm0 shuffle to other 96 bits */ @@ -104,7 +98,7 @@ ALIGNTEXT32 SUB_L( ECX, EDX ) /* last -= first */ -LLBL( v16_katmai_pv_loop_start ): +LLBL(v16_katmai_pv_loop_start): MOVUPS( REGOFF(0, ECX), XMM3 ) /* f[3], f[2], f[1], f[0] */ MOVSS( REGOFF(12, ECX), XMM2 ) /* -, -, -, f[3] */ @@ -121,7 +115,7 @@ LLBL( v16_katmai_pv_loop_start ): ADD_L( EAX, ECX ) /* f += stride */ SUB_L( EAX, EDX ) /* (last-first)-stride */ - JA ( LLBL( v16_katmai_pv_loop_start ) ) + JA ( LLBL(v16_katmai_pv_loop_start) ) POP_L( EBP ) RET @@ -159,9 +153,9 @@ ALIGNTEXT32 SHUFPS( CONST(0x44), REGOFF(MAT_SZ, EBP), XMM1 ) /* -, x33, x22, x11 => xmm1 */ -LLBL( v16_katmai_pcv_loop_start ): +LLBL(v16_katmai_pcv_loop_start): CMP_B ( CONST(0), REGIND(ESI) ) /* clip_mask == 0 ? */ - JNE( LLBL( v16_katmai_pcv_skip ) ) /* no -> skip ! */ + JNE( LLBL(v16_katmai_pcv_skip) ) /* no -> skip ! */ MOVUPS( REGOFF(0, ECX), XMM3 ) /* f[3], f[2], f[1], f[0] */ @@ -176,12 +170,12 @@ LLBL( v16_katmai_pcv_loop_start ): MOVUPS( XMM1, REGOFF(0, ECX) ) /* back to f */ MOVSS( XMM2, REGOFF(12, ECX) ) /* 1/f[3] into f[3] ! */ -LLBL( v16_katmai_pcv_skip ): +LLBL(v16_katmai_pcv_skip): ADD_L( EAX, ECX ) /* f += stride */ INC_L( ESI ) /* nect ClipMask */ CMP_L( ECX, EDX ) /* p_first_vertex == p_last_vertex */ - JNE( LLBL( v16_katmai_pcv_loop_start ) ) + JNE( LLBL(v16_katmai_pcv_loop_start) ) /* no -> go on with next vertex */ POP_L( ESI ) diff --git a/xc/extras/Mesa/src/X86/x86a.S b/xc/extras/Mesa/src/X86/x86a.S index 2e186d92d..621bc1f1a 100644 --- a/xc/extras/Mesa/src/X86/x86a.S +++ b/xc/extras/Mesa/src/X86/x86a.S @@ -5,12 +5,6 @@ #define FP_ONE 1065353216 #define FP_ZERO 0 -#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) -#define LLBL(a) .L ## a -#else -#define LLBL(a) a -#endif - #define S(i) REGOFF(i * 4, ESI) #define D(i) REGOFF(i * 4, EDI) #define M(i) REGOFF(i * 4, EDX) |