mesa: add support for CET to x86/x86-64 asm files.

Control-flow enforcement technology is a new instructions on x86
processors to denote where indirect jumps can land. Gcc auto adds
the instruction (which encodes as a NOP on older CPUs) to entrypoints
but assembler files need manual adding. This adds it to all the
entry points in the mesa x86/x86-64 assembler files.

This will only happen if mesa is built with the -fcf-protection flag
to gcc as some distros are wanting to do.

Acked-by: Eric Anholt <eric@anholt.net>

diff --git a/meson.build b/meson.build
index 9c8768bbad0af0320b78c639b61068e2f2f99f91..379090fbbf6a3276b916fdbf449381397601bb7f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1034,7 +1034,7 @@ elif cc.has_header_symbol('sys/mkdev.h', 'major')
   pre_args += '-DMAJOR_IN_MKDEV'
 endif
 
-foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h', 'sys/shm.h']
+foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h', 'sys/shm.h', 'cet.h']
   if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h))
     pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
   endif

diff --git a/src/mesa/x86-64/xform4.S b/src/mesa/x86-64/xform4.S
index b5d224237cfae63a81f9d48880dcdaf4854b8fd8..e36a6276d2ae902f45ab451eb8262f27e9eb00b4 100644 (file)
--- a/src/mesa/x86-64/xform4.S
+++ b/src/mesa/x86-64/xform4.S
@@ -21,6 +21,11 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
+#ifdef HAVE_CET_H
+#include <cet.h>
+#else
+#define _CET_ENDBR
+#endif
 
 #ifdef USE_X86_64_ASM
 
@@ -33,6 +38,7 @@
 .globl _mesa_x86_64_cpuid
 .hidden _mesa_x86_64_cpuid
 _mesa_x86_64_cpuid:
+       _CET_ENDBR
        pushq   %rbx
        movl    (%rdi), %eax
        movl    8(%rdi), %ecx
@@ -55,6 +61,7 @@ _mesa_x86_64_transform_points4_general:
  *     rsi = matrix
  *     rdx = source
  */
+       _CET_ENDBR
        movl V4F_COUNT(%rdx), %ecx      /* count */
        movzbl V4F_STRIDE(%rdx), %eax   /* stride */
 
@@ -130,7 +137,7 @@ p4_constants:
  * because it ensures that the last matrix row (or is it column?) is 0,0,0,1
  */
 _mesa_x86_64_transform_points4_3d:
-
+       _CET_ENDBR
        leaq p4_constants(%rip), %rax
 
        prefetchnta 64(%rsi)
@@ -198,7 +205,7 @@ p4_3d_done:
 .globl _mesa_x86_64_transform_points4_identity
 .hidden _mesa_x86_64_transform_points4_identity
 _mesa_x86_64_transform_points4_identity:
-
+       _CET_ENDBR
        movl V4F_COUNT(%rdx), %ecx      /* count */
        movzbl V4F_STRIDE(%rdx), %eax   /* stride */
 
@@ -227,7 +234,7 @@ p4_identity_done:
 .globl _mesa_3dnow_transform_points4_3d_no_rot
 .hidden _mesa_3dnow_transform_points4_3d_no_rot
 _mesa_3dnow_transform_points4_3d_no_rot:
-
+       _CET_ENDBR
        movl V4F_COUNT(%rdx), %ecx      /* count */
        movzbl V4F_STRIDE(%rdx), %eax   /* stride */
 
@@ -292,7 +299,7 @@ p4_3d_no_rot_done:
 .globl _mesa_3dnow_transform_points4_perspective
 .hidden _mesa_3dnow_transform_points4_perspective
 _mesa_3dnow_transform_points4_perspective:
-
+       _CET_ENDBR
        movl V4F_COUNT(%rdx), %ecx      /* count */
        movzbl V4F_STRIDE(%rdx), %eax   /* stride */
 
@@ -359,7 +366,7 @@ p4_perspective_done:
 .globl _mesa_3dnow_transform_points4_2d_no_rot
 .hidden _mesa_3dnow_transform_points4_2d_no_rot
 _mesa_3dnow_transform_points4_2d_no_rot:
