From a45f710f8fdb5b9cf11fbdcb2a74cb5007ea79fd Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 16 Mar 2013 17:37:40 +0000 Subject: Fix bad conditional logic in mkconfig.c; Add user-mode pthread start-up logic git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5748 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/ChangeLog | 13 ++++ nuttx/arch/arm/src/armv6-m/svcall.h | 15 +++- nuttx/arch/arm/src/armv6-m/up_svcall.c | 39 +++++++++- nuttx/arch/arm/src/armv7-m/svcall.h | 15 +++- nuttx/arch/arm/src/armv7-m/up_svcall.c | 39 +++++++++- nuttx/arch/arm/src/common/up_pthread_start.c | 96 ++++++++++++++++++++++++ nuttx/arch/arm/src/lpc17xx/Make.defs | 2 +- nuttx/arch/arm/src/sam3u/Make.defs | 2 +- nuttx/configs/open1788/kernel/up_userspace.c | 3 + nuttx/configs/open1788/knsh/defconfig | 2 +- nuttx/configs/sam3u-ek/kernel/up_userspace.c | 7 ++ nuttx/configs/sam3u-ek/knsh/defconfig | 2 +- nuttx/include/nuttx/arch.h | 30 +++++++- nuttx/include/nuttx/sched.h | 20 +++++ nuttx/include/nuttx/userspace.h | 6 +- nuttx/include/pthread.h | 2 +- nuttx/libc/pthread/Make.defs | 4 + nuttx/libc/pthread/pthread_startup.c | 108 +++++++++++++++++++++++++++ nuttx/sched/pthread_create.c | 12 ++- nuttx/tools/mkconfig.c | 9 --- 20 files changed, 392 insertions(+), 34 deletions(-) create mode 100644 nuttx/arch/arm/src/common/up_pthread_start.c create mode 100644 nuttx/libc/pthread/pthread_startup.c (limited to 'nuttx') diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index ae585ae33..9074c2895 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -4332,3 +4332,16 @@ Ryan Sundberg. (2013-03-14). 6.27 2013-xx-xx Gregory Nutt + + * arch/arm/src/armv7-m/up_mpu.c: Correct MPU sub-region settings for + unaligned regions (2013-03-15). + * arch/arm/src/armv6-m/up_svcall.c: Bring up to equivalent to the + ARMv7-M version (2013-03-15). + * configs/lm4f120-launchpad/tools: Add scripts and instructions to + simplify use of OpenOCD with ICDI (from JP Carballo, 2013-03-15). + * tools/mkconfig.c: Logic that attempts to suppressed buffered I/O + within the kernel is wrong. sizeof(struct file_struct) must be + the same in both kernel- and user-spaces (2013-03-16). + * arch/arm/src/common/up_pthread_start.c, nuttx/libc/pthread/pthread_startup.c, + and related files: Implement switch to user-space and user-space + pthread start-up function (2013-03-16). diff --git a/nuttx/arch/arm/src/armv6-m/svcall.h b/nuttx/arch/arm/src/armv6-m/svcall.h index f453cad55..c7f2013fc 100644 --- a/nuttx/arch/arm/src/armv6-m/svcall.h +++ b/nuttx/arch/arm/src/armv6-m/svcall.h @@ -57,9 +57,9 @@ #ifdef CONFIG_NUTTX_KERNEL # ifndef CONFIG_SYS_RESERVED -# error "CONFIG_SYS_RESERVED must be defined to the value 5" -# elif CONFIG_SYS_RESERVED != 5 -# error "CONFIG_SYS_RESERVED must have the value 5" +# error "CONFIG_SYS_RESERVED must be defined to the value 6" +# elif CONFIG_SYS_RESERVED != 6 +# error "CONFIG_SYS_RESERVED must have the value 6" # endif #endif @@ -94,12 +94,19 @@ #define SYS_syscall_return (3) -/* SYS call 3: +/* SYS call 4: * * void up_task_start(main_t taskentry, int argc, FAR char *argv[]) noreturn_function; */ #define SYS_task_start (4) + +/* SYS call 5: + * + * void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg) noreturn_function + */ + +#define SYS_pthread_start (5) #endif /************************************************************************************ diff --git a/nuttx/arch/arm/src/armv6-m/up_svcall.c b/nuttx/arch/arm/src/armv6-m/up_svcall.c index 06d6a61e1..ac99cabe0 100644 --- a/nuttx/arch/arm/src/armv6-m/up_svcall.c +++ b/nuttx/arch/arm/src/armv6-m/up_svcall.c @@ -196,7 +196,7 @@ int up_svcall(int irq, FAR void *context) } break; - /* R0=SYS_restore_context: This a restore context command: + /* R0=SYS_restore_context: This a restore context command: * * void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function; * @@ -218,7 +218,7 @@ int up_svcall(int irq, FAR void *context) } break; - /* R0=SYS_switch_context: This a switch context command: + /* R0=SYS_switch_context: This a switch context command: * * void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs); * @@ -242,7 +242,7 @@ int up_svcall(int irq, FAR void *context) } break; - /* R0=SYS_syscall_return: This a syscall return command: + /* R0=SYS_syscall_return: This a syscall return command: * * void up_syscall_return(void); * @@ -280,7 +280,7 @@ int up_svcall(int irq, FAR void *context) break; #endif - /* R0=SYS_task_start: This a user task start + /* R0=SYS_task_start: This a user task start * * void up_task_start(main_t taskentry, int argc, FAR char *argv[]) noreturn_function; * @@ -313,6 +313,37 @@ int up_svcall(int irq, FAR void *context) break; #endif + /* R0=SYS_pthread_start: This a user pthread start + * + * void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg) noreturn_function; + * + * At this point, the following values are saved in context: + * + * R0 = SYS_pthread_start + * R1 = entrypt + * R2 = arg + */ + +#if defined(CONFIG_NUTTX_KERNEL) && !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_EXC_RETURN] = EXC_RETURN_UNPRIVTHR; + + /* Change the parameter ordering to match the expectation of struct + * userpace_s pthread_startup: + */ + + regs[REG_R0] = regs[REG_R1]; /* pthread entry */ + regs[REG_R1] = regs[REG_R2]; /* arg */ + } + break; +#endif + /* This is not an architecture-specific system call. If NuttX is built * as a standalone kernel with a system call interface, then all of the * additional system calls must be handled as in the default case. diff --git a/nuttx/arch/arm/src/armv7-m/svcall.h b/nuttx/arch/arm/src/armv7-m/svcall.h index f6b068f86..333dfb6d0 100644 --- a/nuttx/arch/arm/src/armv7-m/svcall.h +++ b/nuttx/arch/arm/src/armv7-m/svcall.h @@ -57,9 +57,9 @@ #ifdef CONFIG_NUTTX_KERNEL # ifndef CONFIG_SYS_RESERVED -# error "CONFIG_SYS_RESERVED must be defined to the value 5" -# elif CONFIG_SYS_RESERVED != 5 -# error "CONFIG_SYS_RESERVED must have the value 5" +# error "CONFIG_SYS_RESERVED must be defined to the value 6" +# elif CONFIG_SYS_RESERVED != 6 +# error "CONFIG_SYS_RESERVED must have the value 6" # endif #endif @@ -94,12 +94,19 @@ #define SYS_syscall_return (3) -/* SYS call 3: +/* SYS call 4: * * void up_task_start(main_t taskentry, int argc, FAR char *argv[]) noreturn_function; */ #define SYS_task_start (4) + +/* SYS call 5: + * + * void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg) noreturn_function + */ + +#define SYS_pthread_start (5) #endif /************************************************************************************ diff --git a/nuttx/arch/arm/src/armv7-m/up_svcall.c b/nuttx/arch/arm/src/armv7-m/up_svcall.c index 950ddd1d3..1a153dead 100644 --- a/nuttx/arch/arm/src/armv7-m/up_svcall.c +++ b/nuttx/arch/arm/src/armv7-m/up_svcall.c @@ -197,7 +197,7 @@ int up_svcall(int irq, FAR void *context) } break; - /* R0=SYS_restore_context: This a restore context command: + /* R0=SYS_restore_context: This a restore context command: * * void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function; * @@ -219,7 +219,7 @@ int up_svcall(int irq, FAR void *context) } break; - /* R0=SYS_switch_context: This a switch context command: + /* R0=SYS_switch_context: This a switch context command: * * void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs); * @@ -246,7 +246,7 @@ int up_svcall(int irq, FAR void *context) } break; - /* R0=SYS_syscall_return: This a syscall return command: + /* R0=SYS_syscall_return: This a syscall return command: * * void up_syscall_return(void); * @@ -284,7 +284,7 @@ int up_svcall(int irq, FAR void *context) break; #endif - /* R0=SYS_task_start: This a user task start + /* R0=SYS_task_start: This a user task start * * void up_task_start(main_t taskentry, int argc, FAR char *argv[]) noreturn_function; * @@ -317,6 +317,37 @@ int up_svcall(int irq, FAR void *context) break; #endif + /* R0=SYS_pthread_start: This a user pthread start + * + * void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg) noreturn_function; + * + * At this point, the following values are saved in context: + * + * R0 = SYS_pthread_start + * R1 = entrypt + * R2 = arg + */ + +#if defined(CONFIG_NUTTX_KERNEL) && !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_EXC_RETURN] = EXC_RETURN_UNPRIVTHR; + + /* Change the parameter ordering to match the expectation of struct + * userpace_s pthread_startup: + */ + + regs[REG_R0] = regs[REG_R1]; /* pthread entry */ + regs[REG_R1] = regs[REG_R2]; /* arg */ + } + break; +#endif + /* This is not an architecture-specific system call. If NuttX is built * as a standalone kernel with a system call interface, then all of the * additional system calls must be handled as in the default case. diff --git a/nuttx/arch/arm/src/common/up_pthread_start.c b/nuttx/arch/arm/src/common/up_pthread_start.c new file mode 100644 index 000000000..2f9de8995 --- /dev/null +++ b/nuttx/arch/arm/src/common/up_pthread_start.c @@ -0,0 +1,96 @@ +/**************************************************************************** + * arch/arm/src/common/up_pthread_start.c + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include +#include + +#include "svcall.h" +#include "up_internal.h" + +#if defined(CONFIG_NUTTX_KERNEL) && defined(__KERNEL__) && !defined(CONFIG_DISABLE_PTHREAD) + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: up_pthread_start + * + * Description: + * In this kernel mode build, this function will be called to execute a + * pthread in user-space. When the pthread is first started, a kernel-mode + * stub will first run to perform some housekeeping functions. This + * kernel-mode stub will then be called transfer control to the user-mode + * pthread. + * + * Normally the a user-mode start-up stub will also execute before the + * pthread actually starts. See libc/pthread/pthread_startup.c + * + * Input Parameters: + * entrypt - The user-space address of the pthread entry point + * arg - Standard argument for the pthread entry point + * + * Returned Value: + * This function should not return. It should call the user-mode start-up + * stub and that stub should call pthread_exit if/when the user pthread + * terminates. + * + ****************************************************************************/ + +void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg) +{ + /* Let sys_call2() do all of the work */ + + sys_call2(SYS_pthread_start, (uintptr_t)entrypt, (uintptr_t)arg); +} + +#endif /* CONFIG_NUTTX_KERNEL &&& __KERNEL__ && !CONFIG_DISABLE_PTHREAD */ diff --git a/nuttx/arch/arm/src/lpc17xx/Make.defs b/nuttx/arch/arm/src/lpc17xx/Make.defs index 82ce2c4b6..e6d007902 100644 --- a/nuttx/arch/arm/src/lpc17xx/Make.defs +++ b/nuttx/arch/arm/src/lpc17xx/Make.defs @@ -64,7 +64,7 @@ CMN_ASRCS += up_memcpy.S endif ifeq ($(CONFIG_NUTTX_KERNEL),y) -CMN_CSRCS += up_mpu.c up_task_start.c +CMN_CSRCS += up_mpu.c up_task_start.c up_pthread_start.c endif ifeq ($(CONFIG_NET),y) diff --git a/nuttx/arch/arm/src/sam3u/Make.defs b/nuttx/arch/arm/src/sam3u/Make.defs index 918d40148..a2047a78a 100644 --- a/nuttx/arch/arm/src/sam3u/Make.defs +++ b/nuttx/arch/arm/src/sam3u/Make.defs @@ -56,7 +56,7 @@ CMN_ASRCS += up_memcpy.S endif ifeq ($(CONFIG_NUTTX_KERNEL),y) -CMN_CSRCS += up_mpu.c up_task_start.c +CMN_CSRCS += up_mpu.c up_task_start.c up_pthread_start.c endif ifeq ($(CONFIG_ELF),y) diff --git a/nuttx/configs/open1788/kernel/up_userspace.c b/nuttx/configs/open1788/kernel/up_userspace.c index e2cb8c013..3947af1cd 100644 --- a/nuttx/configs/open1788/kernel/up_userspace.c +++ b/nuttx/configs/open1788/kernel/up_userspace.c @@ -105,6 +105,9 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup stubs */ .task_startup = task_startup, +#ifndef CONFIG_DISABLE_PTHREAD + .pthread_startup = pthread_startup, +#endif /* Memory manager entry points (declared in include/nuttx/mm.h) */ diff --git a/nuttx/configs/open1788/knsh/defconfig b/nuttx/configs/open1788/knsh/defconfig index 50b4e3d6d..b8d36e6fd 100755 --- a/nuttx/configs/open1788/knsh/defconfig +++ b/nuttx/configs/open1788/knsh/defconfig @@ -344,7 +344,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024 CONFIG_USERMAIN_STACKSIZE=2048 CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_DEFAULT=2048 -CONFIG_SYS_RESERVED=5 +CONFIG_SYS_RESERVED=6 # # Device Drivers diff --git a/nuttx/configs/sam3u-ek/kernel/up_userspace.c b/nuttx/configs/sam3u-ek/kernel/up_userspace.c index e148b135c..ee61d1b69 100644 --- a/nuttx/configs/sam3u-ek/kernel/up_userspace.c +++ b/nuttx/configs/sam3u-ek/kernel/up_userspace.c @@ -101,6 +101,13 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = .us_bssstart = (uintptr_t)&_sbss, .us_bssend = (uintptr_t)&_ebss, + /* Task/thread startup stubs */ + + .task_startup = task_startup, +#ifndef CONFIG_DISABLE_PTHREAD + .pthread_startup = pthread_startup, +#endif + /* Memory manager entry points (declared in include/nuttx/mm.h) */ .mm_initialize = umm_initialize, diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig index 7146ef6bf..9bdb33004 100755 --- a/nuttx/configs/sam3u-ek/knsh/defconfig +++ b/nuttx/configs/sam3u-ek/knsh/defconfig @@ -249,7 +249,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024 CONFIG_USERMAIN_STACKSIZE=2048 CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_DEFAULT=2048 -CONFIG_SYS_RESERVED=5 +CONFIG_SYS_RESERVED=6 # # Device Drivers diff --git a/nuttx/include/nuttx/arch.h b/nuttx/include/nuttx/arch.h index 7bdd90ade..ed461b50d 100644 --- a/nuttx/include/nuttx/arch.h +++ b/nuttx/include/nuttx/arch.h @@ -390,10 +390,38 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver); * ****************************************************************************/ -#ifdef CONFIG_NUTTX_KERNEL +#if defined(CONFIG_NUTTX_KERNEL) && defined(__KERNEL__) void up_task_start(main_t taskentry, int argc, FAR char *argv[]) noreturn_function; #endif +/**************************************************************************** + * Name: up_pthread_start + * + * Description: + * In this kernel mode build, this function will be called to execute a + * pthread in user-space. When the pthread is first started, a kernel-mode + * stub will first run to perform some housekeeping functions. This + * kernel-mode stub will then be called transfer control to the user-mode + * pthread. + * + * Normally the a user-mode start-up stub will also execute before the + * pthread actually starts. See libc/pthread/pthread_startup.c + * + * Input Parameters: + * entrypt - The user-space address of the pthread entry point + * arg - Standard argument for the pthread entry point + * + * Returned Value: + * This function should not return. It should call the user-mode start-up + * stub and that stub should call pthread_exit if/when the user pthread + * terminates. + * + ****************************************************************************/ + +#if defined(CONFIG_NUTTX_KERNEL) && defined(__KERNEL__) && !defined(CONFIG_DISABLE_PTHREAD) +void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg) noreturn_function; +#endif + /**************************************************************************** * Name: up_allocate_heap * diff --git a/nuttx/include/nuttx/sched.h b/nuttx/include/nuttx/sched.h index f707e8269..9101a2876 100644 --- a/nuttx/include/nuttx/sched.h +++ b/nuttx/include/nuttx/sched.h @@ -702,6 +702,26 @@ void task_vforkabort(FAR struct task_tcb_s *child, int errcode); void task_startup(main_t entrypt, int argc, FAR char *argv[]); #endif +/**************************************************************************** + * Name: pthread_startup + * + * Description: + * This function is the user-space, pthread startup function. It is called + * from up_pthread_start() in user-mode. + * + * Inputs: + * entrypt - The user-space address of the pthread entry point + * arg - Standard argument for the pthread entry point + * + * Return: + * None. This function does not return. + * + ****************************************************************************/ + +#if defined(CONFIG_NUTTX_KERNEL) && !defined(__KERNEL__) && !defined(CONFIG_DISABLE_PTHREAD) +void pthread_startup(pthread_startroutine_t entrypt, pthread_addr_t arg); +#endif + #undef EXTERN #if defined(__cplusplus) } diff --git a/nuttx/include/nuttx/userspace.h b/nuttx/include/nuttx/userspace.h index 40fe656b0..842870664 100644 --- a/nuttx/include/nuttx/userspace.h +++ b/nuttx/include/nuttx/userspace.h @@ -44,6 +44,7 @@ #include #include +#include #ifdef CONFIG_NUTTX_KERNEL @@ -111,9 +112,12 @@ struct userspace_s uintptr_t us_bssstart; uintptr_t us_bssend; - /* Task/thread startup stubs */ + /* Task/thread startup routines */ void (*task_startup)(main_t entrypt, int argc, FAR char *argv[]) noreturn_function; +#ifndef CONFIG_DISABLE_PTHREAD + void (*pthread_startup)(pthread_startroutine_t entrypt, pthread_addr_t arg); +#endif /* Memory manager entry points */ diff --git a/nuttx/include/pthread.h b/nuttx/include/pthread.h index a98b9aaaa..586d1208e 100644 --- a/nuttx/include/pthread.h +++ b/nuttx/include/pthread.h @@ -167,7 +167,7 @@ typedef FAR void *pthread_addr_t; typedef pthread_addr_t any_t; typedef pthread_addr_t (*pthread_startroutine_t)(pthread_addr_t); -typedef pthread_startroutine_t pthread_func_t; +typedef pthread_startroutine_t pthread_func_t; struct pthread_attr_s { diff --git a/nuttx/libc/pthread/Make.defs b/nuttx/libc/pthread/Make.defs index 07e4f0570..c4ccbf635 100644 --- a/nuttx/libc/pthread/Make.defs +++ b/nuttx/libc/pthread/Make.defs @@ -50,6 +50,10 @@ ifeq ($(CONFIG_MUTEX_TYPES),y) CSRCS += pthread_mutexattrsettype.c pthread_mutexattrgettype.c endif +ifeq ($(CONFIG_NUTTX_KERNEL),y) +CSRCS += pthread_startup.c +endif + # Add the pthread directory to the build DEPPATH += --dep-path pthread diff --git a/nuttx/libc/pthread/pthread_startup.c b/nuttx/libc/pthread/pthread_startup.c new file mode 100644 index 000000000..dee9826fc --- /dev/null +++ b/nuttx/libc/pthread/pthread_startup.c @@ -0,0 +1,108 @@ +/**************************************************************************** + * libc/pthread/pthread_startup.c + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include + +#include + +#if defined(CONFIG_NUTTX_KERNEL) && !defined(__KERNEL__) + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Type Declarations + ****************************************************************************/ + +/**************************************************************************** + * Global Variables + ****************************************************************************/ + +/**************************************************************************** + * Private Variables + ****************************************************************************/ + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: pthread_startup + * + * Description: + * This function is the user-space, pthread startup function. It is called + * from up_pthread_start() in user-mode. + * + * Inputs: + * entrypt - The user-space address of the pthread entry point + * arg - Standard argument for the pthread entry point + * + * Return: + * None. This function does not return. + * + ****************************************************************************/ + +void pthread_startup(pthread_startroutine_t entrypt, pthread_addr_t arg) +{ + pthread_addr_t exit_status; + + DEBUGASSERT(entrypt); + + /* Pass control to the thread entry point. */ + + exit_status = entrypt(arg); + + /* The pthread has returned */ + + pthread_exit(exit_status); +} + +#endif /* CONFIG_NUTTX_KERNEL && !__KERNEL__ */ diff --git a/nuttx/sched/pthread_create.c b/nuttx/sched/pthread_create.c index 3fcb7eea1..09f98220b 100644 --- a/nuttx/sched/pthread_create.c +++ b/nuttx/sched/pthread_create.c @@ -185,11 +185,19 @@ static void pthread_start(void) pjoin->started = true; (void)pthread_givesemaphore(&pjoin->data_sem); - /* Pass control to the thread entry point. */ + /* Pass control to the thread entry point. In the kernel build this has to + * be handled differently if we are starting a user-space pthread; we have + * to switch to user-mode before calling into the pthread. + */ +#ifdef CONFIG_NUTTX_KERNEL + up_pthread_start(ptcb->cmn.entry.pthread, ptcb->arg); + exit_status = NULL; +#else exit_status = (*ptcb->cmn.entry.pthread)(ptcb->arg); +#endif - /* The thread has returned */ + /* The thread has returned (should never happen in the kernel mode case) */ pthread_exit(exit_status); } diff --git a/nuttx/tools/mkconfig.c b/nuttx/tools/mkconfig.c index a622743a0..25ea88916 100644 --- a/nuttx/tools/mkconfig.c +++ b/nuttx/tools/mkconfig.c @@ -191,15 +191,6 @@ int main(int argc, char **argv, char **envp) printf("# undef CONFIG_STDIO_BUFFER_SIZE\n"); printf("# define CONFIG_STDIO_BUFFER_SIZE 0\n"); printf("#endif\n\n"); - printf("/* We are building a kernel version of the C library, then some user-space features\n"); - printf(" * need to be disabled\n"); - printf(" */\n\n"); - printf("#if defined(CONFIG_NUTTX_KERNEL) && defined(__KERNEL__)\n"); - printf("# undef CONFIG_STDIO_BUFFER_SIZE\n"); - printf("# define CONFIG_STDIO_BUFFER_SIZE 0\n"); - printf("# undef CONFIG_NUNGET_CHARS\n"); - printf("# define CONFIG_NUNGET_CHARS 0\n"); - printf("#endif\n\n"); printf("/* If no standard C buffered I/O is not supported, then line-oriented buffering\n"); printf(" * cannot be supported.\n"); printf(" */\n\n"); -- cgit v1.2.3