(Changes from Daniel Berlin, with revisions by Jim Blandy.)

Abstract out operations specific to particular C++ ABI's, and
invoke them through a function table.  This removes the C++ ABI
dependencies scattered throughout the code, and allows us to
cleanly add support for new C++ ABI's.
* cp-abi.h, cp-abi.h, gnu-v2-abi.c, hpacc-abi.c: New files.
* c-typeprint.c, c-valprint.c, dbxread.c, eval.c, gdbtypes.c,
jv-typeprint.c, linespec.c, symtab.c, typeprint.c, valops.c:
#include "cp-abi.h".  These files all use functions now declared
there.
* symtab.h (OPNAME_PREFIX_P, VTBL_PREFIX_P, DESTRUCTOR_PREFIX_P):
Deleted.  These services are now provided by functions declared in
cp-abi.h.
* value.h (value_rtti_type, value_virtual_fn_field): Same.
* values.c (value_virtual_fn_field): Same, for this definition.
* valops.c (value_rtti_type): Same.
* c-typeprint.c (c_type_print_base): Use the functions from
"cp-abi.h", instead of the old macros, or hard-coded ABI-specific
tests.
* dbxread.c (record_minimal_symbol): Same.
* gdbtypes.c (get_destructor_fn_field, virtual_base_index,
virtual_base_index_skip_primaries): Same.
* jv-typeprint.c (java_type_print_base): Same.
* linespec.c (find_methods, decode_line_1): Same.
* symtab.c (gdb_mangle_name): Same.
* Makefile.in (SFILES): Add the new .c files mentioned above.
(cp_abi_h): New variable.
(COMMON_OBS): Add gnu-v2-abi.o, hpacc-abi.o, and cp-abi.o.
(cp-abi.o, gnu-v2-abi.o, hpacc-abi.o): New targets.
(c-typeprint.o, c-valprint.o, dbxread.o, eval.o, gdbtypes.o,
jv-typeprint.o, symtab.o, linespec.o, typeprint.o, valops.o): Add
dependency on $(cp_abi_h).

1 files changed, 99 insertions, 0 deletions

diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
new file mode 100644
index 00000000000..eb31270367e
--- /dev/null
+++ b/gdb/cp-abi.c
@@ -0,0 +1,99 @@
+/* Generic code for supporting multiple C++ ABI's
+   Copyright 2001 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program 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 of the License, or
+   (at your option) any later version.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "value.h"
+#include "cp-abi.h"
+
+struct cp_abi_ops current_cp_abi;
+
+struct cp_abi_ops *cp_abis;
+
+int num_cp_abis = 0;
+
+enum ctor_kinds
+is_constructor_name (const char *name)
+{
+  if ((current_cp_abi.is_constructor_name) == NULL)
+    error ("ABI doesn't define required function is_constructor_name");
+  return (*current_cp_abi.is_constructor_name) (name);
+}
+
+enum dtor_kinds
+is_destructor_name (const char *name)
+{
+  if ((current_cp_abi.is_destructor_name) == NULL)
+    error ("ABI doesn't define required function is_destructor_name");
+  return (*current_cp_abi.is_destructor_name) (name);
+}
+
+int
+is_vtable_name (const char *name)
+{
+  if ((current_cp_abi.is_vtable_name) == NULL)
+    error ("ABI doesn't define required function is_vtable_name");
+  return (*current_cp_abi.is_vtable_name) (name);
+}
+
+int
+is_operator_name (const char *name)
+{
+  if ((current_cp_abi.is_operator_name) == NULL)
+    error ("ABI doesn't define required function is_operator_name");
+  return (*current_cp_abi.is_operator_name) (name);
+}
+
+value_ptr
+value_virtual_fn_field (value_ptr * arg1p, struct fn_field * f, int j,
+			struct type * type, int offset)
+{
+  if ((current_cp_abi.virtual_fn_field) == NULL)
+    return NULL;
+  return (*current_cp_abi.virtual_fn_field) (arg1p, f, j, type, offset);
+}
+struct type *
+value_rtti_type (value_ptr v, int *full, int *top, int *using_enc)
+{
+  if ((current_cp_abi.rtti_type) == NULL)
+    return NULL;
+  return (*current_cp_abi.rtti_type) (v, full, top, using_enc);
+}
+
+int
+register_cp_abi (struct cp_abi_ops abi)
+{
+  cp_abis =
+    xrealloc (cp_abis, (num_cp_abis + 1) * sizeof (struct cp_abi_ops));
+  cp_abis[num_cp_abis++] = abi;
+
+  return 1;
+
+}
+
+int
+switch_to_cp_abi (const char *short_name)
+{
+  int i;
+  for (i = 0; i < num_cp_abis; i++)
+    if (strcmp (cp_abis[i].shortname, short_name) == 0)
+      current_cp_abi = cp_abis[i];
+  return 1;
+}
+