Add support for C++ static constructors (at least to a few platforms)

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4438 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-02-28 21:58:24 +00:00
parent d83d1596b0
commit 82da59c616
50 changed files with 667 additions and 37 deletions

View File

@@ -362,12 +362,19 @@ examples/helloxx
library suupport is available, and that class are instantiated library suupport is available, and that class are instantiated
correctly. correctly.
NuttX configuration settings: NuttX configuration prerequisites:
CONFIG_HAVE_CXX -- Enable C++ Support
Optional NuttX configuration settings:
CONFIG_HAVE_CXXINITIALIZE -- Enable support for static constructors
(may not be available on all platforms).
NuttX configuration settings specific to this examp;le:
CONFIG_EXAMPLES_HELLOXX_BUILTIN -- Build the helloxx example as a CONFIG_EXAMPLES_HELLOXX_BUILTIN -- Build the helloxx example as a
"built-in" that can be executed from the NSH command line. "built-in" that can be executed from the NSH command line.
CONFIG_EXAMPLES_HELLOXX_NOSTATICCONST - Set if system does not support
static constructors.
CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST - Set if the system does not CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST - Set if the system does not
support construction of objects on the stack. support construction of objects on the stack.

View File

@@ -1,8 +1,8 @@
//*************************************************************************** //***************************************************************************
// examples/helloxx/main.c // examples/helloxx/main.cxx
// //
// Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. // Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
// Author: Gregory Nutt <spudmonkey@racsa.co.cr> // Author: Gregory Nutt <gnutt@nuttx.org>
// //
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions // modification, are permitted provided that the following conditions
@@ -38,13 +38,39 @@
//*************************************************************************** //***************************************************************************
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/init.h>
#include <cstdio> #include <cstdio>
#include <debug.h> #include <debug.h>
#include <nuttx/init.h>
#include <nuttx/arch.h>
//*************************************************************************** //***************************************************************************
// Definitions // Definitions
//*************************************************************************** //***************************************************************************
// Debug ********************************************************************
// Non-standard debug that may be enabled just for testing the 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 Classes // Private Classes
@@ -53,11 +79,20 @@
class CHelloWorld class CHelloWorld
{ {
public: public:
CHelloWorld(void) : mSecret(42) { lldbg("Constructor\n"); }; CHelloWorld(void) : mSecret(42)
~CHelloWorld(void) { lldbg("Destructor\n"); }; {
cxxdbg("Constructor: mSecret=%d\n", mSecret);
}
~CHelloWorld(void)
{
cxxdbg("Destructor\n");
}
bool HelloWorld(void) bool HelloWorld(void)
{ {
cxxdbg("HelloWorld: mSecret=%d\n", mSecret);
if (mSecret != 42) if (mSecret != 42)
{ {
printf("CHelloWorld::HelloWorld: CONSTRUCTION FAILED!\n"); printf("CHelloWorld::HelloWorld: CONSTRUCTION FAILED!\n");
@@ -68,7 +103,7 @@ class CHelloWorld
printf("CHelloWorld::HelloWorld: Hello, World!!\n"); printf("CHelloWorld::HelloWorld: Hello, World!!\n");
return true; return true;
} }
}; }
private: private:
int mSecret; int mSecret;
@@ -78,7 +113,10 @@ class CHelloWorld
// Private Data // Private Data
//*************************************************************************** //***************************************************************************
#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTATICCONST // Define a statically constructed CHellowWorld instance if C++ static
// initializers are supported by the platform
#ifdef CONFIG_HAVE_CXXINITIALIZE
static CHelloWorld g_HelloWorld; static CHelloWorld g_HelloWorld;
#endif #endif
@@ -105,20 +143,31 @@ extern "C" int helloxx_main(int argc, char *argv[]);
int MAIN_NAME(int argc, char *argv[]) int MAIN_NAME(int argc, char *argv[])
{ {
#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST // If C++ initialization for static constructors is supported, then do
CHelloWorld HelloWorld; // that first
#endif
CHelloWorld *pHelloWorld = new CHelloWorld;
#ifdef CONFIG_HAVE_CXXINITIALIZE
up_cxxinitialize();
#endif
// Exercise an explictly instantiated C++ object
CHelloWorld *pHelloWorld = new CHelloWorld;
printf(MAIN_STRING "Saying hello from the dynamically constructed instance\n"); printf(MAIN_STRING "Saying hello from the dynamically constructed instance\n");
pHelloWorld->HelloWorld(); pHelloWorld->HelloWorld();
// Exercise an C++ object instantiated on the stack
#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST #ifndef CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST
CHelloWorld HelloWorld;
printf(MAIN_STRING "Saying hello from the instance constructed on the stack\n"); printf(MAIN_STRING "Saying hello from the instance constructed on the stack\n");
HelloWorld.HelloWorld(); HelloWorld.HelloWorld();
#endif #endif
#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTATICCONST // Exercise an statically constructed C++ object
#ifdef CONFIG_HAVE_CXXINITIALIZE
printf(MAIN_STRING "Saying hello from the statically constructed instance\n"); printf(MAIN_STRING "Saying hello from the statically constructed instance\n");
g_HelloWorld.HelloWorld(); g_HelloWorld.HelloWorld();
#endif #endif

View File

@@ -2519,3 +2519,6 @@
* drivers/usbdev/cdcacm.c and include/nuttx/usbdev/cdcacm.h: The CDC/ACM * drivers/usbdev/cdcacm.c and include/nuttx/usbdev/cdcacm.h: The CDC/ACM
driver can now be dynamically connected and disconnected from the host driver can now be dynamically connected and disconnected from the host
under software control. under software control.
* include/nuttx/arch.h, configs/stm3240g-eval/src/up_cxxinitialize.c, and
configs/stm3240g-eval/src/up_cxxinitialize.c: Add support for C++ static
initializers.

View File

@@ -12,7 +12,7 @@
<h1><big><font color="#3c34ec"> <h1><big><font color="#3c34ec">
<i>NuttX RTOS Porting Guide</i> <i>NuttX RTOS Porting Guide</i>
</font></big></h1> </font></big></h1>
<p>Last Updated: February 22, 2011</p> <p>Last Updated: February 28, 2011</p>
</td> </td>
</tr> </tr>
</table> </table>
@@ -3608,6 +3608,9 @@ void (*notify)(FAR struct pm_callback_s *cb, enum pm_state_e pmstate);
Toolchain supports C++ and <code>CXX</code>, <code>CXXFLAGS</code>, and <code>COMPILEXX</code> Toolchain supports C++ and <code>CXX</code>, <code>CXXFLAGS</code>, and <code>COMPILEXX</code>
have been defined in the configurations <code>Make.defs</code> file. have been defined in the configurations <code>Make.defs</code> file.
</li> </li>
<li><code>CONFIG_HAVE_CXXINITIALIZE</code>:
The platform-specific logic includes support for initialization of static C++ instances for this architecture and for the selected toolchain (via <code>up_cxxinitialize()</code>).
</li>
</ul> </ul>
<p> <p>
Building application code: Building application code:

View File

@@ -172,8 +172,11 @@ defconfig -- This is a configuration file similar to the Linux
should not be selected if you are not using the GNU toolchain. should not be selected if you are not using the GNU toolchain.
CONFIG_HAVE_LIBM - toolchain supports libm.a CONFIG_HAVE_LIBM - toolchain supports libm.a
CONFIG_HAVE_CXX - toolchain supports C++ and CXX, CXXFLAGS, and CONFIG_HAVE_CXX - toolchain supports C++ and CXX, CXXFLAGS, and
COMPILEXX have been defined in the configuratins Make.defs COMPILEXX have been defined in the configurations Make.defs
file. file.
CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
for initialization of static C++ instances for this architecture
and for the selected toolchain (via up_cxxinitialize()).
Building application code: Building application code:

View File

@@ -257,6 +257,9 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++ # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -345,6 +348,7 @@ CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_DEBUG_SCHED=n CONFIG_DEBUG_SCHED=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=0 CONFIG_RR_INTERVAL=0

View File

@@ -59,6 +59,9 @@ CONFIG_ARCH_BOARD_SIM=y
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++ # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -120,6 +123,7 @@ CONFIG_DEBUG=y
CONFIG_DEBUG_VERBOSE=y CONFIG_DEBUG_VERBOSE=y
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=0 CONFIG_RR_INTERVAL=0

View File

@@ -82,7 +82,10 @@ CONFIG_SIM_TOUCHSCREEN=y
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -166,6 +169,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEBUG_GRAPHICS=n CONFIG_DEBUG_GRAPHICS=n
CONFIG_DEBUG_INPUT=n CONFIG_DEBUG_INPUT=n
CONFIG_HAVE_CXX=y CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=0 CONFIG_RR_INTERVAL=0

View File

@@ -66,6 +66,9 @@ CONFIG_SIM_FBBPP=8
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++ # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -128,6 +131,7 @@ CONFIG_DEBUG_VERBOSE=y
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_DEBUG_GRAPHICS=y CONFIG_DEBUG_GRAPHICS=y
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=0 CONFIG_RR_INTERVAL=0

View File

@@ -261,7 +261,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -351,6 +354,7 @@ CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_DEBUG_SCHED=y CONFIG_DEBUG_SCHED=y
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -274,7 +274,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -363,6 +366,7 @@ CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -270,7 +270,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -358,6 +361,7 @@ CONFIG_DEBUG_FS=n
CONFIG_DEBUG_USB=n CONFIG_DEBUG_USB=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -270,7 +270,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -359,6 +362,7 @@ CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -318,7 +318,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -410,6 +413,7 @@ CONFIG_DEBUG_USB=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_DEBUG_CAN=n CONFIG_DEBUG_CAN=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -270,7 +270,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -358,6 +361,7 @@ CONFIG_DEBUG_GRAPHICS=n
CONFIG_DEBUG_LCD=n CONFIG_DEBUG_LCD=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -270,7 +270,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -358,6 +361,7 @@ CONFIG_DEBUG_GRAPHICS=n
CONFIG_DEBUG_LCD=n CONFIG_DEBUG_LCD=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -270,7 +270,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -358,6 +361,7 @@ CONFIG_DEBUG_GRAPHICS=n
CONFIG_DEBUG_LCD=n CONFIG_DEBUG_LCD=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -298,7 +298,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -387,6 +390,7 @@ CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -272,7 +272,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -362,6 +365,7 @@ CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_USB=n CONFIG_DEBUG_USB=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -270,7 +270,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -358,6 +361,7 @@ CONFIG_DEBUG_FS=n
CONFIG_DEBUG_USB=n CONFIG_DEBUG_USB=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -390,7 +390,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -479,6 +482,7 @@ CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_DEBUG_NET=n CONFIG_DEBUG_NET=n
CONFIG_HAVE_CXX=y CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -72,6 +72,12 @@ SECTIONS
_etext = ABSOLUTE(.); _etext = ABSOLUTE(.);
} > flash } > flash
.init_section : {
_sinit = ABSOLUTE(.);
*(.init_array .init_array.*)
_einit = ABSOLUTE(.);
} > flash
__exidx_start = ABSOLUTE(.); __exidx_start = ABSOLUTE(.);
.ARM.exidx : { .ARM.exidx : {
*(.ARM.exidx*) *(.ARM.exidx*)

View File

@@ -390,7 +390,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -479,6 +482,7 @@ CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_DEBUG_NET=n CONFIG_DEBUG_NET=n
CONFIG_HAVE_CXX=y CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -72,6 +72,12 @@ SECTIONS
_etext = ABSOLUTE(.); _etext = ABSOLUTE(.);
} > flash } > flash
.init_section : {
_sinit = ABSOLUTE(.);
*(.init_array .init_array.*)
_einit = ABSOLUTE(.);
} > flash
__exidx_start = ABSOLUTE(.); __exidx_start = ABSOLUTE(.);
.ARM.exidx : { .ARM.exidx : {
*(.ARM.exidx*) *(.ARM.exidx*)

View File

@@ -427,6 +427,9 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++ # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -524,6 +527,7 @@ CONFIG_DEBUG_PWM=n
CONFIG_DEBUG_CAN=n CONFIG_DEBUG_CAN=n
CONFIG_DEBUG_I2C=n CONFIG_DEBUG_I2C=n
CONFIG_HAVE_CXX=y CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -72,6 +72,12 @@ SECTIONS
_etext = ABSOLUTE(.); _etext = ABSOLUTE(.);
} > flash } > flash
.init_section : {
_sinit = ABSOLUTE(.);
*(.init_array .init_array.*)
_einit = ABSOLUTE(.);
} > flash
__exidx_start = ABSOLUTE(.); __exidx_start = ABSOLUTE(.);
.ARM.exidx : { .ARM.exidx : {
*(.ARM.exidx*) *(.ARM.exidx*)

View File

@@ -428,6 +428,9 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++ # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -526,6 +529,7 @@ CONFIG_DEBUG_CAN=n
CONFIG_DEBUG_I2C=n CONFIG_DEBUG_I2C=n
CONFIG_DEBUG_DMA=n CONFIG_DEBUG_DMA=n
CONFIG_HAVE_CXX=y CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -72,6 +72,12 @@ SECTIONS
_etext = ABSOLUTE(.); _etext = ABSOLUTE(.);
} > flash } > flash
.init_section : {
_sinit = ABSOLUTE(.);
*(.init_array .init_array.*)
_einit = ABSOLUTE(.);
} > flash
__exidx_start = ABSOLUTE(.); __exidx_start = ABSOLUTE(.);
.ARM.exidx : { .ARM.exidx : {
*(.ARM.exidx*) *(.ARM.exidx*)

View File

@@ -388,7 +388,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -476,6 +479,7 @@ CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -72,6 +72,12 @@ SECTIONS
_etext = ABSOLUTE(.); _etext = ABSOLUTE(.);
} > flash } > flash
.init_section : {
_sinit = ABSOLUTE(.);
*(.init_array .init_array.*)
_einit = ABSOLUTE(.);
} > flash
__exidx_start = ABSOLUTE(.); __exidx_start = ABSOLUTE(.);
.ARM.exidx : { .ARM.exidx : {
*(.ARM.exidx*) *(.ARM.exidx*)

View File

@@ -42,6 +42,10 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_boot.c up_spi.c CSRCS = up_boot.c up_spi.c
ifeq ($(CONFIG_HAVE_CXX),y)
CSRCS += up_cxxinitialize.c
endif
ifeq ($(CONFIG_ARCH_LEDS),y) ifeq ($(CONFIG_ARCH_LEDS),y)
CSRCS += up_autoleds.c CSRCS += up_autoleds.c
else else

View File

@@ -0,0 +1,155 @@
/************************************************************************************
* configs/stm3240g-eval/src/up_cxxinitialize.c
* arch/arm/src/board/up_cxxinitialize.c
*
* Copyright (C) 2012 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>
#include <arch/stm32/chip.h>
#include "chip.h"
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
/************************************************************************************
* 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 defintion 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 initialzation 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 */

View File

@@ -390,7 +390,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -479,6 +482,7 @@ CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_DEBUG_NET=n CONFIG_DEBUG_NET=n
CONFIG_HAVE_CXX=y CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -72,6 +72,12 @@ SECTIONS
_etext = ABSOLUTE(.); _etext = ABSOLUTE(.);
} > flash } > flash
.init_section : {
_sinit = ABSOLUTE(.);
*(.init_array .init_array.*)
_einit = ABSOLUTE(.);
} > flash
__exidx_start = ABSOLUTE(.); __exidx_start = ABSOLUTE(.);
.ARM.exidx : { .ARM.exidx : {
*(.ARM.exidx*) *(.ARM.exidx*)

View File

@@ -373,6 +373,9 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++ # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -470,6 +473,7 @@ CONFIG_DEBUG_PWM=n
CONFIG_DEBUG_CAN=n CONFIG_DEBUG_CAN=n
CONFIG_DEBUG_QENCODER=n CONFIG_DEBUG_QENCODER=n
CONFIG_HAVE_CXX=y CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -72,6 +72,12 @@ SECTIONS
_etext = ABSOLUTE(.); _etext = ABSOLUTE(.);
} > flash } > flash
.init_section : {
_sinit = ABSOLUTE(.);
*(.init_array .init_array.*)
_einit = ABSOLUTE(.);
} > flash
__exidx_start = ABSOLUTE(.); __exidx_start = ABSOLUTE(.);
.ARM.exidx : { .ARM.exidx : {
*(.ARM.exidx*) *(.ARM.exidx*)

View File

@@ -355,7 +355,10 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++S # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -443,6 +446,7 @@ CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200

View File

@@ -72,6 +72,12 @@ SECTIONS
_etext = ABSOLUTE(.); _etext = ABSOLUTE(.);
} > flash } > flash
.init_section : {
_sinit = ABSOLUTE(.);
*(.init_array .init_array.*)
_einit = ABSOLUTE(.);
} > flash
__exidx_start = ABSOLUTE(.); __exidx_start = ABSOLUTE(.);
.ARM.exidx : { .ARM.exidx : {
*(.ARM.exidx*) *(.ARM.exidx*)

View File

@@ -42,6 +42,10 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_boot.c up_spi.c CSRCS = up_boot.c up_spi.c
ifeq ($(CONFIG_HAVE_CXX),y)
CSRCS += up_cxxinitialize.c
endif
ifeq ($(CONFIG_ARCH_LEDS),y) ifeq ($(CONFIG_ARCH_LEDS),y)
CSRCS += up_autoleds.c CSRCS += up_autoleds.c
else else

View File

@@ -0,0 +1,155 @@
/************************************************************************************
* configs/stm32f4discovery/src/up_cxxinitialize.c
* arch/arm/src/board/up_cxxinitialize.c
*
* Copyright (C) 2012 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>
#include <arch/stm32/chip.h>
#include "chip.h"
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
/************************************************************************************
* 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 defintion 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 initialzation 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 */

View File

@@ -257,6 +257,9 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_SYMBOLS - build without optimization and with # CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger). # debug symbols (needed for use with a debugger).
# CONFIG_HAVE_CXX - Enable support for C++ # CONFIG_HAVE_CXX - Enable support for C++
# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
# for initialization of static C++ instances for this architecture
# and for the selected toolchain (via up_cxxinitialize()).
# CONFIG_MM_REGIONS - If the architecture includes multiple # CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the # regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must # number of memory regions that the memory manager must
@@ -349,6 +352,7 @@ CONFIG_DEBUG_USB=n
CONFIG_PIC32MX_USBDEV_REGDEBUG=n CONFIG_PIC32MX_USBDEV_REGDEBUG=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=0 CONFIG_RR_INTERVAL=0

View File

@@ -500,6 +500,26 @@ EXTERN char up_romgetc(FAR const char *ptr);
EXTERN void up_mdelay(unsigned int milliseconds); EXTERN void up_mdelay(unsigned int milliseconds);
EXTERN void up_udelay(useconds_t microseconds); EXTERN void up_udelay(useconds_t microseconds);
/****************************************************************************
* 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 defintion only provides the 'contract' between application
* specific C++ code and platform-specific toolchain support
*
***************************************************************************/
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
EXTERN void up_cxxinitialize(void);
#endif
/**************************************************************************** /****************************************************************************
* These are standard interfaces that are exported by the OS * These are standard interfaces that are exported by the OS
* for use by the architecture specific logic * for use by the architecture specific logic

4
nuttx/libxx/Makefile Executable file → Normal file
View File

@@ -39,8 +39,8 @@ ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = CSRCS =
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))
CXXSRCS = libxx_new.cxx libxx_newa.cxx libxx_delete.cxx \ CXXSRCS = libxx_cxapurevirtual.cxx libxx_delete.cxx libxx_deletea.cxx \
libxx_deletea.cxx libxx_cxapurevirtual.cxx libxx_eabi_atexit.cxx libxx_new.cxx libxx_newa.cxx
CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT)) CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS)

0
nuttx/libxx/README.txt Executable file → Normal file
View File

0
nuttx/libxx/libxx_cxapurevirtual.cxx Executable file → Normal file
View File

0
nuttx/libxx/libxx_delete.cxx Executable file → Normal file
View File

0
nuttx/libxx/libxx_deletea.cxx Executable file → Normal file
View File

View File

@@ -0,0 +1,83 @@
//***************************************************************************
// libxx/libxx_eabi_atexit.cxx
//
// Copyright (C) 2012 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 <cstdlib>
//***************************************************************************
// Definitions
//***************************************************************************
//***************************************************************************
// Private Data
//***************************************************************************
extern "C"
{
//*************************************************************************
// Public Data
//*************************************************************************
void *__dso_handle = NULL;
//*************************************************************************
// Public Functions
//*************************************************************************
//*************************************************************************
// Name: __aeabi_atexit
//
// Description:
// Registers static object destructors. Normally atexit(f) should call
// __aeabi_atexit (NULL, f, NULL). But in the usage model here, static
// constructors are initialized at power up and are never destroyed
// because they have global scope and must persist for as long as the
// embedded device is powered on.
//
// Reference:
// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0041c/IHI0041C_cppabi.pdf
//
//*************************************************************************
int __aeabi_atexit(void* object, void (*destroyer)(void*), void *dso_handle)
{
//return __cxa_atexit(destroyer, object, dso_handle); // 0 ? OK; non-0 ? failed }
return 0;
}
}

0
nuttx/libxx/libxx_new.cxx Executable file → Normal file
View File

0
nuttx/libxx/libxx_newa.cxx Executable file → Normal file
View File