Remove CALL_THREAD_FCT macro

Submitted by Adhemerval Zanella on April 4, 2017, 7:05 p.m.

Details

Message ID 1491332713-10642-1-git-send-email-adhemerval.zanella@linaro.org
State New
Headers show

Commit Message

Adhemerval Zanella April 4, 2017, 7:05 p.m.
This patch removes CALL_THREAD_FCT macro usage and its defition for
x86.  For 32 bits it usage is only for force 16 stack alignment,
however stack is already explicit aligned in clone syscall.  For
64 bits and x32 it just a function call and there is no need to
code it with inline assembly.

Checked on i686-linux-gnu, x86_64-linux-gnu, and x86_64-linux-gnu-x32.

	* nptl/pthread_create.c (START_THREAD_DEFN): Remove
	CALL_THREAD_FCT macro usage.
	* sysdeps/i386/nptl/tls.h (CALL_THREAD_FCT): Remove definition.
	* sysdeps/x86_64/nptl/tls.h (CALL_THREAD_FCT): Likewise.
	* sysdeps/x86_64/32/nptl/tls.h: Remove file.
---
 ChangeLog                     |  8 ++++++++
 nptl/pthread_create.c         |  4 ----
 sysdeps/i386/nptl/tls.h       | 16 ---------------
 sysdeps/x86_64/nptl/tls.h     | 12 -----------
 sysdeps/x86_64/x32/nptl/tls.h | 46 -------------------------------------------
 5 files changed, 8 insertions(+), 78 deletions(-)
 delete mode 100644 sysdeps/x86_64/x32/nptl/tls.h

Comments

Florian Weimer April 4, 2017, 7:22 p.m.
* Adhemerval Zanella:

> This patch removes CALL_THREAD_FCT macro usage and its defition for
> x86.  For 32 bits it usage is only for force 16 stack alignment,
> however stack is already explicit aligned in clone syscall.  For
> 64 bits and x32 it just a function call and there is no need to
> code it with inline assembly.
>
> Checked on i686-linux-gnu, x86_64-linux-gnu, and x86_64-linux-gnu-x32.
>
> 	* nptl/pthread_create.c (START_THREAD_DEFN): Remove
> 	CALL_THREAD_FCT macro usage.
> 	* sysdeps/i386/nptl/tls.h (CALL_THREAD_FCT): Remove definition.
> 	* sysdeps/x86_64/nptl/tls.h (CALL_THREAD_FCT): Likewise.
> 	* sysdeps/x86_64/32/nptl/tls.h: Remove file.

Looks good to me.  Thanks.

Patch hide | download patch | download mbox

diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 2ef2bcb..d0d7414 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -452,11 +452,7 @@  START_THREAD_DEFN
       LIBC_PROBE (pthread_start, 3, (pthread_t) pd, pd->start_routine, pd->arg);
 
       /* Run the code the user provided.  */
-#ifdef CALL_THREAD_FCT
-      THREAD_SETMEM (pd, result, CALL_THREAD_FCT (pd));
-#else
       THREAD_SETMEM (pd, result, pd->start_routine (pd->arg));
-#endif
     }
 
   /* Call destructors for the thread_local TLS variables.  */
diff --git a/sysdeps/i386/nptl/tls.h b/sysdeps/i386/nptl/tls.h
index 04dc6ae..f9a6b11 100644
--- a/sysdeps/i386/nptl/tls.h
+++ b/sysdeps/i386/nptl/tls.h
@@ -394,22 +394,6 @@  tls_fill_user_desc (union user_desc_init *desc,
 	      abort (); })
 
 
-/* Call the user-provided thread function.  */
-#define CALL_THREAD_FCT(descr) \
-  ({ void *__res;							      \
-     int __ignore1, __ignore2;						      \
-     asm volatile ("pushl %%eax\n\t"					      \
-		   "pushl %%eax\n\t"					      \
-		   "pushl %%eax\n\t"					      \
-		   "pushl %%gs:%P4\n\t"					      \
-		   "call *%%gs:%P3\n\t"					      \
-		   "addl $16, %%esp"					      \
-		   : "=a" (__res), "=c" (__ignore1), "=d" (__ignore2)	      \
-		   : "i" (offsetof (struct pthread, start_routine)),	      \
-		     "i" (offsetof (struct pthread, arg)));		      \
-     __res; })
-
-
 /* Set the stack guard field in TCB head.  */
 #define THREAD_SET_STACK_GUARD(value) \
   THREAD_SETMEM (THREAD_SELF, header.stack_guard, value)
diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h
index 53b41bc..9b8ad82 100644
--- a/sysdeps/x86_64/nptl/tls.h
+++ b/sysdeps/x86_64/nptl/tls.h
@@ -326,18 +326,6 @@  typedef struct
 	      abort (); })
 
 
-# define CALL_THREAD_FCT(descr) \
-  ({ void *__res;							      \
-     asm volatile ("movq %%fs:%P2, %%rdi\n\t"				      \
-		   "callq *%%fs:%P1"					      \
-		   : "=a" (__res)					      \
-		   : "i" (offsetof (struct pthread, start_routine)),	      \
-		     "i" (offsetof (struct pthread, arg))		      \
-		   : "di", "si", "cx", "dx", "r8", "r9", "r10", "r11",	      \
-		     "memory", "cc");					      \
-     __res; })
-
-
 /* Set the stack guard field in TCB head.  */
 # define THREAD_SET_STACK_GUARD(value) \
     THREAD_SETMEM (THREAD_SELF, header.stack_guard, value)
diff --git a/sysdeps/x86_64/x32/nptl/tls.h b/sysdeps/x86_64/x32/nptl/tls.h
deleted file mode 100644
index 68f65a6..0000000
--- a/sysdeps/x86_64/x32/nptl/tls.h
+++ /dev/null
@@ -1,46 +0,0 @@ 
-/* Definition for thread-local data handling.  nptl/x32 version.
-   Copyright (C) 2012-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _X32_TLS_H
-#define _X32_TLS_H	1
-
-#include_next <tls.h>
-
-#ifndef __ASSEMBLER__
-
-/* X32 doesn't support 32-bit indirect calls via memory.  Instead, we
-   load the 32-bit address from memory into the lower 32 bits of the
-   return-value register, which will automatically zero-extend the upper
-   32 bits of the return-value register.  We then do the indirect call
-   via the 64-bit return-value register.  */
-# undef CALL_THREAD_FCT
-# define CALL_THREAD_FCT(descr) \
-  ({ void *__res;							      \
-     asm volatile ("movl %%fs:%P2, %%edi\n\t"				      \
-		   "movl %%fs:%P1, %k0\n\t"				      \
-		   "callq *%q0"						      \
-		   : "=a" (__res)					      \
-		   : "i" (offsetof (struct pthread, start_routine)),	      \
-		     "i" (offsetof (struct pthread, arg))		      \
-		   : "di", "si", "cx", "dx", "r8", "r9", "r10", "r11",	      \
-		     "memory", "cc");					      \
-     __res; })
-
-#endif /* __ASSEMBLER__ */
-
-#endif	/* x32/tls.h */