Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

tls: restore C89 compatibility for TLS

Browse Source 
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
This commit is contained in:
Petro Karashchenko
2021-12-13 20:27:51 +02:00
committed by Xiang Xiao
parent 9a86aa7f77
commit af614ac77d
4 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/common/arm_tls.c
+2 -2
View File
@@ -65,7 +65,7 @@ int up_tls_size(void)
void up_tls_initialize(FAR struct tls_info_s *info) void up_tls_initialize(FAR struct tls_info_s *info)
{ {
FAR uint8_t *tls_data = info->tl_data; FAR uint8_t *tls_data = (FAR uint8_t *)(info + 1);
uint32_t tdata_len = sizeof(uint32_t) * (_END_TDATA - _START_TDATA); uint32_t tdata_len = sizeof(uint32_t) * (_END_TDATA - _START_TDATA);
uint32_t tbss_len = sizeof(uint32_t) * (_END_TBSS - _START_TBSS); uint32_t tbss_len = sizeof(uint32_t) * (_END_TBSS - _START_TBSS);
@@ -86,5 +86,5 @@ void up_tls_initialize(FAR struct tls_info_s *info)
void *__aeabi_read_tp(void) void *__aeabi_read_tp(void)
{ {
return tls_get_info()->tl_data; return (void *)(tls_get_info() + 1);
} }
arch/risc-v/src/common/riscv_tls.c
+1 -1
View File
@@ -62,7 +62,7 @@ int up_tls_size(void)
void up_tls_initialize(FAR struct tls_info_s *info) void up_tls_initialize(FAR struct tls_info_s *info)
{ {
FAR uint8_t *tls_data = info->tl_data; FAR uint8_t *tls_data = (FAR uint8_t *)(info + 1);
uint32_t tdata_len = sizeof(uint32_t) * (_END_TDATA - _START_TDATA); uint32_t tdata_len = sizeof(uint32_t) * (_END_TDATA - _START_TDATA);
uint32_t tbss_len = sizeof(uint32_t) * (_END_TBSS - _START_TBSS); uint32_t tbss_len = sizeof(uint32_t) * (_END_TBSS - _START_TBSS);
arch/risc-v/src/rv32im/riscv_initialstate.c
+2 -6
View File
@@ -55,11 +55,6 @@
void up_initial_state(struct tcb_s *tcb) void up_initial_state(struct tcb_s *tcb)
{ {
struct xcptcontext *xcp = &tcb->xcp; struct xcptcontext *xcp = &tcb->xcp;
#ifdef CONFIG_SCHED_THREAD_LOCAL
struct tls_info_s *info = tcb->stack_alloc_ptr;
#endif
uint32_t regval; uint32_t regval;
/* Initialize the idle thread stack */ /* Initialize the idle thread stack */
@@ -101,7 +96,8 @@ void up_initial_state(struct tcb_s *tcb)
/* Setup thread local storage pointer */ /* Setup thread local storage pointer */
#ifdef CONFIG_SCHED_THREAD_LOCAL #ifdef CONFIG_SCHED_THREAD_LOCAL
xcp->regs[REG_TP] = (uint32_t)info->tl_data; xcp->regs[REG_TP] = (uint32_t)tcb->stack_alloc_ptr +
sizeof(struct tls_info_s);
#endif #endif
/* If this task is running PIC, then set the PIC base register to the /* If this task is running PIC, then set the PIC base register to the
include/nuttx/tls.h
+1 -4
View File
@@ -140,7 +140,7 @@ struct pthread_cleanup_s
* The stack memory is fully accessible to user mode threads. TLS is not * The stack memory is fully accessible to user mode threads. TLS is not
* available from interrupt handlers (nor from the IDLE thread). * available from interrupt handlers (nor from the IDLE thread).
* *
* The following diagram represent the typic stack layout: * The following diagram represent the typical stack layout:
* *
* Push Down Push Up * Push Down Push Up
* +-------------+ +-------------+ <- Stack memory allocation * +-------------+ +-------------+ <- Stack memory allocation
@@ -179,9 +179,6 @@ struct tls_info_s
#endif #endif
int tl_errno; /* Per-thread error number */ int tl_errno; /* Per-thread error number */
#ifdef CONFIG_SCHED_THREAD_LOCAL
uint8_t tl_data[0];
#endif
}; };
/**************************************************************************** /****************************************************************************