From b305028464f02947c0cce0476af0e35f4ed1fafa Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 4 Dec 2003 03:19:46 +0000
Subject: Port over changes from XFree86/Mesa 5.0.2, mostly to silence compiler
 warnings.

---
 src/mesa/x86/mmx_blendtmp.h | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'src/mesa/x86/mmx_blendtmp.h')

diff --git a/src/mesa/x86/mmx_blendtmp.h b/src/mesa/x86/mmx_blendtmp.h
index 1a8190355e..5d22f288a0 100644
--- a/src/mesa/x86/mmx_blendtmp.h
+++ b/src/mesa/x86/mmx_blendtmp.h
@@ -24,7 +24,7 @@ GLNAME( TAG(_mesa_mmx_blend) ):
 
     MOV_L      ( REGOFF(12, EBP), ECX )		/* n */
     CMP_L      ( CONST(0), ECX)
-    JE         ( LLBL ( TAG(GMB_return) ) )
+    JE         ( LLTAG(GMB_return) )
 
     MOV_L      ( REGOFF(16, EBP), EBX )		/* mask */
     MOV_L      ( REGOFF(20, EBP), EDI )         /* rgba */
@@ -33,10 +33,10 @@ GLNAME( TAG(_mesa_mmx_blend) ):
     INIT
     
     TEST_L     ( CONST(4), EDI )		/* align rgba on an 8-byte boundary */
-    JZ         ( LLBL ( TAG(GMB_align_end) ) )
+    JZ         ( LLTAG(GMB_align_end) )
 
     CMP_B      ( CONST(0), REGIND(EBX) )	/* *mask == 0 */
-    JE         ( LLBL ( TAG(GMB_align_continue) ) )
+    JE         ( LLTAG(GMB_align_continue) )
 
     /* runin */
 #define ONE(x)	x
@@ -45,23 +45,23 @@ GLNAME( TAG(_mesa_mmx_blend) ):
 #undef ONE
 #undef TWO
 
-LLBL ( TAG(GMB_align_continue) ):
+LLTAG(GMB_align_continue):
 
     DEC_L      ( ECX )				/* n -= 1 */
     INC_L      ( EBX )		                /* mask += 1 */
     ADD_L      ( CONST(4), EDI )		/* rgba += 1 */
     ADD_L      ( CONST(4), ESI )		/* dest += 1 */ 
 
-LLBL ( TAG(GMB_align_end) ):
+LLTAG(GMB_align_end):
 
     CMP_L      ( CONST(2), ECX)
-    JB         ( LLBL ( TAG(GMB_loop_end) ) )
+    JB         ( LLTAG(GMB_loop_end) )
 
 ALIGNTEXT16
-LLBL ( TAG(GMB_loop_begin) ):
+LLTAG(GMB_loop_begin):
 
     CMP_W      ( CONST(0), REGIND(EBX) )	/* *mask == 0 && *(mask + 1) == 0 */
-    JE         ( LLBL ( TAG(GMB_loop_continue) ) )
+    JE         ( LLTAG(GMB_loop_continue) )
 
     /* main loop */
 #define ONE(x)
@@ -70,7 +70,7 @@ LLBL ( TAG(GMB_loop_begin) ):
 #undef ONE
 #undef TWO
 
-LLBL ( TAG(GMB_loop_continue) ):
+LLTAG(GMB_loop_continue):
 
     DEC_L      ( ECX )
     DEC_L      ( ECX )				/* n -= 2 */
@@ -78,15 +78,15 @@ LLBL ( TAG(GMB_loop_continue) ):
     ADD_L      ( CONST(8), EDI )		/* rgba += 2 */
     ADD_L      ( CONST(8), ESI )		/* dest += 2 */ 
     CMP_L      ( CONST(2), ECX )
-    JAE        ( LLBL ( TAG(GMB_loop_begin) ) )
+    JAE        ( LLTAG(GMB_loop_begin) )
 
-LLBL ( TAG(GMB_loop_end) ):
+LLTAG(GMB_loop_end):
 
     CMP_L      ( CONST(1), ECX )
-    JB         ( LLBL ( TAG(GMB_done) ) )
+    JB         ( LLTAG(GMB_done) )
 
     CMP_B      ( CONST(0), REGIND(EBX) )	/* *mask == 0 */
-    JE         ( LLBL ( TAG(GMB_done) ) )
+    JE         ( LLTAG(GMB_done) )
 
     /* runout */
 #define ONE(x)	x
@@ -95,11 +95,11 @@ LLBL ( TAG(GMB_loop_end) ):
 #undef ONE
 #undef TWO
 
-LLBL ( TAG(GMB_done) ):
+LLTAG(GMB_done):
 
     EMMS
 
-LLBL ( TAG(GMB_return) ):
+LLTAG(GMB_return):
 
     POP_L      ( EBX )
     POP_L      ( EDI )
@@ -109,5 +109,6 @@ LLBL ( TAG(GMB_return) ):
     RET
 
 #undef TAG
+#undef LLTAG
 #undef INIT
 #undef MAIN
-- 
cgit v1.2.3