X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fch-valprint.c;h=44b1c5343118bdbdc67fb7a1b8c9aa13810bee11;hb=60166579ed5b79959d46a75ae1968e0f15ef9b0b;hp=24e503113614aaa1f417c789557f80f788e9b4f2;hpb=82a2edfbcf9e89d869c4f60d82c69bc4851aa4e3;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ch-valprint.c b/gdb/ch-valprint.c index 24e5031136..44b1c53431 100644 --- a/gdb/ch-valprint.c +++ b/gdb/ch-valprint.c @@ -1,22 +1,24 @@ /* Support for printing Chill values for GDB, the GNU debugger. - Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994 + Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 2000, 2001 Free Software Foundation, Inc. -This file is part of GDB. + 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 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. + 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. */ + 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "obstack.h" @@ -27,13 +29,154 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "value.h" #include "language.h" #include "demangle.h" -#include "c-lang.h" /* For c_val_print */ +#include "c-lang.h" /* For c_val_print */ +#include "typeprint.h" +#include "ch-lang.h" +#include "annotate.h" + +static void chill_print_value_fields (struct type *, char *, + struct ui_file *, int, int, + enum val_prettyprint, struct type **); + +static void chill_print_type_scalar (struct type *, LONGEST, + struct ui_file *); + +static void chill_val_print_array_elements (struct type *, char *, + CORE_ADDR, struct ui_file *, + int, int, int, + enum val_prettyprint); + -static void -chill_print_value_fields PARAMS ((struct type *, char *, GDB_FILE *, int, int, - enum val_prettyprint, struct type **)); +/* Print integral scalar data VAL, of type TYPE, onto stdio stream STREAM. + Used to print data from type structures in a specified type. For example, + array bounds may be characters or booleans in some languages, and this + allows the ranges to be printed in their "natural" form rather than as + decimal integer values. */ +static void +chill_print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream) +{ + switch (TYPE_CODE (type)) + { + case TYPE_CODE_RANGE: + if (TYPE_TARGET_TYPE (type)) + { + chill_print_type_scalar (TYPE_TARGET_TYPE (type), val, stream); + return; + } + break; + case TYPE_CODE_UNDEF: + case TYPE_CODE_PTR: + case TYPE_CODE_ARRAY: + case TYPE_CODE_STRUCT: + case TYPE_CODE_UNION: + case TYPE_CODE_ENUM: + case TYPE_CODE_FUNC: + case TYPE_CODE_INT: + case TYPE_CODE_FLT: + case TYPE_CODE_VOID: + case TYPE_CODE_SET: + case TYPE_CODE_STRING: + case TYPE_CODE_BITSTRING: + case TYPE_CODE_ERROR: + case TYPE_CODE_MEMBER: + case TYPE_CODE_METHOD: + case TYPE_CODE_REF: + case TYPE_CODE_CHAR: + case TYPE_CODE_BOOL: + case TYPE_CODE_COMPLEX: + case TYPE_CODE_TYPEDEF: + default: + break; + } + print_type_scalar (type, val, stream); +} +/* Print the elements of an array. + Similar to val_print_array_elements, but prints + element indexes (in Chill syntax). */ + +static void +chill_val_print_array_elements (struct type *type, char *valaddr, + CORE_ADDR address, struct ui_file *stream, + int format, int deref_ref, int recurse, + enum val_prettyprint pretty) +{ + unsigned int i = 0; + unsigned int things_printed = 0; + unsigned len; + struct type *elttype; + struct type *range_type = TYPE_FIELD_TYPE (type, 0); + struct type *index_type = TYPE_TARGET_TYPE (range_type); + unsigned eltlen; + /* Position of the array element we are examining to see + whether it is repeated. */ + unsigned int rep1; + /* Number of repetitions we have detected so far. */ + unsigned int reps; + LONGEST low_bound = TYPE_FIELD_BITPOS (range_type, 0); + + elttype = check_typedef (TYPE_TARGET_TYPE (type)); + eltlen = TYPE_LENGTH (elttype); + len = TYPE_LENGTH (type) / eltlen; + + annotate_array_section_begin (i, elttype); + + for (; i < len && things_printed < print_max; i++) + { + 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)); + + rep1 = i + 1; + reps = 1; + while ((rep1 < len) && + !memcmp (valaddr + i * eltlen, valaddr + rep1 * eltlen, eltlen)) + { + ++reps; + ++rep1; + } + + fputs_filtered ("(", stream); + chill_print_type_scalar (index_type, low_bound + i, stream); + if (reps > 1) + { + fputs_filtered (":", stream); + chill_print_type_scalar (index_type, low_bound + i + reps - 1, + stream); + fputs_filtered ("): ", stream); + val_print (elttype, valaddr + i * eltlen, 0, 0, stream, format, + deref_ref, recurse + 1, pretty); + + i = rep1 - 1; + things_printed += 1; + } + else + { + fputs_filtered ("): ", stream); + val_print (elttype, valaddr + i * eltlen, 0, 0, stream, format, + deref_ref, recurse + 1, pretty); + annotate_elt (); + things_printed++; + } + } + annotate_array_section_end (); + if (i < len) + { + fprintf_filtered (stream, "..."); + } +} + /* Print data of type TYPE located at VALADDR (within GDB), which came from the inferior at address ADDRESS, onto stdio stream STREAM according to FORMAT (a letter or 0 for natural format). The data at VALADDR is in @@ -48,22 +191,17 @@ chill_print_value_fields PARAMS ((struct type *, char *, GDB_FILE *, int, int, The PRETTY parameter controls prettyprinting. */ int -chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, - pretty) - struct type *type; - char *valaddr; - CORE_ADDR address; - GDB_FILE *stream; - int format; - int deref_ref; - int recurse; - enum val_prettyprint pretty; +chill_val_print (struct type *type, char *valaddr, int embedded_offset, + CORE_ADDR address, struct ui_file *stream, int format, + int deref_ref, int recurse, enum val_prettyprint pretty) { LONGEST val; unsigned int i = 0; /* Number of characters printed. */ struct type *elttype; CORE_ADDR addr; + CHECK_TYPEDEF (type); + switch (TYPE_CODE (type)) { case TYPE_CODE_ARRAY: @@ -74,8 +212,8 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, print_spaces_filtered (2 + 2 * recurse, stream); } fprintf_filtered (stream, "["); - val_print_array_elements (type, valaddr, address, stream, format, - deref_ref, recurse, pretty, 0); + chill_val_print_array_elements (type, valaddr, address, stream, + format, deref_ref, recurse, pretty); fprintf_filtered (stream, "]"); } else @@ -136,8 +274,8 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, case TYPE_CODE_UNDEF: /* This happens (without TYPE_FLAG_STUB set) on systems which don't use - dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar" - and no complete type for struct foo in that file. */ + dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar" + and no complete type for struct foo in that file. */ fprintf_filtered (stream, ""); break; @@ -148,8 +286,15 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, break; } addr = unpack_pointer (type, valaddr); - elttype = TYPE_TARGET_TYPE (type); - + elttype = check_typedef (TYPE_TARGET_TYPE (type)); + + /* We assume a NULL pointer is all zeros ... */ + if (addr == 0) + { + fputs_filtered ("NULL", stream); + return 0; + } + if (TYPE_CODE (elttype) == TYPE_CODE_FUNC) { /* Try to print what function it points to. */ @@ -159,78 +304,93 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, } if (addressprint && format != 's') { - print_address_numeric (addr, stream); + print_address_numeric (addr, 1, stream); } - + /* For a pointer to char or unsigned char, also print the string - pointed to, unless pointer is null. */ + pointed to, unless pointer is null. */ if (TYPE_LENGTH (elttype) == 1 && TYPE_CODE (elttype) == TYPE_CODE_CHAR && (format == 0 || format == 's') && addr != 0 - && /* If print_max is UINT_MAX, the alloca below will fail. - In that case don't try to print the string. */ + && /* If print_max is UINT_MAX, the alloca below will fail. + In that case don't try to print the string. */ print_max < UINT_MAX) - { - i = val_print_string (addr, 0, stream); - } + i = val_print_string (addr, -1, TYPE_LENGTH (elttype), stream); + /* Return number of characters printed, plus one for the - terminating null if we have "reached the end". */ + terminating null if we have "reached the end". */ return (i + (print_max && i != print_max)); break; case TYPE_CODE_STRING: - if (format && format != 's') - { - print_scalar_formatted (valaddr, type, format, 0, stream); - break; - } i = TYPE_LENGTH (type); - LA_PRINT_STRING (stream, valaddr, i, 0); + LA_PRINT_STRING (stream, valaddr, i, 1, 0); /* Return number of characters printed, plus one for the terminating - null if we have "reached the end". */ + null if we have "reached the end". */ return (i + (print_max && i != print_max)); break; case TYPE_CODE_BITSTRING: case TYPE_CODE_SET: + elttype = TYPE_INDEX_TYPE (type); + CHECK_TYPEDEF (elttype); + if (TYPE_STUB (elttype)) + { + fprintf_filtered (stream, ""); + gdb_flush (stream); + break; + } { - struct type *range = TYPE_FIELD_TYPE (type, 0); - int low_bound = TYPE_LOW_BOUND (range); - int high_bound = TYPE_HIGH_BOUND (range); + struct type *range = elttype; + LONGEST low_bound, high_bound; int i; int is_bitstring = TYPE_CODE (type) == TYPE_CODE_BITSTRING; int need_comma = 0; - int in_range = 0; if (is_bitstring) fputs_filtered ("B'", stream); else fputs_filtered ("[", stream); + + i = get_discrete_bounds (range, &low_bound, &high_bound); + maybe_bad_bstring: + if (i < 0) + { + fputs_filtered ("", stream); + goto done; + } + for (i = low_bound; i <= high_bound; i++) { int element = value_bit_index (type, valaddr, i); + if (element < 0) + { + i = element; + goto maybe_bad_bstring; + } if (is_bitstring) fprintf_filtered (stream, "%d", element); else if (element) { if (need_comma) fputs_filtered (", ", stream); - print_type_scalar (TYPE_TARGET_TYPE (range), i, stream); + chill_print_type_scalar (range, (LONGEST) i, stream); need_comma = 1; /* Look for a continuous range of true elements. */ - if (i+1 <= high_bound && value_bit_index (type, valaddr, ++i)) + if (i + 1 <= high_bound && value_bit_index (type, valaddr, ++i)) { - int j = i; /* j is the upper bound so far of the range */ + int j = i; /* j is the upper bound so far of the range */ fputs_filtered (":", stream); - while (i+1 <= high_bound + while (i + 1 <= high_bound && value_bit_index (type, valaddr, ++i)) j = i; - print_type_scalar (TYPE_TARGET_TYPE (range), j, stream); + chill_print_type_scalar (range, (LONGEST) j, stream); } } } + done: if (is_bitstring) fputs_filtered ("'", stream); else @@ -239,24 +399,29 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, break; case TYPE_CODE_STRUCT: - if (chill_is_varying_struct (type)) + if (chill_varying_type (type)) { - struct type *inner = TYPE_FIELD_TYPE (type, 1); + struct type *inner = check_typedef (TYPE_FIELD_TYPE (type, 1)); long length = unpack_long (TYPE_FIELD_TYPE (type, 0), valaddr); char *data_addr = valaddr + TYPE_FIELD_BITPOS (type, 1) / 8; - + switch (TYPE_CODE (inner)) { case TYPE_CODE_STRING: - if (length > TYPE_LENGTH (type)) + if (length > TYPE_LENGTH (type) - 2) { fprintf_filtered (stream, - " static length %d>", + " static length %d> *invalid*", length, TYPE_LENGTH (type)); - length > TYPE_LENGTH (type); + + /* Don't print the string; doing so might produce a + segfault. */ + return length; } - LA_PRINT_STRING (stream, data_addr, length, 0); + LA_PRINT_STRING (stream, data_addr, length, 1, 0); return length; + default: + break; } } chill_print_value_fields (type, valaddr, stream, format, recurse, pretty, @@ -265,27 +430,30 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, case TYPE_CODE_REF: if (addressprint) - { + { fprintf_filtered (stream, "LOC("); print_address_numeric (extract_address (valaddr, TARGET_PTR_BIT / HOST_CHAR_BIT), + 1, stream); fprintf_filtered (stream, ")"); if (deref_ref) fputs_filtered (": ", stream); - } + } /* De-reference the reference. */ if (deref_ref) { if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_UNDEF) { - value_ptr deref_val = - value_at - (TYPE_TARGET_TYPE (type), - unpack_pointer (lookup_pointer_type (builtin_type_void), - valaddr)); + struct value *deref_val = + value_at + (TYPE_TARGET_TYPE (type), + unpack_pointer (lookup_pointer_type (builtin_type_void), + valaddr), + NULL); val_print (VALUE_TYPE (deref_val), VALUE_CONTENTS (deref_val), + 0, VALUE_ADDRESS (deref_val), stream, format, deref_ref, recurse + 1, pretty); } @@ -295,13 +463,13 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, break; case TYPE_CODE_ENUM: - c_val_print (type, valaddr, address, stream, format, + c_val_print (type, valaddr, 0, address, stream, format, deref_ref, recurse, pretty); break; case TYPE_CODE_RANGE: if (TYPE_TARGET_TYPE (type)) - chill_val_print (TYPE_TARGET_TYPE (type), valaddr, address, stream, + chill_val_print (TYPE_TARGET_TYPE (type), valaddr, 0, address, stream, format, deref_ref, recurse, pretty); break; @@ -312,8 +480,8 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, case TYPE_CODE_ERROR: default: /* Let's defer printing to the C printer, rather than - print an error message. FIXME! */ - c_val_print (type, valaddr, address, stream, format, + print an error message. FIXME! */ + c_val_print (type, valaddr, 0, address, stream, format, deref_ref, recurse, pretty); } gdb_flush (stream); @@ -330,20 +498,14 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, should not print, or zero if called from top level. */ static void -chill_print_value_fields (type, valaddr, stream, format, recurse, pretty, - dont_print) - struct type *type; - char *valaddr; - GDB_FILE *stream; - int format; - int recurse; - enum val_prettyprint pretty; - struct type **dont_print; +chill_print_value_fields (struct type *type, char *valaddr, + struct ui_file *stream, int format, int recurse, + enum val_prettyprint pretty, struct type **dont_print) { int i, len; int fields_seen = 0; - check_stub_type (type); + CHECK_TYPEDEF (type); fprintf_filtered (stream, "["); len = TYPE_NFIELDS (type); @@ -365,7 +527,7 @@ chill_print_value_fields (type, valaddr, stream, format, recurse, pretty, fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); } - else + else { wrap_here (n_spaces (2 + 2 * recurse)); } @@ -375,20 +537,20 @@ chill_print_value_fields (type, valaddr, stream, format, recurse, pretty, fputs_filtered (": ", stream); if (TYPE_FIELD_PACKED (type, i)) { - value_ptr v; + struct value *v; /* Bitfields require special handling, especially due to byte - order problems. */ + order problems. */ v = value_from_longest (TYPE_FIELD_TYPE (type, i), - unpack_field_as_long (type, valaddr, i)); + unpack_field_as_long (type, valaddr, i)); - chill_val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0, + chill_val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0, 0, stream, format, 0, recurse + 1, pretty); } else { - chill_val_print (TYPE_FIELD_TYPE (type, i), - valaddr + TYPE_FIELD_BITPOS (type, i) / 8, + chill_val_print (TYPE_FIELD_TYPE (type, i), + valaddr + TYPE_FIELD_BITPOS (type, i) / 8, 0, 0, stream, format, 0, recurse + 1, pretty); } } @@ -400,3 +562,44 @@ chill_print_value_fields (type, valaddr, stream, format, recurse, pretty, } fprintf_filtered (stream, "]"); } + +int +chill_value_print (struct value *val, struct ui_file *stream, int format, + enum val_prettyprint pretty) +{ + struct type *type = VALUE_TYPE (val); + struct type *real_type = check_typedef (type); + + /* If it is a pointer, indicate what it points to. + + Print type also if it is a reference. */ + + if (TYPE_CODE (real_type) == TYPE_CODE_PTR || + TYPE_CODE (real_type) == TYPE_CODE_REF) + { + char *valaddr = VALUE_CONTENTS (val); + CORE_ADDR addr = unpack_pointer (type, valaddr); + if (TYPE_CODE (type) != TYPE_CODE_PTR || addr != 0) + { + int i; + char *name = TYPE_NAME (type); + if (name) + fputs_filtered (name, stream); + else if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_VOID) + fputs_filtered ("PTR", stream); + else + { + fprintf_filtered (stream, "("); + type_print (type, "", stream, -1); + fprintf_filtered (stream, ")"); + } + fprintf_filtered (stream, "("); + i = val_print (type, valaddr, 0, VALUE_ADDRESS (val), + stream, format, 1, 0, pretty); + fprintf_filtered (stream, ")"); + return i; + } + } + return (val_print (type, VALUE_CONTENTS (val), 0, + VALUE_ADDRESS (val), stream, format, 1, 0, pretty)); +}