Reviewed and approved by Alan Modra <amodra@bigpond.net.au>

[deliverable/binutils-gdb.git] / gdb / cp-abi.h

diff --git a/gdb/cp-abi.h b/gdb/cp-abi.h
index bd5430d5a936179629c30aa9aaa88c8ab6666fc8..0413abafc4e78c1f06e39231903efa0ad0eea2d2 100644 (file)
--- a/gdb/cp-abi.h
+++ b/gdb/cp-abi.h
@@ -25,6 +25,10 @@
 #ifndef CP_ABI_H_
 #define CP_ABI_H_ 1
 
+struct fn_field;
+struct type;
+struct value;
+
 /* The functions here that attempt to determine what sort of thing a
    mangled name refers to may well be revised in the future.  It would
    certainly be cleaner to carry this information explicitly in GDB's
@@ -99,9 +103,9 @@ extern int is_operator_name (const char *name);
    TYPE is the base type of *VALUEP whose method we're invoking ---
    this is the type containing F.  OFFSET is the offset of that base
    type within *VALUEP.  */
-extern value_ptr value_virtual_fn_field (value_ptr *valuep,
-                                        struct fn_field *f, int j,
-                                        struct type *type, int offset);
+extern struct value *value_virtual_fn_field (struct value **valuep,
+                                            struct fn_field *f, int j,
+                                            struct type *type, int offset);
 
 
 /* Try to find the run-time type of VALUE, using C++ run-time type
@@ -130,7 +134,17 @@ extern value_ptr value_virtual_fn_field (value_ptr *valuep,
 extern struct type *value_rtti_type (struct value *value,
                                      int *full, int *top, int *using_enc);
 
+/* Compute the offset of the baseclass which is
+   the INDEXth baseclass of class TYPE,
+   for value at VALADDR (in host) at ADDRESS (in target).
+   The result is the offset of the baseclass value relative
+   to (the address of)(ARG) + OFFSET.
+
+   -1 is returned on error. */
 
+extern int baseclass_offset (struct type *type, int index, char *valaddr,
+                            CORE_ADDR address);
+                  
 struct cp_abi_ops
 {
   const char *shortname;
@@ -142,18 +156,17 @@ struct cp_abi_ops
   enum dtor_kinds (*is_destructor_name) (const char *name);
   int (*is_vtable_name) (const char *name);
   int (*is_operator_name) (const char *name);
-  value_ptr (*virtual_fn_field) (value_ptr * arg1p, struct fn_field * f,
-                                int j, struct type * type, int offset);
-  struct type *(*rtti_type) (value_ptr v, int *full, int *top,
+  struct value *(*virtual_fn_field) (struct value **arg1p, struct fn_field * f,
+                                    int j, struct type * type, int offset);
+  struct type *(*rtti_type) (struct value *v, int *full, int *top,
                             int *using_enc);
+  int (*baseclass_offset) (struct type *type, int index, char *valaddr,
+                          CORE_ADDR address);
 };
 
 
-extern struct cp_abi_ops *cp_abis;
-extern int num_cp_abis;
-extern struct cp_abi_ops current_cp_abi;
-extern int register_cp_abi (struct cp_abi_ops abi);
-extern int switch_to_cp_abi (const char *short_name);
+extern int register_cp_abi (struct cp_abi_ops *abi);
+extern void set_cp_abi_as_auto_default (const char *short_name);
 
 #endif