Attachment 128810 Details for Bug 94512 – x32 fix attempt

[patch] x32 fix attempt

x32try.patch (text/plain), 1.27 KB, created by Grazvydas Ignotas on 2017-01-07 23:22:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Grazvydas Ignotas

Created: 2017-01-07 23:22:51 UTC

Size: 1.27 KB

patch

obsolete

>diff --git a/src/mapi/entry_x86-64_tls.h b/src/mapi/entry_x86-64_tls.h
>index 8f3fa91..6472ca4 100644
>--- a/src/mapi/entry_x86-64_tls.h
>+++ b/src/mapi/entry_x86-64_tls.h
>@@ -41,11 +41,22 @@ __asm__(".text\n"
>    ".balign 32\n"                                        \
>    func ":"
> 
>+#ifndef __ILP32__
>+
> #define STUB_ASM_CODE(slot)                              \
>    "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)                              \
>+   "movq " ENTRY_CURRENT_TABLE "@GOTTPOFF(%rip), %rax\n\t"  \
>+   "movl %fs:(%rax), %r11d\n\t"                          \
>+   "jmp *(4 * " slot ")(%r11)"
>+
>+#endif
>+
> #define MAPI_TMP_STUB_ASM_GCC
> #include "mapi_tmp.h"
> 
>@@ -79,12 +90,17 @@ mapi_func
> entry_generate(int slot)
> {
>    const char code_templ[16] = {
>+#ifndef __ILP32__
>       /* movq %fs:0, %r11 */
>       0x64, 0x4c, 0x8b, 0x1c, 0x25, 0x00, 0x00, 0x00, 0x00,
>+#else
>+      /* movl %fs:0, %r11d */
>+      0x64, 0x44, 0x8b, 0x1c, 0x25, 0x00, 0x00, 0x00, 0x00,
>+#endif
>       /* jmp *0x1234(%r11) */
>       0x41, 0xff, 0xa3, 0x34, 0x12, 0x00, 0x00,
>    };
>-   unsigned long addr;
>+   unsigned long long addr;
>    char *code;
>    mapi_func entry;
>

Actions: View | Splinter Review

Attachments on bug 94512: 122253 | 124376 | 128810

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.