xiaoxiang781216 commented on a change in pull request #3626:
URL: https://github.com/apache/incubator-nuttx/pull/3626#discussion_r634243332
##########
File path: syscall/syscall.csv
##########
@@ -82,15 +83,12 @@
"pread","unistd.h","","ssize_t","int","FAR void *","size_t","off_t"
"pselect","sys/select.h","","int","int","FAR fd_set *","FAR fd_set *","FAR
fd_set *","FAR const struct timespec *","FAR const sigset_t *"
"pthread_cancel","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","pthread_t"
-"pthread_cleanup_pop","pthread.h","defined(CONFIG_PTHREAD_CLEANUP)","void","int"
-"pthread_cleanup_push","pthread.h","defined(CONFIG_PTHREAD_CLEANUP)","void","pthread_cleanup_t","FAR
void *"
"pthread_cond_broadcast","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR
pthread_cond_t *"
"pthread_cond_clockwait","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR
pthread_cond_t *","FAR pthread_mutex_t *","clockid_t","FAR const struct
timespec *"
"pthread_cond_signal","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR
pthread_cond_t *"
"pthread_cond_wait","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR
pthread_cond_t *","FAR pthread_mutex_t *"
-"pthread_create","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR
pthread_t *","FAR const pthread_attr_t
*","pthread_startroutine_t","pthread_addr_t"
"pthread_detach","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","pthread_t"
-"pthread_exit","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","noreturn","pthread_addr_t"
+"nx_pthread_exit","nuttx/pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","noreturn","pthread_addr_t"
Review comment:
move after line 69
##########
File path: arch/arm/src/armv6-m/arm_svcall.c
##########
@@ -298,34 +298,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
+
/* R0=SYS_pthread_start: This a user pthread start
*
- * void up_pthread_start(pthread_startroutine_t entrypt,
- * pthread_addr_t arg) noreturn_function;
+ * void up_pthread_start(pthread_trampoline_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
*
* At this point, the following values are saved in context:
*
* R0 = SYS_pthread_start
- * R1 = entrypt
- * R2 = arg
+ * R1 = startup
+ * R2 = entrypt
+ * R3 = arg
*/
-#if defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_DISABLE_PTHREAD)
case SYS_pthread_start:
{
/* Set up to return to the user-space pthread start-up function in
* unprivileged mode.
*/
- regs[REG_PC] = (uint32_t)USERSPACE->pthread_startup;
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
Review comment:
should we keep the thumb bit?
##########
File path: arch/arm/src/armv6-m/svcall.h
##########
@@ -124,6 +116,17 @@
#define SYS_signal_handler_return (7)
#endif /* CONFIG_BUILD_PROTECTED */
+
+/* SYS call 5:
+ *
+ * void up_pthread_start(pthread_startroutine_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
+ * noreturn_function
+ */
+
+#define SYS_pthread_start (5)
Review comment:
where define SYS_pthread_exit?
##########
File path: arch/arm/src/armv6-m/arm_svcall.c
##########
@@ -298,34 +298,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
+
/* R0=SYS_pthread_start: This a user pthread start
*
- * void up_pthread_start(pthread_startroutine_t entrypt,
- * pthread_addr_t arg) noreturn_function;
+ * void up_pthread_start(pthread_trampoline_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
*
* At this point, the following values are saved in context:
*
* R0 = SYS_pthread_start
- * R1 = entrypt
- * R2 = arg
+ * R1 = startup
+ * R2 = entrypt
+ * R3 = arg
*/
-#if defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_DISABLE_PTHREAD)
case SYS_pthread_start:
{
/* Set up to return to the user-space pthread start-up function in
* unprivileged mode.
*/
- regs[REG_PC] = (uint32_t)USERSPACE->pthread_startup;
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
regs[REG_EXC_RETURN] = EXC_RETURN_UNPRIVTHR;
- /* Change the parameter ordering to match the expectation of struct
- * userpace_s pthread_startup:
+ /* Change the parameter ordering to match the expectation of the
+ * user space pthread_startup:
+ */
+
+ regs[REG_R0] = regs[REG_R2]; /* pthread entry */
+ regs[REG_R1] = regs[REG_R3]; /* arg */
+ }
+ break;
+
+ /* R0=SYS_pthread_exit: This pthread_exit call in user-space
+ *
+ * void up_pthread_exit(pthread_exitroutine_t exit,
+ * FAR void *exit_value)
+ *
+ * At this point, the following values are saved in context:
+ *
+ * R0 = SYS_pthread_exit
+ * R1 = pthread_exit trampoline routine
+ * R2 = exit_value
+ */
+
+ case SYS_pthread_exit:
+ {
+ /* Set up to return to the user-space pthread start-up function in
+ * unprivileged mode.
+ */
+
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
Review comment:
should we keep the thumb bit?
##########
File path: arch/arm/src/armv8-m/svcall.h
##########
@@ -122,6 +115,17 @@
#define SYS_signal_handler_return (7)
#endif /* CONFIG_BUILD_PROTECTED */
+
+/* SYS call 5:
+ *
+ * void up_pthread_start(pthread_startroutine_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
+ * noreturn_function
+ */
+
+#define SYS_pthread_start (5)
Review comment:
where SYS_pthread_exit
##########
File path: arch/arm/src/armv8-m/svcall.h
##########
@@ -88,6 +88,7 @@
#define SYS_syscall_return (3)
+#ifndef CONFIG_BUILD_FLAT
Review comment:
remove
##########
File path: arch/arm/src/armv8-m/arm_svcall.c
##########
@@ -311,34 +311,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
+
/* R0=SYS_pthread_start: This a user pthread start
*
- * void up_pthread_start(pthread_startroutine_t entrypt,
- * pthread_addr_t arg) noreturn_function;
+ * void up_pthread_start(pthread_trampoline_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
*
* At this point, the following values are saved in context:
*
* R0 = SYS_pthread_start
- * R1 = entrypt
- * R2 = arg
+ * R1 = startup
+ * R2 = entrypt
+ * R3 = arg
*/
-#if defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_DISABLE_PTHREAD)
case SYS_pthread_start:
{
/* Set up to return to the user-space pthread start-up function in
* unprivileged mode.
*/
- regs[REG_PC] = (uint32_t)USERSPACE->pthread_startup & ~1;
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
Review comment:
remove cast and ~1
##########
File path: arch/arm/src/armv7-r/svcall.h
##########
@@ -108,6 +101,17 @@
#endif /* CONFIG_BUILD_PROTECTED */
+/* SYS call 3:
+ *
+ * void up_pthread_start(pthread_startroutine_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
+ * noreturn_function
+ */
+
+#define SYS_pthread_start (3)
Review comment:
where SYS_pthread_exit
##########
File path: arch/arm/src/armv8-m/arm_svcall.c
##########
@@ -311,34 +311,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
+
/* R0=SYS_pthread_start: This a user pthread start
*
- * void up_pthread_start(pthread_startroutine_t entrypt,
- * pthread_addr_t arg) noreturn_function;
+ * void up_pthread_start(pthread_trampoline_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
*
* At this point, the following values are saved in context:
*
* R0 = SYS_pthread_start
- * R1 = entrypt
- * R2 = arg
+ * R1 = startup
+ * R2 = entrypt
+ * R3 = arg
*/
-#if defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_DISABLE_PTHREAD)
case SYS_pthread_start:
{
/* Set up to return to the user-space pthread start-up function in
* unprivileged mode.
*/
- regs[REG_PC] = (uint32_t)USERSPACE->pthread_startup & ~1;
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
regs[REG_EXC_RETURN] = EXC_RETURN_UNPRIVTHR;
- /* Change the parameter ordering to match the expectation of struct
- * userpace_s pthread_startup:
+ /* Change the parameter ordering to match the expectation of the
+ * user space pthread_startup:
+ */
+
+ regs[REG_R0] = regs[REG_R2]; /* pthread entry */
+ regs[REG_R1] = regs[REG_R3]; /* arg */
+ }
+ break;
+
+ /* R0=SYS_pthread_exit: This pthread_exit call in user-space
+ *
+ * void up_pthread_exit(pthread_exitroutine_t exit,
+ * FAR void *exit_value)
+ *
+ * At this point, the following values are saved in context:
+ *
+ * R0 = SYS_pthread_exit
+ * R1 = pthread_exit trampoline routine
+ * R2 = exit_value
+ */
+
+ case SYS_pthread_exit:
+ {
+ /* Set up to return to the user-space pthread start-up function in
+ * unprivileged mode.
+ */
+
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
Review comment:
remove ~1? and (uint32_t)
##########
File path: arch/arm/src/armv7-a/svcall.h
##########
@@ -65,6 +65,7 @@
#define SYS_syscall_return (0)
+#ifndef CONFIG_BUILD_FLAT
Review comment:
why add CONFIG_BUILD_FLAT? the change look incorrect.
##########
File path: arch/arm/src/armv6-m/svcall.h
##########
@@ -89,6 +89,7 @@
#define SYS_syscall_return (3)
+#ifndef CONFIG_BUILD_FLAT
Review comment:
The change looks wrong
##########
File path: arch/arm/src/armv7-m/arm_svcall.c
##########
@@ -312,34 +312,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
+
/* R0=SYS_pthread_start: This a user pthread start
*
- * void up_pthread_start(pthread_startroutine_t entrypt,
- * pthread_addr_t arg) noreturn_function;
+ * void up_pthread_start(pthread_trampoline_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
*
* At this point, the following values are saved in context:
*
* R0 = SYS_pthread_start
- * R1 = entrypt
- * R2 = arg
+ * R1 = startup
+ * R2 = entrypt
+ * R3 = arg
*/
-#if defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_DISABLE_PTHREAD)
case SYS_pthread_start:
{
/* Set up to return to the user-space pthread start-up function in
* unprivileged mode.
*/
- regs[REG_PC] = (uint32_t)USERSPACE->pthread_startup & ~1;
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
Review comment:
remove the cast and ~1
##########
File path: arch/arm/src/armv6-m/arm_svcall.c
##########
@@ -298,34 +298,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
Review comment:
should keep #if defined(CONFIG_BUILD_PROTECTED)
##########
File path: arch/arm/src/armv7-m/arm_svcall.c
##########
@@ -312,34 +312,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
Review comment:
restore to defined(CONFIG_BUILD_PROTECTED)
##########
File path: arch/arm/src/armv7-m/svcall.h
##########
@@ -123,6 +116,24 @@
#define SYS_signal_handler_return (7)
#endif /* CONFIG_BUILD_PROTECTED */
+
+/* SYS call 5:
+ *
+ * void up_pthread_start((pthread_startroutine_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
+ * noreturn_function
+ */
+
+#define SYS_pthread_start (5)
Review comment:
restore the original location
##########
File path: arch/arm/src/armv7-m/arm_svcall.c
##########
@@ -312,34 +312,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
+
/* R0=SYS_pthread_start: This a user pthread start
*
- * void up_pthread_start(pthread_startroutine_t entrypt,
- * pthread_addr_t arg) noreturn_function;
+ * void up_pthread_start(pthread_trampoline_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
*
* At this point, the following values are saved in context:
*
* R0 = SYS_pthread_start
- * R1 = entrypt
- * R2 = arg
+ * R1 = startup
+ * R2 = entrypt
+ * R3 = arg
*/
-#if defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_DISABLE_PTHREAD)
case SYS_pthread_start:
{
/* Set up to return to the user-space pthread start-up function in
* unprivileged mode.
*/
- regs[REG_PC] = (uint32_t)USERSPACE->pthread_startup & ~1;
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
regs[REG_EXC_RETURN] = EXC_RETURN_UNPRIVTHR;
- /* Change the parameter ordering to match the expectation of struct
- * userpace_s pthread_startup:
+ /* Change the parameter ordering to match the expectation of the
+ * user space pthread_startup:
+ */
+
+ regs[REG_R0] = regs[REG_R2]; /* pthread entry */
+ regs[REG_R1] = regs[REG_R3]; /* arg */
+ }
+ break;
+
+ /* R0=SYS_pthread_exit: This pthread_exit call in user-space
+ *
+ * void up_pthread_exit(pthread_exitroutine_t exit,
+ * FAR void *exit_value)
+ *
+ * At this point, the following values are saved in context:
+ *
+ * R0 = SYS_pthread_exit
+ * R1 = pthread_exit trampoline routine
+ * R2 = exit_value
+ */
+
+ case SYS_pthread_exit:
+ {
+ /* Set up to return to the user-space pthread start-up function in
+ * unprivileged mode.
+ */
+
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
Review comment:
remove the cast and ~1
##########
File path: arch/arm/src/armv6-m/arm_svcall.c
##########
@@ -298,34 +298,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
+
/* R0=SYS_pthread_start: This a user pthread start
*
- * void up_pthread_start(pthread_startroutine_t entrypt,
- * pthread_addr_t arg) noreturn_function;
+ * void up_pthread_start(pthread_trampoline_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
*
* At this point, the following values are saved in context:
*
* R0 = SYS_pthread_start
- * R1 = entrypt
- * R2 = arg
+ * R1 = startup
+ * R2 = entrypt
+ * R3 = arg
*/
-#if defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_DISABLE_PTHREAD)
case SYS_pthread_start:
{
/* Set up to return to the user-space pthread start-up function in
* unprivileged mode.
*/
- regs[REG_PC] = (uint32_t)USERSPACE->pthread_startup;
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
Review comment:
remove the uint32_t cast
##########
File path: sched/task/task_setcancelstate.c
##########
@@ -112,7 +112,14 @@ int task_setcancelstate(int state, FAR int *oldstate)
if ((tcb->flags & TCB_FLAG_TTYPE_MASK) ==
TCB_FLAG_TTYPE_PTHREAD)
{
+ tcb->flags &= ~TCB_FLAG_CANCEL_PENDING;
+ tcb->flags |= TCB_FLAG_CANCEL_DOING;
Review comment:
why not move TCB_FLAG_CANCEL_DOING/TCB_FLAG_CANCEL_PENDING to
tls_info_s? so task_setcancelstate can move libc.
##########
File path: arch/arm/src/armv7-r/svcall.h
##########
@@ -108,6 +101,17 @@
#endif /* CONFIG_BUILD_PROTECTED */
+/* SYS call 3:
+ *
+ * void up_pthread_start(pthread_startroutine_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
+ * noreturn_function
+ */
+
+#define SYS_pthread_start (3)
Review comment:
need update CONFIG_SYS_RESERVED
##########
File path: include/nuttx/sched.h
##########
@@ -504,33 +509,35 @@ struct task_group_s
#endif /* CONFIG_SCHED_HAVE_PARENT */
#if defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_SCHED_HAVE_PARENT)
- /* waitpid support
************************************************************/
+ /* waitpid support ********************************************************/
- /* Simple mechanism used only when there is no support for SIGCHLD
*/
+ /* Simple mechanism used only when there is no support for SIGCHLD */
- uint8_t tg_nwaiters; /* Number of waiters
*/
- uint8_t tg_waitflags; /* User flags for waitpid behavior
*/
- sem_t tg_exitsem; /* Support for waitpid
*/
- FAR int *tg_statloc; /* Location to return exit status
*/
+ uint8_t tg_nwaiters; /* Number of waiters */
+ uint8_t tg_waitflags; /* User flags for waitpid behavior */
+ sem_t tg_exitsem; /* Support for waitpid */
+ FAR int *tg_statloc; /* Location to return exit status */
#endif
#ifndef CONFIG_DISABLE_PTHREAD
- /* Pthreads
*******************************************************************/
+ /* Pthreads ***************************************************************/
- /* Pthread join Info:
*/
+ /* Pthread join Info: */
- sem_t tg_joinsem; /* Mutually exclusive access to join
data */
- FAR struct join_s *tg_joinhead; /* Head of a list of join data
*/
- FAR struct join_s *tg_jointail; /* Tail of a list of join data
*/
+ sem_t tg_joinsem; /* Mutually exclusive access to join data */
+ FAR struct join_s *tg_joinhead; /* Head of a list of join data */
+ FAR struct join_s *tg_jointail; /* Tail of a list of join data */
#endif
- /* Thread local storage
*******************************************************/
+ /* Thread local storage ***************************************************/
#if CONFIG_TLS_NELEM > 0
- tls_ndxset_t tg_tlsset; /* Set of TLS data indexes allocated
*/
+ tls_ndxset_t tg_tlsset; /* Set of TLS indexes allocated */
+
+ tls_dtor_t tg_tlsdestr[CONFIG_TLS_NELEM]; /* List of TLS destructors */
Review comment:
why not save to task_info_s?
##########
File path: arch/arm/src/armv8-m/svcall.h
##########
@@ -122,6 +115,17 @@
#define SYS_signal_handler_return (7)
#endif /* CONFIG_BUILD_PROTECTED */
+
+/* SYS call 5:
+ *
+ * void up_pthread_start(pthread_startroutine_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
+ * noreturn_function
+ */
+
+#define SYS_pthread_start (5)
Review comment:
CONFIG_SYS_RESERVED need update
##########
File path: arch/arm/src/armv6-m/arm_svcall.c
##########
@@ -298,34 +298,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
+
/* R0=SYS_pthread_start: This a user pthread start
*
- * void up_pthread_start(pthread_startroutine_t entrypt,
- * pthread_addr_t arg) noreturn_function;
+ * void up_pthread_start(pthread_trampoline_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
*
* At this point, the following values are saved in context:
*
* R0 = SYS_pthread_start
- * R1 = entrypt
- * R2 = arg
+ * R1 = startup
+ * R2 = entrypt
+ * R3 = arg
*/
-#if defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_DISABLE_PTHREAD)
case SYS_pthread_start:
{
/* Set up to return to the user-space pthread start-up function in
* unprivileged mode.
*/
- regs[REG_PC] = (uint32_t)USERSPACE->pthread_startup;
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
regs[REG_EXC_RETURN] = EXC_RETURN_UNPRIVTHR;
- /* Change the parameter ordering to match the expectation of struct
- * userpace_s pthread_startup:
+ /* Change the parameter ordering to match the expectation of the
+ * user space pthread_startup:
+ */
+
+ regs[REG_R0] = regs[REG_R2]; /* pthread entry */
+ regs[REG_R1] = regs[REG_R3]; /* arg */
+ }
+ break;
+
+ /* R0=SYS_pthread_exit: This pthread_exit call in user-space
+ *
+ * void up_pthread_exit(pthread_exitroutine_t exit,
+ * FAR void *exit_value)
+ *
+ * At this point, the following values are saved in context:
+ *
+ * R0 = SYS_pthread_exit
+ * R1 = pthread_exit trampoline routine
+ * R2 = exit_value
+ */
+
+ case SYS_pthread_exit:
+ {
+ /* Set up to return to the user-space pthread start-up function in
+ * unprivileged mode.
+ */
+
+ regs[REG_PC] = (uint32_t)regs[REG_R1] & ~1; /* startup */
Review comment:
remove the uint32_t cast
##########
File path: arch/arm/src/armv7-m/svcall.h
##########
@@ -81,6 +81,7 @@
#define SYS_switch_context (2)
+#ifndef CONFIG_BUILD_FLAT
Review comment:
remove
##########
File path: sched/task/task_setcanceltype.c
##########
@@ -100,7 +100,14 @@ int task_setcanceltype(int type, FAR int *oldtype)
#ifndef CONFIG_DISABLE_PTHREAD
if ((tcb->flags & TCB_FLAG_TTYPE_MASK) == TCB_FLAG_TTYPE_PTHREAD)
{
+ tcb->flags &= ~TCB_FLAG_CANCEL_PENDING;
+ tcb->flags |= TCB_FLAG_CANCEL_DOING;
+#if !defined(CONFIG_BUILD_FLAT) && defined(__KERNEL__)
Review comment:
why not move TCB_FLAG_CANCEL_DOING/TCB_FLAG_CANCEL_PENDING to
tls_info_s? so task_setcanceltype can move libc.
##########
File path: arch/arm/src/armv7-a/arm_syscall.c
##########
@@ -278,31 +278,48 @@ uint32_t *arm_syscall(uint32_t *regs)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
Review comment:
restore !defined(CONFIG_BUILD_FLAT) to defined(CONFIG_BUILD_KERNEL)
##########
File path: arch/arm/src/armv7-r/arm_syscall.c
##########
@@ -273,31 +273,48 @@ uint32_t *arm_syscall(uint32_t *regs)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
Review comment:
restore to defined(CONFIG_BUILD_PROTECTED)
##########
File path: arch/arm/src/armv7-r/svcall.h
##########
@@ -66,6 +66,7 @@
#define SYS_syscall_return (0)
+#ifndef CONFIG_BUILD_FLAT
Review comment:
remove
##########
File path: arch/arm/src/armv8-m/arm_svcall.c
##########
@@ -311,34 +311,65 @@ int arm_svcall(int irq, FAR void *context, FAR void *arg)
break;
#endif
+#if !defined(CONFIG_BUILD_FLAT) && !defined(CONFIG_DISABLE_PTHREAD)
Review comment:
restore to defined(CONFIG_BUILD_PROTECTED)
##########
File path: arch/arm/src/armv7-a/svcall.h
##########
@@ -105,6 +98,24 @@
#define SYS_signal_handler_return (5)
+#endif /* !CONFIG_BUILD_FLAT */
+
+/* SYS call 3:
+ *
+ * void up_pthread_start(pthread_startroutine_t startup,
+ * pthread_startroutine_t entrypt, pthread_addr_t arg)
+ * noreturn_function
+ */
+
+#define SYS_pthread_start (3)
+
+/* SYS call 8:
Review comment:
I don't see the update here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
