diff --git a/platform/nucleo-f303re/Kconfig b/platform/nucleo-f303re/Kconfig new file mode 100644 index 000000000..22555e64e --- /dev/null +++ b/platform/nucleo-f303re/Kconfig @@ -0,0 +1,8 @@ +# +# For a description of the syntax of this configuration file, +# see the file kconfig-language.txt in the NuttX tools repository. +# + +if ARCH_BOARD_NUCLEO_F303RE + +endif diff --git a/platform/nucleo-f303re/Make.defs b/platform/nucleo-f303re/Make.defs new file mode 100644 index 000000000..eb28c145e --- /dev/null +++ b/platform/nucleo-f303re/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/platform/nucleo-f303re/Make.defs +# +# Copyright (C) 2015 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. +# +############################################################################ + +# Add platform specific sources to ASRCS and CSRCS + +ifeq ($(CONFIG_HAVE_CXX),y) +CSRCS += stm32_cxxinitialize.c +endif diff --git a/platform/nucleo-f303re/stm32_cxxinitialize.c b/platform/nucleo-f303re/stm32_cxxinitialize.c new file mode 100644 index 000000000..4884f6ba6 --- /dev/null +++ b/platform/nucleo-f303re/stm32_cxxinitialize.c @@ -0,0 +1,153 @@ +/**************************************************************************** + * apps/platform/nucleo-f303re/stm32_cxxinitialize.c + * + * Copyright (C) 2015 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 + +#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ +/* Debug ********************************************************************/ +/* Non-standard debug that may be enabled just for testing the static + * constructors + */ + +#ifndef CONFIG_DEBUG +# undef CONFIG_DEBUG_CXX +#endif + +#ifdef CONFIG_DEBUG_CXX +# define cxxdbg dbg +# define cxxlldbg lldbg +# ifdef CONFIG_DEBUG_VERBOSE +# define cxxvdbg vdbg +# define cxxllvdbg llvdbg +# else +# define cxxvdbg(x...) +# define cxxllvdbg(x...) +# endif +#else +# define cxxdbg(x...) +# define cxxlldbg(x...) +# define cxxvdbg(x...) +# define cxxllvdbg(x...) +#endif + +/**************************************************************************** + * Private Types + ****************************************************************************/ +/* This type defines one entry in initialization array */ + +typedef void (*initializer_t)(void); + +/**************************************************************************** + * External References + ****************************************************************************/ +/* _sinit and _einit are symbols exported by the linker script that mark the + * beginning and the end of the C++ initialization section. + */ + +extern initializer_t _sinit; +extern initializer_t _einit; + +/* _stext and _etext are symbols exported by the linker script that mark the + * beginning and the end of text. + */ + +extern uint32_t _stext; +extern uint32_t _etext; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: up_cxxinitialize + * + * Description: + * If C++ and C++ static constructors are supported, then this function + * must be provided by board-specific logic in order to perform + * initialization of the static C++ class instances. + * + * This function should then be called in the application-specific + * user_start logic in order to perform the C++ initialization. NOTE + * that no component of the core NuttX RTOS logic is involved; this + * function definition only provides the 'contract' between application + * specific C++ code and platform-specific toolchain support. + * + ****************************************************************************/ + +void up_cxxinitialize(void) +{ + initializer_t *initp; + + cxxdbg("_sinit: %p _einit: %p _stext: %p _etext: %p\n", + &_sinit, &_einit, &_stext, &_etext); + + /* Visit each entry in the initialization table */ + + for (initp = &_sinit; initp != &_einit; initp++) + { + initializer_t initializer = *initp; + cxxdbg("initp: %p initializer: %p\n", initp, initializer); + + /* Make sure that the address is non-NULL and lies in the text region + * defined by the linker script. Some toolchains may put NULL values + * or counts in the initialization table. + */ + + if ((void *)initializer > (void *)&_stext && + (void *)initializer < (void *)&_etext) + { + cxxdbg("Calling %p\n", initializer); + initializer(); + } + } +} + +#endif /* CONFIG_HAVE_CXX && CONFIG_HAVE_CXXINITIALIZE */ diff --git a/platform/stm3240g-eval/stm32_cxxinitialize.c b/platform/stm3240g-eval/stm32_cxxinitialize.c index d713b7270..ddf2fe09e 100644 --- a/platform/stm3240g-eval/stm32_cxxinitialize.c +++ b/platform/stm3240g-eval/stm32_cxxinitialize.c @@ -1,4 +1,4 @@ -/************************************************************************************ +/**************************************************************************** * apps/platform/stm3240g-eval/src/stm32_cxxinitialize.c * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -43,15 +43,15 @@ #include -#include - #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ -/* Debug ****************************************************************************/ -/* Non-standard debug that may be enabled just for testing the static constructors */ + ****************************************************************************/ +/* Debug ********************************************************************/ +/* Non-standard debug that may be enabled just for testing the static + * constructors + */ #ifndef CONFIG_DEBUG # undef CONFIG_DEBUG_CXX @@ -74,16 +74,16 @@ # define cxxllvdbg(x...) #endif -/************************************************************************************ +/**************************************************************************** * Private Types - ************************************************************************************/ + ****************************************************************************/ /* This type defines one entry in initialization array */ typedef void (*initializer_t)(void); -/************************************************************************************ - * External references - ************************************************************************************/ +/**************************************************************************** + * External References + ****************************************************************************/ /* _sinit and _einit are symbols exported by the linker script that mark the * beginning and the end of the C++ initialization section. */ @@ -98,13 +98,13 @@ extern initializer_t _einit; extern uint32_t _stext; extern uint32_t _etext; -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ /**************************************************************************** * Name: up_cxxinitialize @@ -115,10 +115,10 @@ extern uint32_t _etext; * initialization of the static C++ class instances. * * This function should then be called in the application-specific - * logic in order to perform the C++ initialization. NOTE that no - * component of the core NuttX RTOS logic is involved; This function - * definition only provides the 'contract' between application - * specific C++ code and platform-specific toolchain support + * user_start logic in order to perform the C++ initialization. NOTE + * that no component of the core NuttX RTOS logic is involved; this + * function definition only provides the 'contract' between application + * specific C++ code and platform-specific toolchain support. * ****************************************************************************/ @@ -129,7 +129,7 @@ void up_cxxinitialize(void) cxxdbg("_sinit: %p _einit: %p _stext: %p _etext: %p\n", &_sinit, &_einit, &_stext, &_etext); - /* Visit each entry in the initialzation table */ + /* Visit each entry in the initialization table */ for (initp = &_sinit; initp != &_einit; initp++) { @@ -138,10 +138,11 @@ void up_cxxinitialize(void) /* Make sure that the address is non-NULL and lies in the text region * defined by the linker script. Some toolchains may put NULL values - * or counts in the initialization table + * or counts in the initialization table. */ - if ((void*)initializer > (void*)&_stext && (void*)initializer < (void*)&_etext) + if ((void *)initializer > (void *)&_stext && + (void *)initializer < (void *)&_etext) { cxxdbg("Calling %p\n", initializer); initializer(); diff --git a/platform/stm32f4discovery/stm32_cxxinitialize.c b/platform/stm32f4discovery/stm32_cxxinitialize.c index 618297f86..7922a8142 100644 --- a/platform/stm32f4discovery/stm32_cxxinitialize.c +++ b/platform/stm32f4discovery/stm32_cxxinitialize.c @@ -1,4 +1,4 @@ -/************************************************************************************ +/**************************************************************************** * apps/platform/stm32f4discovery/src/stm32_cxxinitialize.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -45,11 +45,13 @@ #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ -/* Debug ****************************************************************************/ -/* Non-standard debug that may be enabled just for testing the static constructors */ + ****************************************************************************/ +/* Debug ********************************************************************/ +/* Non-standard debug that may be enabled just for testing the static + * constructors + */ #ifndef CONFIG_DEBUG # undef CONFIG_DEBUG_CXX @@ -72,16 +74,16 @@ # define cxxllvdbg(x...) #endif -/************************************************************************************ +/**************************************************************************** * Private Types - ************************************************************************************/ + ****************************************************************************/ /* This type defines one entry in initialization array */ typedef void (*initializer_t)(void); -/************************************************************************************ - * External references - ************************************************************************************/ +/**************************************************************************** + * External References + ****************************************************************************/ /* _sinit and _einit are symbols exported by the linker script that mark the * beginning and the end of the C++ initialization section. */ @@ -96,13 +98,13 @@ extern initializer_t _einit; extern uint32_t _stext; extern uint32_t _etext; -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ /**************************************************************************** * Name: up_cxxinitialize @@ -114,9 +116,9 @@ extern uint32_t _etext; * * This function should then be called in the application-specific * user_start logic in order to perform the C++ initialization. NOTE - * that no component of the core NuttX RTOS logic is involved; This + * that no component of the core NuttX RTOS logic is involved; this * function definition only provides the 'contract' between application - * specific C++ code and platform-specific toolchain support + * specific C++ code and platform-specific toolchain support. * ****************************************************************************/ @@ -136,10 +138,11 @@ void up_cxxinitialize(void) /* Make sure that the address is non-NULL and lies in the text region * defined by the linker script. Some toolchains may put NULL values - * or counts in the initialization table + * or counts in the initialization table. */ - if ((void*)initializer > (void*)&_stext && (void*)initializer < (void*)&_etext) + if ((void *)initializer > (void *)&_stext && + (void *)initializer < (void *)&_etext) { cxxdbg("Calling %p\n", initializer); initializer(); diff --git a/platform/stm32f746g-disco/stm32_cxxinitialize.c b/platform/stm32f746g-disco/stm32_cxxinitialize.c index 6ddaae424..cb98ffc9b 100644 --- a/platform/stm32f746g-disco/stm32_cxxinitialize.c +++ b/platform/stm32f746g-disco/stm32_cxxinitialize.c @@ -1,4 +1,4 @@ -/************************************************************************************ +/**************************************************************************** * apps/platform/stm32f746g-disco/stm32_cxxinitialize.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -45,11 +45,13 @@ #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ -/* Debug ****************************************************************************/ -/* Non-standard debug that may be enabled just for testing the static constructors */ + ****************************************************************************/ +/* Debug ********************************************************************/ +/* Non-standard debug that may be enabled just for testing the static + * constructors + */ #ifndef CONFIG_DEBUG # undef CONFIG_DEBUG_CXX @@ -72,16 +74,16 @@ # define cxxllvdbg(x...) #endif -/************************************************************************************ +/**************************************************************************** * Private Types - ************************************************************************************/ + ****************************************************************************/ /* This type defines one entry in initialization array */ typedef void (*initializer_t)(void); -/************************************************************************************ - * External references - ************************************************************************************/ +/**************************************************************************** + * External References + ****************************************************************************/ /* _sinit and _einit are symbols exported by the linker script that mark the * beginning and the end of the C++ initialization section. */ @@ -96,13 +98,13 @@ extern initializer_t _einit; extern uint32_t _stext; extern uint32_t _etext; -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ /**************************************************************************** * Name: up_cxxinitialize @@ -114,9 +116,9 @@ extern uint32_t _etext; * * This function should then be called in the application-specific * user_start logic in order to perform the C++ initialization. NOTE - * that no component of the core NuttX RTOS logic is involved; This - * function defintion only provides the 'contract' between application - * specific C++ code and platform-specific toolchain support + * that no component of the core NuttX RTOS logic is involved; this + * function definition only provides the 'contract' between application + * specific C++ code and platform-specific toolchain support. * ****************************************************************************/ @@ -127,7 +129,7 @@ void up_cxxinitialize(void) cxxdbg("_sinit: %p _einit: %p _stext: %p _etext: %p\n", &_sinit, &_einit, &_stext, &_etext); - /* Visit each entry in the initialzation table */ + /* Visit each entry in the initialization table */ for (initp = &_sinit; initp != &_einit; initp++) { @@ -136,10 +138,11 @@ void up_cxxinitialize(void) /* Make sure that the address is non-NULL and lies in the text region * defined by the linker script. Some toolchains may put NULL values - * or counts in the initialization table + * or counts in the initialization table. */ - if ((void*)initializer > (void*)&_stext && (void*)initializer < (void*)&_etext) + if ((void *)initializer > (void *)&_stext && + (void *)initializer < (void *)&_etext) { cxxdbg("Calling %p\n", initializer); initializer(); @@ -148,4 +151,3 @@ void up_cxxinitialize(void) } #endif /* CONFIG_HAVE_CXX && CONFIG_HAVE_CXXINITIALIZE */ -