(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).
2001-04-27 08:19:09 +08:00
|
|
|
/* 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"
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
#include "command.h"
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
#include "ui-out.h"
|
|
|
|
|
2002-08-28 06:37:14 +08:00
|
|
|
#include "gdb_string.h"
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
static struct cp_abi_ops *find_cp_abi (const char *short_name);
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
static struct cp_abi_ops current_cp_abi = { "", NULL };
|
|
|
|
static struct cp_abi_ops auto_cp_abi = { "auto", NULL };
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
#define CP_ABI_MAX 8
|
|
|
|
static struct cp_abi_ops *cp_abis[CP_ABI_MAX];
|
|
|
|
static int num_cp_abis = 0;
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2002-01-05 02:20:19 +08:00
|
|
|
int
|
|
|
|
baseclass_offset (struct type *type, int index, char *valaddr,
|
|
|
|
CORE_ADDR address)
|
|
|
|
{
|
|
|
|
if (current_cp_abi.baseclass_offset == NULL)
|
|
|
|
error ("ABI doesn't define required function baseclass_offset");
|
|
|
|
return (*current_cp_abi.baseclass_offset) (type, index, valaddr, address);
|
|
|
|
}
|
|
|
|
|
2001-10-21 09:06:25 +08:00
|
|
|
struct value *
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
value_virtual_fn_field (struct value **arg1p, struct fn_field *f, int j,
|
|
|
|
struct type *type, int offset)
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
{
|
|
|
|
if ((current_cp_abi.virtual_fn_field) == NULL)
|
|
|
|
return NULL;
|
|
|
|
return (*current_cp_abi.virtual_fn_field) (arg1p, f, j, type, offset);
|
|
|
|
}
|
2002-01-05 02:20:19 +08:00
|
|
|
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
struct type *
|
2001-10-21 09:06:25 +08:00
|
|
|
value_rtti_type (struct value *v, int *full, int *top, int *using_enc)
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
{
|
|
|
|
if ((current_cp_abi.rtti_type) == NULL)
|
|
|
|
return NULL;
|
|
|
|
return (*current_cp_abi.rtti_type) (v, full, top, using_enc);
|
|
|
|
}
|
|
|
|
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
/* Set the current C++ ABI to SHORT_NAME. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
switch_to_cp_abi (const char *short_name)
|
|
|
|
{
|
|
|
|
struct cp_abi_ops *abi;
|
|
|
|
|
|
|
|
abi = find_cp_abi (short_name);
|
|
|
|
if (abi == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
current_cp_abi = *abi;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add ABI to the list of supported C++ ABI's. */
|
|
|
|
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
int
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
register_cp_abi (struct cp_abi_ops *abi)
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
{
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
if (num_cp_abis == CP_ABI_MAX)
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
"Too many C++ ABIs, please increase CP_ABI_MAX in cp-abi.c");
|
|
|
|
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
cp_abis[num_cp_abis++] = abi;
|
|
|
|
|
|
|
|
return 1;
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the ABI to use in "auto" mode to SHORT_NAME. */
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
void
|
|
|
|
set_cp_abi_as_auto_default (const char *short_name)
|
|
|
|
{
|
|
|
|
char *new_longname, *new_doc;
|
|
|
|
struct cp_abi_ops *abi = find_cp_abi (short_name);
|
|
|
|
|
|
|
|
if (abi == NULL)
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
"Cannot find C++ ABI \"%s\" to set it as auto default.",
|
|
|
|
short_name);
|
|
|
|
|
|
|
|
if (auto_cp_abi.longname != NULL)
|
|
|
|
xfree ((char *) auto_cp_abi.longname);
|
|
|
|
if (auto_cp_abi.doc != NULL)
|
|
|
|
xfree ((char *) auto_cp_abi.doc);
|
|
|
|
|
|
|
|
auto_cp_abi = *abi;
|
|
|
|
|
|
|
|
auto_cp_abi.shortname = "auto";
|
|
|
|
new_longname = xmalloc (strlen ("currently ") + 1 + strlen (abi->shortname)
|
|
|
|
+ 1 + 1);
|
|
|
|
sprintf (new_longname, "currently \"%s\"", abi->shortname);
|
|
|
|
auto_cp_abi.longname = new_longname;
|
|
|
|
|
|
|
|
new_doc = xmalloc (strlen ("Automatically selected; currently ")
|
|
|
|
+ 1 + strlen (abi->shortname) + 1 + 1);
|
|
|
|
sprintf (new_doc, "Automatically selected; currently \"%s\"", abi->shortname);
|
|
|
|
auto_cp_abi.doc = new_doc;
|
|
|
|
|
|
|
|
/* Since we copy the current ABI into current_cp_abi instead of
|
|
|
|
using a pointer, if auto is currently the default, we need to
|
|
|
|
reset it. */
|
|
|
|
if (strcmp (current_cp_abi.shortname, "auto") == 0)
|
|
|
|
switch_to_cp_abi ("auto");
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
}
|
|
|
|
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
/* Return the ABI operations associated with SHORT_NAME. */
|
|
|
|
|
|
|
|
static struct cp_abi_ops *
|
|
|
|
find_cp_abi (const char *short_name)
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
{
|
|
|
|
int i;
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
for (i = 0; i < num_cp_abis; i++)
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
if (strcmp (cp_abis[i]->shortname, short_name) == 0)
|
|
|
|
return cp_abis[i];
|
|
|
|
|
|
|
|
return NULL;
|
(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).
2001-04-27 08:19:09 +08:00
|
|
|
}
|
|
|
|
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
/* Display the list of registered C++ ABIs. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
list_cp_abis (int from_tty)
|
|
|
|
{
|
|
|
|
struct cleanup *cleanup_chain;
|
|
|
|
int i;
|
|
|
|
ui_out_text (uiout, "The available C++ ABIs are:\n");
|
|
|
|
|
|
|
|
cleanup_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "cp-abi-list");
|
|
|
|
for (i = 0; i < num_cp_abis; i++)
|
|
|
|
{
|
|
|
|
char pad[14];
|
|
|
|
int padcount;
|
|
|
|
|
|
|
|
ui_out_text (uiout, " ");
|
|
|
|
ui_out_field_string (uiout, "cp-abi", cp_abis[i]->shortname);
|
|
|
|
|
|
|
|
padcount = 16 - 2 - strlen (cp_abis[i]->shortname);
|
|
|
|
pad[padcount] = 0;
|
|
|
|
while (padcount > 0)
|
|
|
|
pad[--padcount] = ' ';
|
|
|
|
ui_out_text (uiout, pad);
|
|
|
|
|
|
|
|
ui_out_field_string (uiout, "doc", cp_abis[i]->doc);
|
|
|
|
ui_out_text (uiout, "\n");
|
|
|
|
}
|
|
|
|
do_cleanups (cleanup_chain);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the current C++ ABI, or display the list of options if no
|
|
|
|
argument is given. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
set_cp_abi_cmd (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
if (args == NULL)
|
|
|
|
{
|
|
|
|
list_cp_abis (from_tty);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!switch_to_cp_abi (args))
|
|
|
|
error ("Could not find \"%s\" in ABI list", args);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Show the currently selected C++ ABI. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
show_cp_abi_cmd (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
ui_out_text (uiout, "The currently selected C++ ABI is \"");
|
|
|
|
|
|
|
|
ui_out_field_string (uiout, "cp-abi", current_cp_abi.shortname);
|
|
|
|
ui_out_text (uiout, "\" (");
|
|
|
|
ui_out_field_string (uiout, "longname", current_cp_abi.longname);
|
|
|
|
ui_out_text (uiout, ").\n");
|
|
|
|
}
|
|
|
|
|
2003-06-08 Andrew Cagney <cagney@redhat.com>
* acinclude.m4 (gcc_AC_CHECK_DECL, (gcc_AC_CHECK_DECL): Stolen
from GCC's acinclude.m4.
* configure.in: Check for getopt's delcaration.
* aclocal.m4, config.in, configure: Re-generate.
* main.c (error_init): Delete declaration.
* defs.h (error_init): Declare.
* rs6000-tdep.c (rs6000_fetch_pointer_argument): Make static.
(rs6000_convert_from_func_ptr_addr): Make static.
(_initialize_rs6000_tdep): Add declaration.
* cli/cli-cmds.c (dont_repeat): Delete declaration.
(show_commands, set_verbose, show_history): Delete declaration.
* top.h (set_verbose): Add declaration.
(show_history, set_history, show_commands): Add declaration.
(do_restore_instream_cleanup): Add declaration.
* objc-lang.c (specialcmp): Make static.
(print_object_command): Make static.
(find_objc_msgsend): Make static.
(find_objc_msgcall_submethod_helper): Make static.
(find_objc_msgcall_submethod): Make static.
(_initialize_objc_language): Add declaration.
(find_implementation_from_class): Make static.
(find_implementation): Make static.
* objc-exp.y (yylex): Delete lookup_struct_typedef declaration.
* objc-lang.h (lookup_struct_typedef): Add declaration.
* cli/cli-interp.c (_initialize_cli_interp): Add declaration.
* cli/cli-script.c (clear_hook_in_cleanup): Make static.
(do_restore_user_call_depth): Make static.
(do_restore_instream_cleanup): Delete declaration.
(dont_repeat): Delete declaration.
* cli/cli-decode.c (add_abbrev_cmd): Delete function.
* cli/cli-dump.c (_initialize_cli_dump): Add declaration.
* reggroups.c (_initialize_reggroup): Add declaration.
* cp-support.c (_initialize_cp_support): Add declaration.
* cp-abi.c (_initialize_cp_abi): Add declaration.
* hpacc-abi.c (_initialize_hpacc_abi): Add declaration.
* gnu-v3-abi.c (gnuv3_baseclass_offset): Make static.
(_initialize_gnu_v3_abi): Add declaration.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Make static.
(_initialize_gnu_v2_abi): Add declaration.
* frame-base.c (_initialize_frame_base): Add declaration.
* doublest.c (floatformat_from_length): Make static.
* frame-unwind.c (_initialize_frame_unwind): Add declaration.
* frame.c (create_sentinel_frame): Make static.
(_initialize_frame): Add declaration.
* top.c (do_catch_errors): Make static.
(gdb_rl_operate_and_get_next_completion): Make static.
* typeprint.c: Include "typeprint.h".
* sentinel-frame.c (sentinel_frame_prev_register): Make static.
(sentinel_frame_this_id): Make static.
* p-valprint.c (_initialize_pascal_valprint): Add declaration.
* ui-out.c (make_cleanup_ui_out_begin_end): Delete function.
* dwarf2-frame.c (dwarf2_frame_cache): Make static.
* p-exp.y (push_current_type, pop_current_type): ISO C declaration.
* dwarf2expr.h (dwarf_expr_context): ISO C declaration.
* maint.c (maintenance_print_architecture): Make static.
* signals/signals.c (_initialize_signals): Add declaration.
* std-regs.c (_initialize_frame_reg): Add declaration.
* jv-exp.y (push_variable): ISO C definition.
(push_qualified_expression_name): Ditto.
* memattr.c (_initialize_mem): Add declaration.
* remote.c (remote_check_watch_resources): Make static.
(remote_stopped_by_watchpoint): Make static.
(remote_stopped_data_address): Make static.
* d10v-tdep.c (nr_dmap_regs): Make static.
(a0_regnum): Make static.
(d10v_frame_unwind_cache): Make static.
(d10v_frame_p): Make static.
* osabi.c (show_osabi): Make static.
(_initialize_gdb_osabi): Add extern declaration.
* gdbtypes.c (make_qualified_type): Make static.
(safe_parse_type): Make static.
* macrocmd.c (_initialize_macrocmd): Add extern declaration.
* macrotab.c (macro_bcache_free): Make static.
* interps.c (interp_set_quiet): Make static.
(interpreter_exec_cmd): Make static.
* stack.h (select_frame_command): New file.
* stack.c: Include "stack.h".
(select_frame_command_wrapper): Delete function.
(select_frame_command): Make global.
* infcall.c: Include "infcall.h".
* linespec.c: Include "linespec.h".
* symfile.c (sections_overlap): Make static.
* cp-support.h (cp_initialize_namespace): ISO C declaration.
* charset.c (_initialize_charset): Add missing prototype.
* regcache.c (init_legacy_regcache_descr): Make static.
(do_regcache_xfree): Make static.
(regcache_xfer_part): Make static.
(_initialize_regcache): Add missing prototype.
* breakpoint.c (parse_breakpoint_sals): Make static.
(breakpoint_sals_to_pc): Make static.
* interps.h (clear_interpreter_hooks): ISO C declaration.
* Makefile.in (stack_h): Define.
(stack.o, typeprint.o, mi-main.o): Update dependencies.
(mi-cmd-stack.o, infcall.o, linespec.o): Update dependencies.
Index: mi/ChangeLog
2003-06-08 Andrew Cagney <cagney@redhat.com>
* mi-parse.c (_initialize_mi_parse): Delete function.
* mi-main.c: Include "mi-main.h".
* mi-interp.c (_initialize_mi_interp): Add declaration.
* mi-cmd-stack.c: Include "stack.h".
(select_frame_command_wrapper): Delete extern declaration.
(mi_cmd_stack_select_frame): Replace select_frame_command_wrapper
with select_frame_command.
2003-06-09 02:27:14 +08:00
|
|
|
extern initialize_file_ftype _initialize_cp_abi; /* -Wmissing-prototypes */
|
|
|
|
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-06 02:01:46 +08:00
|
|
|
void
|
|
|
|
_initialize_cp_abi (void)
|
|
|
|
{
|
|
|
|
register_cp_abi (&auto_cp_abi);
|
|
|
|
switch_to_cp_abi ("auto");
|
|
|
|
|
|
|
|
add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd,
|
|
|
|
"Set the ABI used for inspecting C++ objects.\n"
|
|
|
|
"\"set cp-abi\" with no arguments will list the available ABIs.",
|
|
|
|
&setlist);
|
|
|
|
|
|
|
|
add_cmd ("cp-abi", class_obscure, show_cp_abi_cmd,
|
|
|
|
"Show the ABI used for inspecting C++ objects.", &showlist);
|
|
|
|
}
|