+ try
+ {
+ ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc);
+ }
+ catch (const gdb_exception_error &e)
+ {
+ 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);
+}
+
+/* See cp-abi.h. */
+
+void
+cplus_print_vtable (struct value *value)
+{
+ if (current_cp_abi.print_vtable == NULL)
+ error (_("GDB cannot print the vtable on this target"));
+ (*current_cp_abi.print_vtable) (value);
+}
+
+/* See cp-abi.h. */
+
+struct value *
+cplus_typeid (struct value *value)
+{
+ if (current_cp_abi.get_typeid == NULL)
+ error (_("GDB cannot find the typeid on this target"));
+ return (*current_cp_abi.get_typeid) (value);
+}
+
+/* See cp-abi.h. */
+
+struct type *
+cplus_typeid_type (struct gdbarch *gdbarch)
+{
+ if (current_cp_abi.get_typeid_type == NULL)
+ error (_("GDB cannot find the type for 'typeid' on this target"));
+ return (*current_cp_abi.get_typeid_type) (gdbarch);
+}
+
+/* See cp-abi.h. */
+
+struct type *
+cplus_type_from_type_info (struct value *value)
+{
+ if (current_cp_abi.get_type_from_type_info == NULL)
+ error (_("GDB cannot find the type from a std::type_info on this target"));
+ return (*current_cp_abi.get_type_from_type_info) (value);
+}
+
+/* See cp-abi.h. */
+
+std::string
+cplus_typename_from_type_info (struct value *value)
+{
+ if (current_cp_abi.get_typename_from_type_info == NULL)
+ error (_("GDB cannot find the type name "
+ "from a std::type_info on this target"));
+ return (*current_cp_abi.get_typename_from_type_info) (value);
+}
+
+/* See cp-abi.h. */
+
+struct language_pass_by_ref_info
+cp_pass_by_reference (struct type *type)
+{
+ if ((current_cp_abi.pass_by_reference) == NULL)
+ return default_pass_by_reference (type);
+ return (*current_cp_abi.pass_by_reference) (type);