Several patches from Petteri Aimonen (mostly NxWidgets)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5324 42af7a65-404d-4744-a932-0658087f49c3
2026-05-22 22:20:01 +08:00 · 2012-11-09 14:54:29 +00:00
parent 013a27cbc9
commit 55c7b1f978
8 changed files with 230 additions and 106 deletions
@@ -3584,3 +3584,4 @@
 	  tool.
 	* configs/stm32f4discovery/src/up_ug2864ambag01.c:  Board-specific
 	  initialization for UG-2864AMBAG01 OLED connecte to STM32F4Disovery.
+	* libxx/libxx_stdthrow.cxx:  Exception stubs from Petteri Aimonen.
@@ -246,38 +246,46 @@
 |   |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/nuttx/syscall/README.txt"><b><i>README.txt</i></b></a>
 |   `- tools/
 |       `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/nuttx/tools/README.txt"><b><i>README.txt</i></b></a>
- `- apps/
-     |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/README.txt"><b>README.txt</b></a>
-     |- examples/
-     |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/json/README.txt">json/README.txt</a>
-     |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/pashello/README.txt">pashello/README.txt</a>
-     |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/README.txt"><b><i>README.txt</i></b></a>
-     |- graphics/
-     |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/graphics/tiff/README.txt">"<b><i>tiff/README.txt</i></b></a>
-     |- interpreters/
-     |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/interpreters/ficl/README.txt"><b><i>ficl/README.txt</i></b></a>
-     |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/interpreters/README.txt"><b><i>README.txt</i></b></a>
-     |- modbus/
-     |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/modbus/README.txt"><b><i>README.txt</i></b></a>
-     |- netutils/
-     |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/discover/README.txt">discover/README.txt</a>
-     |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/ftpc/README.txt">ftpc/README.txt</a>
-     |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/json/README.txt">json/README.txt</a>
-     |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/telnetd/README.txt">telnetd/README.txt</a>
-     |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/README.txt"><b><i>README.txt</i></b></a>
-     |- nshlib/
-     |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/nshlib/README.txt"><b><i>README.txt</i></b></a>
-     |- NxWidgets/
-     |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/NxWidgets/README.txt"><b><i>README.txt</i></b></a>
-     `- system/
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/i2c/README.txt"><b><i>i2c/README.txt</i></b></a>
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/free/README.txt">free/README.txt</a>
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/install/README.txt">install/README.txt</a>
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/poweroff/README.txt">poweroff/README.txt</a>
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/ramtron/README.txt">ramtron/README.txt</a>
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sdcard/README.txt">sdcard/README.txt</a>
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sysinfo/README.txt">sysinfo/README.txt</a>
-         `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sdcard/README.txt"><b><i>README.txt</i></b></a>
+ |- apps/
+ |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/README.txt"><b>README.txt</b></a>
+ |   |- examples/
+ |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/json/README.txt">json/README.txt</a>
+ |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/pashello/README.txt">pashello/README.txt</a>
+ |   |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/README.txt"><b><i>README.txt</i></b></a>
+ |   |- graphics/
+ |   |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/graphics/tiff/README.txt">"<b><i>tiff/README.txt</i></b></a>
+ |   |- interpreters/
+ |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/interpreters/ficl/README.txt"><b><i>ficl/README.txt</i></b></a>
+ |   |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/interpreters/README.txt"><b><i>README.txt</i></b></a>
+ |   |- modbus/
+ |   |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/modbus/README.txt"><b><i>README.txt</i></b></a>
+ |   |- netutils/
+ |   |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/discover/README.txt">discover/README.txt</a>
+ |   |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/ftpc/README.txt">ftpc/README.txt</a>
+ |   |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/json/README.txt">json/README.txt</a>
+ |   |   |   |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/telnetd/README.txt">telnetd/README.txt</a>
+ |   |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/README.txt"><b><i>README.txt</i></b></a>
+ |   |- nshlib/
+ |   |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/nshlib/README.txt"><b><i>README.txt</i></b></a>
+ |   |- NxWidgets/
+ |   |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/NxWidgets/README.txt"><b><i>README.txt</i></b></a>
+ |   `- system/
+ |       |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/i2c/README.txt"><b><i>i2c/README.txt</i></b></a>
+ |       |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/free/README.txt">free/README.txt</a>
+ |       |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/install/README.txt">install/README.txt</a>
+ |       |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/poweroff/README.txt">poweroff/README.txt</a>
+ |       |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/ramtron/README.txt">ramtron/README.txt</a>
+ |       |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sdcard/README.txt">sdcard/README.txt</a>
+ |       |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sysinfo/README.txt">sysinfo/README.txt</a>
+ |       `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sdcard/README.txt"><b><i>README.txt</i></b></a>
+ `- NxWidgets
+     |- Doxygen
+     |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/NxWidgets/Doxygen/README.txt"><b><i>README.txt</i></b></a>
+     |- tools
+     |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/NxWidgets/tools/README.txt"><b><i>README.txt</i></b></a>
+     |- UnitTests
+     |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/NxWidgets/UnitTests/README.txt"><b><i>README.txt</i></b></a>
+     `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/NxWidgets/README.txt"><b><i>README.txt</i></b></a>
 </pre></ul>
 </body>
 </html>
@@ -894,3 +894,12 @@ apps
 |   `- sysinfo
 |      `- README.txt
 `- README.txt
