x86: Add ENDBR at function entries

[mesa.git] / src / mapi / entry_x86-64_tls.h

diff --git a/src/mapi/entry_x86-64_tls.h b/src/mapi/entry_x86-64_tls.h
index c5262a18ddb1ca442fc89a3646a0d405241d3ad5..aebe4cf4a3f29cebdd81a631de6ba649a079ed4f 100644 (file)
--- a/src/mapi/entry_x86-64_tls.h
+++ b/src/mapi/entry_x86-64_tls.h
@@ -25,7 +25,13 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#ifdef HAVE_FUNC_ATTRIBUTE_VISIBIITY
+#ifdef __CET__
+#define ENDBR "endbr64\n\t"
+#else
+#define ENDBR
+#endif
+
+#ifdef HAVE_FUNC_ATTRIBUTE_VISIBILITY
 #define HIDDEN __attribute__((visibility("hidden")))
 #else
 #define HIDDEN
@@ -41,11 +47,25 @@ __asm__(".text\n"
    ".balign 32\n"                                        \
    func ":"
 
+#ifndef __ILP32__
+
 #define STUB_ASM_CODE(slot)                              \
+   ENDBR                                                 \
    "movq " ENTRY_CURRENT_TABLE "@GOTTPOFF(%rip), %rax\n\t"  \
    "movq %fs:(%rax), %r11\n\t"                           \
    "jmp *(8 * " slot ")(%r11)"
 
+#else
+
+#define STUB_ASM_CODE(slot)                              \
+   ENDBR                                                 \
+   "movq " ENTRY_CURRENT_TABLE "@GOTTPOFF(%rip), %rax\n\t"  \
+   "movl %fs:(%rax), %r11d\n\t"                          \
+   "movl 4*" slot "(%r11d), %r11d\n\t"                   \
+   "jmp *%r11"
+
+#endif
+
 #define MAPI_TMP_STUB_ASM_GCC
 #include "mapi_tmp.h"
 
@@ -72,19 +92,32 @@ void
 entry_patch(mapi_func entry, int slot)
 {
    char *code = (char *) entry;
-   *((unsigned int *) (code + 12)) = slot * sizeof(mapi_func);
+   int offset = 12;
+#ifdef __ILP32__
+   offset = 13;
+#endif
+   *((unsigned int *) (code + offset)) = slot * sizeof(mapi_func);
 }
 
 mapi_func
 entry_generate(int slot)
 {
-   const char code_templ[16] = {
+   const char code_templ[] = {
+#ifndef __ILP32__
       /* movq %fs:0, %r11 */
       0x64, 0x4c, 0x8b, 0x1c, 0x25, 0x00, 0x00, 0x00, 0x00,
       /* jmp *0x1234(%r11) */
       0x41, 0xff, 0xa3, 0x34, 0x12, 0x00, 0x00,
+#else
+      /* movl %fs:0, %r11d */
+      0x64, 0x44, 0x8b, 0x1c, 0x25, 0x00, 0x00, 0x00, 0x00,
+      /* movl 0x1234(%r11d), %r11d */
+      0x67, 0x45, 0x8b, 0x9b, 0x34, 0x12, 0x00, 0x00,
+      /* jmp *%r11 */
+      0x41, 0xff, 0xe3,
+#endif
    };
-   unsigned long addr;
+   unsigned long long addr;
    char *code;
    mapi_func entry;