From 1a428e49eca24aa3cdcd7e63f161a7ba3b5c24fc Mon Sep 17 00:00:00 2001
From: nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 6 Apr 2000 11:53:30 +0000
Subject: [PATCH] * vec.cc: New file. * Make-lang.in
(CXX_LIB2FUNCS): Add it. (vec.o): Build it. * inc/cxxabi.h
(__cxa_vec_new, __cxa_vec_ctor, __cxa_vec_dtor, __cxa_vec_delete):
Declare.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32967 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/cp/Make-lang.in | 5 +-
gcc/cp/inc/cxxabi.h | 28 ++++++++-
gcc/cp/vec.cc | 140 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 171 insertions(+), 2 deletions(-)
create mode 100644 gcc/cp/vec.cc
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index fb8ce9f8b84d..fe8eb4a974d7 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -62,7 +62,7 @@ CXX_EXTRA_HEADERS = $(srcdir)/cp/inc/typeinfo $(srcdir)/cp/inc/exception \
# Extra code to include in libgcc2.
CXX_LIB2FUNCS = tinfo.o tinfo2.o new.o opnew.o opnewnt.o opvnew.o opvnewnt.o \
- opdel.o opdelnt.o opvdel.o opvdelnt.o exception.o
+ opdel.o opdelnt.o opvdel.o opvdelnt.o exception.o vec.o
CXX_LIB2SRCS = $(srcdir)/cp/new.cc $(srcdir)/cp/new1.cc $(srcdir)/cp/new2.cc \
$(srcdir)/cp/exception.cc $(srcdir)/cp/tinfo.cc \
$(srcdir)/cp/tinfo2.cc $(srcdir)/cp/tinfo.h
@@ -173,6 +173,9 @@ opvdel.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
opvdelnt.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(GXX_ABI_FLAG) $(CXXFLAGS) $(INCLUDES) \
-c $(srcdir)/cp/new2.cc -DL_op_vdelnt -o opvdelnt.o
+vec.o: cc1plus$(exeext) $(srcdir)/cp/vec.cc
+ $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(GXX_ABI_FLAG) $(CXXFLAGS) $(INCLUDES) \
+ -c $(srcdir)/cp/vec.cc -o vec.o
# We want to update cplib2.txt if any of the source files change...
cplib2.txt: $(CXX_LIB2SRCS) $(CXX_EXTRA_HEADERS) cplib2.ready
diff --git a/gcc/cp/inc/cxxabi.h b/gcc/cp/inc/cxxabi.h
index 26cec3fae0a6..1bc7782b8a02 100644
--- a/gcc/cp/inc/cxxabi.h
+++ b/gcc/cp/inc/cxxabi.h
@@ -385,7 +385,33 @@ void *__dynamic_cast (const void *src_ptr, /* object started from */
-2: src_type is not a public base of dst_type
-3: src_type is a multiple public non-virtual base of dst_type */
-
+/* array ctor/dtor routines */
+
+/* allocate and construct array */
+void *__cxa_vec_new (size_t __element_count,
+ size_t __element_size,
+ size_t __padding_size,
+ void (*__constructor) (void *),
+ void (*__destructor) (void *));
+
+/* construct array */
+void __cxa_vec_ctor (void *__array_address,
+ size_t __element_count,
+ size_t __element_size,
+ void (*__constructor) (void *),
+ void (*__destructor) (void *));
+
+/* destruct array */
+void __cxa_vec_dtor (void *__array_address,
+ size_t __element_count,
+ size_t __element_size,
+ void (*__destructor) (void *));
+
+/* destruct and release array */
+void __cxa_vec_delete (void *__array_address,
+ size_t __element_size,
+ size_t __padding_size,
+ void (*__destructor) (void *));
} /* namespace __cxxabiv1 */
diff --git a/gcc/cp/vec.cc b/gcc/cp/vec.cc
new file mode 100644
index 000000000000..3b5182cdcb8f
--- /dev/null
+++ b/gcc/cp/vec.cc
@@ -0,0 +1,140 @@
+// new abi support -*- C++ -*-
+// Copyright (C) 2000
+// Free Software Foundation, Inc.
+// Written by Nathan Sidwell, Codesourcery LLC, <nathan@codesourcery.com>
+//
+// GNU CC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// GNU CC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with GNU CC; see the file COPYING. If not, write to
+// the Free Software Foundation, 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+// As a special exception, if you link this library with other files,
+// some of which are compiled with GCC, to produce an executable,
+// this library does not by itself cause the resulting executable
+// to be covered by the GNU General Public License.
+// This exception does not however invalidate any other reasons why
+// the executable file might be covered by the GNU General Public License.
+
+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100
+#include <cxxabi.h>
+
+namespace __cxxabiv1
+{
+
+/* allocate and construct array */
+void *
+__cxa_vec_new (size_t element_count,
+ size_t element_size,
+ size_t padding_size,
+ void (*constructor) (void *),
+ void (*destructor) (void *))
+{
+ size_t size = element_count * element_size + padding_size;
+ char *base = static_cast <char *> (operator new[] (size));
+
+ if (padding_size)
+ {
+ base += padding_size;
+ reinterpret_cast <size_t *> (base)[-1] = element_count;
+ }
+ try
+ {
+ __cxa_vec_ctor (base, element_count, element_size,
+ constructor, destructor);
+ }
+ catch (...)
+ {
+ operator delete[] (base - padding_size);
+ throw;
+ }
+ return base;
+}
+
+/* construct array */
+void
+__cxa_vec_ctor (void *array_address,
+ size_t element_count,
+ size_t element_size,
+ void (*constructor) (void *),
+ void (*destructor) (void *))
+{
+ size_t ix = 0;
+ char *ptr = static_cast <char *> (array_address);
+
+ try
+ {
+ if (constructor)
+ for (; ix != element_count; ix++, ptr += element_size)
+ constructor (ptr);
+ }
+ catch (...)
+ {
+ try
+ {
+ if (destructor)
+ for (; ix--; ptr -= element_size)
+ destructor (ptr);
+ }
+ catch (...)
+ {
+ // [except.ctor]/3 If a destructor called during stack unwinding
+ // exists with an exception, terminate is called.
+ std::terminate ();
+ }
+ throw;
+ }
+}
+
+/* destruct array */
+void
+__cxa_vec_dtor (void *array_address,
+ size_t element_count,
+ size_t element_size,
+ void (*destructor) (void *))
+{
+ if (destructor)
+ {
+ char *ptr = static_cast <char *> (array_address);
+
+ ptr += element_count * element_size;
+
+ for (size_t ix = element_count; ix--;)
+ {
+ ptr -= element_size;
+ destructor (ptr);
+ }
+ }
+}
+
+/* destruct and release array */
+void
+__cxa_vec_delete (void *array_address,
+ size_t element_size,
+ size_t padding_size,
+ void (*destructor) (void *))
+{
+ char *base = static_cast <char *> (array_address);
+
+ if (padding_size)
+ {
+ size_t element_count = reinterpret_cast <size_t *> (base)[-1];
+
+ __cxa_vec_dtor (base, element_count, element_size, destructor);
+ base -= padding_size;
+ }
+ operator delete[] (base);
+}
+
+} // namespace __cxxabiv1
+
+#endif // defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100
--
GitLab