+
+ NxWidgets
+ |- Doxygen
+ |   `- README.txt
+ |- tools
+ |   `- README.txt
+ |- UnitTests
+ |   `- README.txt
+ `- README.txt
@@ -180,7 +180,6 @@ config STM32_STM32F10XX

 config STM32_VALUELINE
 	bool
-	select ARMV7M_CMNVECTOR

 config STM32_HIGHDENSITY
 	bool
@@ -835,14 +835,6 @@ struct eth_rxdesc_s
 * Public Functions
 ****************************************************************************************************/

-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
-#endif
-
 #endif /* __ASSEMBLY__ */
 #endif /* STM32_NETHERNET > 0 */
 #endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32_ETH_H */
@@ -46,7 +46,12 @@ CXXSRCS  = libxx_cxapurevirtual.cxx libxx_eabi_atexit.cxx  libxx_cxa_atexit.cxx
 # uClibx++ replaces them

 ifneq ($(CONFIG_UCLIBCXX),y)
-CXXSRCS += libxx_delete.cxx libxx_deletea.cxx libxx_new.cxx libxx_newa.cxx 
+CXXSRCS += libxx_delete.cxx libxx_deletea.cxx libxx_new.cxx libxx_newa.cxx
+CXXSRCS += libxx_stdthrow.cxx
+else
+ifneq ($(UCLIBCXX_EXCEPTION),y)
+CXXSRCS += libxx_stdthrow.cxx
+endif
 endif

 # Paths
@@ -0,0 +1,74 @@
+//***************************************************************************
+// libxx/libxx_newa.cxx
+//
+//   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+//   Author: Petteri Aimonen <petteri.aimonen@gmail.com>;
+//
+// 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 <cstdlib>
+#include <debug.h>
+
+//***************************************************************************
+// Definitions
+//***************************************************************************
+
+//***************************************************************************
+// Private Data
+//***************************************************************************
+
+//***************************************************************************
+// Public Functions
+//***************************************************************************
+
+namespace std
+{
+  void __throw_out_of_range(const char*)
+  {
+    dbg("C++: Vector .at() with argument out of range\n");
+    abort();
+   }
+    
+  void __throw_length_error(const char*)
+  {
+     dbg("C++: Vector resize to excessive length\n");
+     abort();
+  }
+    
+  void __throw_bad_alloc()
+  {
+    dbg("C++: Bad allocation\n");
+    abort();
+  }
+}