X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcp-abi.c;h=e949088f39690e34b200f615c82e0623b2ac6058;hb=3d3e6bc3f438c51ff235d6a454ee1010246e814a;hp=f5077856569ea23b2de4d760ec484ebb8dc17ee4;hpb=049742daef2e31e791ee3497a8060a082997e566;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c index f507785656..e949088f39 100644 --- a/gdb/cp-abi.c +++ b/gdb/cp-abi.c @@ -1,12 +1,12 @@ /* Generic code for supporting multiple C++ ABI's - Copyright 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2012 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,17 +15,16 @@ 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. */ + along with this program. If not, see . */ #include "defs.h" #include "value.h" #include "cp-abi.h" #include "command.h" +#include "exceptions.h" #include "gdbcmd.h" #include "ui-out.h" - +#include "gdb_assert.h" #include "gdb_string.h" static struct cp_abi_ops *find_cp_abi (const char *short_name); @@ -70,29 +69,112 @@ is_operator_name (const char *name) } int -baseclass_offset (struct type *type, int index, const bfd_byte *valaddr, - CORE_ADDR address) +baseclass_offset (struct type *type, int index, const gdb_byte *valaddr, + int embedded_offset, CORE_ADDR address, + const struct value *val) { - 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); + volatile struct gdb_exception ex; + int res = 0; + + gdb_assert (current_cp_abi.baseclass_offset != NULL); + + TRY_CATCH (ex, RETURN_MASK_ERROR) + { + res = (*current_cp_abi.baseclass_offset) (type, index, valaddr, + embedded_offset, + address, val); + } + + if (ex.reason < 0 && ex.error == NOT_AVAILABLE_ERROR) + throw_error (NOT_AVAILABLE_ERROR, + _("Cannot determine virtual baseclass offset " + "of incomplete object")); + else if (ex.reason < 0) + throw_exception (ex); + else + return res; } struct value * -value_virtual_fn_field (struct value **arg1p, struct fn_field *f, int j, +value_virtual_fn_field (struct value **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); + return (*current_cp_abi.virtual_fn_field) (arg1p, f, j, + type, offset); } struct type * -value_rtti_type (struct value *v, int *full, int *top, int *using_enc) +value_rtti_type (struct value *v, int *full, + int *top, int *using_enc) { + struct type *ret = NULL; + volatile struct gdb_exception e; + if ((current_cp_abi.rtti_type) == NULL) return NULL; - return (*current_cp_abi.rtti_type) (v, full, top, using_enc); + TRY_CATCH (e, RETURN_MASK_ERROR) + { + ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc); + } + if (e.reason < 0) + return NULL; + return ret; +} + +void +cplus_print_method_ptr (const gdb_byte *contents, + struct type *type, + struct ui_file *stream) +{ + if (current_cp_abi.print_method_ptr == NULL) + error (_("GDB does not support pointers to methods on this target")); + (*current_cp_abi.print_method_ptr) (contents, type, stream); +} + +int +cplus_method_ptr_size (struct type *to_type) +{ + if (current_cp_abi.method_ptr_size == NULL) + error (_("GDB does not support pointers to methods on this target")); + return (*current_cp_abi.method_ptr_size) (to_type); +} + +void +cplus_make_method_ptr (struct type *type, gdb_byte *contents, + CORE_ADDR value, int is_virtual) +{ + if (current_cp_abi.make_method_ptr == NULL) + error (_("GDB does not support pointers to methods on this target")); + (*current_cp_abi.make_method_ptr) (type, contents, value, is_virtual); +} + +CORE_ADDR +cplus_skip_trampoline (struct frame_info *frame, + CORE_ADDR stop_pc) +{ + if (current_cp_abi.skip_trampoline == NULL) + return 0; + return (*current_cp_abi.skip_trampoline) (frame, stop_pc); +} + +struct value * +cplus_method_ptr_to_value (struct value **this_p, + struct value *method_ptr) +{ + if (current_cp_abi.method_ptr_to_value == NULL) + error (_("GDB does not support pointers to methods on this target")); + return (*current_cp_abi.method_ptr_to_value) (this_p, method_ptr); +} + +int +cp_pass_by_reference (struct type *type) +{ + if ((current_cp_abi.pass_by_reference) == NULL) + return 0; + return (*current_cp_abi.pass_by_reference) (type); } /* Set the current C++ ABI to SHORT_NAME. */ @@ -117,7 +199,8 @@ register_cp_abi (struct cp_abi_ops *abi) { if (num_cp_abis == CP_ABI_MAX) internal_error (__FILE__, __LINE__, - _("Too many C++ ABIs, please increase CP_ABI_MAX in cp-abi.c")); + _("Too many C++ ABIs, please increase " + "CP_ABI_MAX in cp-abi.c")); cp_abis[num_cp_abis++] = abi; @@ -145,10 +228,10 @@ set_cp_abi_as_auto_default (const char *short_name) auto_cp_abi = *abi; auto_cp_abi.shortname = "auto"; - xasprintf (&new_longname, "currently \"%s\"", abi->shortname); + new_longname = xstrprintf ("currently \"%s\"", abi->shortname); auto_cp_abi.longname = new_longname; - xasprintf (&new_doc, "Automatically selected; currently \"%s\"", + new_doc = xstrprintf ("Automatically selected; currently \"%s\"", abi->shortname); auto_cp_abi.doc = new_doc; @@ -178,11 +261,13 @@ find_cp_abi (const char *short_name) static void list_cp_abis (int from_tty) { + struct ui_out *uiout = current_uiout; 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"); + 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]; @@ -224,6 +309,8 @@ set_cp_abi_cmd (char *args, int from_tty) static void show_cp_abi_cmd (char *args, int from_tty) { + struct ui_out *uiout = current_uiout; + ui_out_text (uiout, "The currently selected C++ ABI is \""); ui_out_field_string (uiout, "cp-abi", current_cp_abi.shortname); @@ -246,5 +333,6 @@ Set the ABI used for inspecting C++ objects.\n\ &setlist); add_cmd ("cp-abi", class_obscure, show_cp_abi_cmd, - _("Show the ABI used for inspecting C++ objects."), &showlist); + _("Show the ABI used for inspecting C++ objects."), + &showlist); }