fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-23 10:30:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

mapi: update the asm code to support x32

Browse source 
Fixes crashes when both glx-tls and asm are enabled on x32.

Cc: mesa-stable@lists.freedesktop.org
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94512
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=575458
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
(cherry picked from commit 8945836658)
This commit is contained in:
Grazvydas Ignotas 2017-01-08 19:38:09 +02:00 • committed by Emil Velikov
parent 8a1113ce3f
commit eba4c8fea0
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mapi/entry_x86-64_tls.h
View file

@ -41,11 +41,23 @@ __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" \
"movl 4*" slot "(%r11d), %r11d\n\t" \
"jmp *%r11"
#endif
#define MAPI_TMP_STUB_ASM_GCC
#include "mapi_tmp.h"
@ -72,19 +84,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;