Merge branch 'mesa_7_6_branch'

[mesa.git] / src / mesa / x86 / mmx_blendtmp.h

diff --git a/src/mesa/x86/mmx_blendtmp.h b/src/mesa/x86/mmx_blendtmp.h
index 395436ba015c96f051d0906f378c07662d9a2658..c2fdeb62b3b28bb803e8bddfb9e872e892db2a9f 100644 (file)
--- a/src/mesa/x86/mmx_blendtmp.h
+++ b/src/mesa/x86/mmx_blendtmp.h
@@ -13,7 +13,7 @@
  */
 ALIGNTEXT16
 GLOBL GLNAME( TAG(_mesa_mmx_blend) )
-
+HIDDEN( TAG(_mesa_mmx_blend) )
 GLNAME( TAG(_mesa_mmx_blend) ):
 
     PUSH_L     ( EBP )
@@ -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,44 +33,44 @@ 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
 #define TWO(x)  
-    MAIN
+    MAIN       ( EDI, ESI )
 #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)
 #define TWO(x) x
-    MAIN
+    MAIN       ( EDI, ESI )
 #undef ONE
 #undef TWO
 
-LLBL ( TAG(GMB_loop_continue) ):
+LLTAG(GMB_loop_continue):
 
     DEC_L      ( ECX )
     DEC_L      ( ECX )                         /* n -= 2 */
@@ -78,28 +78,28 @@ 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
 #define TWO(x)
-    MAIN
+    MAIN       ( EDI, ESI )
 #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