X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Ftypeprint.c;h=b18410322a98c3a25e6177017019ab371ae582fe;hb=5cb316ef79dafb9f22426015584817e5e2756507;hp=e892e5e6da2cb81f412e4d82a3d9594828bfd7af;hpb=c5aa993b1f4add48fbdc6cc3117059f616e49875;p=binutils-gdb.git diff --git a/gdb/typeprint.c b/gdb/typeprint.c index e892e5e6da2..b18410322a9 100644 --- a/gdb/typeprint.c +++ b/gdb/typeprint.c @@ -1,5 +1,7 @@ /* Language independent support for printing types for GDB, the GNU debugger. - Copyright 1986, 88, 89, 91, 92, 93, 1998 Free Software Foundation, Inc. + + Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1998, + 1999, 2000, 2001, 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -19,7 +21,7 @@ Boston, MA 02111-1307, USA. */ #include "defs.h" -#include "obstack.h" +#include "gdb_obstack.h" #include "bfd.h" /* Binary File Description */ #include "symtab.h" #include "gdbtypes.h" @@ -30,7 +32,7 @@ #include "gdbcmd.h" #include "target.h" #include "language.h" -#include "demangle.h" +#include "cp-abi.h" #include "gdb_string.h" #include @@ -39,19 +41,59 @@ extern int objectprint; /* Controls looking up an object's derived type using what we find in its vtables. */ -extern void _initialize_typeprint PARAMS ((void)); +extern void _initialize_typeprint (void); -static void -ptype_command PARAMS ((char *, int)); +static void ptype_command (char *, int); -static struct type * - ptype_eval PARAMS ((struct expression *)); +static struct type *ptype_eval (struct expression *); -static void -whatis_command PARAMS ((char *, int)); +static void whatis_command (char *, int); -static void -whatis_exp PARAMS ((char *, int)); +static void whatis_exp (char *, int); + +/* Print a description of a type in the format of a + typedef for the current language. + NEW is the new name for a type TYPE. */ + +void +typedef_print (struct type *type, struct symbol *new, struct ui_file *stream) +{ + CHECK_TYPEDEF (type); + switch (current_language->la_language) + { +#ifdef _LANG_c + case language_c: + case language_cplus: + fprintf_filtered (stream, "typedef "); + type_print (type, "", stream, 0); + if (TYPE_NAME ((SYMBOL_TYPE (new))) == 0 + || strcmp (TYPE_NAME ((SYMBOL_TYPE (new))), SYMBOL_NAME (new)) != 0) + fprintf_filtered (stream, " %s", SYMBOL_SOURCE_NAME (new)); + break; +#endif +#ifdef _LANG_m2 + case language_m2: + fprintf_filtered (stream, "TYPE "); + if (!TYPE_NAME (SYMBOL_TYPE (new)) + || strcmp (TYPE_NAME ((SYMBOL_TYPE (new))), SYMBOL_NAME (new)) != 0) + fprintf_filtered (stream, "%s = ", SYMBOL_SOURCE_NAME (new)); + else + fprintf_filtered (stream, " = "); + type_print (type, "", stream, 0); + break; +#endif +#ifdef _LANG_pascal + case language_pascal: + fprintf_filtered (stream, "type "); + fprintf_filtered (stream, "%s = ", SYMBOL_SOURCE_NAME (new)); + type_print (type, "", stream, 0); + break; +#endif + default: + error ("Language not supported."); + } + fprintf_filtered (stream, ";\n"); +} /* Print a description of a type TYPE in the form of a declaration of a variable named VARSTRING. (VARSTRING is demangled if necessary.) @@ -61,11 +103,8 @@ whatis_exp PARAMS ((char *, int)); If SHOW is negative, we never show the details of elements' types. */ void -type_print (type, varstring, stream, show) - struct type *type; - char *varstring; - GDB_FILE *stream; - int show; +type_print (struct type *type, char *varstring, struct ui_file *stream, + int show) { LA_PRINT_TYPE (type, varstring, stream, show, 0); } @@ -74,14 +113,13 @@ type_print (type, varstring, stream, show) show is passed to type_print. */ static void -whatis_exp (exp, show) - char *exp; - int show; +whatis_exp (char *exp, int show) { struct expression *expr; - register value_ptr val; + struct value *val; register struct cleanup *old_chain = NULL; struct type *real_type = NULL; + struct type *type; int full = 0; int top = -1; int using_enc = 0; @@ -89,24 +127,46 @@ whatis_exp (exp, show) if (exp) { expr = parse_expression (exp); - old_chain = make_cleanup ((make_cleanup_func) free_current_contents, - &expr); + old_chain = make_cleanup (free_current_contents, &expr); val = evaluate_type (expr); } else val = access_value_history (0); + type = VALUE_TYPE (val); + + if (objectprint) + { + if (((TYPE_CODE (type) == TYPE_CODE_PTR) || + (TYPE_CODE (type) == TYPE_CODE_REF)) + && + (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS)) + { + real_type = value_rtti_target_type (val, &full, &top, &using_enc); + if (real_type) + { + if (TYPE_CODE (type) == TYPE_CODE_PTR) + real_type = lookup_pointer_type (real_type); + else + real_type = lookup_reference_type (real_type); + } + } + else if (TYPE_CODE (type) == TYPE_CODE_CLASS) real_type = value_rtti_type (val, &full, &top, &using_enc); + } printf_filtered ("type = "); - if (real_type && objectprint) - printf_filtered ("/* real type = %s%s */\n", - TYPE_NAME (real_type), - full ? "" : " (incomplete object)"); - /* FIXME: maybe better to use type_print (real_type, "", gdb_stdout, -1); */ + if (real_type) + { + printf_filtered ("/* real type = "); + type_print (real_type, "", gdb_stdout, -1); + if (! full) + printf_filtered (" (incomplete object)"); + printf_filtered (" */\n"); + } - type_print (VALUE_TYPE (val), "", gdb_stdout, show); + type_print (type, "", gdb_stdout, show); printf_filtered ("\n"); if (exp) @@ -115,9 +175,7 @@ whatis_exp (exp, show) /* ARGSUSED */ static void -whatis_command (exp, from_tty) - char *exp; - int from_tty; +whatis_command (char *exp, int from_tty) { /* Most of the time users do not want to see all the fields in a structure. If they do they can use the "ptype" command. @@ -128,8 +186,7 @@ whatis_command (exp, from_tty) /* Simple subroutine for ptype_command. */ static struct type * -ptype_eval (exp) - struct expression *exp; +ptype_eval (struct expression *exp) { if (exp->elts[0].opcode == OP_TYPE) { @@ -145,9 +202,7 @@ ptype_eval (exp) /* ARGSUSED */ static void -ptype_command (typename, from_tty) - char *typename; - int from_tty; +ptype_command (char *typename, int from_tty) { register struct type *type; struct expression *expr; @@ -161,8 +216,7 @@ ptype_command (typename, from_tty) else { expr = parse_expression (typename); - old_chain = make_cleanup ((make_cleanup_func) free_current_contents, - &expr); + old_chain = make_cleanup (free_current_contents, &expr); type = ptype_eval (expr); if (type != NULL) { @@ -194,10 +248,7 @@ ptype_command (typename, from_tty) that come from the inferior in target byte order and target size. */ void -print_type_scalar (type, val, stream) - struct type *type; - LONGEST val; - GDB_FILE *stream; +print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream) { unsigned int i; unsigned len; @@ -270,11 +321,9 @@ print_type_scalar (type, val, stream) and whatis_command(). */ void -maintenance_print_type (typename, from_tty) - char *typename; - int from_tty; +maintenance_print_type (char *typename, int from_tty) { - register value_ptr val; + struct value *val; register struct type *type; register struct cleanup *old_chain; struct expression *expr; @@ -282,7 +331,7 @@ maintenance_print_type (typename, from_tty) if (typename != NULL) { expr = parse_expression (typename); - old_chain = make_cleanup ((make_cleanup_func) free_current_contents, &expr); + old_chain = make_cleanup (free_current_contents, &expr); if (expr->elts[0].opcode == OP_TYPE) { /* The user expression names a type directly, just use that type. */ @@ -305,7 +354,7 @@ maintenance_print_type (typename, from_tty) void -_initialize_typeprint () +_initialize_typeprint (void) { add_com ("ptype", class_vars, ptype_command,