mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-27 03:51:15 +08:00
e8b24d9ff5
Nowadays, we pass both val and return value of value_contents_for_printing (val) to la_val_print. The latter is unnecessary. This patch removes the second parameter of la_val_print, and get valaddr in each language's implementation by calling value_contents_for_printing. Since value_contents_for_printing calls value_fetch_lazy, I also make VAL non-const. Note that - I don't clean up the valaddr usages in each language's routines, - I don't remove valaddr from apply_ext_lang_val_pretty_printer, and extension language ops apply_val_pretty_printer. They can be done in followup patches. gdb: 2016-11-08 Yao Qi <yao.qi@linaro.org> * ada-lang.h (ada_val_print): Remove second parameter. Remove const from "struct value *". * ada-valprint.c (print_field_values): Remove const from "struct value *". (val_print_packed_array_elements): Likewise. (print_variant_part): Likewise. (ada_val_print_string): Likewise. (ada_val_print_gnat_array): Likewise. (ada_val_print_ptr): Likewise. (ada_val_print_num): Likewise. (ada_val_print_enum): Likewise. (ada_val_print_flt): Likewise. (ada_val_print_union): Likewise. (ada_val_print_struct_union): Likewise. (ada_val_print_ref): Likewise. (ada_val_print_1): Remove second parameter. Remove const from "struct value *". (ada_val_print): Likewise. * c-lang.h (c_val_print): Likewise. * c-valprint.c (c_val_print_array): Remove const from "struct value *". (c_val_print_ptr): Likewise. (c_val_print_struct): Likewise. (c_val_print_union): Likewise. (c_val_print_int): Likewise. (c_val_print_memberptr): Likewise. (c_val_print): Remove second parameter. Remove const from "struct value *". All callers updated. * cp-valprint.c (cp_print_value): Remove const from "struct value *". (cp_print_value_fields): Likewise. (c_val_print_value): Likewise. * d-lang.h (d_val_print): Remove second parameter. Remove const from "struct value *". * d-valprint.c (dynamic_array_type): Likewise. (d_val_print): Likewise. * f-lang.h (f_val_print): Likewise. * f-valprint.c (f_val_print): Likewise. * go-lang.h (go_val_print): Likewise. * go-valprint.c (print_go_string): Likewise. (go_val_print): Likewise. * language.c (unk_lang_val_print): Likewise. * language.h (struct language_defn) <la_val_print>: Likewise. Update comments. (LA_VAL_PRINT): Remove. * m2-lang.h (m2_val_print): Remove const from "struct value *". * m2-valprint.c (m2_print_array_contents): Likewise. (m2_val_print): Likewise. * p-lang.h (pascal_val_print): Remove second parameter. Remove const from "struct value *". (pascal_object_print_value_fields): Likewise. * p-valprint.c (pascal_val_print): Likewise. (pascal_object_print_value_fields): Likewise. (pascal_object_print_value): Likewise. * rust-lang.c (rust_get_disr_info): Likewise. (val_print_struct): Likewise. (rust_val_print): Likewise. * valprint.c (generic_val_print_array): Likewise. (generic_val_print_ptr): Likewise. (generic_val_print_memberptr): Likewise. (generic_val_print_ref): Likewise. (generic_val_print_enum): Likewise. (generic_val_print_flags): Likewise. (generic_val_print_func): Likewise. (generic_val_print_bool): Likewise. (generic_val_print_int): Likewise. (generic_val_print_char): Likewise. (generic_val_print_float): Likewise. (generic_val_print_decfloat): Likewise. (generic_val_print_complex): Likewise. (generic_val_print): Likewise. (val_print): Likewise. (common_val_print): Likewise. (val_print_type_code_flags): Likewise. (val_print_scalar_formatted): Likewise. (val_print_array_elements): Likewise. * valprint.h (val_print_array_elements): Update declaration. (val_print_scalar_formatted): Likewise. (generic_val_print): Likewise. * value.h (val_print): Likewise.
124 lines
3.6 KiB
C
124 lines
3.6 KiB
C
/* Support for printing Go values for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 2012-2016 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
NOTE: This currently only provides special support for printing gccgo
|
|
strings. 6g objects are handled in Python.
|
|
The remaining gccgo types may also be handled in Python.
|
|
Strings are handled specially here, at least for now, in case the Python
|
|
support is unavailable. */
|
|
|
|
#include "defs.h"
|
|
#include "gdbtypes.h"
|
|
#include "gdbcore.h"
|
|
#include "go-lang.h"
|
|
#include "c-lang.h"
|
|
#include "valprint.h"
|
|
|
|
/* Print a Go string.
|
|
|
|
Note: We assume
|
|
gdb_assert (go_classify_struct_type (type) == GO_TYPE_STRING). */
|
|
|
|
static void
|
|
print_go_string (struct type *type,
|
|
LONGEST embedded_offset, CORE_ADDR address,
|
|
struct ui_file *stream, int recurse,
|
|
struct value *val,
|
|
const struct value_print_options *options)
|
|
{
|
|
struct gdbarch *gdbarch = get_type_arch (type);
|
|
struct type *elt_ptr_type = TYPE_FIELD_TYPE (type, 0);
|
|
struct type *elt_type = TYPE_TARGET_TYPE (elt_ptr_type);
|
|
LONGEST length;
|
|
/* TODO(dje): The encapsulation of what a pointer is belongs in value.c.
|
|
I.e. If there's going to be unpack_pointer, there should be
|
|
unpack_value_field_as_pointer. Do this until we can get
|
|
unpack_value_field_as_pointer. */
|
|
LONGEST addr;
|
|
const gdb_byte *valaddr = value_contents_for_printing (val);
|
|
|
|
|
|
if (! unpack_value_field_as_long (type, valaddr, embedded_offset, 0,
|
|
val, &addr))
|
|
error (_("Unable to read string address"));
|
|
|
|
if (! unpack_value_field_as_long (type, valaddr, embedded_offset, 1,
|
|
val, &length))
|
|
error (_("Unable to read string length"));
|
|
|
|
/* TODO(dje): Print address of struct or actual string? */
|
|
if (options->addressprint)
|
|
{
|
|
fputs_filtered (paddress (gdbarch, addr), stream);
|
|
fputs_filtered (" ", stream);
|
|
}
|
|
|
|
if (length < 0)
|
|
{
|
|
fputs_filtered (_("<invalid length: "), stream);
|
|
fputs_filtered (plongest (addr), stream);
|
|
fputs_filtered (">", stream);
|
|
return;
|
|
}
|
|
|
|
/* TODO(dje): Perhaps we should pass "UTF8" for ENCODING.
|
|
The target encoding is a global switch.
|
|
Either choice is problematic. */
|
|
val_print_string (elt_type, NULL, addr, length, stream, options);
|
|
}
|
|
|
|
/* Implements the la_val_print routine for language Go. */
|
|
|
|
void
|
|
go_val_print (struct type *type, int embedded_offset,
|
|
CORE_ADDR address, struct ui_file *stream, int recurse,
|
|
struct value *val,
|
|
const struct value_print_options *options)
|
|
{
|
|
type = check_typedef (type);
|
|
|
|
switch (TYPE_CODE (type))
|
|
{
|
|
case TYPE_CODE_STRUCT:
|
|
{
|
|
enum go_type go_type = go_classify_struct_type (type);
|
|
|
|
switch (go_type)
|
|
{
|
|
case GO_TYPE_STRING:
|
|
if (! options->raw)
|
|
{
|
|
print_go_string (type, embedded_offset, address,
|
|
stream, recurse, val, options);
|
|
return;
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
/* Fall through. */
|
|
|
|
default:
|
|
c_val_print (type, embedded_offset, address, stream,
|
|
recurse, val, options);
|
|
break;
|
|
}
|
|
}
|