-
+       _CET_ENDBR
        movl V4F_COUNT(%rdx), %ecx      /* count */
        movzbl V4F_STRIDE(%rdx), %eax   /* stride */
 
@@ -415,7 +422,7 @@ p4_2d_no_rot_done:
 .globl _mesa_3dnow_transform_points4_2d
 .hidden _mesa_3dnow_transform_points4_2d
 _mesa_3dnow_transform_points4_2d:
-
+       _CET_ENDBR
        movl V4F_COUNT(%rdx), %ecx      /* count */
        movzbl V4F_STRIDE(%rdx), %eax   /* stride */
 

diff --git a/src/mesa/x86/3dnow_xform1.S b/src/mesa/x86/3dnow_xform1.S
index 2b157bb0e27f815ee871b7c9e8b190a1e7d227b5..b158a5a3714017ab4f35be4e5bae10a976536a0b 100644 (file)
--- a/src/mesa/x86/3dnow_xform1.S
+++ b/src/mesa/x86/3dnow_xform1.S
@@ -38,7 +38,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points1_general )
 HIDDEN(_mesa_3dnow_transform_points1_general)
 GLNAME( _mesa_3dnow_transform_points1_general ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -103,7 +103,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points1_identity )
 HIDDEN(_mesa_3dnow_transform_points1_identity)
 GLNAME( _mesa_3dnow_transform_points1_identity ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -151,7 +151,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points1_3d_no_rot )
 HIDDEN(_mesa_3dnow_transform_points1_3d_no_rot)
 GLNAME( _mesa_3dnow_transform_points1_3d_no_rot ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -209,7 +209,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points1_perspective )
 HIDDEN(_mesa_3dnow_transform_points1_perspective)
 GLNAME( _mesa_3dnow_transform_points1_perspective ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -263,7 +263,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points1_2d )
 HIDDEN(_mesa_3dnow_transform_points1_2d)
 GLNAME( _mesa_3dnow_transform_points1_2d ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -319,7 +319,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points1_2d_no_rot )
 HIDDEN(_mesa_3dnow_transform_points1_2d_no_rot)
 GLNAME( _mesa_3dnow_transform_points1_2d_no_rot ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -373,7 +373,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points1_3d )
 HIDDEN(_mesa_3dnow_transform_points1_3d)
 GLNAME( _mesa_3dnow_transform_points1_3d ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )

diff --git a/src/mesa/x86/3dnow_xform2.S b/src/mesa/x86/3dnow_xform2.S
index fd71648e2c0092cbde203a2b5b7c8a06a8fc4468..bed217bd8ca22b672389a7846911fd73f6c13242 100644 (file)
--- a/src/mesa/x86/3dnow_xform2.S
+++ b/src/mesa/x86/3dnow_xform2.S
@@ -38,7 +38,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points2_general )
 HIDDEN(_mesa_3dnow_transform_points2_general)
 GLNAME( _mesa_3dnow_transform_points2_general ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -119,7 +119,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points2_perspective )
 HIDDEN(_mesa_3dnow_transform_points2_perspective)
 GLNAME( _mesa_3dnow_transform_points2_perspective ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -175,7 +175,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points2_3d )
 HIDDEN(_mesa_3dnow_transform_points2_3d)
 GLNAME( _mesa_3dnow_transform_points2_3d ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -252,7 +252,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points2_3d_no_rot )
 HIDDEN(_mesa_3dnow_transform_points2_3d_no_rot)
 GLNAME( _mesa_3dnow_transform_points2_3d_no_rot ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -311,7 +311,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points2_2d )
 HIDDEN(_mesa_3dnow_transform_points2_2d)
 GLNAME( _mesa_3dnow_transform_points2_2d ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -375,7 +375,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points2_2d_no_rot )
 HIDDEN(_mesa_3dnow_transform_points2_2d_no_rot)
 GLNAME( _mesa_3dnow_transform_points2_2d_no_rot ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -431,7 +431,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points2_identity )
 HIDDEN(_mesa_3dnow_transform_points2_identity)
 GLNAME( _mesa_3dnow_transform_points2_identity ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )

