2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
324 lines
8.5 KiB
C
324 lines
8.5 KiB
C
/* 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, 2009 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include "defs.h"
|
||
#include "gdb_obstack.h"
|
||
#include "bfd.h" /* Binary File Description */
|
||
#include "symtab.h"
|
||
#include "gdbtypes.h"
|
||
#include "expression.h"
|
||
#include "value.h"
|
||
#include "gdbcore.h"
|
||
#include "command.h"
|
||
#include "gdbcmd.h"
|
||
#include "target.h"
|
||
#include "language.h"
|
||
#include "cp-abi.h"
|
||
#include "typeprint.h"
|
||
#include "gdb_string.h"
|
||
#include "exceptions.h"
|
||
#include "valprint.h"
|
||
#include <errno.h>
|
||
|
||
extern void _initialize_typeprint (void);
|
||
|
||
static void ptype_command (char *, int);
|
||
|
||
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. */
|
||
|
||
void
|
||
typedef_print (struct type *type, struct symbol *new, struct ui_file *stream)
|
||
{
|
||
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
|
||
variable named VARSTRING. (VARSTRING is demangled if necessary.)
|
||
Output goes to STREAM (via stdio).
|
||
If SHOW is positive, we show the contents of the outermost level
|
||
of structure even if there is a type name that could be used instead.
|
||
If SHOW is negative, we never show the details of elements' types. */
|
||
|
||
void
|
||
type_print (struct type *type, char *varstring, struct ui_file *stream,
|
||
int show)
|
||
{
|
||
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. */
|
||
|
||
static void
|
||
whatis_exp (char *exp, int show)
|
||
{
|
||
struct expression *expr;
|
||
struct value *val;
|
||
struct cleanup *old_chain = NULL;
|
||
struct type *real_type = NULL;
|
||
struct type *type;
|
||
int full = 0;
|
||
int top = -1;
|
||
int using_enc = 0;
|
||
struct value_print_options opts;
|
||
|
||
if (exp)
|
||
{
|
||
expr = parse_expression (exp);
|
||
old_chain = make_cleanup (free_current_contents, &expr);
|
||
val = evaluate_type (expr);
|
||
}
|
||
else
|
||
val = access_value_history (0);
|
||
|
||
type = value_type (val);
|
||
|
||
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))
|
||
{
|
||
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)
|
||
{
|
||
printf_filtered ("/* real type = ");
|
||
type_print (real_type, "", gdb_stdout, -1);
|
||
if (! full)
|
||
printf_filtered (" (incomplete object)");
|
||
printf_filtered (" */\n");
|
||
}
|
||
|
||
type_print (type, "", gdb_stdout, show);
|
||
printf_filtered ("\n");
|
||
|
||
if (exp)
|
||
do_cleanups (old_chain);
|
||
}
|
||
|
||
static void
|
||
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.
|
||
Hence the "-1" below. */
|
||
whatis_exp (exp, -1);
|
||
}
|
||
|
||
/* TYPENAME is either the name of a type, or an expression. */
|
||
|
||
static void
|
||
ptype_command (char *typename, int from_tty)
|
||
{
|
||
whatis_exp (typename, 1);
|
||
}
|
||
|
||
/* Print integral scalar data VAL, of type TYPE, onto stdio stream STREAM.
|
||
Used to print data from type structures in a specified type. For example,
|
||
array bounds may be characters or booleans in some languages, and this
|
||
allows the ranges to be printed in their "natural" form rather than as
|
||
decimal integer values.
|
||
|
||
FIXME: This is here simply because only the type printing routines
|
||
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. */
|
||
|
||
void
|
||
print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream)
|
||
{
|
||
unsigned int i;
|
||
unsigned len;
|
||
|
||
CHECK_TYPEDEF (type);
|
||
|
||
switch (TYPE_CODE (type))
|
||
{
|
||
|
||
case TYPE_CODE_ENUM:
|
||
len = TYPE_NFIELDS (type);
|
||
for (i = 0; i < len; i++)
|
||
{
|
||
if (TYPE_FIELD_BITPOS (type, i) == val)
|
||
{
|
||
break;
|
||
}
|
||
}
|
||
if (i < len)
|
||
{
|
||
fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
|
||
}
|
||
else
|
||
{
|
||
print_longest (stream, 'd', 0, val);
|
||
}
|
||
break;
|
||
|
||
case TYPE_CODE_INT:
|
||
print_longest (stream, TYPE_UNSIGNED (type) ? 'u' : 'd', 0, val);
|
||
break;
|
||
|
||
case TYPE_CODE_CHAR:
|
||
LA_PRINT_CHAR ((unsigned char) val, type, stream);
|
||
break;
|
||
|
||
case TYPE_CODE_BOOL:
|
||
fprintf_filtered (stream, val ? "TRUE" : "FALSE");
|
||
break;
|
||
|
||
case TYPE_CODE_RANGE:
|
||
print_type_scalar (TYPE_TARGET_TYPE (type), val, stream);
|
||
return;
|
||
|
||
case TYPE_CODE_UNDEF:
|
||
case TYPE_CODE_PTR:
|
||
case TYPE_CODE_ARRAY:
|
||
case TYPE_CODE_STRUCT:
|
||
case TYPE_CODE_UNION:
|
||
case TYPE_CODE_FUNC:
|
||
case TYPE_CODE_FLT:
|
||
case TYPE_CODE_VOID:
|
||
case TYPE_CODE_SET:
|
||
case TYPE_CODE_STRING:
|
||
case TYPE_CODE_ERROR:
|
||
case TYPE_CODE_MEMBERPTR:
|
||
case TYPE_CODE_METHODPTR:
|
||
case TYPE_CODE_METHOD:
|
||
case TYPE_CODE_REF:
|
||
case TYPE_CODE_NAMESPACE:
|
||
error (_("internal error: unhandled type in print_type_scalar"));
|
||
break;
|
||
|
||
default:
|
||
error (_("Invalid type code in symbol table."));
|
||
}
|
||
gdb_flush (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(). */
|
||
|
||
void
|
||
maintenance_print_type (char *typename, int from_tty)
|
||
{
|
||
struct value *val;
|
||
struct type *type;
|
||
struct cleanup *old_chain;
|
||
struct expression *expr;
|
||
|
||
if (typename != NULL)
|
||
{
|
||
expr = parse_expression (typename);
|
||
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. */
|
||
type = expr->elts[1].type;
|
||
}
|
||
else
|
||
{
|
||
/* The user expression may name a type indirectly by naming an
|
||
object of that type. Find that indirectly named type. */
|
||
val = evaluate_type (expr);
|
||
type = value_type (val);
|
||
}
|
||
if (type != NULL)
|
||
{
|
||
recursive_dump_type (type, 0);
|
||
}
|
||
do_cleanups (old_chain);
|
||
}
|
||
}
|
||
|
||
|
||
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\
|
||
or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n\
|
||
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."));
|
||
}
|