X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftypeprint.c;h=8133ad03be68718f981517651084aa5b6ef6bed4;hb=2bd7c093f663139ad9e57ddc748ade12f6bfbe01;hp=9f31a40dfb41cc749a7f9d9c7743ebf646f13a32;hpb=9b254dd1ce46c19dde1dde5b8d1e22e862dfacce;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/typeprint.c b/gdb/typeprint.c index 9f31a40dfb..8133ad03be 100644 --- a/gdb/typeprint.c +++ b/gdb/typeprint.c @@ -1,7 +1,7 @@ /* Language independent support for printing types for GDB, the GNU debugger. Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1998, 1999, - 2000, 2001, 2003, 2006, 2007, 2008 Free Software Foundation, Inc. + 2000, 2001, 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GDB. @@ -33,12 +33,10 @@ #include "cp-abi.h" #include "typeprint.h" #include "gdb_string.h" +#include "exceptions.h" +#include "valprint.h" #include -/* For real-type printing in whatis_exp() */ -extern int objectprint; /* Controls looking up an object's derived type - using what we find in its vtables. */ - extern void _initialize_typeprint (void); static void ptype_command (char *, int); @@ -47,6 +45,7 @@ static void whatis_command (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. */ @@ -54,41 +53,16 @@ static void whatis_exp (char *, int); 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))), DEPRECATED_SYMBOL_NAME (new)) != 0) - fprintf_filtered (stream, " %s", SYMBOL_PRINT_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))), DEPRECATED_SYMBOL_NAME (new)) != 0) - fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_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_PRINT_NAME (new)); - type_print (type, "", stream, 0); - break; -#endif - default: - error (_("Language not supported.")); - } - fprintf_filtered (stream, ";\n"); + LA_PRINT_TYPEDEF (type, new, stream); +} + +/* The default way to print a typedef. */ + +void +default_print_typedef (struct type *type, struct symbol *new_symbol, + struct ui_file *stream) +{ + error (_("Language not supported.")); } /* Print a description of a type TYPE in the form of a declaration of a @@ -105,6 +79,34 @@ type_print (struct type *type, char *varstring, struct ui_file *stream, LA_PRINT_TYPE (type, varstring, stream, show, 0); } +/* Print TYPE to a string, returning it. The caller is responsible for + freeing the string. */ + +char * +type_to_string (struct type *type) +{ + char *s = NULL; + long dummy; + struct ui_file *stb; + struct cleanup *old_chain; + volatile struct gdb_exception except; + + stb = mem_fileopen (); + old_chain = make_cleanup_ui_file_delete (stb); + + TRY_CATCH (except, RETURN_MASK_ALL) + { + type_print (type, "", stb, -1); + s = ui_file_xstrdup (stb, &dummy); + } + if (except.reason < 0) + s = NULL; + + do_cleanups (old_chain); + + return s; +} + /* Print type of EXP, or last thing in value history if EXP == NULL. show is passed to type_print. */ @@ -119,6 +121,7 @@ whatis_exp (char *exp, int show) int full = 0; int top = -1; int using_enc = 0; + struct value_print_options opts; if (exp) { @@ -131,12 +134,12 @@ whatis_exp (char *exp, int show) type = value_type (val); - if (objectprint) + get_user_print_options (&opts); + if (opts.objectprint) { - if (((TYPE_CODE (type) == TYPE_CODE_PTR) || - (TYPE_CODE (type) == TYPE_CODE_REF)) - && - (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS)) + 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) @@ -148,7 +151,7 @@ whatis_exp (char *exp, int show) } } else if (TYPE_CODE (type) == TYPE_CODE_CLASS) - real_type = value_rtti_type (val, &full, &top, &using_enc); + real_type = value_rtti_type (val, &full, &top, &using_enc); } printf_filtered ("type = "); @@ -196,7 +199,7 @@ ptype_command (char *typename, int from_tty) currently use it, and it wasn't clear if it really belonged somewhere else (like printcmd.c). There are a lot of other gdb routines that do something similar, but they are generally concerned with printing values - that come from the inferior in target byte order and target size. */ + that come from the inferior in target byte order and target size. */ void print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream) @@ -233,7 +236,7 @@ print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream) break; case TYPE_CODE_CHAR: - LA_PRINT_CHAR ((unsigned char) val, stream); + LA_PRINT_CHAR ((unsigned char) val, type, stream); break; case TYPE_CODE_BOOL: @@ -271,7 +274,7 @@ print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream) /* Dump details of a type specified either directly or indirectly. Uses the same sort of type lookup mechanism as ptype_command() - and whatis_command(). */ + and whatis_command(). */ void maintenance_print_type (char *typename, int from_tty) @@ -309,7 +312,6 @@ maintenance_print_type (char *typename, int from_tty) void _initialize_typeprint (void) { - add_com ("ptype", class_vars, ptype_command, _("\ Print definition of type TYPE.\n\ Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n\ @@ -318,5 +320,4 @@ The selected stack frame's lexical context is used to look up the name.")); add_com ("whatis", class_vars, whatis_command, _("Print data type of expression EXP.")); - }