diff --git a/src/mesa/x86/3dnow_xform3.S b/src/mesa/x86/3dnow_xform3.S
index db24843463f4a7fa8f0b7e40abd61b9f584332be..85ad3014413e2cb28d4643386b4e440167f60b3a 100644 (file)
--- a/src/mesa/x86/3dnow_xform3.S
+++ b/src/mesa/x86/3dnow_xform3.S
@@ -38,7 +38,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points3_general )
 HIDDEN(_mesa_3dnow_transform_points3_general)
 GLNAME( _mesa_3dnow_transform_points3_general ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -123,7 +123,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points3_perspective )
 HIDDEN(_mesa_3dnow_transform_points3_perspective)
 GLNAME( _mesa_3dnow_transform_points3_perspective ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -204,7 +204,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points3_3d )
 HIDDEN(_mesa_3dnow_transform_points3_3d)
 GLNAME( _mesa_3dnow_transform_points3_3d ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -292,7 +292,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points3_3d_no_rot )
 HIDDEN(_mesa_3dnow_transform_points3_3d_no_rot)
 GLNAME( _mesa_3dnow_transform_points3_3d_no_rot ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -368,7 +368,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points3_2d )
 HIDDEN(_mesa_3dnow_transform_points3_2d)
 GLNAME( _mesa_3dnow_transform_points3_2d ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -441,7 +441,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points3_2d_no_rot )
 HIDDEN(_mesa_3dnow_transform_points3_2d_no_rot)
 GLNAME( _mesa_3dnow_transform_points3_2d_no_rot ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -508,7 +508,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points3_identity )
 HIDDEN(_mesa_3dnow_transform_points3_identity)
 GLNAME( _mesa_3dnow_transform_points3_identity ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )

diff --git a/src/mesa/x86/3dnow_xform4.S b/src/mesa/x86/3dnow_xform4.S
index 161aaa1a9b7151524b72aca5561d486e28500fc0..87868e445238581ed4273b1b7cbc41fe2c92e108 100644 (file)
--- a/src/mesa/x86/3dnow_xform4.S
+++ b/src/mesa/x86/3dnow_xform4.S
@@ -38,7 +38,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points4_general )
 HIDDEN(_mesa_3dnow_transform_points4_general)
 GLNAME( _mesa_3dnow_transform_points4_general ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -131,7 +131,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points4_perspective )
 HIDDEN(_mesa_3dnow_transform_points4_perspective)
 GLNAME( _mesa_3dnow_transform_points4_perspective ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -211,7 +211,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points4_3d )
 HIDDEN(_mesa_3dnow_transform_points4_3d)
 GLNAME( _mesa_3dnow_transform_points4_3d ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -301,7 +301,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points4_3d_no_rot )
 HIDDEN(_mesa_3dnow_transform_points4_3d_no_rot)
 GLNAME( _mesa_3dnow_transform_points4_3d_no_rot ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
     MOV_L     ( ARG_DEST, ECX )
     MOV_L     ( ARG_MATRIX, ESI )
@@ -374,7 +374,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points4_2d )
 HIDDEN(_mesa_3dnow_transform_points4_2d)
 GLNAME( _mesa_3dnow_transform_points4_2d ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -449,7 +449,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points4_2d_no_rot )
 HIDDEN(_mesa_3dnow_transform_points4_2d_no_rot)
 GLNAME( _mesa_3dnow_transform_points4_2d_no_rot ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )
@@ -517,7 +517,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_3dnow_transform_points4_identity )
 HIDDEN(_mesa_3dnow_transform_points4_identity)
 GLNAME( _mesa_3dnow_transform_points4_identity ):
-
+    _CET_ENDBR
     PUSH_L    ( ESI )
 
     MOV_L     ( ARG_DEST, ECX )

diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h
index 67867bda4577bc0a14f547b0b436691134f7b40c..f269cb45ce7a43042aa2f06f7bc83b3b505aa309 100644 (file)
--- a/src/mesa/x86/assyntax.h
+++ b/src/mesa/x86/assyntax.h
@@ -1736,4 +1736,11 @@
 #  define HIDDEN(x)
 #endif
 
+/* Control flow enforcement support */
+#ifdef HAVE_CET_H
+#include <cet.h>
+#else
+#define _CET_ENDBR
+#endif
+
 #endif /* __ASSYNTAX_H__ */

diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S
index 7b29416c7aa8a31175a5f2f495fba38a3342d5c4..765e324b20e69ea5781833723a4a2417c7c3a638 100644 (file)
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -48,7 +48,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_has_cpuid)
 HIDDEN(_mesa_x86_has_cpuid)
 GLNAME(_mesa_x86_has_cpuid):
-
+       _CET_ENDBR
        /* Test for the CPUID command.  If the ID Flag bit in EFLAGS
         * (bit 21) is writable, the CPUID command is present */
        PUSHF_L
@@ -72,7 +72,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_cpuid)
 HIDDEN(_mesa_x86_cpuid)
 GLNAME(_mesa_x86_cpuid):
-
+       _CET_ENDBR
        MOV_L   (REGOFF(4, ESP), EAX)           /* cpuid op */
        PUSH_L  (EDI)
        PUSH_L  (EBX)
@@ -96,7 +96,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_cpuid_eax)
 HIDDEN(_mesa_x86_cpuid_eax)
 GLNAME(_mesa_x86_cpuid_eax):
-
+       _CET_ENDBR
        MOV_L   (REGOFF(4, ESP), EAX)           /* cpuid op */
        PUSH_L  (EBX)
 
@@ -109,7 +109,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_cpuid_ebx)
 HIDDEN(_mesa_x86_cpuid_ebx)
 GLNAME(_mesa_x86_cpuid_ebx):
-
+       _CET_ENDBR
        MOV_L   (REGOFF(4, ESP), EAX)           /* cpuid op */
        PUSH_L  (EBX)
 
@@ -123,7 +123,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_cpuid_ecx)
 HIDDEN(_mesa_x86_cpuid_ecx)
 GLNAME(_mesa_x86_cpuid_ecx):
-
+       _CET_ENDBR
        MOV_L   (REGOFF(4, ESP), EAX)           /* cpuid op */
        PUSH_L  (EBX)
 
@@ -137,7 +137,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_cpuid_edx)
 HIDDEN(_mesa_x86_cpuid_edx)
 GLNAME(_mesa_x86_cpuid_edx):
-
+       _CET_ENDBR
        MOV_L   (REGOFF(4, ESP), EAX)           /* cpuid op */
        PUSH_L  (EBX)
 
@@ -163,7 +163,7 @@ ALIGNTEXT4
 GLOBL GLNAME( _mesa_test_os_sse_support )
 HIDDEN(_mesa_test_os_sse_support)
 GLNAME( _mesa_test_os_sse_support ):
-
+       _CET_ENDBR
        XORPS   ( XMM0, XMM0 )
 
        RET
@@ -178,7 +178,7 @@ ALIGNTEXT4
 GLOBL GLNAME( _mesa_test_os_sse_exception_support )
 HIDDEN(_mesa_test_os_sse_exception_support)
 GLNAME( _mesa_test_os_sse_exception_support ):
-
+       _CET_ENDBR
        PUSH_L  ( EBP )
        MOV_L   ( ESP, EBP )
        SUB_L   ( CONST( 8 ), ESP )

diff --git a/src/mesa/x86/mmx_blendtmp.h b/src/mesa/x86/mmx_blendtmp.h
index 8534792e2970224d54ab2b9e25e600a68b35c7e6..56fee70d93a4861d5cd96335d45ccd06b74c17ce 100644 (file)
--- a/src/mesa/x86/mmx_blendtmp.h
+++ b/src/mesa/x86/mmx_blendtmp.h
@@ -15,7 +15,7 @@ ALIGNTEXT16
 GLOBL GLNAME( TAG(_mesa_mmx_blend) )
 HIDDEN( TAG(_mesa_mmx_blend) )
 GLNAME( TAG(_mesa_mmx_blend) ):
