79a45b7d67
* varobj.c (value_get_print_value): Include valprint.h. (value_get_print_value): Use get_formatted_print_options. * value.h (struct value_print_options): Declare. (value_print, val_print, common_val_print, val_print_string): Update. * value.c: Include valprint.h. (show_values): Use get_user_print_options. (show_convenience): Likewise. * valprint.h (prettyprint_arrays, prettyprint_structs): Don't declare. (struct value_print_options): New type. (vtblprint, unionprint, addressprint, objectprint, print_max, inspect_it, repeat_count_threshold, output_format, stop_print_at_null): Don't declare. (user_print_options, get_user_print_options, get_raw_print_options, get_formatted_print_options): Declare. (print_array_indexes_p): Don't declare. (maybe_print_array_index, val_print_array_elements): Update. * valprint.c (print_max): Remove. (user_print_options): New global. (get_user_print_options, get_raw_print_options, get_formatted_print_options): New functions. (print_array_indexes, repeat_count_threshold, stop_print_at_null, prettyprint_structs, prettyprint_arrays, unionprint, addressprint): Remove. (val_print): Remove format, deref_ref, pretty arguments; add options. Update. (common_val_print): Likewise. (print_array_indexes_p): Remove. (maybe_print_array_index): Remove format, pretty arguments; add options. Update. (val_print_array_elements): Remove format, deref_ref, pretty arguments; add options. Update. (val_print_string): Add options argument. Update. (_initialize_valprint): Use user_print_options. (output_format): Remove. (set_output_radix_1): Use user_print_options. * typeprint.c: Include valprint.h. (objectprint): Don't declare. (whatis_exp): Use get_user_print_options. * tui/tui-regs.c: Include valprint.h. (tui_register_format): Use get_formatted_print_options. * tracepoint.c: Include valprint.h. (addressprint): Don't declare. (trace_mention): Use get_user_print_options. (tracepoints_info): Likewise. * stack.c (print_frame_args): Use get_raw_print_options. (print_frame_info): Use get_user_print_options. (print_frame): Likewise. * sh64-tdep.c: Include valprint.h (sh64_do_register): Use get_formatted_print_options. * scm-valprint.c (scm_inferior_print): Remove format, deref_ref, pretty arguments; add options. (scm_scmlist_print): Likewise. Update. (scm_scmval_print): Likewise. (scm_val_print): Likewise. (scm_value_print): Remove format, pretty arguments; add options. Update. * scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print): Update. * scm-lang.c (scm_printstr): Add options argument. * python/python-value.c: Include valprint.h. (valpy_str): Use get_user_print_options. * printcmd.c: Include valprint.h. (addressprint): Don't declare. (inspect_it): Remove. (print_formatted): Remove format option; add options. Update. (print_scalar_formatted): Likewise. (print_address_demangle): Use get_user_print_options. (do_examine): Use get_formatted_print_options. (print_command_1): Likewise. (output_command): Use get_formatted_print_options. (do_one_display): Likewise. (print_variable_value): Use get_user_print_options. * p-valprint.c (pascal_val_print): Remove format, deref_ref, pretty arguments; add options. Update. (pascal_value_print): Remove format, pretty arguments; add options. Update. (vtblprint, objectprint): Don't declare. (pascal_static_field_print): Remove. (pascal_object_print_value_fields): Remove format, pretty arguments; add options. Update. (pascal_object_print_static_field): Likewise. (_initialize_pascal_valprint): Use user_print_options. Update. * p-lang.h (pascal_val_print, pascal_value_print, pascal_printstr, pascal_object_print_value_fields): Update. (vtblprint, static_field_print): Don't declare. * p-lang.c (pascal_printstr): Add options argument. Update. * objc-lang.c (objc_printstr): Add options argument. Update. * mt-tdep.c: Include valprint.h. (mt_registers_info): Use get_raw_print_options. * mips-tdep.c: Include valprint.h. (mips_print_fp_register): Use get_formatted_print_options. (mips_print_register): Likewise. * mi/mi-main.c: Include valprint.h. (get_register): Use get_user_print_options. (mi_cmd_data_evaluate_expression): Likewise. (mi_cmd_data_read_memory): Use get_formatted_print_options. * mi/mi-cmd-stack.c: Include valprint.h. (list_args_or_locals): Use get_raw_print_options. * m2-valprint.c (print_function_pointer_address): Add addressprint argument. (m2_print_long_set): Remove format, pretty arguments. (m2_print_unbounded_array): Remove format, deref_ref, pretty arguments; add options. Update. (print_unpacked_pointer): Remove format argument; add options. Now static. Update. (print_variable_at_address): Remove format, deref_ref, pretty arguments; add options. Update. (m2_print_array_contents): Likewise. (m2_val_print): Likewise. * m2-lang.h (m2_val_print): Update. * m2-lang.c (m2_printstr): Add options argument. Update. * language.h (struct value_print_options): Declare. (struct language_defn) <la_printstr>: Add options argument. <la_val_print>: Remove format, deref_ref, pretty argument; add options. <la_value_print>: Remove format, pretty arguments; add options. <la_print_array_index>: Likewise. (LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING, LA_PRINT_ARRAY_INDEX): Update. (default_print_array_index): Update. * language.c (default_print_array_index): Remove format, pretty arguments; add options. Update. (unk_lang_printstr): Add options argument. (unk_lang_val_print): Remove format, deref_ref, pretty arguments; add options. (unk_lang_value_print): Remove format, pretty arguments; add options. * jv-valprint.c (java_value_print): Remove format, pretty arguments; add options. Update. (java_print_value_fields): Likewise. (java_val_print): Remove format, deref_ref, pretty arguments; add options. Update. * jv-lang.h (java_val_print, java_value_print): Declare. * infcmd.c: Include valprint.h. (print_return_value): Use get_raw_print_options. (default_print_registers_info): Use get_user_print_options, get_formatted_print_options. (registers_info): Use get_formatted_print_options. * gdbtypes.h (struct value_print_options): Declare. (print_scalar_formatted): Update. * f-valprint.c (f77_print_array_1): Remove format, deref_ref, pretty arguments; add options. Update. (f77_print_array): Likewise. (f_val_print): Likewise. * f-lang.h (f_val_print): Update. * f-lang.c (f_printstr): Add options argument. Update. (c_value_print): Update declaration. * expprint.c: Include valprint.h. (print_subexp_standard): Use get_raw_print_options, get_user_print_options. * eval.c: Include valprint.h. (objectprint): Don't declare. (evaluate_subexp_standard): Use get_user_print_options. * cp-valprint.c (vtblprint, objectprint, static_field_print): Remove. (cp_print_value_fields): Remove format, pretty arguments; add options. Update. (cp_print_value): Likewise. (cp_print_static_field): Likewise. (_initialize_cp_valprint): Use user_print_options. Update. * c-valprint.c (print_function_pointer_address): Add addressprint argument. (c_val_print): Remove format, deref_ref, pretty arguments; add options. Update. (c_value_print): Add options argument. Update. * c-lang.h (c_val_print, c_value_print, c_printstr): Update. (vtblprint, static_field_print): Don't declare. (cp_print_value_fields): Update. * c-lang.c (c_printstr): Add options argument. Update. * breakpoint.c: Include valprint.h. (addressprint): Don't declare. (watchpoint_value_print): Use get_user_print_options. (print_one_breakpoint_location): Likewise. (breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention, print_exception_catchpoint): Likewise. * auxv.c (fprint_target_auxv): Don't declare addressprint. Use get_user_print_options. * ada-valprint.c (struct ada_val_print_args): Remove format, deref_ref, and pretty; add options. (print_optional_low_bound): Add options argument. (val_print_packed_array_elements): Remove format and pretty arguments; add options. Update. (printstr): Add options argument. Update. (ada_printstr): Likewise. (ada_val_print): Remove format, deref_ref, pretty arguments; add options argument. Update. (ada_val_print_stub): Update. (ada_val_print_array): Remove format, deref_ref, pretty arguments; add options. Update. (ada_val_print_1): Likewise. (print_variant_part): Likewise. (ada_value_print): Remove format, pretty arguments; add options. Update. (print_record): Likewise. (print_field_values): Likewise. * ada-lang.h (ada_val_print, ada_value_print, ada_printstr): Update. * ada-lang.c (ada_print_array_index): Add options argument; remove format and pretty arguments. (print_one_exception): Use get_user_print_options. gdb/testsuite * gdb.base/exprs.exp (test_expr): Add enum formatting tests.
432 lines
10 KiB
C
432 lines
10 KiB
C
/* Scheme/Guile language support routines for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2005, 2007, 2008
|
|
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 "scm-lang.h"
|
|
#include "valprint.h"
|
|
#include "gdbcore.h"
|
|
#include "c-lang.h"
|
|
#include "infcall.h"
|
|
#include "objfiles.h"
|
|
|
|
static void scm_ipruk (char *, LONGEST, struct ui_file *);
|
|
static void scm_scmlist_print (LONGEST, struct ui_file *, int,
|
|
const struct value_print_options *);
|
|
static int scm_inferior_print (LONGEST, struct ui_file *, int,
|
|
const struct value_print_options *);
|
|
|
|
/* Prints the SCM value VALUE by invoking the inferior, if appropraite.
|
|
Returns >= 0 on success; return -1 if the inferior cannot/should not
|
|
print VALUE. */
|
|
|
|
static int
|
|
scm_inferior_print (LONGEST value, struct ui_file *stream,
|
|
int recurse, const struct value_print_options *options)
|
|
{
|
|
struct objfile *objf;
|
|
struct gdbarch *gdbarch;
|
|
struct value *func, *arg, *result;
|
|
struct symbol *gdb_output_sym, *gdb_output_len_sym;
|
|
char *output;
|
|
int ret, output_len;
|
|
|
|
func = find_function_in_inferior ("gdb_print", &objf);
|
|
gdbarch = get_objfile_arch (objf);
|
|
arg = value_from_longest (builtin_type (gdbarch)->builtin_core_addr, value);
|
|
|
|
result = call_function_by_hand (func, 1, &arg);
|
|
ret = (int) value_as_long (result);
|
|
if (ret == 0)
|
|
{
|
|
/* XXX: Should we cache these symbols? */
|
|
gdb_output_sym =
|
|
lookup_symbol_global ("gdb_output", NULL, NULL, VAR_DOMAIN);
|
|
gdb_output_len_sym =
|
|
lookup_symbol_global ("gdb_output_length", NULL, NULL, VAR_DOMAIN);
|
|
|
|
if ((gdb_output_sym == NULL) || (gdb_output_len_sym == NULL))
|
|
ret = -1;
|
|
else
|
|
{
|
|
struct value *remote_buffer;
|
|
|
|
read_memory (SYMBOL_VALUE_ADDRESS (gdb_output_len_sym),
|
|
(char *) &output_len, sizeof (output_len));
|
|
|
|
output = (char *) alloca (output_len);
|
|
remote_buffer = value_at (builtin_type (gdbarch)->builtin_core_addr,
|
|
SYMBOL_VALUE_ADDRESS (gdb_output_sym));
|
|
read_memory (value_as_address (remote_buffer),
|
|
output, output_len);
|
|
|
|
ui_file_write (stream, output, output_len);
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* {Names of immediate symbols}
|
|
* This table must agree with the declarations in scm.h: {Immediate Symbols}.*/
|
|
|
|
static char *scm_isymnames[] =
|
|
{
|
|
/* This table must agree with the declarations */
|
|
"and",
|
|
"begin",
|
|
"case",
|
|
"cond",
|
|
"do",
|
|
"if",
|
|
"lambda",
|
|
"let",
|
|
"let*",
|
|
"letrec",
|
|
"or",
|
|
"quote",
|
|
"set!",
|
|
"define",
|
|
#if 0
|
|
"literal-variable-ref",
|
|
"literal-variable-set!",
|
|
#endif
|
|
"apply",
|
|
"call-with-current-continuation",
|
|
|
|
/* user visible ISYMS */
|
|
/* other keywords */
|
|
/* Flags */
|
|
|
|
"#f",
|
|
"#t",
|
|
"#<undefined>",
|
|
"#<eof>",
|
|
"()",
|
|
"#<unspecified>"
|
|
};
|
|
|
|
static void
|
|
scm_scmlist_print (LONGEST svalue, struct ui_file *stream, int recurse,
|
|
const struct value_print_options *options)
|
|
{
|
|
unsigned int more = options->print_max;
|
|
if (recurse > 6)
|
|
{
|
|
fputs_filtered ("...", stream);
|
|
return;
|
|
}
|
|
scm_scmval_print (SCM_CAR (svalue), stream, recurse + 1, options);
|
|
svalue = SCM_CDR (svalue);
|
|
for (; SCM_NIMP (svalue); svalue = SCM_CDR (svalue))
|
|
{
|
|
if (SCM_NECONSP (svalue))
|
|
break;
|
|
fputs_filtered (" ", stream);
|
|
if (--more == 0)
|
|
{
|
|
fputs_filtered ("...", stream);
|
|
return;
|
|
}
|
|
scm_scmval_print (SCM_CAR (svalue), stream, recurse + 1, options);
|
|
}
|
|
if (SCM_NNULLP (svalue))
|
|
{
|
|
fputs_filtered (" . ", stream);
|
|
scm_scmval_print (svalue, stream, recurse + 1, options);
|
|
}
|
|
}
|
|
|
|
static void
|
|
scm_ipruk (char *hdr, LONGEST ptr, struct ui_file *stream)
|
|
{
|
|
fprintf_filtered (stream, "#<unknown-%s", hdr);
|
|
#define SCM_SIZE TYPE_LENGTH (builtin_type_scm)
|
|
if (SCM_CELLP (ptr))
|
|
fprintf_filtered (stream, " (0x%lx . 0x%lx) @",
|
|
(long) SCM_CAR (ptr), (long) SCM_CDR (ptr));
|
|
fprintf_filtered (stream, " 0x%s>", paddr_nz (ptr));
|
|
}
|
|
|
|
void
|
|
scm_scmval_print (LONGEST svalue, struct ui_file *stream,
|
|
int recurse, const struct value_print_options *options)
|
|
{
|
|
taloop:
|
|
switch (7 & (int) svalue)
|
|
{
|
|
case 2:
|
|
case 6:
|
|
print_longest (stream,
|
|
options->format ? options->format : 'd',
|
|
1, svalue >> 2);
|
|
break;
|
|
case 4:
|
|
if (SCM_ICHRP (svalue))
|
|
{
|
|
svalue = SCM_ICHR (svalue);
|
|
scm_printchar (svalue, stream);
|
|
break;
|
|
}
|
|
else if (SCM_IFLAGP (svalue)
|
|
&& (SCM_ISYMNUM (svalue)
|
|
< (sizeof scm_isymnames / sizeof (char *))))
|
|
{
|
|
fputs_filtered (SCM_ISYMCHARS (svalue), stream);
|
|
break;
|
|
}
|
|
else if (SCM_ILOCP (svalue))
|
|
{
|
|
fprintf_filtered (stream, "#@%ld%c%ld",
|
|
(long) SCM_IFRAME (svalue),
|
|
SCM_ICDRP (svalue) ? '-' : '+',
|
|
(long) SCM_IDIST (svalue));
|
|
break;
|
|
}
|
|
else
|
|
goto idef;
|
|
break;
|
|
case 1:
|
|
/* gloc */
|
|
svalue = SCM_CAR (svalue - 1);
|
|
goto taloop;
|
|
default:
|
|
idef:
|
|
scm_ipruk ("immediate", svalue, stream);
|
|
break;
|
|
case 0:
|
|
|
|
switch (SCM_TYP7 (svalue))
|
|
{
|
|
case scm_tcs_cons_gloc:
|
|
if (SCM_CDR (SCM_CAR (svalue) - 1L) == 0)
|
|
{
|
|
#if 0
|
|
SCM name;
|
|
#endif
|
|
fputs_filtered ("#<latte ", stream);
|
|
#if 1
|
|
fputs_filtered ("???", stream);
|
|
#else
|
|
name = ((SCM n *) (STRUCT_TYPE (exp)))[struct_i_name];
|
|
scm_lfwrite (CHARS (name),
|
|
(sizet) sizeof (char),
|
|
(sizet) LENGTH (name),
|
|
port);
|
|
#endif
|
|
fprintf_filtered (stream, " #X%s>", paddr_nz (svalue));
|
|
break;
|
|
}
|
|
case scm_tcs_cons_imcar:
|
|
case scm_tcs_cons_nimcar:
|
|
fputs_filtered ("(", stream);
|
|
scm_scmlist_print (svalue, stream, recurse + 1, options);
|
|
fputs_filtered (")", stream);
|
|
break;
|
|
case scm_tcs_closures:
|
|
fputs_filtered ("#<CLOSURE ", stream);
|
|
scm_scmlist_print (SCM_CODE (svalue), stream, recurse + 1, options);
|
|
fputs_filtered (">", stream);
|
|
break;
|
|
case scm_tc7_string:
|
|
{
|
|
int len = SCM_LENGTH (svalue);
|
|
CORE_ADDR addr = (CORE_ADDR) SCM_CDR (svalue);
|
|
int i;
|
|
int done = 0;
|
|
int buf_size;
|
|
gdb_byte buffer[64];
|
|
int truncate = options->print_max && len > (int) options->print_max;
|
|
if (truncate)
|
|
len = options->print_max;
|
|
fputs_filtered ("\"", stream);
|
|
for (; done < len; done += buf_size)
|
|
{
|
|
buf_size = min (len - done, 64);
|
|
read_memory (addr + done, buffer, buf_size);
|
|
|
|
for (i = 0; i < buf_size; ++i)
|
|
switch (buffer[i])
|
|
{
|
|
case '\"':
|
|
case '\\':
|
|
fputs_filtered ("\\", stream);
|
|
default:
|
|
fprintf_filtered (stream, "%c", buffer[i]);
|
|
}
|
|
}
|
|
fputs_filtered (truncate ? "...\"" : "\"", stream);
|
|
break;
|
|
}
|
|
break;
|
|
case scm_tcs_symbols:
|
|
{
|
|
int len = SCM_LENGTH (svalue);
|
|
|
|
char *str = alloca (len);
|
|
read_memory (SCM_CDR (svalue), (gdb_byte *) str, len + 1);
|
|
/* Should handle weird characters FIXME */
|
|
str[len] = '\0';
|
|
fputs_filtered (str, stream);
|
|
break;
|
|
}
|
|
case scm_tc7_vector:
|
|
{
|
|
int len = SCM_LENGTH (svalue);
|
|
int i;
|
|
LONGEST elements = SCM_CDR (svalue);
|
|
fputs_filtered ("#(", stream);
|
|
for (i = 0; i < len; ++i)
|
|
{
|
|
if (i > 0)
|
|
fputs_filtered (" ", stream);
|
|
scm_scmval_print (scm_get_field (elements, i), stream,
|
|
recurse + 1, options);
|
|
}
|
|
fputs_filtered (")", stream);
|
|
}
|
|
break;
|
|
#if 0
|
|
case tc7_lvector:
|
|
{
|
|
SCM result;
|
|
SCM hook;
|
|
hook = scm_get_lvector_hook (exp, LV_PRINT_FN);
|
|
if (hook == BOOL_F)
|
|
{
|
|
scm_puts ("#<locked-vector ", port);
|
|
scm_intprint (CDR (exp), 16, port);
|
|
scm_puts (">", port);
|
|
}
|
|
else
|
|
{
|
|
result
|
|
= scm_apply (hook,
|
|
scm_listify (exp, port,
|
|
(writing ? BOOL_T : BOOL_F),
|
|
SCM_UNDEFINED),
|
|
EOL);
|
|
if (result == BOOL_F)
|
|
goto punk;
|
|
}
|
|
break;
|
|
}
|
|
break;
|
|
case tc7_bvect:
|
|
case tc7_ivect:
|
|
case tc7_uvect:
|
|
case tc7_fvect:
|
|
case tc7_dvect:
|
|
case tc7_cvect:
|
|
scm_raprin1 (exp, port, writing);
|
|
break;
|
|
#endif
|
|
case scm_tcs_subrs:
|
|
{
|
|
int index = SCM_CAR (svalue) >> 8;
|
|
#if 1
|
|
char str[20];
|
|
sprintf (str, "#%d", index);
|
|
#else
|
|
char *str = index ? SCM_CHARS (scm_heap_org + index) : "";
|
|
#define SCM_CHARS(x) ((char *)(SCM_CDR(x)))
|
|
char *str = CHARS (SNAME (exp));
|
|
#endif
|
|
fprintf_filtered (stream, "#<primitive-procedure %s>",
|
|
str);
|
|
}
|
|
break;
|
|
#if 0
|
|
#ifdef CCLO
|
|
case tc7_cclo:
|
|
scm_puts ("#<compiled-closure ", port);
|
|
scm_iprin1 (CCLO_SUBR (exp), port, writing);
|
|
scm_putc ('>', port);
|
|
break;
|
|
#endif
|
|
case tc7_contin:
|
|
fprintf_filtered (stream, "#<continuation %d @ #X%lx >",
|
|
LENGTH (svalue),
|
|
(long) CHARS (svalue));
|
|
break;
|
|
case tc7_port:
|
|
i = PTOBNUM (exp);
|
|
if (i < scm_numptob
|
|
&& scm_ptobs[i].print
|
|
&& (scm_ptobs[i].print) (exp, port, writing))
|
|
break;
|
|
goto punk;
|
|
case tc7_smob:
|
|
i = SMOBNUM (exp);
|
|
if (i < scm_numsmob && scm_smobs[i].print
|
|
&& (scm_smobs[i].print) (exp, port, writing))
|
|
break;
|
|
goto punk;
|
|
#endif
|
|
default:
|
|
#if 0
|
|
punk:
|
|
#endif
|
|
scm_ipruk ("type", svalue, stream);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
int
|
|
scm_val_print (struct type *type, const gdb_byte *valaddr,
|
|
int embedded_offset, CORE_ADDR address,
|
|
struct ui_file *stream, int recurse,
|
|
const struct value_print_options *options)
|
|
{
|
|
if (is_scmvalue_type (type))
|
|
{
|
|
LONGEST svalue = extract_signed_integer (valaddr, TYPE_LENGTH (type));
|
|
|
|
if (scm_inferior_print (svalue, stream, recurse, options) >= 0)
|
|
{
|
|
}
|
|
else
|
|
{
|
|
scm_scmval_print (svalue, stream, recurse, options);
|
|
}
|
|
|
|
gdb_flush (stream);
|
|
return (0);
|
|
}
|
|
else
|
|
{
|
|
return c_val_print (type, valaddr, 0, address, stream, recurse, options);
|
|
}
|
|
}
|
|
|
|
int
|
|
scm_value_print (struct value *val, struct ui_file *stream,
|
|
const struct value_print_options *options)
|
|
{
|
|
struct value_print_options opts = *options;
|
|
opts.deref_ref = 1;
|
|
return (common_val_print (val, stream, 0, &opts, current_language));
|
|
}
|