mesa: fix formatting of messages printed using _mesa_log

[mesa.git] / src / mesa / x86 / read_rgba_span_x86.S

diff --git a/src/mesa/x86/read_rgba_span_x86.S b/src/mesa/x86/read_rgba_span_x86.S
index 2e5c3be83fef3974e78b78339ec4b31e5db62a0a..9a68ab83e34e33c22d5f52cc49bfec50dd452489 100644 (file)
--- a/src/mesa/x86/read_rgba_span_x86.S
+++ b/src/mesa/x86/read_rgba_span_x86.S
@@ -29,9 +29,15 @@
  *
  * \author Ian Romanick <idr@us.ibm.com>
  */
+/* Control flow enforcement support */
+#ifdef HAVE_CET_H
+#include <cet.h>
+#else
+#define _CET_ENDBR
+#endif
 
        .file   "read_rgba_span_x86.S"
-#if !defined(__DJGPP__) && !defined(__MINGW32__) /* this one cries for assyntax.h */
+#if !defined(__MINGW32__) && !defined(__APPLE__) /* this one cries for assyntax.h */
 /* Kevin F. Quinn 2nd July 2006
  * Replaced data segment constants with text-segment instructions.
  */
@@ -65,7 +71,7 @@
        movl    (%ebx), %eax ; \
        bswap   %eax          /* ARGB -> BGRA */ ; \
        rorl    $8, %eax      /* BGRA -> ABGR */ ; \
-       movl    %eax, (%ecx)  /* ABGR -> R, G, B, A */ ; \
+       movl    %eax, (%ecx)  /* ABGR -> R, G, B, A */ ;
 
 
 /**
@@ -80,6 +86,7 @@
 .hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
        .type   _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
 _generic_read_RGBA_span_BGRA8888_REV_MMX:
+       _CET_ENDBR
        pushl   %ebx
 
 #ifdef USE_INNER_EMMS
@@ -175,6 +182,7 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX:
 .hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
        .type   _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
 _generic_read_RGBA_span_BGRA8888_REV_SSE:
+       _CET_ENDBR
        pushl   %esi
        pushl   %ebx
        pushl   %ebp
@@ -338,6 +346,7 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE:
 .hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
        .type   _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
 _generic_read_RGBA_span_BGRA8888_REV_SSE2:
+       _CET_ENDBR
        pushl   %esi
        pushl   %ebx
 
@@ -434,7 +443,8 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
        je      .L47
 
        movq    (%ebx), %xmm0
-
+       addl    $8, %ebx
+        
        movdqa  %xmm0, %xmm3
        movdqa  %xmm0, %xmm4
        andps   %xmm1, %xmm0
@@ -448,6 +458,7 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
        orps    %xmm3, %xmm0
 
        movq    %xmm0, (%ecx)
+       addl    $8, %ecx        
 .L47:
 
        testl   $1, %edx
@@ -496,7 +507,7 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
        .type   _generic_read_RGBA_span_RGB565_MMX, @function
 
 _generic_read_RGBA_span_RGB565_MMX:
-
+       _CET_ENDBR
 #ifdef USE_INNER_EMMS
        emms
 #endif
@@ -520,7 +531,7 @@ _generic_read_RGBA_span_RGB565_MMX:
        addl    $32,%esp
 
        sarl    $2, %ecx
-       jle     .L01            /* Bail early if the count is negative. */
+       jl      .L01            /* Bail early if the count is negative. */
        jmp     .L02
 
 .L03:
@@ -646,7 +657,7 @@ _generic_read_RGBA_span_RGB565_MMX:
        testl   $0x01, %ecx
        je      .L01
 
-       movzxw  (%eax), %ecx
+       movzwl  (%eax), %ecx
        movd    %ecx, %mm4
 
        pshufw  $0x00, %mm4, %mm0
@@ -669,7 +680,7 @@ _generic_read_RGBA_span_RGB565_MMX:
        emms
 #endif
        ret
-#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) */
+#endif /* !defined(__MINGW32__) && !defined(__APPLE__) */
        
 #if defined (__ELF__) && defined (__linux__)
        .section .note.GNU-stack,"",%progbits