-
+    _CET_ENDBR
     PUSH_L     ( EBP )
     MOV_L      ( ESP, EBP )
     PUSH_L     ( ESI )

diff --git a/src/mesa/x86/read_rgba_span_x86.S b/src/mesa/x86/read_rgba_span_x86.S
index 0b94f024ec268f2158f0cad1335a887fa1143d6a..9a68ab83e34e33c22d5f52cc49bfec50dd452489 100644 (file)
--- a/src/mesa/x86/read_rgba_span_x86.S
+++ b/src/mesa/x86/read_rgba_span_x86.S
@@ -29,6 +29,12 @@
  *
  * \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(__MINGW32__) && !defined(__APPLE__) /* this one cries for assyntax.h */
@@ -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
 
@@ -498,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

diff --git a/src/mesa/x86/sse_normal.S b/src/mesa/x86/sse_normal.S
index 279f6eafcad9b358d81b67d98b1d526981a3dd7c..b04a77a7b2dc8906c121e044efeb57d17f1060d1 100644 (file)
--- a/src/mesa/x86/sse_normal.S
+++ b/src/mesa/x86/sse_normal.S
@@ -48,7 +48,7 @@ ALIGNTEXT16
 GLOBL GLNAME(_mesa_sse_transform_rescale_normals_no_rot)
 HIDDEN(_mesa_sse_transform_rescale_normals_no_rot)
 GLNAME(_mesa_sse_transform_rescale_normals_no_rot):
-
+       _CET_ENDBR
 #define FRAME_OFFSET 8
        PUSH_L  ( ESI )
        PUSH_L  ( EDI )
@@ -110,7 +110,7 @@ ALIGNTEXT16
 GLOBL GLNAME(_mesa_sse_transform_rescale_normals)
 HIDDEN(_mesa_sse_transform_rescale_normals)
 GLNAME(_mesa_sse_transform_rescale_normals):
-
+       _CET_ENDBR
 #define FRAME_OFFSET 8
        PUSH_L  ( ESI )
        PUSH_L  ( EDI )
@@ -203,7 +203,7 @@ ALIGNTEXT16
 GLOBL GLNAME(_mesa_sse_transform_normals_no_rot)
 HIDDEN(_mesa_sse_transform_normals_no_rot)
 GLNAME(_mesa_sse_transform_normals_no_rot):
-
+       _CET_ENDBR
 #define FRAME_OFFSET 8
        PUSH_L  ( ESI )
        PUSH_L  ( EDI )

diff --git a/src/mesa/x86/sse_xform1.S b/src/mesa/x86/sse_xform1.S
index 9473fc1571f31f3d37e21dd468978c8051b6e5f7..aeeda863d0fc171a3f5fad863695f64737c6350d 100644 (file)
--- a/src/mesa/x86/sse_xform1.S
+++ b/src/mesa/x86/sse_xform1.S
@@ -47,7 +47,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points1_general)
 HIDDEN( _mesa_sse_transform_points1_general )
 GLNAME( _mesa_sse_transform_points1_general ):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L    ( ESI )
     PUSH_L    ( EDI )
@@ -104,7 +104,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points1_identity)
 HIDDEN(_mesa_sse_transform_points1_identity)
 GLNAME( _mesa_sse_transform_points1_identity ):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L    ( ESI )
     PUSH_L    ( EDI )
@@ -156,7 +156,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points1_3d_no_rot)
 HIDDEN(_mesa_sse_transform_points1_3d_no_rot)
 GLNAME(_mesa_sse_transform_points1_3d_no_rot):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L( ESI )
     PUSH_L( EDI )
@@ -217,7 +217,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points1_perspective)
 HIDDEN(_mesa_sse_transform_points1_perspective)
 GLNAME(_mesa_sse_transform_points1_perspective):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L   ( ESI )
     PUSH_L   ( EDI )
