6c7a06a3fa
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.
288 lines
8 KiB
C
288 lines
8 KiB
C
/* Scheme/Guile language support routines for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1995, 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 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 "symtab.h"
|
|
#include "gdbtypes.h"
|
|
#include "expression.h"
|
|
#include "parser-defs.h"
|
|
#include "language.h"
|
|
#include "value.h"
|
|
#include "c-lang.h"
|
|
#include "scm-lang.h"
|
|
#include "scm-tags.h"
|
|
#include "source.h"
|
|
#include "gdb_string.h"
|
|
#include "gdbcore.h"
|
|
#include "infcall.h"
|
|
#include "objfiles.h"
|
|
|
|
extern void _initialize_scheme_language (void);
|
|
static struct value *evaluate_subexp_scm (struct type *, struct expression *,
|
|
int *, enum noside);
|
|
static struct value *scm_lookup_name (char *);
|
|
static int in_eval_c (void);
|
|
|
|
struct type *builtin_type_scm;
|
|
|
|
void
|
|
scm_printchar (int c, struct type *type, struct ui_file *stream)
|
|
{
|
|
fprintf_filtered (stream, "#\\%c", c);
|
|
}
|
|
|
|
static void
|
|
scm_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
|
|
unsigned int length, int force_ellipses,
|
|
const struct value_print_options *options)
|
|
{
|
|
fprintf_filtered (stream, "\"%s\"", string);
|
|
}
|
|
|
|
int
|
|
is_scmvalue_type (struct type *type)
|
|
{
|
|
if (TYPE_NAME (type) && strcmp (TYPE_NAME (type), "SCM") == 0)
|
|
{
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Get the INDEX'th SCM value, assuming SVALUE is the address
|
|
of the 0'th one. */
|
|
|
|
LONGEST
|
|
scm_get_field (LONGEST svalue, int index)
|
|
{
|
|
gdb_byte buffer[20];
|
|
read_memory (SCM2PTR (svalue) + index * TYPE_LENGTH (builtin_type_scm),
|
|
buffer, TYPE_LENGTH (builtin_type_scm));
|
|
return extract_signed_integer (buffer, TYPE_LENGTH (builtin_type_scm));
|
|
}
|
|
|
|
/* Unpack a value of type TYPE in buffer VALADDR as an integer
|
|
(if CONTEXT == TYPE_CODE_IN), a pointer (CONTEXT == TYPE_CODE_PTR),
|
|
or Boolean (CONTEXT == TYPE_CODE_BOOL). */
|
|
|
|
LONGEST
|
|
scm_unpack (struct type *type, const gdb_byte *valaddr, enum type_code context)
|
|
{
|
|
if (is_scmvalue_type (type))
|
|
{
|
|
LONGEST svalue = extract_signed_integer (valaddr, TYPE_LENGTH (type));
|
|
if (context == TYPE_CODE_BOOL)
|
|
{
|
|
if (svalue == SCM_BOOL_F)
|
|
return 0;
|
|
else
|
|
return 1;
|
|
}
|
|
switch (7 & (int) svalue)
|
|
{
|
|
case 2:
|
|
case 6: /* fixnum */
|
|
return svalue >> 2;
|
|
case 4: /* other immediate value */
|
|
if (SCM_ICHRP (svalue)) /* character */
|
|
return SCM_ICHR (svalue);
|
|
else if (SCM_IFLAGP (svalue))
|
|
{
|
|
switch ((int) svalue)
|
|
{
|
|
#ifndef SICP
|
|
case SCM_EOL:
|
|
#endif
|
|
case SCM_BOOL_F:
|
|
return 0;
|
|
case SCM_BOOL_T:
|
|
return 1;
|
|
}
|
|
}
|
|
error (_("Value can't be converted to integer."));
|
|
default:
|
|
return svalue;
|
|
}
|
|
}
|
|
else
|
|
return unpack_long (type, valaddr);
|
|
}
|
|
|
|
/* True if we're correctly in Guile's eval.c (the evaluator and apply). */
|
|
|
|
static int
|
|
in_eval_c (void)
|
|
{
|
|
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
|
|
|
|
if (cursal.symtab && cursal.symtab->filename)
|
|
{
|
|
char *filename = cursal.symtab->filename;
|
|
int len = strlen (filename);
|
|
if (len >= 6 && strcmp (filename + len - 6, "eval.c") == 0)
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Lookup a value for the variable named STR.
|
|
First lookup in Scheme context (using the scm_lookup_cstr inferior
|
|
function), then try lookup_symbol for compiled variables. */
|
|
|
|
static struct value *
|
|
scm_lookup_name (char *str)
|
|
{
|
|
struct objfile *objf;
|
|
struct gdbarch *gdbarch;
|
|
struct value *args[3];
|
|
int len = strlen (str);
|
|
struct value *func;
|
|
struct value *val;
|
|
struct symbol *sym;
|
|
|
|
func = find_function_in_inferior ("scm_lookup_cstr", &objf);
|
|
gdbarch = get_objfile_arch (objf);
|
|
|
|
args[0] = value_allocate_space_in_inferior (len);
|
|
args[1] = value_from_longest (builtin_type (gdbarch)->builtin_int, len);
|
|
write_memory (value_as_long (args[0]), (gdb_byte *) str, len);
|
|
|
|
if (in_eval_c ()
|
|
&& (sym = lookup_symbol ("env",
|
|
expression_context_block,
|
|
VAR_DOMAIN, (int *) NULL)) != NULL)
|
|
args[2] = value_of_variable (sym, expression_context_block);
|
|
else
|
|
/* FIXME in this case, we should try lookup_symbol first */
|
|
args[2] = value_from_longest (builtin_type_scm, SCM_EOL);
|
|
|
|
val = call_function_by_hand (func, 3, args);
|
|
if (!value_logical_not (val))
|
|
return value_ind (val);
|
|
|
|
sym = lookup_symbol (str,
|
|
expression_context_block,
|
|
VAR_DOMAIN, (int *) NULL);
|
|
if (sym)
|
|
return value_of_variable (sym, NULL);
|
|
error (_("No symbol \"%s\" in current context."), str);
|
|
}
|
|
|
|
struct value *
|
|
scm_evaluate_string (char *str, int len)
|
|
{
|
|
struct value *func;
|
|
struct value *addr = value_allocate_space_in_inferior (len + 1);
|
|
LONGEST iaddr = value_as_long (addr);
|
|
write_memory (iaddr, (gdb_byte *) str, len);
|
|
/* FIXME - should find and pass env */
|
|
write_memory (iaddr + len, (gdb_byte *) "", 1);
|
|
func = find_function_in_inferior ("scm_evstr", NULL);
|
|
return call_function_by_hand (func, 1, &addr);
|
|
}
|
|
|
|
static struct value *
|
|
evaluate_exp (struct type *expect_type, struct expression *exp,
|
|
int *pos, enum noside noside)
|
|
{
|
|
enum exp_opcode op = exp->elts[*pos].opcode;
|
|
int len, pc;
|
|
char *str;
|
|
switch (op)
|
|
{
|
|
case OP_NAME:
|
|
pc = (*pos)++;
|
|
len = longest_to_int (exp->elts[pc + 1].longconst);
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (len + 1);
|
|
if (noside == EVAL_SKIP)
|
|
goto nosideret;
|
|
str = &exp->elts[pc + 2].string;
|
|
return scm_lookup_name (str);
|
|
case OP_STRING:
|
|
pc = (*pos)++;
|
|
len = longest_to_int (exp->elts[pc + 1].longconst);
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (len + 1);
|
|
if (noside == EVAL_SKIP)
|
|
goto nosideret;
|
|
str = &exp->elts[pc + 2].string;
|
|
return scm_evaluate_string (str, len);
|
|
default:;
|
|
}
|
|
return evaluate_subexp_standard (expect_type, exp, pos, noside);
|
|
nosideret:
|
|
return value_from_longest (builtin_type_int8, (LONGEST) 1);
|
|
}
|
|
|
|
const struct exp_descriptor exp_descriptor_scm =
|
|
{
|
|
print_subexp_standard,
|
|
operator_length_standard,
|
|
op_name_standard,
|
|
dump_subexp_body_standard,
|
|
evaluate_exp
|
|
};
|
|
|
|
const struct language_defn scm_language_defn =
|
|
{
|
|
"scheme", /* Language name */
|
|
language_scm,
|
|
range_check_off,
|
|
type_check_off,
|
|
case_sensitive_off,
|
|
array_row_major,
|
|
macro_expansion_no,
|
|
&exp_descriptor_scm,
|
|
scm_parse,
|
|
c_error,
|
|
null_post_parser,
|
|
scm_printchar, /* Print a character constant */
|
|
scm_printstr, /* Function to print string constant */
|
|
NULL, /* Function to print a single character */
|
|
c_print_type, /* Print a type using appropriate syntax */
|
|
default_print_typedef, /* Print a typedef using appropriate syntax */
|
|
scm_val_print, /* Print a value using appropriate syntax */
|
|
scm_value_print, /* Print a top-level value */
|
|
NULL, /* Language specific skip_trampoline */
|
|
NULL, /* name_of_this */
|
|
basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
|
|
basic_lookup_transparent_type,/* lookup_transparent_type */
|
|
NULL, /* Language specific symbol demangler */
|
|
NULL, /* Language specific class_name_from_physname */
|
|
NULL, /* expression operators for printing */
|
|
1, /* c-style arrays */
|
|
0, /* String lower bound */
|
|
default_word_break_characters,
|
|
default_make_symbol_completion_list,
|
|
c_language_arch_info,
|
|
default_print_array_index,
|
|
default_pass_by_reference,
|
|
default_get_string,
|
|
LANG_MAGIC
|
|
};
|
|
|
|
void
|
|
_initialize_scheme_language (void)
|
|
{
|
|
add_language (&scm_language_defn);
|
|
builtin_type_scm =
|
|
init_type (TYPE_CODE_INT,
|
|
gdbarch_long_bit (current_gdbarch) / TARGET_CHAR_BIT,
|
|
0, "SCM", (struct objfile *) NULL);
|
|
}
|