Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae7b7e9b authored May 21, 2018 by Chris Forbes Committed by android-build-merger May 21, 2018

Merge "Switch x86/x64 trampolines to use attribute((naked))" into pi-dev

am: 370b0a10

Change-Id: I7a0b0157b85dc6f2b42ccf3cf87763a86ee651ff

parents 0f47305d 370b0a10

opengl/libs/EGL/getProcAddress.cpp

+20 −22

Original line number	Diff line number	Diff line
		@@ -80,46 +80,44 @@ namespace android {

		#elif defined(__i386__)

		#define API_ENTRY(_api) __attribute__((noinline,optimize("omit-frame-pointer"))) _api
		#define API_ENTRY(_api) __attribute__((naked)) _api

		#define CALL_GL_EXTENSION_API(_api) \
		register void** fn; \
		__asm__ volatile( \
		"mov %%gs:0, %[fn]\n" \
		"mov %P[tls](%[fn]), %[fn]\n" \
		"test %[fn], %[fn]\n" \
		"cmovne %P[api](%[fn]), %[fn]\n" \
		"test %[fn], %[fn]\n" \
		"mov %%gs:0, %%eax\n" \
		"mov %P[tls](%%eax), %%eax\n" \
		"test %%eax, %%eax\n" \
		"cmovne %P[api](%%eax), %%eax\n" \
		"test %%eax, %%eax\n" \
		"je 1f\n" \
		"jmp *%[fn]\n" \
		"1:\n" \
		: [fn] "=r" (fn) \
		"jmp *%%eax\n" \
		"1: ret\n" \
		: \
		: [tls] "i" (TLS_SLOT_OPENGL_APIsizeof(void)), \
		[api] "i" (__builtin_offsetof(gl_hooks_t, \
		ext.extensions[_api])) \
		: "cc" \
		: "eax", "cc" \
		);

		#elif defined(__x86_64__)

		#define API_ENTRY(_api) __attribute__((noinline,optimize("omit-frame-pointer"))) _api
		#define API_ENTRY(_api) __attribute__((naked)) _api

		#define CALL_GL_EXTENSION_API(_api) \
		register void** fn; \
		__asm__ volatile( \
		"mov %%fs:0, %[fn]\n" \
		"mov %P[tls](%[fn]), %[fn]\n" \
		"test %[fn], %[fn]\n" \
		"cmovne %P[api](%[fn]), %[fn]\n" \
		"test %[fn], %[fn]\n" \
		"mov %%fs:0, %%rax\n" \
		"mov %P[tls](%%rax), %%rax\n" \
		"test %%rax, %%rax\n" \
		"cmovne %P[api](%%rax), %%rax\n" \
		"test %%rax, %%rax\n" \
		"je 1f\n" \
		"jmp *%[fn]\n" \
		"1:\n" \
		: [fn] "=r" (fn) \
		"jmp *%%rax\n" \
		"1: ret\n" \
		: \
		: [tls] "i" (TLS_SLOT_OPENGL_APIsizeof(void)), \
		[api] "i" (__builtin_offsetof(gl_hooks_t, \
		ext.extensions[_api])) \
		: "cc" \
		: "rax", "cc" \
		);

		#elif defined(__mips64)