sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in paulpatience/nuttx-apps/platform_cxx (pull request #23)

Browse Source 
Nucleo F303RE: Move C++ initialization from configs to apps/platform
This commit is contained in:
Gregory Nutt 2015-11-12 12:32:24 -06:00
commit ee0316926d
6 changed files with 278 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/nucleo-f303re/Kconfig Normal file
View File

@ -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

40
platform/nucleo-f303re/Make.defs Normal file
View File

@ -0,0 +1,40 @@
############################################################################
# apps/platform/nucleo-f303re/Make.defs
#
# Copyright (C) 2015 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# 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

153
platform/nucleo-f303re/stm32_cxxinitialize.c Normal file
View File

@ -0,0 +1,153 @@
/****************************************************************************
* apps/platform/nucleo-f303re/stm32_cxxinitialize.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* 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 <nuttx/config.h>
#include <debug.h>
#include <nuttx/arch.h>
#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 */

53
platform/stm3240g-eval/stm32_cxxinitialize.c
View File

@ -1,4 +1,4 @@
/************************************************************************************ /****************************************************************************
* apps/platform/stm3240g-eval/src/stm32_cxxinitialize.c * apps/platform/stm3240g-eval/src/stm32_cxxinitialize.c
* *
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * 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 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -43,15 +43,15 @@
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <arch/stm32/chip.h>
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Debug ****************************************************************************/ /* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing the static constructors */ /* Non-standard debug that may be enabled just for testing the static
* constructors
*/
#ifndef CONFIG_DEBUG #ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_CXX # undef CONFIG_DEBUG_CXX
@ -74,16 +74,16 @@
# define cxxllvdbg(x...) # define cxxllvdbg(x...)
#endif #endif
/************************************************************************************ /****************************************************************************
* Private Types * Private Types
************************************************************************************/ ****************************************************************************/
/* This type defines one entry in initialization array */ /* This type defines one entry in initialization array */
typedef void (*initializer_t)(void); typedef void (*initializer_t)(void);
/************************************************************************************ /****************************************************************************
* External references * External References
************************************************************************************/ ****************************************************************************/
/* _sinit and _einit are symbols exported by the linker script that mark the /* _sinit and _einit are symbols exported by the linker script that mark the
* beginning and the end of the C++ initialization section. * beginning and the end of the C++ initialization section.
*/ */
@ -98,13 +98,13 @@ extern initializer_t _einit;
extern uint32_t _stext; extern uint32_t _stext;
extern uint32_t _etext; extern uint32_t _etext;
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: up_cxxinitialize * Name: up_cxxinitialize
@ -115,10 +115,10 @@ extern uint32_t _etext;
* initialization of the static C++ class instances. * initialization of the static C++ class instances.
* *
* This function should then be called in the application-specific * This function should then be called in the application-specific
* logic in order to perform the C++ initialization. NOTE that no * user_start logic in order to perform the C++ initialization. NOTE
* component of the core NuttX RTOS logic is involved; This function * that no component of the core NuttX RTOS logic is involved; this
* definition only provides the 'contract' between application * function definition only provides the 'contract' between application
* specific C++ code and platform-specific toolchain support * 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", cxxdbg("_sinit: %p _einit: %p _stext: %p _etext: %p\n",
&_sinit, &_einit, &_stext, &_etext); &_sinit, &_einit, &_stext, &_etext);
/* Visit each entry in the initialzation table */ /* Visit each entry in the initialization table */
for (initp = &_sinit; initp != &_einit; initp++) 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 /* 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 * 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); cxxdbg("Calling %p\n", initializer);
initializer(); initializer();

45
platform/stm32f4discovery/stm32_cxxinitialize.c
View File

@ -1,4 +1,4 @@
/************************************************************************************ /****************************************************************************
* apps/platform/stm32f4discovery/src/stm32_cxxinitialize.c * apps/platform/stm32f4discovery/src/stm32_cxxinitialize.c
* *
* Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * 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 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -45,11 +45,13 @@
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Debug ****************************************************************************/ /* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing the static constructors */ /* Non-standard debug that may be enabled just for testing the static
* constructors
*/
#ifndef CONFIG_DEBUG #ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_CXX # undef CONFIG_DEBUG_CXX
@ -72,16 +74,16 @@
# define cxxllvdbg(x...) # define cxxllvdbg(x...)
#endif #endif
/************************************************************************************ /****************************************************************************
* Private Types * Private Types
************************************************************************************/ ****************************************************************************/
/* This type defines one entry in initialization array */ /* This type defines one entry in initialization array */
typedef void (*initializer_t)(void); typedef void (*initializer_t)(void);
/************************************************************************************ /****************************************************************************
* External references * External References
************************************************************************************/ ****************************************************************************/
/* _sinit and _einit are symbols exported by the linker script that mark the /* _sinit and _einit are symbols exported by the linker script that mark the
* beginning and the end of the C++ initialization section. * beginning and the end of the C++ initialization section.
*/ */
@ -96,13 +98,13 @@ extern initializer_t _einit;
extern uint32_t _stext; extern uint32_t _stext;
extern uint32_t _etext; extern uint32_t _etext;
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: up_cxxinitialize * Name: up_cxxinitialize
@ -114,9 +116,9 @@ extern uint32_t _etext;
* *
* This function should then be called in the application-specific * This function should then be called in the application-specific
* user_start logic in order to perform the C++ initialization. NOTE * 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 * 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 /* 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 * 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); cxxdbg("Calling %p\n", initializer);
initializer(); initializer();

50
platform/stm32f746g-disco/stm32_cxxinitialize.c
View File

@ -1,4 +1,4 @@
/************************************************************************************ /****************************************************************************
* apps/platform/stm32f746g-disco/stm32_cxxinitialize.c * apps/platform/stm32f746g-disco/stm32_cxxinitialize.c
* *
* Copyright (C) 2015 Gregory Nutt. All rights reserved. * 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 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -45,11 +45,13 @@
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Debug ****************************************************************************/ /* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing the static constructors */ /* Non-standard debug that may be enabled just for testing the static
* constructors
*/
#ifndef CONFIG_DEBUG #ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_CXX # undef CONFIG_DEBUG_CXX
@ -72,16 +74,16 @@
# define cxxllvdbg(x...) # define cxxllvdbg(x...)
#endif #endif
/************************************************************************************ /****************************************************************************
* Private Types * Private Types
************************************************************************************/ ****************************************************************************/
/* This type defines one entry in initialization array */ /* This type defines one entry in initialization array */
typedef void (*initializer_t)(void); typedef void (*initializer_t)(void);
/************************************************************************************ /****************************************************************************
* External references * External References
************************************************************************************/ ****************************************************************************/
/* _sinit and _einit are symbols exported by the linker script that mark the /* _sinit and _einit are symbols exported by the linker script that mark the
* beginning and the end of the C++ initialization section. * beginning and the end of the C++ initialization section.
*/ */
@ -96,13 +98,13 @@ extern initializer_t _einit;
extern uint32_t _stext; extern uint32_t _stext;
extern uint32_t _etext; extern uint32_t _etext;
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: up_cxxinitialize * Name: up_cxxinitialize
@ -114,9 +116,9 @@ extern uint32_t _etext;
* *
* This function should then be called in the application-specific * This function should then be called in the application-specific
* user_start logic in order to perform the C++ initialization. NOTE * 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 defintion only provides the 'contract' between application * function definition only provides the 'contract' between application
* specific C++ code and platform-specific toolchain support * 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", cxxdbg("_sinit: %p _einit: %p _stext: %p _etext: %p\n",
&_sinit, &_einit, &_stext, &_etext); &_sinit, &_einit, &_stext, &_etext);
/* Visit each entry in the initialzation table */ /* Visit each entry in the initialization table */
for (initp = &_sinit; initp != &_einit; initp++) 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 /* 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 * 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); cxxdbg("Calling %p\n", initializer);
initializer(); initializer();
@ -148,4 +151,3 @@ void up_cxxinitialize(void)
} }
#endif /* CONFIG_HAVE_CXX && CONFIG_HAVE_CXXINITIALIZE */ #endif /* CONFIG_HAVE_CXX && CONFIG_HAVE_CXXINITIALIZE */