RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-05 11:17:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

deduplicate TP_ADJ logic out of each arch, replace with TP_OFFSET

Browse Source 
the only part of TP_ADJ that was not uniquely determined by
TLS_ABOVE_TP was the 0x7000 adjustment used mainly on mips and powerpc
variants.
This commit is contained in:
Rich Felker 2020-08-24 22:04:52 -04:00
parent 19f8642494
commit ea71a9004e
17 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/aarch64/pthread_arch.h
View File

@ -7,6 +7,5 @@ static inline struct pthread *__pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 16 #define GAP_ABOVE_TP 16
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
#define MC_PC pc #define MC_PC pc

1
arch/arm/pthread_arch.h
View File

@ -28,6 +28,5 @@ static inline pthread_t __pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 8 #define GAP_ABOVE_TP 8
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
#define MC_PC arm_pc #define MC_PC arm_pc

2
arch/i386/pthread_arch.h
View File

@ -5,6 +5,4 @@ static inline struct pthread *__pthread_self()
return self; return self;
} }
#define TP_ADJ(p) (p)
#define MC_PC gregs[REG_EIP] #define MC_PC gregs[REG_EIP]

2
arch/m68k/pthread_arch.h
View File

@ -6,8 +6,8 @@ static inline struct pthread *__pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 0 #define GAP_ABOVE_TP 0
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
#define TP_OFFSET 0x7000
#define DTP_OFFSET 0x8000 #define DTP_OFFSET 0x8000
#define MC_PC gregs[R_PC] #define MC_PC gregs[R_PC]

2
arch/microblaze/pthread_arch.h
View File

@ -5,6 +5,4 @@ static inline struct pthread *__pthread_self()
return self; return self;
} }
#define TP_ADJ(p) (p)
#define MC_PC regs.pc #define MC_PC regs.pc

2
arch/mips/pthread_arch.h
View File

@ -12,8 +12,8 @@ static inline struct pthread *__pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 0 #define GAP_ABOVE_TP 0
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
#define TP_OFFSET 0x7000
#define DTP_OFFSET 0x8000 #define DTP_OFFSET 0x8000
#define MC_PC pc #define MC_PC pc

2
arch/mips64/pthread_arch.h
View File

@ -12,8 +12,8 @@ static inline struct pthread *__pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 0 #define GAP_ABOVE_TP 0
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
#define TP_OFFSET 0x7000
#define DTP_OFFSET 0x8000 #define DTP_OFFSET 0x8000
#define MC_PC pc #define MC_PC pc

2
arch/mipsn32/pthread_arch.h
View File

@ -12,8 +12,8 @@ static inline struct pthread *__pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 0 #define GAP_ABOVE_TP 0
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
#define TP_OFFSET 0x7000
#define DTP_OFFSET 0x8000 #define DTP_OFFSET 0x8000
#define MC_PC pc #define MC_PC pc

1
arch/or1k/pthread_arch.h
View File

@ -13,6 +13,5 @@ static inline struct pthread *__pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 0 #define GAP_ABOVE_TP 0
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
#define MC_PC regs.pc #define MC_PC regs.pc

2
arch/powerpc/pthread_arch.h
View File

@ -7,8 +7,8 @@ static inline struct pthread *__pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 0 #define GAP_ABOVE_TP 0
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
#define TP_OFFSET 0x7000
#define DTP_OFFSET 0x8000 #define DTP_OFFSET 0x8000
// the kernel calls the ip "nip", it's the first saved value after the 32 // the kernel calls the ip "nip", it's the first saved value after the 32

2
arch/powerpc64/pthread_arch.h
View File

@ -7,8 +7,8 @@ static inline struct pthread *__pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 0 #define GAP_ABOVE_TP 0
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
#define TP_OFFSET 0x7000
#define DTP_OFFSET 0x8000 #define DTP_OFFSET 0x8000
// the kernel calls the ip "nip", it's the first saved value after the 32 // the kernel calls the ip "nip", it's the first saved value after the 32

1
arch/riscv64/pthread_arch.h
View File

@ -7,7 +7,6 @@ static inline struct pthread *__pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 0 #define GAP_ABOVE_TP 0
#define TP_ADJ(p) ((char *)p + sizeof(struct pthread))
#define DTP_OFFSET 0x800 #define DTP_OFFSET 0x800

2
arch/s390x/pthread_arch.h
View File

@ -9,6 +9,4 @@ static inline struct pthread *__pthread_self()
return self; return self;
} }
#define TP_ADJ(p) (p)
#define MC_PC psw.addr #define MC_PC psw.addr

1
arch/sh/pthread_arch.h
View File

@ -7,7 +7,6 @@ static inline struct pthread *__pthread_self()
#define TLS_ABOVE_TP #define TLS_ABOVE_TP
#define GAP_ABOVE_TP 8 #define GAP_ABOVE_TP 8
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
#define MC_PC sc_pc #define MC_PC sc_pc

2
arch/x32/pthread_arch.h
View File

@ -5,8 +5,6 @@ static inline struct pthread *__pthread_self()
return self; return self;
} }
#define TP_ADJ(p) (p)
#define MC_PC gregs[REG_RIP] #define MC_PC gregs[REG_RIP]
#define CANARY canary2 #define CANARY canary2

2
arch/x86_64/pthread_arch.h
View File

@ -5,6 +5,4 @@ static inline struct pthread *__pthread_self()
return self; return self;
} }
#define TP_ADJ(p) (p)
#define MC_PC gregs[REG_RIP] #define MC_PC gregs[REG_RIP]

10
src/internal/pthread_impl.h
View File

@ -105,10 +105,20 @@ struct __timer {
#define CANARY canary #define CANARY canary
#endif #endif
#ifndef TP_OFFSET
#define TP_OFFSET 0
#endif
#ifndef DTP_OFFSET #ifndef DTP_OFFSET
#define DTP_OFFSET 0 #define DTP_OFFSET 0
#endif #endif
#ifdef TLS_ABOVE_TP
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + TP_OFFSET)
#else
#define TP_ADJ(p) (p)
#endif
#ifndef tls_mod_off_t #ifndef tls_mod_off_t
#define tls_mod_off_t size_t #define tls_mod_off_t size_t
#endif #endif