@@ -276,7 +276,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points1_2d)
 HIDDEN(_mesa_sse_transform_points1_2d)
 GLNAME(_mesa_sse_transform_points1_2d):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L( ESI )
     PUSH_L( EDI )
@@ -331,7 +331,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points1_2d_no_rot)
 HIDDEN(_mesa_sse_transform_points1_2d_no_rot)
 GLNAME(_mesa_sse_transform_points1_2d_no_rot):
-
+       _CET_ENDBR
 #define FRAME_OFFSET 8
        PUSH_L( ESI )
        PUSH_L( EDI )
@@ -388,7 +388,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points1_3d)
 HIDDEN(_mesa_sse_transform_points1_3d)
 GLNAME(_mesa_sse_transform_points1_3d):
-
+       _CET_ENDBR
 #define FRAME_OFFSET 8
        PUSH_L( ESI )
        PUSH_L( EDI )

diff --git a/src/mesa/x86/sse_xform2.S b/src/mesa/x86/sse_xform2.S
index f89146b42d56a5ea29414c47af8eb089834a4649..5ba9afa012fdb2407441a01f333c9cc100127a2d 100644 (file)
--- a/src/mesa/x86/sse_xform2.S
+++ b/src/mesa/x86/sse_xform2.S
@@ -47,7 +47,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points2_general)
 HIDDEN (_mesa_sse_transform_points2_general)
 GLNAME( _mesa_sse_transform_points2_general ):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L    ( ESI )
     PUSH_L    ( EDI )
@@ -108,7 +108,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points2_identity)
 HIDDEN(_mesa_sse_transform_points2_identity)
 GLNAME( _mesa_sse_transform_points2_identity ):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L    ( ESI )
     PUSH_L    ( EDI )
@@ -161,7 +161,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points2_3d_no_rot)
 HIDDEN(_mesa_sse_transform_points2_3d_no_rot)
 GLNAME(_mesa_sse_transform_points2_3d_no_rot):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L( ESI )
     PUSH_L( EDI )
@@ -222,7 +222,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points2_perspective)
 HIDDEN(_mesa_sse_transform_points2_perspective)
 GLNAME(_mesa_sse_transform_points2_perspective):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L   ( ESI )
     PUSH_L   ( EDI )
@@ -281,7 +281,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points2_2d)
 HIDDEN(_mesa_sse_transform_points2_2d)
 GLNAME(_mesa_sse_transform_points2_2d):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L( ESI )
     PUSH_L( EDI )
@@ -344,7 +344,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points2_2d_no_rot)
 HIDDEN(_mesa_sse_transform_points2_2d_no_rot)
 GLNAME(_mesa_sse_transform_points2_2d_no_rot):
-
+       _CET_ENDBR
 #define FRAME_OFFSET 8
        PUSH_L( ESI )
        PUSH_L( EDI )
@@ -401,7 +401,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points2_3d)
 HIDDEN(_mesa_sse_transform_points2_3d)
 GLNAME(_mesa_sse_transform_points2_3d):
-
+       _CET_ENDBR
 #define FRAME_OFFSET 8
        PUSH_L( ESI )
        PUSH_L( EDI )

diff --git a/src/mesa/x86/sse_xform3.S b/src/mesa/x86/sse_xform3.S
index 933878603896fd170300f4b592df2376fff1f40c..fe0ccca1a11ee0d19942cb613fe89eb6c16d704f 100644 (file)
--- a/src/mesa/x86/sse_xform3.S
+++ b/src/mesa/x86/sse_xform3.S
@@ -47,7 +47,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points3_general)
 HIDDEN(_mesa_sse_transform_points3_general)
 GLNAME( _mesa_sse_transform_points3_general ):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L    ( ESI )
     PUSH_L    ( EDI )
@@ -117,7 +117,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points3_identity)
 HIDDEN(_mesa_sse_transform_points3_identity)
 GLNAME( _mesa_sse_transform_points3_identity ):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L    ( ESI )
     PUSH_L    ( EDI )
