aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/mach/hurd
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-02-17 00:40:39 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-02-17 00:40:39 +0100
commitf1bdee617975bfd962a7940b76ec75c8b1d768d7 (patch)
treefd7cfb50713ffd5754576f4b7fc0b483da4eefd4 /sysdeps/mach/hurd
parentedba4e5f91ee3f5aea32e77df7eb1019d32ae5ed (diff)
downloadglibc-f1bdee617975bfd962a7940b76ec75c8b1d768d7.tar
glibc-f1bdee617975bfd962a7940b76ec75c8b1d768d7.tar.gz
glibc-f1bdee617975bfd962a7940b76ec75c8b1d768d7.tar.bz2
glibc-f1bdee617975bfd962a7940b76ec75c8b1d768d7.zip
x86 tls: Use _Static_assert for TLS access size assertion
Diffstat (limited to 'sysdeps/mach/hurd')
-rw-r--r--sysdeps/mach/hurd/i386/tls.h46
1 files changed, 20 insertions, 26 deletions
diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h
index 7ec8c81a76..ed3d8fd1f2 100644
--- a/sysdeps/mach/hurd/i386/tls.h
+++ b/sysdeps/mach/hurd/i386/tls.h
@@ -166,6 +166,9 @@ out:
/* Read member of the thread descriptor directly. */
# define THREAD_GETMEM(descr, member) \
({ __typeof (descr->member) __value; \
+ _Static_assert (sizeof (__value) == 1 \
+ || sizeof (__value) == 4 \
+ || sizeof (__value) == 8); \
if (sizeof (__value) == 1) \
asm volatile ("movb %%gs:%P2,%b0" \
: "=q" (__value) \
@@ -174,13 +177,8 @@ out:
asm volatile ("movl %%gs:%P1,%0" \
: "=r" (__value) \
: "i" (offsetof (tcbhead_t, member))); \
- else \
+ else /* 8 */ \
{ \
- if (sizeof (__value) != 8) \
- /* There should not be any value with a size other than 1, \
- 4 or 8. */ \
- abort (); \
- \
asm volatile ("movl %%gs:%P1,%%eax\n\t" \
"movl %%gs:%P2,%%edx" \
: "=A" (__value) \
@@ -193,6 +191,9 @@ out:
/* Same as THREAD_GETMEM, but the member offset can be non-constant. */
# define THREAD_GETMEM_NC(descr, member, idx) \
({ __typeof (descr->member[0]) __value; \
+ _Static_assert (sizeof (__value) == 1 \
+ || sizeof (__value) == 4 \
+ || sizeof (__value) == 8); \
if (sizeof (__value) == 1) \
asm volatile ("movb %%gs:%P2(%3),%b0" \
: "=q" (__value) \
@@ -203,13 +204,8 @@ out:
: "=r" (__value) \
: "i" (offsetof (tcbhead_t, member[0])), \
"r" (idx)); \
- else \
+ else /* 8 */ \
{ \
- if (sizeof (__value) != 8) \
- /* There should not be any value with a size other than 1, \
- 4 or 8. */ \
- abort (); \
- \
asm volatile ("movl %%gs:%P1(,%2,8),%%eax\n\t" \
"movl %%gs:4+%P1(,%2,8),%%edx" \
: "=&A" (__value) \
@@ -222,7 +218,11 @@ out:
/* Set member of the thread descriptor directly. */
# define THREAD_SETMEM(descr, member, value) \
- ({ if (sizeof (descr->member) == 1) \
+ ({ \
+ _Static_assert (sizeof (descr->member) == 1 \
+ || sizeof (descr->member) == 4 \
+ || sizeof (descr->member) == 8); \
+ if (sizeof (descr->member) == 1) \
asm volatile ("movb %b0,%%gs:%P1" : \
: "iq" (value), \
"i" (offsetof (tcbhead_t, member))); \
@@ -230,13 +230,8 @@ out:
asm volatile ("movl %0,%%gs:%P1" : \
: "ir" (value), \
"i" (offsetof (tcbhead_t, member))); \
- else \
+ else /* 8 */ \
{ \
- if (sizeof (descr->member) != 8) \
- /* There should not be any value with a size other than 1, \
- 4 or 8. */ \
- abort (); \
- \
asm volatile ("movl %%eax,%%gs:%P1\n\t" \
"movl %%edx,%%gs:%P2" : \
: "A" ((uint64_t) cast_to_integer (value)), \
@@ -247,7 +242,11 @@ out:
/* Same as THREAD_SETMEM, but the member offset can be non-constant. */
# define THREAD_SETMEM_NC(descr, member, idx, value) \
- ({ if (sizeof (descr->member[0]) == 1) \
+ ({ \
+ _Static_assert (sizeof (descr->member[0]) == 1 \
+ || sizeof (descr->member[0]) == 4 \
+ || sizeof (descr->member[0]) == 8); \
+ if (sizeof (descr->member[0]) == 1) \
asm volatile ("movb %b0,%%gs:%P1(%2)" : \
: "iq" (value), \
"i" (offsetof (tcbhead_t, member)), \
@@ -257,13 +256,8 @@ out:
: "ir" (value), \
"i" (offsetof (tcbhead_t, member)), \
"r" (idx)); \
- else \
+ else /* 8 */ \
{ \
- if (sizeof (descr->member[0]) != 8) \
- /* There should not be any value with a size other than 1, \
- 4 or 8. */ \
- abort (); \
- \
asm volatile ("movl %%eax,%%gs:%P1(,%2,8)\n\t" \
"movl %%edx,%%gs:4+%P1(,%2,8)" : \
: "A" ((uint64_t) cast_to_integer (value)), \