-/* Create the byte pattern in CONTENTS representing a pointer to
- member function at ADDRESS (if IS_VIRTUAL is 0) or with virtual
- table offset ADDRESS (if IS_VIRTUAL is 1). This is the opposite
- of cplus_method_ptr_to_value. */
-void cplus_make_method_ptr (gdb_byte *CONTENTS, CORE_ADDR address,
- int is_virtual);
+/* Create the byte pattern in CONTENTS representing a pointer of type
+ TYPE to member function at ADDRESS (if IS_VIRTUAL is 0) or with
+ virtual table offset ADDRESS (if IS_VIRTUAL is 1). This is the
+ opposite of cplus_method_ptr_to_value. */
+void cplus_make_method_ptr (struct type *type, gdb_byte *CONTENTS,
+ CORE_ADDR address, int is_virtual);
+
+/* Print the vtable for VALUE, if there is one. If there is no
+ vtable, print a message, but do not throw. */
+
+void cplus_print_vtable (struct value *value);
+
+/* Implement 'typeid': find the type info for VALUE, if possible. If
+ the type info cannot be found, throw an exception. */
+
+extern struct value *cplus_typeid (struct value *value);
+
+/* Return the type of 'typeid' for the current C++ ABI on the given
+ architecture. */
+
+extern struct type *cplus_typeid_type (struct gdbarch *gdbarch);
+
+/* Given a value which holds a pointer to a std::type_info, return the
+ type which that type_info represents. Throw an exception if the
+ type cannot be found. */
+
+extern struct type *cplus_type_from_type_info (struct value *value);
+
+/* Given a value which holds a pointer to a std::type_info, return the
+ name of the type which that type_info represents. Throw an
+ exception if the type name cannot be found. */
+
+extern std::string cplus_typename_from_type_info (struct value *value);
+
+/* Determine if we are currently in a C++ thunk. If so, get the
+ address of the routine we are thunking to and continue to there
+ instead. */