@@ -172,7 +172,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points3_3d_no_rot)
 HIDDEN(_mesa_sse_transform_points3_3d_no_rot)
 GLNAME(_mesa_sse_transform_points3_3d_no_rot):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L( ESI )
     PUSH_L( EDI )
@@ -240,7 +240,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points3_perspective)
 HIDDEN(_mesa_sse_transform_points3_perspective)
 GLNAME(_mesa_sse_transform_points3_perspective):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L   ( ESI )
     PUSH_L   ( EDI )
@@ -313,7 +313,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points3_2d)
 HIDDEN(_mesa_sse_transform_points3_2d)
 GLNAME(_mesa_sse_transform_points3_2d):
-
+    _CET_ENDBR
 #define FRAME_OFFSET 8
     PUSH_L( ESI )
     PUSH_L( EDI )
@@ -378,7 +378,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points3_2d_no_rot)
 HIDDEN(_mesa_sse_transform_points3_2d_no_rot)
 GLNAME(_mesa_sse_transform_points3_2d_no_rot):
-
+       _CET_ENDBR
 #define FRAME_OFFSET 8
        PUSH_L( ESI )
        PUSH_L( EDI )
@@ -439,7 +439,7 @@ ALIGNTEXT4
 GLOBL GLNAME(_mesa_sse_transform_points3_3d)
 HIDDEN(_mesa_sse_transform_points3_3d)
 GLNAME(_mesa_sse_transform_points3_3d):
-
+       _CET_ENDBR
 #define FRAME_OFFSET 8
        PUSH_L( ESI )
        PUSH_L( EDI )

diff --git a/src/mesa/x86/sse_xform4.S b/src/mesa/x86/sse_xform4.S
index d81e9a5b9a1693ea2773267e5b79aa24e8f46655..bd322e822d522f21cf6b0201c1a9d1b2f86fd05a 100644 (file)
--- a/src/mesa/x86/sse_xform4.S
+++ b/src/mesa/x86/sse_xform4.S
@@ -44,7 +44,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_sse_transform_points4_general )
 HIDDEN(_mesa_sse_transform_points4_general)
 GLNAME( _mesa_sse_transform_points4_general ):
-
+       _CET_ENDBR
        PUSH_L( ESI )
        PUSH_L( EDI )
 
@@ -116,7 +116,7 @@ ALIGNTEXT4
 GLOBL GLNAME( _mesa_sse_transform_points4_3d )
 HIDDEN(_mesa_sse_transform_points4_3d)
 GLNAME( _mesa_sse_transform_points4_3d ):
-
+       _CET_ENDBR
        PUSH_L( ESI )
        PUSH_L( EDI )
 
@@ -188,7 +188,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_sse_transform_points4_identity )
 HIDDEN(_mesa_sse_transform_points4_identity)
 GLNAME( _mesa_sse_transform_points4_identity ):
-
+       _CET_ENDBR
        PUSH_L( ESI )
        PUSH_L( EDI )
 

diff --git a/src/mesa/x86/x86_cliptest.S b/src/mesa/x86/x86_cliptest.S
index 231c029e84fefa99e0d0c7519c404086a9a2ecdd..6ae64ae85647eaf25188b39d788388a696ec7b23 100644 (file)
--- a/src/mesa/x86/x86_cliptest.S
+++ b/src/mesa/x86/x86_cliptest.S
@@ -104,7 +104,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_x86_cliptest_points4 )
 HIDDEN(_mesa_x86_cliptest_points4)
 GLNAME( _mesa_x86_cliptest_points4 ):
-
+       _CET_ENDBR
 #ifdef ELFPIC
 #define FRAME_OFFSET 20
 #else
@@ -279,7 +279,7 @@ ALIGNTEXT16
 GLOBL GLNAME( _mesa_x86_cliptest_points4_np )
 HIDDEN(_mesa_x86_cliptest_points4_np)
 GLNAME( _mesa_x86_cliptest_points4_np ):
-
+       _CET_ENDBR
 #ifdef ELFPIC
 #define FRAME_OFFSET 20
 #else