From 7471e4ab675fe38614f59e3dcb98bdf27e057b0a Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 16 Jun 2009 18:11:12 +0000 Subject: More C++ stubs git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@1888 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/libxx/Makefile | 3 +- nuttx/libxx/libxx_cxapurevirtual.cxx | 64 ++++++++++++++++++++++++ nuttx/libxx/libxx_delete.cxx | 2 - nuttx/libxx/libxx_deletea.cxx | 61 +++++++++++++++++++++++ nuttx/libxx/libxx_new.cxx | 7 +-- nuttx/libxx/libxx_newa.cxx | 94 ++++++++++++++++++++++++++++++++++++ 6 files changed, 225 insertions(+), 6 deletions(-) create mode 100755 nuttx/libxx/libxx_cxapurevirtual.cxx create mode 100755 nuttx/libxx/libxx_deletea.cxx create mode 100755 nuttx/libxx/libxx_newa.cxx (limited to 'nuttx/libxx') diff --git a/nuttx/libxx/Makefile b/nuttx/libxx/Makefile index f9229dd0e9..38e3d3a73f 100755 --- a/nuttx/libxx/Makefile +++ b/nuttx/libxx/Makefile @@ -39,7 +39,8 @@ ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = COBJS = $(CSRCS:.c=$(OBJEXT)) -CXXSRCS = libxx_new.cxx libxx_delete.cxx +CXXSRCS = libxx_new.cxx libxx_newa.cxx libxx_delete.cxx \ + libxx_deletea.cxx libxx_cxapurevirtual.cxx CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) diff --git a/nuttx/libxx/libxx_cxapurevirtual.cxx b/nuttx/libxx/libxx_cxapurevirtual.cxx new file mode 100755 index 0000000000..4a0ca36717 --- /dev/null +++ b/nuttx/libxx/libxx_cxapurevirtual.cxx @@ -0,0 +1,64 @@ +//*************************************************************************** +// libxx/libxx_cxapurevirtual.cxx +// +// Copyright (C) 2009 Gregory Nutt. All rights reserved. +// Author: Gregory Nutt +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// 3. Neither the name NuttX nor the names of its contributors may be +// used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// +//*************************************************************************** + +//*************************************************************************** +// Included Files +//*************************************************************************** + +//*************************************************************************** +// Definitions +//*************************************************************************** + +//*************************************************************************** +// Private Data +//*************************************************************************** + +//*************************************************************************** +// Operators +//*************************************************************************** + +//*************************************************************************** +// Name: __cxa_pure_virtual +// +// Description: +// Do nothing when a pure virtual function is called +// +//*************************************************************************** + +int __cxa_pure_virtual(void) +{ + return 0; +} + diff --git a/nuttx/libxx/libxx_delete.cxx b/nuttx/libxx/libxx_delete.cxx index 2a5e91fc53..b1d72c6959 100755 --- a/nuttx/libxx/libxx_delete.cxx +++ b/nuttx/libxx/libxx_delete.cxx @@ -38,8 +38,6 @@ //*************************************************************************** #include -#include -#include //*************************************************************************** // Definitions diff --git a/nuttx/libxx/libxx_deletea.cxx b/nuttx/libxx/libxx_deletea.cxx new file mode 100755 index 0000000000..34963b6f5e --- /dev/null +++ b/nuttx/libxx/libxx_deletea.cxx @@ -0,0 +1,61 @@ +//*************************************************************************** +// libxx/libxx_newa.cxx +// +// Copyright (C) 2009 Gregory Nutt. All rights reserved. +// Author: Gregory Nutt +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// 3. Neither the name NuttX nor the names of its contributors may be +// used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// +//*************************************************************************** + +//*************************************************************************** +// Included Files +//*************************************************************************** + +#include + +//*************************************************************************** +// Definitions +//*************************************************************************** + +//*************************************************************************** +// Private Data +//*************************************************************************** + +//*************************************************************************** +// Operators +//*************************************************************************** + +//*************************************************************************** +// Name: delete +//*************************************************************************** + +void operator delete[](void *ptr) +{ + free(ptr); +} diff --git a/nuttx/libxx/libxx_new.cxx b/nuttx/libxx/libxx_new.cxx index d9044207fe..fd088333ac 100755 --- a/nuttx/libxx/libxx_new.cxx +++ b/nuttx/libxx/libxx_new.cxx @@ -59,8 +59,9 @@ // // NOTE: // This should take a type of size_t, which for ARM GCC is unsigned long. -// but size_t may actually be a different different, in sys/include.h it -// is typed as uint32. Need to REVISIT this. +// but size_t may actually be a different different type, in sys/include.h, +// it is typed as uint32. Need to REVISIT this. +// //*************************************************************************** //void *operator new(size_t nbytes) @@ -68,7 +69,7 @@ void *operator new(unsigned long nbytes) { // We have to allocate something - if (nbytes< 1) + if (nbytes < 1) { nbytes = 1; } diff --git a/nuttx/libxx/libxx_newa.cxx b/nuttx/libxx/libxx_newa.cxx new file mode 100755 index 0000000000..9bffb3c699 --- /dev/null +++ b/nuttx/libxx/libxx_newa.cxx @@ -0,0 +1,94 @@ +//*************************************************************************** +// libxx/libxx_newa.cxx +// +// Copyright (C) 2009 Gregory Nutt. All rights reserved. +// Author: Gregory Nutt +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// 3. Neither the name NuttX nor the names of its contributors may be +// used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// +//*************************************************************************** + +//*************************************************************************** +// Included Files +//*************************************************************************** + +#include +#include +#include +#include + +//*************************************************************************** +// Definitions +//*************************************************************************** + +//*************************************************************************** +// Private Data +//*************************************************************************** + +//*************************************************************************** +// Operators +//*************************************************************************** + +//*************************************************************************** +// Name: new +// +// NOTE: +// This should take a type of size_t, which for ARM GCC is unsigned long. +// but size_t may actually be a different different type, in sys/include.h, +// it is typed as uint32. Need to REVISIT this. +// +//*************************************************************************** + +//void *operator new[](size_t size) +void *operator new[]((unsigned long size) +{ + // We have to allocate something + + if (nbytes< 1) + { + nbytes = 1; + } + + // Perform the allocation + + void *alloc = malloc(nbytes); + +#ifdef CONFIG_DEBUG + if (alloc == 0) + { + // Oh my.. we are required to return a valid pointer and + // we cannot throw an exception! We are bad. + + dbg("Failed to allocate\n"); + } +#endif + + // Return the allocated value + + return alloc; +} -- cgit v1.2.3