2004-06-02 09:55:36 +00:00
|
|
|
|
/* Support for printing Ada values for GDB, the GNU debugger.
|
2005-01-28 19:19:10 +00:00
|
|
|
|
|
2004-06-02 09:55:36 +00:00
|
|
|
|
Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1997, 2001,
|
2005-01-28 19:19:10 +00:00
|
|
|
|
2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
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 2 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, write to the Free Software
|
|
|
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include "defs.h"
|
2004-06-02 09:55:36 +00:00
|
|
|
|
#include "gdb_string.h"
|
2002-06-04 15:28:49 +00:00
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
|
#include "expression.h"
|
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "demangle.h"
|
|
|
|
|
#include "valprint.h"
|
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "annotate.h"
|
|
|
|
|
#include "ada-lang.h"
|
|
|
|
|
#include "c-lang.h"
|
2003-04-21 Andrew Cagney <cagney@redhat.com>
* infcall.c: New file.
* infcall.h: New file.
* valarith.c: Include "infcall.h".
* scm-lang.c, objc-lang.cm, hppa-tdep.c, gcore.c: Ditto.
* eval.c, ada-valprint.c, ada-lang.c: Ditto.
* Makefile.in (valarith.o, scm-lang.o): Update dependencies.
(objc-lang.o, hppa-tdep.o, gcore.o): Update dependencies.
(eval.o, ada-valprint.o, ada-lang.o): Update dependencies.
(SFILES): Add "infcall.c"
(COMMON_OBS): Add "infcall.o".
(infcall.o): Specify dependencies.
* value.h (call_function_by_hand): Delete declaration.
* inferior.h (run_stack_dummy): Delete declaration.
* infcmd.c (breakpoint_auto_delete_contents): Move to "infcall.c".
(run_stack_dummy): Move to "infcall.c", merged into
call_function_by_hand.
* valops.c (call_function_by_hand): Moved to "infcall.c".
(find_function_addr, value_arg_coerce): Ditto.
(unwindonsignal_p, coerce_float_to_double): Ditto.
(_initialize_valops): Move "set/show coerce-float-to-double", and
"set/show unwindonsignal" commands to "infcall.c".
* v850-tdep.c, target.h: Update comments.
* sparc-tdep.c (sparc_fix_call_dummy): Update comments.
* sh-tdep.c (sh_init_extra_frame_info): Update comments.
(sh64_init_extra_frame_info): Update comments.
* mn10300-tdep.c: Update comments.
* mcore-tdep.c (mcore_init_extra_frame_info): Update comments.
* config/sparc/tm-sparc.h: Update comments.
* breakpoint.h: Update comments.
* avr-tdep.c (avr_init_extra_frame_info): Update comments.
* arm-tdep.c: Update comment.
2003-04-21 16:48:41 +00:00
|
|
|
|
#include "infcall.h"
|
2005-01-12 Andrew Cagney <cagney@gnu.org>
* exceptions.h (enum return_reason, RETURN_MASK)
(RETURN_MASK_QUIT, RETURN_MASK_ERROR, RETURN_MASK_ALL)
(return_mask, throw_exception, catch_exceptions_ftype)
(catch_exceptions_with_msg, catch_errors_ftype, catch_errors)
(catch_command_errors_ftype, catch_command_errors): Move to
exceptions.h.
* exceptions.c, exceptions.h: New files.
* top.c: Do not include <setjmp.h>.
(SIGJMP_BUF, SIGSETJMP, SIGLONGJMP, catch_return)
(throw_exception, catcher, catch_exceptions)
(catch_exceptions_with_msg, struct catch_errors_args)
(do_catch_errors, catch_errors, struct captured_command_args)
(do_captured_command, catch_command_errors): Move to exceptions.c.
* wrapper.c, wince.c, win32-nat.c, utils.c: Include "exceptions.h".
* tui/tui-interp.c, top.c, thread.c, symmisc.c: Ditto.
* symfile-mem.c, stack.c, solib.c, rs6000-nat.c: Ditto.
* remote-sds.c, remote-mips.c, remote-fileio.c: Ditto.
* remote-e7000.c, objc-lang.c, ocd.c: Ditto.
* remote.c, nto-procfs.c, monitor.c, mi/mi-main.c: Ditto.
* main.c, m32r-rom.c, infrun.c, inf-loop.c: Ditto.
* hppa-hpux-tdep.c, frame.c, event-top.c, event-loop.c: Ditto.
* corelow.c, corefile.c, cli/cli-interp.c, breakpoint.c: Ditto.
* ada-valprint.c, ada-lang.c: Ditto.
* Makefile.in (HFILES_NO_SRCDIR, COMMON_OBS): Add exceptions.h and
exceptions.o. Update all dependencies.
2005-01-12 18:31:35 +00:00
|
|
|
|
#include "exceptions.h"
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2004-06-02 09:55:36 +00:00
|
|
|
|
/* Encapsulates arguments to ada_val_print. */
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct ada_val_print_args
|
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
const gdb_byte *valaddr0;
|
2002-06-04 15:28:49 +00:00
|
|
|
|
int embedded_offset;
|
|
|
|
|
CORE_ADDR address;
|
|
|
|
|
struct ui_file *stream;
|
|
|
|
|
int format;
|
|
|
|
|
int deref_ref;
|
|
|
|
|
int recurse;
|
|
|
|
|
enum val_prettyprint pretty;
|
|
|
|
|
};
|
|
|
|
|
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
static void print_record (struct type *, const gdb_byte *, struct ui_file *,
|
2005-01-28 Andrew Cagney <cagney@gnu.org>
* language.h (struct language_defn): Make la_val_print's buffer
parameter a const bfd_byte.
* cp-valprint.c (cp_print_value_fields, cp_print_value): Update.
* ada-lang.c (ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* valprint.c (val_print_array_elements): Update.
* valprint.h (val_print_array_elements): Update.
* ada-lang.h (ada_val_print, ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* ada-valprint.c (ada_val_print, struct ada_val_print_args)
(ada_val_print_1, ada_print_floating, printable_val_type)
(print_record, val_print_packed_array_elements)
(print_field_values, print_variant_part): Update.
* c-lang.h (c_val_print, cp_print_value_fields): Update.
* c-valprint.c (c_val_print): Update.
* f-lang.h (f_val_print): Update.
* f-valprint.c (f_val_print, f77_print_array_1)
(f77_print_array): Update.
* jv-lang.h (java_val_print): Update.
* jv-valprint.c (java_print_value_fields, java_val_print): Update.
* language.c (unk_lang_val_print): Update.
* m2-lang.h (m2_val_print): Update.
* m2-valprint.c (m2_val_print): Update.
* p-lang.h (pascal_val_print): Update.
(pascal_object_print_value_fields): Update.
* p-valprint.c (pascal_val_print)
(pascal_object_print_value_fields, pascal_object_print_value)
(pascal_object_print_value): Update.
* scm-lang.h (scm_val_print): Update.
* scm-valprint.c (scm_val_print): Update.
* value.h (val_print): Update.
2005-01-29 01:59:31 +00:00
|
|
|
|
int, int, enum val_prettyprint);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
static int print_field_values (struct type *, const gdb_byte *,
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct ui_file *, int, int,
|
|
|
|
|
enum val_prettyprint, int, struct type *,
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
const gdb_byte *);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2002-08-18 18:11:12 +00:00
|
|
|
|
static void adjust_type_signedness (struct type *);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2004-07-01 10:11:11 +00:00
|
|
|
|
static int ada_val_print_stub (void *args0);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
static int ada_val_print_1 (struct type *, const gdb_byte *, int, CORE_ADDR,
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct ui_file *, int, int, int,
|
|
|
|
|
enum val_prettyprint);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
|
2004-06-02 09:55:36 +00:00
|
|
|
|
/* Make TYPE unsigned if its range of values includes no negatives. */
|
2002-08-18 18:11:12 +00:00
|
|
|
|
static void
|
2002-09-08 17:44:22 +00:00
|
|
|
|
adjust_type_signedness (struct type *type)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
if (type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE
|
2002-06-04 15:28:49 +00:00
|
|
|
|
&& TYPE_LOW_BOUND (type) >= 0)
|
|
|
|
|
TYPE_FLAGS (type) |= TYPE_FLAG_UNSIGNED;
|
2002-08-18 18:11:12 +00:00
|
|
|
|
}
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2004-07-01 10:30:57 +00:00
|
|
|
|
/* Assuming TYPE is a simple, non-empty array type, prints its lower bound
|
|
|
|
|
on STREAM, if non-standard (i.e., other than 1 for numbers, other
|
|
|
|
|
than lower bound of index type for enumerated type). Returns 1
|
|
|
|
|
if something printed, otherwise 0. */
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2002-08-18 18:11:12 +00:00
|
|
|
|
static int
|
2002-07-25 01:14:26 +00:00
|
|
|
|
print_optional_low_bound (struct ui_file *stream, struct type *type)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
struct type *index_type;
|
|
|
|
|
long low_bound;
|
|
|
|
|
|
|
|
|
|
index_type = TYPE_INDEX_TYPE (type);
|
|
|
|
|
low_bound = 0;
|
|
|
|
|
|
|
|
|
|
if (index_type == NULL)
|
|
|
|
|
return 0;
|
2002-08-18 18:11:12 +00:00
|
|
|
|
if (TYPE_CODE (index_type) == TYPE_CODE_RANGE)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
low_bound = TYPE_LOW_BOUND (index_type);
|
2004-07-01 10:30:57 +00:00
|
|
|
|
if (low_bound > TYPE_HIGH_BOUND (index_type))
|
|
|
|
|
return 0;
|
2002-06-04 15:28:49 +00:00
|
|
|
|
index_type = TYPE_TARGET_TYPE (index_type);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
2002-08-18 18:11:12 +00:00
|
|
|
|
|
|
|
|
|
switch (TYPE_CODE (index_type))
|
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_ENUM:
|
|
|
|
|
if (low_bound == TYPE_FIELD_BITPOS (index_type, 0))
|
|
|
|
|
return 0;
|
|
|
|
|
break;
|
|
|
|
|
case TYPE_CODE_UNDEF:
|
|
|
|
|
index_type = builtin_type_long;
|
|
|
|
|
/* FALL THROUGH */
|
|
|
|
|
default:
|
|
|
|
|
if (low_bound == 1)
|
|
|
|
|
return 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
ada_print_scalar (index_type, (LONGEST) low_bound, stream);
|
|
|
|
|
fprintf_filtered (stream, " => ");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Version of val_print_array_elements for GNAT-style packed arrays.
|
|
|
|
|
Prints elements of packed array of type TYPE at bit offset
|
|
|
|
|
BITOFFSET from VALADDR on STREAM. Formats according to FORMAT and
|
2004-06-02 09:55:36 +00:00
|
|
|
|
separates with commas. RECURSE is the recursion (nesting) level.
|
|
|
|
|
If PRETTY, uses "prettier" format. TYPE must have been decoded (as
|
2002-08-18 18:11:12 +00:00
|
|
|
|
by ada_coerce_to_simple_array). */
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
static void
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
|
2002-07-25 01:14:26 +00:00
|
|
|
|
int bitoffset, struct ui_file *stream,
|
|
|
|
|
int format, int recurse,
|
|
|
|
|
enum val_prettyprint pretty)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned int i;
|
|
|
|
|
unsigned int things_printed = 0;
|
|
|
|
|
unsigned len;
|
|
|
|
|
struct type *elttype;
|
|
|
|
|
unsigned eltlen;
|
|
|
|
|
unsigned long bitsize = TYPE_FIELD_BITSIZE (type, 0);
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct value *mark = value_mark ();
|
|
|
|
|
|
2002-06-04 15:28:49 +00:00
|
|
|
|
elttype = TYPE_TARGET_TYPE (type);
|
|
|
|
|
eltlen = TYPE_LENGTH (check_typedef (elttype));
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
LONGEST low, high;
|
|
|
|
|
if (get_discrete_bounds (TYPE_FIELD_TYPE (type, 0), &low, &high) < 0)
|
|
|
|
|
len = 1;
|
|
|
|
|
else
|
|
|
|
|
len = high - low + 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
annotate_array_section_begin (i, elttype);
|
|
|
|
|
|
|
|
|
|
while (i < len && things_printed < print_max)
|
|
|
|
|
{
|
|
|
|
|
struct value *v0, *v1;
|
|
|
|
|
int i0;
|
|
|
|
|
|
|
|
|
|
if (i != 0)
|
|
|
|
|
{
|
|
|
|
|
if (prettyprint_arrays)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, ",\n");
|
|
|
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, ", ");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
wrap_here (n_spaces (2 + 2 * recurse));
|
|
|
|
|
|
|
|
|
|
i0 = i;
|
2002-08-18 18:11:12 +00:00
|
|
|
|
v0 = ada_value_primitive_packed_val (NULL, valaddr,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
(i0 * bitsize) / HOST_CHAR_BIT,
|
|
|
|
|
(i0 * bitsize) % HOST_CHAR_BIT,
|
|
|
|
|
bitsize, elttype);
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
i += 1;
|
|
|
|
|
if (i >= len)
|
|
|
|
|
break;
|
2002-08-18 18:11:12 +00:00
|
|
|
|
v1 = ada_value_primitive_packed_val (NULL, valaddr,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
(i * bitsize) / HOST_CHAR_BIT,
|
|
|
|
|
(i * bitsize) % HOST_CHAR_BIT,
|
|
|
|
|
bitsize, elttype);
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 00:09:56 +00:00
|
|
|
|
if (memcmp (value_contents (v0), value_contents (v1), eltlen) != 0)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i - i0 > repeat_count_threshold)
|
|
|
|
|
{
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 00:09:56 +00:00
|
|
|
|
val_print (elttype, value_contents (v0), 0, 0, stream, format,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
0, recurse + 1, pretty);
|
|
|
|
|
annotate_elt_rep (i - i0);
|
2005-01-05 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr>
Committed by Andrew Cagney.
* ada-valprint.c, aix-thread.c, alpha-nat.c: I18n markup.
* alphabsd-nat.c, alphanbsd-tdep.c, amd64-linux-nat.c: I18n markup.
* amd64-tdep.c, amd64bsd-nat.c, amd64fbsd-nat.c: I18n markup.
* arch-utils.c, arm-linux-nat.c, arm-tdep.c: I18n markup.
* armnbsd-nat.c, armnbsd-tdep.c, auxv.c, avr-tdep.c: I18n markup.
* aix-thread.c (_initialize_aix_thread): Get rid of the
deprecated_add_show_from_set call.
* alpha-tdep.c (_initialize_alpha_tdep): Ditto.
* arm-tdep.c (_initialize_arm_tdep): Ditto.
* command.h (add_setshow_enum_cmd): Add arguments for returning
new list elements.
* cli/cli-decode.c (add_setshow_enum_cmd): Ditto.
* mips-tdep.c (_initialize_mips_tdep): Modify calls to
add_setshow_enum_cmd.
2005-01-05 15:43:50 +00:00
|
|
|
|
fprintf_filtered (stream, _(" <repeats %u times>"), i - i0);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
annotate_elt_rep_end ();
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int j;
|
|
|
|
|
for (j = i0; j < i; j += 1)
|
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
if (j > i0)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
if (prettyprint_arrays)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, ",\n");
|
|
|
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, ", ");
|
|
|
|
|
}
|
|
|
|
|
wrap_here (n_spaces (2 + 2 * recurse));
|
|
|
|
|
}
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 00:09:56 +00:00
|
|
|
|
val_print (elttype, value_contents (v0), 0, 0, stream, format,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
0, recurse + 1, pretty);
|
|
|
|
|
annotate_elt ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
things_printed += i - i0;
|
|
|
|
|
}
|
|
|
|
|
annotate_array_section_end ();
|
|
|
|
|
if (i < len)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "...");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
value_free_to_mark (mark);
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-18 18:11:12 +00:00
|
|
|
|
static struct type *
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
printable_val_type (struct type *type, const gdb_byte *valaddr)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
return ada_to_fixed_type (ada_aligned_type (type), valaddr, 0, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print the character C on STREAM as part of the contents of a literal
|
|
|
|
|
string whose delimiter is QUOTER. TYPE_LEN is the length in bytes
|
2004-06-02 09:55:36 +00:00
|
|
|
|
(1 or 2) of the character. */
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
void
|
2002-07-25 01:14:26 +00:00
|
|
|
|
ada_emit_char (int c, struct ui_file *stream, int quoter, int type_len)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
if (type_len != 2)
|
|
|
|
|
type_len = 1;
|
|
|
|
|
|
|
|
|
|
c &= (1 << (type_len * TARGET_CHAR_BIT)) - 1;
|
|
|
|
|
|
|
|
|
|
if (isascii (c) && isprint (c))
|
|
|
|
|
{
|
|
|
|
|
if (c == quoter && c == '"')
|
|
|
|
|
fprintf_filtered (stream, "[\"%c\"]", quoter);
|
|
|
|
|
else
|
|
|
|
|
fprintf_filtered (stream, "%c", c);
|
|
|
|
|
}
|
|
|
|
|
else
|
2002-08-18 18:11:12 +00:00
|
|
|
|
fprintf_filtered (stream, "[\"%0*x\"]", type_len * 2, c);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Character #I of STRING, given that TYPE_LEN is the size in bytes (1
|
2004-06-02 09:55:36 +00:00
|
|
|
|
or 2) of a character. */
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
static int
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
char_at (const gdb_byte *string, int i, int type_len)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
if (type_len == 1)
|
|
|
|
|
return string[i];
|
2002-08-18 18:11:12 +00:00
|
|
|
|
else
|
|
|
|
|
return (int) extract_unsigned_integer (string + 2 * i, 2);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 09:55:36 +00:00
|
|
|
|
/* Wrapper around memcpy to make it legal argument to ui_file_put */
|
|
|
|
|
static void
|
|
|
|
|
ui_memcpy (void *dest, const char *buffer, long len)
|
|
|
|
|
{
|
|
|
|
|
memcpy (dest, buffer, (size_t) len);
|
|
|
|
|
((char *) dest)[len] = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print a floating-point value of type TYPE, pointed to in GDB by
|
|
|
|
|
VALADDR, on STREAM. Use Ada formatting conventions: there must be
|
|
|
|
|
a decimal point, and at least one digit before and after the
|
|
|
|
|
point. We use GNAT format for NaNs and infinities. */
|
|
|
|
|
static void
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
ada_print_floating (const gdb_byte *valaddr, struct type *type,
|
2005-01-28 Andrew Cagney <cagney@gnu.org>
* language.h (struct language_defn): Make la_val_print's buffer
parameter a const bfd_byte.
* cp-valprint.c (cp_print_value_fields, cp_print_value): Update.
* ada-lang.c (ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* valprint.c (val_print_array_elements): Update.
* valprint.h (val_print_array_elements): Update.
* ada-lang.h (ada_val_print, ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* ada-valprint.c (ada_val_print, struct ada_val_print_args)
(ada_val_print_1, ada_print_floating, printable_val_type)
(print_record, val_print_packed_array_elements)
(print_field_values, print_variant_part): Update.
* c-lang.h (c_val_print, cp_print_value_fields): Update.
* c-valprint.c (c_val_print): Update.
* f-lang.h (f_val_print): Update.
* f-valprint.c (f_val_print, f77_print_array_1)
(f77_print_array): Update.
* jv-lang.h (java_val_print): Update.
* jv-valprint.c (java_print_value_fields, java_val_print): Update.
* language.c (unk_lang_val_print): Update.
* m2-lang.h (m2_val_print): Update.
* m2-valprint.c (m2_val_print): Update.
* p-lang.h (pascal_val_print): Update.
(pascal_object_print_value_fields): Update.
* p-valprint.c (pascal_val_print)
(pascal_object_print_value_fields, pascal_object_print_value)
(pascal_object_print_value): Update.
* scm-lang.h (scm_val_print): Update.
* scm-valprint.c (scm_val_print): Update.
* value.h (val_print): Update.
2005-01-29 01:59:31 +00:00
|
|
|
|
struct ui_file *stream)
|
2004-06-02 09:55:36 +00:00
|
|
|
|
{
|
|
|
|
|
char buffer[64];
|
|
|
|
|
char *s, *result;
|
|
|
|
|
int len;
|
|
|
|
|
struct ui_file *tmp_stream = mem_fileopen ();
|
|
|
|
|
struct cleanup *cleanups = make_cleanup_ui_file_delete (tmp_stream);
|
|
|
|
|
|
|
|
|
|
print_floating (valaddr, type, tmp_stream);
|
|
|
|
|
ui_file_put (tmp_stream, ui_memcpy, buffer);
|
|
|
|
|
do_cleanups (cleanups);
|
|
|
|
|
|
|
|
|
|
result = buffer;
|
|
|
|
|
len = strlen (result);
|
|
|
|
|
|
|
|
|
|
/* Modify for Ada rules. */
|
2004-07-09 19:29:56 +00:00
|
|
|
|
|
|
|
|
|
s = strstr (result, "inf");
|
|
|
|
|
if (s == NULL)
|
|
|
|
|
s = strstr (result, "Inf");
|
|
|
|
|
if (s == NULL)
|
|
|
|
|
s = strstr (result, "INF");
|
|
|
|
|
if (s != NULL)
|
2004-06-02 09:55:36 +00:00
|
|
|
|
strcpy (s, "Inf");
|
2004-07-09 19:29:56 +00:00
|
|
|
|
|
|
|
|
|
if (s == NULL)
|
2004-06-02 09:55:36 +00:00
|
|
|
|
{
|
2004-07-09 19:29:56 +00:00
|
|
|
|
s = strstr (result, "nan");
|
|
|
|
|
if (s == NULL)
|
|
|
|
|
s = strstr (result, "NaN");
|
|
|
|
|
if (s == NULL)
|
|
|
|
|
s = strstr (result, "Nan");
|
|
|
|
|
if (s != NULL)
|
|
|
|
|
{
|
|
|
|
|
s[0] = s[2] = 'N';
|
|
|
|
|
if (result[0] == '-')
|
|
|
|
|
result += 1;
|
|
|
|
|
}
|
2004-06-02 09:55:36 +00:00
|
|
|
|
}
|
2004-07-09 19:29:56 +00:00
|
|
|
|
|
|
|
|
|
if (s == NULL && strchr (result, '.') == NULL)
|
2004-06-02 09:55:36 +00:00
|
|
|
|
{
|
2004-07-09 19:29:56 +00:00
|
|
|
|
s = strchr (result, 'e');
|
|
|
|
|
if (s == NULL)
|
2004-06-02 09:55:36 +00:00
|
|
|
|
fprintf_filtered (stream, "%s.0", result);
|
|
|
|
|
else
|
|
|
|
|
fprintf_filtered (stream, "%.*s.0%s", (int) (s-result), result, s);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
fprintf_filtered (stream, "%s", result);
|
|
|
|
|
}
|
|
|
|
|
|
2002-06-04 15:28:49 +00:00
|
|
|
|
void
|
2002-07-25 01:14:26 +00:00
|
|
|
|
ada_printchar (int c, struct ui_file *stream)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
fputs_filtered ("'", stream);
|
|
|
|
|
ada_emit_char (c, stream, '\'', 1);
|
|
|
|
|
fputs_filtered ("'", stream);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* [From print_type_scalar in typeprint.c]. Print VAL on STREAM in a
|
2004-06-02 09:55:36 +00:00
|
|
|
|
form appropriate for TYPE. */
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
void
|
2002-07-25 01:14:26 +00:00
|
|
|
|
ada_print_scalar (struct type *type, LONGEST val, struct ui_file *stream)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned int i;
|
|
|
|
|
unsigned len;
|
|
|
|
|
|
2004-10-08 09:40:12 +00:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
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 (ada_enum_name (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, stream);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_BOOL:
|
|
|
|
|
fprintf_filtered (stream, val ? "true" : "false");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_RANGE:
|
|
|
|
|
ada_print_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_MEMBER:
|
|
|
|
|
case TYPE_CODE_METHOD:
|
|
|
|
|
case TYPE_CODE_REF:
|
2005-01-05 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr>
Committed by Andrew Cagney.
* ada-valprint.c, aix-thread.c, alpha-nat.c: I18n markup.
* alphabsd-nat.c, alphanbsd-tdep.c, amd64-linux-nat.c: I18n markup.
* amd64-tdep.c, amd64bsd-nat.c, amd64fbsd-nat.c: I18n markup.
* arch-utils.c, arm-linux-nat.c, arm-tdep.c: I18n markup.
* armnbsd-nat.c, armnbsd-tdep.c, auxv.c, avr-tdep.c: I18n markup.
* aix-thread.c (_initialize_aix_thread): Get rid of the
deprecated_add_show_from_set call.
* alpha-tdep.c (_initialize_alpha_tdep): Ditto.
* arm-tdep.c (_initialize_arm_tdep): Ditto.
* command.h (add_setshow_enum_cmd): Add arguments for returning
new list elements.
* cli/cli-decode.c (add_setshow_enum_cmd): Ditto.
* mips-tdep.c (_initialize_mips_tdep): Modify calls to
add_setshow_enum_cmd.
2005-01-05 15:43:50 +00:00
|
|
|
|
warning (_("internal error: unhandled type in ada_print_scalar"));
|
2002-06-04 15:28:49 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2005-01-05 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr>
Committed by Andrew Cagney.
* ada-valprint.c, aix-thread.c, alpha-nat.c: I18n markup.
* alphabsd-nat.c, alphanbsd-tdep.c, amd64-linux-nat.c: I18n markup.
* amd64-tdep.c, amd64bsd-nat.c, amd64fbsd-nat.c: I18n markup.
* arch-utils.c, arm-linux-nat.c, arm-tdep.c: I18n markup.
* armnbsd-nat.c, armnbsd-tdep.c, auxv.c, avr-tdep.c: I18n markup.
* aix-thread.c (_initialize_aix_thread): Get rid of the
deprecated_add_show_from_set call.
* alpha-tdep.c (_initialize_alpha_tdep): Ditto.
* arm-tdep.c (_initialize_arm_tdep): Ditto.
* command.h (add_setshow_enum_cmd): Add arguments for returning
new list elements.
* cli/cli-decode.c (add_setshow_enum_cmd): Ditto.
* mips-tdep.c (_initialize_mips_tdep): Modify calls to
add_setshow_enum_cmd.
2005-01-05 15:43:50 +00:00
|
|
|
|
error (_("Invalid type code in symbol table."));
|
2002-06-04 15:28:49 +00:00
|
|
|
|
}
|
|
|
|
|
gdb_flush (stream);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print the character string STRING, printing at most LENGTH characters.
|
|
|
|
|
Printing stops early if the number hits print_max; repeat counts
|
|
|
|
|
are printed as appropriate. Print ellipses at the end if we
|
|
|
|
|
had to stop before printing LENGTH characters, or if
|
|
|
|
|
FORCE_ELLIPSES. TYPE_LEN is the length (1 or 2) of the character type.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static void
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
printstr (struct ui_file *stream, const gdb_byte *string,
|
2005-01-28 19:19:10 +00:00
|
|
|
|
unsigned int length, int force_ellipses, int type_len)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned int i;
|
|
|
|
|
unsigned int things_printed = 0;
|
|
|
|
|
int in_quotes = 0;
|
|
|
|
|
int need_comma = 0;
|
|
|
|
|
|
|
|
|
|
if (length == 0)
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered ("\"\"", stream);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < length && things_printed < print_max; i += 1)
|
|
|
|
|
{
|
|
|
|
|
/* Position of the character we are examining
|
2002-08-18 18:11:12 +00:00
|
|
|
|
to see whether it is repeated. */
|
2002-06-04 15:28:49 +00:00
|
|
|
|
unsigned int rep1;
|
|
|
|
|
/* Number of repetitions we have detected so far. */
|
|
|
|
|
unsigned int reps;
|
|
|
|
|
|
|
|
|
|
QUIT;
|
|
|
|
|
|
|
|
|
|
if (need_comma)
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered (", ", stream);
|
|
|
|
|
need_comma = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rep1 = i + 1;
|
|
|
|
|
reps = 1;
|
2004-07-09 19:29:56 +00:00
|
|
|
|
while (rep1 < length
|
|
|
|
|
&& char_at (string, rep1, type_len) == char_at (string, i,
|
|
|
|
|
type_len))
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
rep1 += 1;
|
|
|
|
|
reps += 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (reps > repeat_count_threshold)
|
|
|
|
|
{
|
|
|
|
|
if (in_quotes)
|
|
|
|
|
{
|
|
|
|
|
if (inspect_it)
|
|
|
|
|
fputs_filtered ("\\\", ", stream);
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered ("\", ", stream);
|
|
|
|
|
in_quotes = 0;
|
|
|
|
|
}
|
|
|
|
|
fputs_filtered ("'", stream);
|
2002-08-18 18:11:12 +00:00
|
|
|
|
ada_emit_char (char_at (string, i, type_len), stream, '\'',
|
|
|
|
|
type_len);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
fputs_filtered ("'", stream);
|
2005-01-05 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr>
Committed by Andrew Cagney.
* ada-valprint.c, aix-thread.c, alpha-nat.c: I18n markup.
* alphabsd-nat.c, alphanbsd-tdep.c, amd64-linux-nat.c: I18n markup.
* amd64-tdep.c, amd64bsd-nat.c, amd64fbsd-nat.c: I18n markup.
* arch-utils.c, arm-linux-nat.c, arm-tdep.c: I18n markup.
* armnbsd-nat.c, armnbsd-tdep.c, auxv.c, avr-tdep.c: I18n markup.
* aix-thread.c (_initialize_aix_thread): Get rid of the
deprecated_add_show_from_set call.
* alpha-tdep.c (_initialize_alpha_tdep): Ditto.
* arm-tdep.c (_initialize_arm_tdep): Ditto.
* command.h (add_setshow_enum_cmd): Add arguments for returning
new list elements.
* cli/cli-decode.c (add_setshow_enum_cmd): Ditto.
* mips-tdep.c (_initialize_mips_tdep): Modify calls to
add_setshow_enum_cmd.
2005-01-05 15:43:50 +00:00
|
|
|
|
fprintf_filtered (stream, _(" <repeats %u times>"), reps);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
i = rep1 - 1;
|
|
|
|
|
things_printed += repeat_count_threshold;
|
|
|
|
|
need_comma = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (!in_quotes)
|
|
|
|
|
{
|
|
|
|
|
if (inspect_it)
|
|
|
|
|
fputs_filtered ("\\\"", stream);
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered ("\"", stream);
|
|
|
|
|
in_quotes = 1;
|
|
|
|
|
}
|
|
|
|
|
ada_emit_char (char_at (string, i, type_len), stream, '"',
|
|
|
|
|
type_len);
|
|
|
|
|
things_printed += 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Terminate the quotes if necessary. */
|
|
|
|
|
if (in_quotes)
|
|
|
|
|
{
|
|
|
|
|
if (inspect_it)
|
|
|
|
|
fputs_filtered ("\\\"", stream);
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered ("\"", stream);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (force_ellipses || i < length)
|
|
|
|
|
fputs_filtered ("...", stream);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
ada_printstr (struct ui_file *stream, const gdb_byte *string,
|
2005-01-29 00:11:12 +00:00
|
|
|
|
unsigned int length, int width, int force_ellipses)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
printstr (stream, string, length, force_ellipses, width);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Print data of type TYPE located at VALADDR (within GDB), which came from
|
|
|
|
|
the inferior at address ADDRESS, onto stdio stream STREAM according to
|
2004-06-02 09:55:36 +00:00
|
|
|
|
FORMAT (a letter as for the printf % codes or 0 for natural format).
|
2002-06-04 15:28:49 +00:00
|
|
|
|
The data at VALADDR is in target byte order.
|
|
|
|
|
|
|
|
|
|
If the data is printed as a string, returns the number of string characters
|
|
|
|
|
printed.
|
|
|
|
|
|
|
|
|
|
If DEREF_REF is nonzero, then dereference references, otherwise just print
|
|
|
|
|
them like pointers.
|
|
|
|
|
|
|
|
|
|
RECURSE indicates the amount of indentation to supply before
|
|
|
|
|
continuation lines; this amount is roughly twice the value of RECURSE.
|
|
|
|
|
|
|
|
|
|
When PRETTY is non-zero, prints record fields on separate lines.
|
|
|
|
|
(For some reason, the current version of gdb instead uses a global
|
|
|
|
|
variable---prettyprint_arrays--- to causes a similar effect on
|
|
|
|
|
arrays.) */
|
|
|
|
|
|
|
|
|
|
int
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
ada_val_print (struct type *type, const gdb_byte *valaddr0,
|
2005-01-28 Andrew Cagney <cagney@gnu.org>
* language.h (struct language_defn): Make la_val_print's buffer
parameter a const bfd_byte.
* cp-valprint.c (cp_print_value_fields, cp_print_value): Update.
* ada-lang.c (ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* valprint.c (val_print_array_elements): Update.
* valprint.h (val_print_array_elements): Update.
* ada-lang.h (ada_val_print, ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* ada-valprint.c (ada_val_print, struct ada_val_print_args)
(ada_val_print_1, ada_print_floating, printable_val_type)
(print_record, val_print_packed_array_elements)
(print_field_values, print_variant_part): Update.
* c-lang.h (c_val_print, cp_print_value_fields): Update.
* c-valprint.c (c_val_print): Update.
* f-lang.h (f_val_print): Update.
* f-valprint.c (f_val_print, f77_print_array_1)
(f77_print_array): Update.
* jv-lang.h (java_val_print): Update.
* jv-valprint.c (java_print_value_fields, java_val_print): Update.
* language.c (unk_lang_val_print): Update.
* m2-lang.h (m2_val_print): Update.
* m2-valprint.c (m2_val_print): Update.
* p-lang.h (pascal_val_print): Update.
(pascal_object_print_value_fields): Update.
* p-valprint.c (pascal_val_print)
(pascal_object_print_value_fields, pascal_object_print_value)
(pascal_object_print_value): Update.
* scm-lang.h (scm_val_print): Update.
* scm-valprint.c (scm_val_print): Update.
* value.h (val_print): Update.
2005-01-29 01:59:31 +00:00
|
|
|
|
int embedded_offset, CORE_ADDR address,
|
|
|
|
|
struct ui_file *stream, int format, int deref_ref,
|
|
|
|
|
int recurse, enum val_prettyprint pretty)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
struct ada_val_print_args args;
|
2002-08-18 18:11:12 +00:00
|
|
|
|
args.type = type;
|
|
|
|
|
args.valaddr0 = valaddr0;
|
2002-06-04 15:28:49 +00:00
|
|
|
|
args.embedded_offset = embedded_offset;
|
|
|
|
|
args.address = address;
|
|
|
|
|
args.stream = stream;
|
|
|
|
|
args.format = format;
|
|
|
|
|
args.deref_ref = deref_ref;
|
|
|
|
|
args.recurse = recurse;
|
|
|
|
|
args.pretty = pretty;
|
|
|
|
|
|
|
|
|
|
return catch_errors (ada_val_print_stub, &args, NULL, RETURN_MASK_ALL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper for ada_val_print; used as argument to catch_errors to
|
2004-06-02 09:55:36 +00:00
|
|
|
|
unmarshal the arguments to ada_val_print_1, which does the work. */
|
2002-06-04 15:28:49 +00:00
|
|
|
|
static int
|
2004-07-01 10:11:11 +00:00
|
|
|
|
ada_val_print_stub (void *args0)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct ada_val_print_args *argsp = (struct ada_val_print_args *) args0;
|
|
|
|
|
return ada_val_print_1 (argsp->type, argsp->valaddr0,
|
|
|
|
|
argsp->embedded_offset, argsp->address,
|
|
|
|
|
argsp->stream, argsp->format, argsp->deref_ref,
|
|
|
|
|
argsp->recurse, argsp->pretty);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* See the comment on ada_val_print. This function differs in that it
|
2004-06-02 09:55:36 +00:00
|
|
|
|
* does not catch evaluation errors (leaving that to ada_val_print). */
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
static int
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
|
2005-01-28 Andrew Cagney <cagney@gnu.org>
* language.h (struct language_defn): Make la_val_print's buffer
parameter a const bfd_byte.
* cp-valprint.c (cp_print_value_fields, cp_print_value): Update.
* ada-lang.c (ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* valprint.c (val_print_array_elements): Update.
* valprint.h (val_print_array_elements): Update.
* ada-lang.h (ada_val_print, ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* ada-valprint.c (ada_val_print, struct ada_val_print_args)
(ada_val_print_1, ada_print_floating, printable_val_type)
(print_record, val_print_packed_array_elements)
(print_field_values, print_variant_part): Update.
* c-lang.h (c_val_print, cp_print_value_fields): Update.
* c-valprint.c (c_val_print): Update.
* f-lang.h (f_val_print): Update.
* f-valprint.c (f_val_print, f77_print_array_1)
(f77_print_array): Update.
* jv-lang.h (java_val_print): Update.
* jv-valprint.c (java_print_value_fields, java_val_print): Update.
* language.c (unk_lang_val_print): Update.
* m2-lang.h (m2_val_print): Update.
* m2-valprint.c (m2_val_print): Update.
* p-lang.h (pascal_val_print): Update.
(pascal_object_print_value_fields): Update.
* p-valprint.c (pascal_val_print)
(pascal_object_print_value_fields, pascal_object_print_value)
(pascal_object_print_value): Update.
* scm-lang.h (scm_val_print): Update.
* scm-valprint.c (scm_val_print): Update.
* value.h (val_print): Update.
2005-01-29 01:59:31 +00:00
|
|
|
|
int embedded_offset, CORE_ADDR address,
|
|
|
|
|
struct ui_file *stream, int format,
|
2002-07-25 01:14:26 +00:00
|
|
|
|
int deref_ref, int recurse, enum val_prettyprint pretty)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned int len;
|
|
|
|
|
int i;
|
|
|
|
|
struct type *elttype;
|
|
|
|
|
unsigned int eltlen;
|
|
|
|
|
LONGEST val;
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
const gdb_byte *valaddr = valaddr0 + embedded_offset;
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2004-10-08 09:40:12 +00:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2004-06-02 09:55:36 +00:00
|
|
|
|
if (ada_is_array_descriptor_type (type) || ada_is_packed_array_type (type))
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
int retn;
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct value *mark = value_mark ();
|
|
|
|
|
struct value *val;
|
2002-06-04 15:28:49 +00:00
|
|
|
|
val = value_from_contents_and_address (type, valaddr, address);
|
|
|
|
|
val = ada_coerce_to_simple_array_ptr (val);
|
|
|
|
|
if (val == NULL)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "(null)");
|
|
|
|
|
retn = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 00:09:56 +00:00
|
|
|
|
retn = ada_val_print_1 (value_type (val), value_contents (val), 0,
|
2002-08-18 18:11:12 +00:00
|
|
|
|
VALUE_ADDRESS (val), stream, format,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
deref_ref, recurse, pretty);
|
|
|
|
|
value_free_to_mark (mark);
|
|
|
|
|
return retn;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
valaddr = ada_aligned_value_addr (type, valaddr);
|
|
|
|
|
embedded_offset -= valaddr - valaddr0 - embedded_offset;
|
|
|
|
|
type = printable_val_type (type, valaddr);
|
|
|
|
|
|
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
default:
|
2002-08-18 18:11:12 +00:00
|
|
|
|
return c_val_print (type, valaddr0, embedded_offset, address, stream,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
format, deref_ref, recurse, pretty);
|
|
|
|
|
|
2004-06-02 09:55:36 +00:00
|
|
|
|
case TYPE_CODE_PTR:
|
|
|
|
|
{
|
|
|
|
|
int ret = c_val_print (type, valaddr0, embedded_offset, address,
|
|
|
|
|
stream, format, deref_ref, recurse, pretty);
|
|
|
|
|
if (ada_is_tag_type (type))
|
|
|
|
|
{
|
|
|
|
|
struct value *val =
|
|
|
|
|
value_from_contents_and_address (type, valaddr, address);
|
|
|
|
|
const char *name = ada_tag_name (val);
|
|
|
|
|
if (name != NULL)
|
|
|
|
|
fprintf_filtered (stream, " (%s)", name);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2002-06-04 15:28:49 +00:00
|
|
|
|
case TYPE_CODE_INT:
|
|
|
|
|
case TYPE_CODE_RANGE:
|
|
|
|
|
if (ada_is_fixed_point_type (type))
|
|
|
|
|
{
|
|
|
|
|
LONGEST v = unpack_long (type, valaddr);
|
|
|
|
|
int len = TYPE_LENGTH (type);
|
|
|
|
|
|
|
|
|
|
fprintf_filtered (stream, len < 4 ? "%.11g" : "%.17g",
|
|
|
|
|
(double) ada_fixed_to_float (type, v));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else if (ada_is_vax_floating_type (type))
|
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct value *val =
|
2002-06-04 15:28:49 +00:00
|
|
|
|
value_from_contents_and_address (type, valaddr, address);
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct value *func = ada_vax_float_print_function (type);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
if (func != 0)
|
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
static struct type *parray_of_char = NULL;
|
|
|
|
|
struct value *printable_val;
|
|
|
|
|
|
|
|
|
|
if (parray_of_char == NULL)
|
|
|
|
|
parray_of_char =
|
|
|
|
|
make_pointer_type
|
|
|
|
|
(create_array_type
|
|
|
|
|
(NULL, builtin_type_char,
|
|
|
|
|
create_range_type (NULL, builtin_type_int, 0, 32)), NULL);
|
|
|
|
|
|
|
|
|
|
printable_val =
|
2002-06-04 15:28:49 +00:00
|
|
|
|
value_ind (value_cast (parray_of_char,
|
2002-08-18 18:11:12 +00:00
|
|
|
|
call_function_by_hand (func, 1,
|
|
|
|
|
&val)));
|
|
|
|
|
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 00:09:56 +00:00
|
|
|
|
fprintf_filtered (stream, "%s", value_contents (printable_val));
|
2002-06-04 15:28:49 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2004-06-02 09:55:36 +00:00
|
|
|
|
/* No special printing function. Do as best we can. */
|
2002-06-04 15:28:49 +00:00
|
|
|
|
}
|
|
|
|
|
else if (TYPE_CODE (type) == TYPE_CODE_RANGE)
|
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct type *target_type = TYPE_TARGET_TYPE (type);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
if (TYPE_LENGTH (type) != TYPE_LENGTH (target_type))
|
|
|
|
|
{
|
|
|
|
|
/* Obscure case of range type that has different length from
|
2002-08-18 18:11:12 +00:00
|
|
|
|
its base type. Perform a conversion, or we will get a
|
|
|
|
|
nonsense value. Actually, we could use the same
|
2004-06-02 09:55:36 +00:00
|
|
|
|
code regardless of lengths; I'm just avoiding a cast. */
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct value *v = value_cast (target_type,
|
|
|
|
|
value_from_contents_and_address
|
|
|
|
|
(type, valaddr, 0));
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 00:09:56 +00:00
|
|
|
|
return ada_val_print_1 (target_type, value_contents (v), 0, 0,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
stream, format, 0, recurse + 1, pretty);
|
|
|
|
|
}
|
|
|
|
|
else
|
2002-08-18 18:11:12 +00:00
|
|
|
|
return ada_val_print_1 (TYPE_TARGET_TYPE (type),
|
2002-06-04 15:28:49 +00:00
|
|
|
|
valaddr0, embedded_offset,
|
2002-08-18 18:11:12 +00:00
|
|
|
|
address, stream, format, deref_ref,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
recurse, pretty);
|
|
|
|
|
}
|
2002-08-18 18:11:12 +00:00
|
|
|
|
else
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
format = format ? format : output_format;
|
|
|
|
|
if (format)
|
|
|
|
|
{
|
|
|
|
|
print_scalar_formatted (valaddr, type, format, 0, stream);
|
|
|
|
|
}
|
2004-06-02 09:55:36 +00:00
|
|
|
|
else if (ada_is_system_address_type (type))
|
|
|
|
|
{
|
|
|
|
|
/* FIXME: We want to print System.Address variables using
|
|
|
|
|
the same format as for any access type. But for some
|
|
|
|
|
reason GNAT encodes the System.Address type as an int,
|
|
|
|
|
so we have to work-around this deficiency by handling
|
|
|
|
|
System.Address values as a special case. */
|
|
|
|
|
fprintf_filtered (stream, "(");
|
|
|
|
|
type_print (type, "", stream, -1);
|
|
|
|
|
fprintf_filtered (stream, ") ");
|
2005-02-14 Andrew Cagney <cagney@gnu.org>
* utils.c (paddress): New function.
* defs.h (paddress): Declare.
* printcmd.c (deprecated_print_address_numeric): Rename
print_address_numeric, call paddress.
* valprint.c, ui-out.c, tui/tui-stack.c, tracepoint.c: Update.
* symmisc.c, symfile.c stack.c, p-valprint.c, printcmd.c: Update.
* maint.c, m32r-rom.c, infcmd.c, f-valprint.c, exec.c: Update.
* dwarf2read.c, dve3900-rom.c, defs.h, c-valprint.c: Update.
* corefile.c, cli/cli-cmds.c, breakpoint.c, annotate.c: Update.
* ada-valprint.c: Update.
2005-02-14 14:37:38 +00:00
|
|
|
|
deprecated_print_address_numeric
|
2004-06-02 09:55:36 +00:00
|
|
|
|
(extract_typed_address (valaddr, builtin_type_void_data_ptr),
|
|
|
|
|
1, stream);
|
|
|
|
|
}
|
2002-06-04 15:28:49 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
val_print_type_code_int (type, valaddr, stream);
|
|
|
|
|
if (ada_is_character_type (type))
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered (" ", stream);
|
|
|
|
|
ada_printchar ((unsigned char) unpack_long (type, valaddr),
|
|
|
|
|
stream);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_ENUM:
|
|
|
|
|
if (format)
|
|
|
|
|
{
|
|
|
|
|
print_scalar_formatted (valaddr, type, format, 0, stream);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
len = TYPE_NFIELDS (type);
|
|
|
|
|
val = unpack_long (type, valaddr);
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
|
|
|
|
if (val == TYPE_FIELD_BITPOS (type, i))
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (i < len)
|
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
const char *name = ada_enum_name (TYPE_FIELD_NAME (type, i));
|
|
|
|
|
if (name[0] == '\'')
|
2002-06-04 15:28:49 +00:00
|
|
|
|
fprintf_filtered (stream, "%ld %s", (long) val, name);
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered (name, stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
print_longest (stream, 'd', 0, val);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2002-08-18 18:11:12 +00:00
|
|
|
|
|
2004-06-02 09:55:36 +00:00
|
|
|
|
case TYPE_CODE_FLT:
|
|
|
|
|
if (format)
|
|
|
|
|
return c_val_print (type, valaddr0, embedded_offset, address, stream,
|
|
|
|
|
format, deref_ref, recurse, pretty);
|
|
|
|
|
else
|
|
|
|
|
ada_print_floating (valaddr0 + embedded_offset, type, stream);
|
|
|
|
|
break;
|
|
|
|
|
|
2002-06-04 15:28:49 +00:00
|
|
|
|
case TYPE_CODE_UNION:
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
if (ada_is_bogus_array_descriptor (type))
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "(...?)");
|
|
|
|
|
return 0;
|
2002-08-18 18:11:12 +00:00
|
|
|
|
}
|
2002-06-04 15:28:49 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
print_record (type, valaddr, stream, format, recurse, pretty);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
2004-06-02 09:55:36 +00:00
|
|
|
|
elttype = TYPE_TARGET_TYPE (type);
|
|
|
|
|
if (elttype == NULL)
|
|
|
|
|
eltlen = 0;
|
|
|
|
|
else
|
|
|
|
|
eltlen = TYPE_LENGTH (elttype);
|
|
|
|
|
/* FIXME: This doesn't deal with non-empty arrays of
|
|
|
|
|
0-length items (not a typical case!) */
|
|
|
|
|
if (eltlen == 0)
|
|
|
|
|
len = 0;
|
|
|
|
|
else
|
|
|
|
|
len = TYPE_LENGTH (type) / eltlen;
|
2002-08-18 18:11:12 +00:00
|
|
|
|
|
2002-06-04 15:28:49 +00:00
|
|
|
|
/* For an array of chars, print with string syntax. */
|
2004-06-02 09:55:36 +00:00
|
|
|
|
if (ada_is_string_type (type) && (format == 0 || format == 's'))
|
|
|
|
|
{
|
|
|
|
|
if (prettyprint_arrays)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
2004-06-02 09:55:36 +00:00
|
|
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
}
|
2004-06-02 09:55:36 +00:00
|
|
|
|
/* If requested, look for the first null char and only print
|
|
|
|
|
elements up to it. */
|
|
|
|
|
if (stop_print_at_null)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
2004-06-02 09:55:36 +00:00
|
|
|
|
int temp_len;
|
|
|
|
|
|
|
|
|
|
/* Look for a NULL char. */
|
|
|
|
|
for (temp_len = 0;
|
|
|
|
|
temp_len < len && temp_len < print_max
|
|
|
|
|
&& char_at (valaddr, temp_len, eltlen) != 0;
|
|
|
|
|
temp_len += 1);
|
|
|
|
|
len = temp_len;
|
2002-06-04 15:28:49 +00:00
|
|
|
|
}
|
2004-06-02 09:55:36 +00:00
|
|
|
|
|
|
|
|
|
printstr (stream, valaddr, len, 0, eltlen);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
len = 0;
|
|
|
|
|
fprintf_filtered (stream, "(");
|
|
|
|
|
print_optional_low_bound (stream, type);
|
|
|
|
|
if (TYPE_FIELD_BITSIZE (type, 0) > 0)
|
|
|
|
|
val_print_packed_array_elements (type, valaddr, 0, stream,
|
|
|
|
|
format, recurse, pretty);
|
|
|
|
|
else
|
|
|
|
|
val_print_array_elements (type, valaddr, address, stream,
|
|
|
|
|
format, deref_ref, recurse,
|
|
|
|
|
pretty, 0);
|
|
|
|
|
fprintf_filtered (stream, ")");
|
2002-06-04 15:28:49 +00:00
|
|
|
|
}
|
2004-06-02 09:55:36 +00:00
|
|
|
|
gdb_flush (stream);
|
|
|
|
|
return len;
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
case TYPE_CODE_REF:
|
|
|
|
|
elttype = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
|
/* De-reference the reference */
|
|
|
|
|
if (deref_ref)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
|
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
LONGEST deref_val_int = (LONGEST)
|
|
|
|
|
unpack_pointer (lookup_pointer_type (builtin_type_void),
|
2002-06-04 15:28:49 +00:00
|
|
|
|
valaddr);
|
2002-08-18 18:11:12 +00:00
|
|
|
|
if (deref_val_int != 0)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct value *deref_val =
|
|
|
|
|
ada_value_ind (value_from_longest
|
|
|
|
|
(lookup_pointer_type (elttype),
|
2002-06-04 15:28:49 +00:00
|
|
|
|
deref_val_int));
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 21:45:08 +00:00
|
|
|
|
val_print (value_type (deref_val),
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 00:09:56 +00:00
|
|
|
|
value_contents (deref_val), 0,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
VALUE_ADDRESS (deref_val), stream, format,
|
|
|
|
|
deref_ref, recurse + 1, pretty);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered ("(null)", stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered ("???", stream);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
2004-06-02 09:55:36 +00:00
|
|
|
|
gdb_flush (stream);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
print_variant_part (struct type *type, int field_num, const gdb_byte *valaddr,
|
2002-07-25 01:14:26 +00:00
|
|
|
|
struct ui_file *stream, int format, int recurse,
|
|
|
|
|
enum val_prettyprint pretty, int comma_needed,
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
struct type *outer_type, const gdb_byte *outer_valaddr)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
struct type *var_type = TYPE_FIELD_TYPE (type, field_num);
|
2002-08-18 18:11:12 +00:00
|
|
|
|
int which = ada_which_variant_applies (var_type, outer_type, outer_valaddr);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
if (which < 0)
|
|
|
|
|
return 0;
|
|
|
|
|
else
|
2002-08-18 18:11:12 +00:00
|
|
|
|
return print_field_values
|
2002-06-04 15:28:49 +00:00
|
|
|
|
(TYPE_FIELD_TYPE (var_type, which),
|
|
|
|
|
valaddr + TYPE_FIELD_BITPOS (type, field_num) / HOST_CHAR_BIT
|
|
|
|
|
+ TYPE_FIELD_BITPOS (var_type, which) / HOST_CHAR_BIT,
|
|
|
|
|
stream, format, recurse, pretty,
|
|
|
|
|
comma_needed, outer_type, outer_valaddr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2002-08-18 18:11:12 +00:00
|
|
|
|
ada_value_print (struct value *val0, struct ui_file *stream, int format,
|
2002-07-25 01:14:26 +00:00
|
|
|
|
enum val_prettyprint pretty)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
const gdb_byte *valaddr = value_contents (val0);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 21:45:08 +00:00
|
|
|
|
CORE_ADDR address = VALUE_ADDRESS (val0) + value_offset (val0);
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct type *type =
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 21:45:08 +00:00
|
|
|
|
ada_to_fixed_type (value_type (val0), valaddr, address, NULL);
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct value *val =
|
|
|
|
|
value_from_contents_and_address (type, valaddr, address);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2004-06-02 09:55:36 +00:00
|
|
|
|
/* If it is a pointer, indicate what it points to. */
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
2004-06-02 09:55:36 +00:00
|
|
|
|
/* Hack: don't print (char *) for char strings. Their
|
|
|
|
|
type is indicated by the quoted string anyway. */
|
|
|
|
|
if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) != sizeof (char)
|
|
|
|
|
|| TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_INT
|
|
|
|
|
|| TYPE_UNSIGNED (TYPE_TARGET_TYPE (type)))
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "(");
|
|
|
|
|
type_print (type, "", stream, -1);
|
|
|
|
|
fprintf_filtered (stream, ") ");
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-06-02 09:55:36 +00:00
|
|
|
|
else if (ada_is_array_descriptor_type (type))
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "(");
|
|
|
|
|
type_print (type, "", stream, -1);
|
|
|
|
|
fprintf_filtered (stream, ") ");
|
|
|
|
|
}
|
|
|
|
|
else if (ada_is_bogus_array_descriptor (type))
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "(");
|
|
|
|
|
type_print (type, "", stream, -1);
|
|
|
|
|
fprintf_filtered (stream, ") (...?)");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2004-06-02 09:55:36 +00:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_ARRAY
|
|
|
|
|
&& TYPE_LENGTH (TYPE_TARGET_TYPE (type)) == 0
|
|
|
|
|
&& TYPE_CODE (TYPE_INDEX_TYPE (type)) == TYPE_CODE_RANGE)
|
|
|
|
|
{
|
|
|
|
|
/* This is an array of zero-length elements, that is an array
|
|
|
|
|
of null records. This array needs to be printed by hand,
|
|
|
|
|
as the standard routine to print arrays relies on the size of
|
|
|
|
|
the array elements to be nonzero. This is because it computes
|
|
|
|
|
the number of elements in the array by dividing the array size
|
|
|
|
|
by the array element size. */
|
|
|
|
|
fprintf_filtered (stream, "(%d .. %d => ())",
|
|
|
|
|
TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type)),
|
|
|
|
|
TYPE_HIGH_BOUND (TYPE_INDEX_TYPE (type)));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 00:09:56 +00:00
|
|
|
|
return (val_print (type, value_contents (val), 0, address,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
stream, format, 1, 0, pretty));
|
|
|
|
|
}
|
2002-08-18 18:11:12 +00:00
|
|
|
|
|
2002-06-04 15:28:49 +00:00
|
|
|
|
static void
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
print_record (struct type *type, const gdb_byte *valaddr,
|
2005-01-28 Andrew Cagney <cagney@gnu.org>
* language.h (struct language_defn): Make la_val_print's buffer
parameter a const bfd_byte.
* cp-valprint.c (cp_print_value_fields, cp_print_value): Update.
* ada-lang.c (ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* valprint.c (val_print_array_elements): Update.
* valprint.h (val_print_array_elements): Update.
* ada-lang.h (ada_val_print, ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* ada-valprint.c (ada_val_print, struct ada_val_print_args)
(ada_val_print_1, ada_print_floating, printable_val_type)
(print_record, val_print_packed_array_elements)
(print_field_values, print_variant_part): Update.
* c-lang.h (c_val_print, cp_print_value_fields): Update.
* c-valprint.c (c_val_print): Update.
* f-lang.h (f_val_print): Update.
* f-valprint.c (f_val_print, f77_print_array_1)
(f77_print_array): Update.
* jv-lang.h (java_val_print): Update.
* jv-valprint.c (java_print_value_fields, java_val_print): Update.
* language.c (unk_lang_val_print): Update.
* m2-lang.h (m2_val_print): Update.
* m2-valprint.c (m2_val_print): Update.
* p-lang.h (pascal_val_print): Update.
(pascal_object_print_value_fields): Update.
* p-valprint.c (pascal_val_print)
(pascal_object_print_value_fields, pascal_object_print_value)
(pascal_object_print_value): Update.
* scm-lang.h (scm_val_print): Update.
* scm-valprint.c (scm_val_print): Update.
* value.h (val_print): Update.
2005-01-29 01:59:31 +00:00
|
|
|
|
struct ui_file *stream, int format, int recurse,
|
|
|
|
|
enum val_prettyprint pretty)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
2004-10-08 09:40:12 +00:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "(");
|
|
|
|
|
|
|
|
|
|
if (print_field_values (type, valaddr, stream, format, recurse, pretty,
|
2002-08-18 18:11:12 +00:00
|
|
|
|
0, type, valaddr) != 0 && pretty)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
|
print_spaces_filtered (2 * recurse, stream);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fprintf_filtered (stream, ")");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print out fields of value at VALADDR having structure type TYPE.
|
2004-06-02 09:55:36 +00:00
|
|
|
|
|
2002-06-04 15:28:49 +00:00
|
|
|
|
TYPE, VALADDR, STREAM, FORMAT, RECURSE, and PRETTY have the
|
2004-06-02 09:55:36 +00:00
|
|
|
|
same meanings as in ada_print_value and ada_val_print.
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
OUTER_TYPE and OUTER_VALADDR give type and address of enclosing record
|
|
|
|
|
(used to get discriminant values when printing variant parts).
|
|
|
|
|
|
2004-06-02 09:55:36 +00:00
|
|
|
|
COMMA_NEEDED is 1 if fields have been printed at the current recursion
|
2002-06-04 15:28:49 +00:00
|
|
|
|
level, so that a comma is needed before any field printed by this
|
2004-06-02 09:55:36 +00:00
|
|
|
|
call.
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
2004-06-02 09:55:36 +00:00
|
|
|
|
Returns 1 if COMMA_NEEDED or any fields were printed. */
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
static int
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
print_field_values (struct type *type, const gdb_byte *valaddr,
|
2005-01-28 Andrew Cagney <cagney@gnu.org>
* language.h (struct language_defn): Make la_val_print's buffer
parameter a const bfd_byte.
* cp-valprint.c (cp_print_value_fields, cp_print_value): Update.
* ada-lang.c (ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* valprint.c (val_print_array_elements): Update.
* valprint.h (val_print_array_elements): Update.
* ada-lang.h (ada_val_print, ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* ada-valprint.c (ada_val_print, struct ada_val_print_args)
(ada_val_print_1, ada_print_floating, printable_val_type)
(print_record, val_print_packed_array_elements)
(print_field_values, print_variant_part): Update.
* c-lang.h (c_val_print, cp_print_value_fields): Update.
* c-valprint.c (c_val_print): Update.
* f-lang.h (f_val_print): Update.
* f-valprint.c (f_val_print, f77_print_array_1)
(f77_print_array): Update.
* jv-lang.h (java_val_print): Update.
* jv-valprint.c (java_print_value_fields, java_val_print): Update.
* language.c (unk_lang_val_print): Update.
* m2-lang.h (m2_val_print): Update.
* m2-valprint.c (m2_val_print): Update.
* p-lang.h (pascal_val_print): Update.
(pascal_object_print_value_fields): Update.
* p-valprint.c (pascal_val_print)
(pascal_object_print_value_fields, pascal_object_print_value)
(pascal_object_print_value): Update.
* scm-lang.h (scm_val_print): Update.
* scm-valprint.c (scm_val_print): Update.
* value.h (val_print): Update.
2005-01-29 01:59:31 +00:00
|
|
|
|
struct ui_file *stream, int format, int recurse,
|
|
|
|
|
enum val_prettyprint pretty, int comma_needed,
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 21:20:35 +00:00
|
|
|
|
struct type *outer_type, const gdb_byte *outer_valaddr)
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
int i, len;
|
|
|
|
|
|
|
|
|
|
len = TYPE_NFIELDS (type);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < len; i += 1)
|
|
|
|
|
{
|
|
|
|
|
if (ada_is_ignored_field (type, i))
|
2002-08-18 18:11:12 +00:00
|
|
|
|
continue;
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
if (ada_is_wrapper_field (type, i))
|
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
comma_needed =
|
2002-06-04 15:28:49 +00:00
|
|
|
|
print_field_values (TYPE_FIELD_TYPE (type, i),
|
2002-08-18 18:11:12 +00:00
|
|
|
|
valaddr
|
2002-06-04 15:28:49 +00:00
|
|
|
|
+ TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT,
|
|
|
|
|
stream, format, recurse, pretty,
|
|
|
|
|
comma_needed, type, valaddr);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else if (ada_is_variant_part (type, i))
|
|
|
|
|
{
|
|
|
|
|
comma_needed =
|
|
|
|
|
print_variant_part (type, i, valaddr,
|
|
|
|
|
stream, format, recurse, pretty, comma_needed,
|
|
|
|
|
outer_type, outer_valaddr);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (comma_needed)
|
|
|
|
|
fprintf_filtered (stream, ", ");
|
|
|
|
|
comma_needed = 1;
|
|
|
|
|
|
|
|
|
|
if (pretty)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
|
|
|
}
|
2002-08-18 18:11:12 +00:00
|
|
|
|
else
|
2002-06-04 15:28:49 +00:00
|
|
|
|
{
|
|
|
|
|
wrap_here (n_spaces (2 + 2 * recurse));
|
|
|
|
|
}
|
|
|
|
|
if (inspect_it)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
|
|
|
|
|
fputs_filtered ("\"( ptr \"", stream);
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered ("\"( nodef \"", stream);
|
|
|
|
|
fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
|
|
|
|
|
language_cplus, DMGL_NO_OPTS);
|
|
|
|
|
fputs_filtered ("\" \"", stream);
|
|
|
|
|
fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
|
|
|
|
|
language_cplus, DMGL_NO_OPTS);
|
|
|
|
|
fputs_filtered ("\") \"", stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
annotate_field_begin (TYPE_FIELD_TYPE (type, i));
|
2002-08-18 18:11:12 +00:00
|
|
|
|
fprintf_filtered (stream, "%.*s",
|
2002-06-04 15:28:49 +00:00
|
|
|
|
ada_name_prefix_len (TYPE_FIELD_NAME (type, i)),
|
|
|
|
|
TYPE_FIELD_NAME (type, i));
|
|
|
|
|
annotate_field_name_end ();
|
|
|
|
|
fputs_filtered (" => ", stream);
|
|
|
|
|
annotate_field_value ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (TYPE_FIELD_PACKED (type, i))
|
|
|
|
|
{
|
2002-08-18 18:11:12 +00:00
|
|
|
|
struct value *v;
|
2002-06-04 15:28:49 +00:00
|
|
|
|
|
|
|
|
|
/* Bitfields require special handling, especially due to byte
|
|
|
|
|
order problems. */
|
|
|
|
|
if (TYPE_CPLUS_SPECIFIC (type) != NULL
|
|
|
|
|
&& TYPE_FIELD_IGNORE (type, i))
|
|
|
|
|
{
|
2005-01-05 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr>
Committed by Andrew Cagney.
* ada-valprint.c, aix-thread.c, alpha-nat.c: I18n markup.
* alphabsd-nat.c, alphanbsd-tdep.c, amd64-linux-nat.c: I18n markup.
* amd64-tdep.c, amd64bsd-nat.c, amd64fbsd-nat.c: I18n markup.
* arch-utils.c, arm-linux-nat.c, arm-tdep.c: I18n markup.
* armnbsd-nat.c, armnbsd-tdep.c, auxv.c, avr-tdep.c: I18n markup.
* aix-thread.c (_initialize_aix_thread): Get rid of the
deprecated_add_show_from_set call.
* alpha-tdep.c (_initialize_alpha_tdep): Ditto.
* arm-tdep.c (_initialize_arm_tdep): Ditto.
* command.h (add_setshow_enum_cmd): Add arguments for returning
new list elements.
* cli/cli-decode.c (add_setshow_enum_cmd): Ditto.
* mips-tdep.c (_initialize_mips_tdep): Modify calls to
add_setshow_enum_cmd.
2005-01-05 15:43:50 +00:00
|
|
|
|
fputs_filtered (_("<optimized out or zero length>"), stream);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int bit_pos = TYPE_FIELD_BITPOS (type, i);
|
|
|
|
|
int bit_size = TYPE_FIELD_BITSIZE (type, i);
|
2002-08-18 18:11:12 +00:00
|
|
|
|
|
2002-06-04 15:28:49 +00:00
|
|
|
|
adjust_type_signedness (TYPE_FIELD_TYPE (type, i));
|
|
|
|
|
v = ada_value_primitive_packed_val (NULL, valaddr,
|
|
|
|
|
bit_pos / HOST_CHAR_BIT,
|
|
|
|
|
bit_pos % HOST_CHAR_BIT,
|
2002-08-18 18:11:12 +00:00
|
|
|
|
bit_size,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
TYPE_FIELD_TYPE (type, i));
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 00:09:56 +00:00
|
|
|
|
val_print (TYPE_FIELD_TYPE (type, i), value_contents (v), 0, 0,
|
2002-06-04 15:28:49 +00:00
|
|
|
|
stream, format, 0, recurse + 1, pretty);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
2002-08-18 18:11:12 +00:00
|
|
|
|
ada_val_print (TYPE_FIELD_TYPE (type, i),
|
|
|
|
|
valaddr + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT,
|
|
|
|
|
0, 0, stream, format, 0, recurse + 1, pretty);
|
2002-06-04 15:28:49 +00:00
|
|
|
|
annotate_field_end ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return comma_needed;
|
|
|
|
|
}
|