mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
e86ca25fd6
TYPE_TAG_NAME has been an occasional source of confusion and bugs. It seems to me that it is only useful for C and C++ -- but even there, not so much, because at least with DWARF there doesn't seem to be any way to wind up with a type where the name and the tag name are both non-NULL and different. So, this patch removes TYPE_TAG_NAME entirely. This should save a little memory, but more importantly, it simplifies this part of gdb. A few minor test suite adjustments were needed. In some situations the new code does not yield identical output to the old code. gdb/ChangeLog 2018-06-01 Tom Tromey <tom@tromey.com> * valops.c (enum_constant_from_type, value_namespace_elt) (value_maybe_namespace_elt): Update. * valarith.c (find_size_for_pointer_math): Update. * target-descriptions.c (make_gdb_type): Update. * symmisc.c (print_symbol): Update. * stabsread.c (define_symbol, read_type) (complain_about_struct_wipeout, add_undefined_type) (cleanup_undefined_types_1): Update. * rust-lang.c (rust_tuple_type_p, rust_slice_type_p) (rust_range_type_p, val_print_struct, rust_print_struct_def) (rust_internal_print_type, rust_composite_type) (rust_evaluate_funcall, rust_evaluate_subexp) (rust_inclusive_range_type_p): Update. * python/py-type.c (typy_get_tag): Update. * p-typeprint.c (pascal_type_print_base): Update. * mdebugread.c (parse_symbol, parse_type): Update. * m2-typeprint.c (m2_long_set, m2_record_fields, m2_enum): Update. * guile/scm-type.c (gdbscm_type_tag): Update. * go-lang.c (sixg_string_p): Update. * gnu-v3-abi.c (build_gdb_vtable_type, build_std_type_info_type): Update. * gdbtypes.h (struct main_type) <tag_name>: Remove. (TYPE_TAG_NAME): Remove. * gdbtypes.c (type_name_no_tag): Simplify. (check_typedef, check_types_equal, recursive_dump_type) (copy_type_recursive, arch_composite_type): Update. * f-typeprint.c (f_type_print_base): Update. Print "Type" prefix in summary mode when needed. * eval.c (evaluate_funcall): Update. * dwarf2read.c (fixup_go_packaging, read_structure_type) (process_structure_scope, read_enumeration_type) (read_namespace_type, read_module_type, determine_prefix): Update. * cp-support.c (inspect_type): Update. * coffread.c (process_coff_symbol, decode_base_type): Update. * c-varobj.c (c_is_path_expr_parent): Update. * c-typeprint.c (c_type_print_base_struct_union): Update. (c_type_print_base_1): Update. Print struct/class/union/enum in summary when using C language. * ax-gdb.c (gen_struct_ref, gen_namespace_elt) (gen_maybe_namespace_elt): Update. * ada-lang.c (ada_type_name): Simplify. (empty_record, ada_template_to_fixed_record_type_1) (template_to_static_fixed_type) (to_record_with_fixed_variant_part, ada_check_typedef): Update. gdb/testsuite/ChangeLog 2018-06-01 Tom Tromey <tom@tromey.com> * gdb.xml/tdesc-regs.exp (load_description): Update expected results. * gdb.dwarf2/method-ptr.exp: Set language to C++. * gdb.dwarf2/member-ptr-forwardref.exp: Set language to C++. * gdb.cp/typeid.exp (do_typeid_tests): Update type_re. * gdb.base/maint.exp (maint_pass_if): Update.
200 lines
6.4 KiB
Plaintext
200 lines
6.4 KiB
Plaintext
# Copyright 2007-2018 Free Software Foundation, Inc.
|
|
|
|
# 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/>.
|
|
|
|
if {[gdb_skip_xml_test]} {
|
|
unsupported "tdesc-regs.exp"
|
|
return -1
|
|
}
|
|
|
|
gdb_start
|
|
|
|
# To test adding registers, we need a core set of registers for this
|
|
# architecture, or the description will be rejected.
|
|
|
|
set core-regs ""
|
|
set regdir ""
|
|
set architecture ""
|
|
switch -glob -- [istarget] {
|
|
"aarch64*-*-*" {
|
|
set core-regs {aarch64-core.xml}
|
|
}
|
|
"arc*-*-*" {
|
|
set architecture "arc:ARCv2"
|
|
set core-regs {arc-v2.xml}
|
|
}
|
|
"arm*-*-*" {
|
|
set regdir "arm/"
|
|
set core-regs {arm-core.xml}
|
|
}
|
|
"*m68k-*-*" {
|
|
set core-regs {m68k-core.xml}
|
|
}
|
|
"mips*-*-*" {
|
|
set core-regs {mips-cpu.xml mips-cp0.xml mips-fpu.xml mips-dsp.xml}
|
|
}
|
|
"nds32*-*-*" {
|
|
set core-regs {nds32-core.xml}
|
|
}
|
|
"nios2-*-*" {
|
|
set core-regs {nios2-cpu.xml}
|
|
}
|
|
"or1k-*-*" {
|
|
set core-regs {or1k-core.xml}
|
|
}
|
|
"powerpc*-*-*" {
|
|
set regdir "rs6000/"
|
|
set core-regs {power-core.xml}
|
|
}
|
|
"s390*-*-*" {
|
|
set core-regs {s390-core32.xml s390-acr.xml s390-fpr.xml}
|
|
}
|
|
"sparc-*-*" {
|
|
set regdir "sparc/"
|
|
set core-regs {sparc32-cpu.xml sparc32-fpu.xml sparc32-cp0.xml}
|
|
}
|
|
"sparc64-*-*" {
|
|
set architecture "sparc:v9"
|
|
set regdir "sparc/"
|
|
set core-regs {sparc64-cpu.xml sparc64-fpu.xml sparc64-cp0.xml}
|
|
}
|
|
"spu*-*-*" {
|
|
# This may be either the spu-linux-nat target, or the Cell/B.E.
|
|
# multi-architecture debugger in SPU standalone executable mode.
|
|
# We do not support XML register sets on SPU in either case.
|
|
# However, the multi-arch debugger will accept XML registers sets
|
|
# (on the PowerPC side), hence the test below would fail.
|
|
# Simply return unconditionally here.
|
|
unsupported "register tests"
|
|
return 0
|
|
}
|
|
"tic6x-*-*" {
|
|
set core-regs {tic6x-core.xml}
|
|
}
|
|
"i?86-*-*" {
|
|
set architecture "i386"
|
|
set regdir "i386/"
|
|
set core-regs {32bit-core.xml 32bit-sse.xml}
|
|
}
|
|
"x86_64-*-*" {
|
|
set architecture "i386:x86-64"
|
|
set regdir "i386/"
|
|
set core-regs {64bit-core.xml 64bit-sse.xml}
|
|
}
|
|
}
|
|
|
|
# If no core registers were specified, assume this target does not
|
|
# support target-defined registers. Verify that we get a warning if
|
|
# we try to use them. This not only tests the warning, but also
|
|
# reminds maintainers to add test support when they add the feature.
|
|
|
|
set single_reg_xml [gdb_remote_download host \
|
|
"$srcdir/$subdir/single-reg.xml"]
|
|
|
|
if {[string equal ${core-regs} ""]} {
|
|
gdb_test "set tdesc file $single_reg_xml" \
|
|
"warning: Target-supplied registers are not supported.*" \
|
|
"set tdesc file single-reg.xml"
|
|
unsupported "register tests"
|
|
return 0
|
|
}
|
|
|
|
# Otherwise, we support both XML and target defined registers.
|
|
|
|
# Make sure we reject a description missing standard registers,
|
|
# like the PC.
|
|
gdb_test "set tdesc file $single_reg_xml" \
|
|
"warning: Architecture rejected target-supplied description" \
|
|
"set tdesc file single-reg.xml"
|
|
|
|
# Copy the core registers into the objdir if necessary, so that they
|
|
# will be found by <xi:include>.
|
|
foreach src ${core-regs} {
|
|
set remote_filename($src) \
|
|
[gdb_remote_download host "$srcdir/../features/$regdir$src"]
|
|
}
|
|
|
|
# Similarly, we need to copy files under test into the objdir.
|
|
proc load_description { file errmsg xml_file } {
|
|
global srcdir
|
|
global subdir
|
|
global gdb_prompt
|
|
global core-regs
|
|
global architecture
|
|
global remote_filename
|
|
|
|
set regs_file [standard_output_file $xml_file]
|
|
|
|
file delete $regs_file
|
|
set ifd [open "$srcdir/$subdir/$file" r]
|
|
set ofd [open $regs_file w]
|
|
while {[gets $ifd line] >= 0} {
|
|
if {[regexp {<xi:include href="core-regs.xml"/>} $line]} {
|
|
if {! [string equal ${architecture} ""]} {
|
|
puts $ofd " <architecture>${architecture}</architecture>"
|
|
}
|
|
foreach src ${core-regs} {
|
|
puts $ofd " <xi:include href=\"$src\"/>"
|
|
}
|
|
} else {
|
|
puts $ofd $line
|
|
}
|
|
}
|
|
close $ifd
|
|
close $ofd
|
|
|
|
if {[is_remote host]} {
|
|
set regs_file [remote_download host "$subdir/$xml_file" $xml_file]
|
|
}
|
|
|
|
# Anchor the test output, so that error messages are detected.
|
|
set cmd "set tdesc filename [file tail $regs_file]"
|
|
set msg "set tdesc filename $xml_file - from $file"
|
|
set cmd_regex [string_to_regexp $cmd]
|
|
gdb_test_multiple $cmd $msg {
|
|
-re "^$cmd_regex\r\n$errmsg$gdb_prompt $" {
|
|
pass $msg
|
|
}
|
|
}
|
|
}
|
|
|
|
if {![is_remote host]} {
|
|
gdb_test "cd [standard_output_file {}]" "Working directory .*" \
|
|
"cd to directory holding xml"
|
|
}
|
|
|
|
load_description "extra-regs.xml" "" "test-extra-regs.xml"
|
|
gdb_test "ptype \$extrareg" "type = (int|long|long long)"
|
|
gdb_test "ptype \$uintreg" "type = uint32_t"
|
|
gdb_test "ptype \$vecreg" "type = int8_t __attribute__ \\(\\(vector_size\\(4\\)\\)\\)"
|
|
gdb_test "ptype \$unionreg" \
|
|
"type = union vecint {\r\n *v4int8 v4;\r\n *v2int16 v2;\r\n}"
|
|
gdb_test "ptype \$unionreg.v4" "type = int8_t __attribute__ \\(\\(vector_size\\(4\\)\\)\\)"
|
|
gdb_test "ptype \$structreg" \
|
|
"type = struct struct1 {\r\n *v4int8 v4;\r\n *v2int16 v2;\r\n}"
|
|
gdb_test "ptype \$structreg.v4" "type = int8_t __attribute__ \\(\\(vector_size\\(4\\)\\)\\)"
|
|
gdb_test "ptype \$bitfields" \
|
|
"type = struct struct2 {\r\n *uint64_t f1 : 35;\r\n *uint64_t f2 : 1;\r\n}"
|
|
gdb_test "ptype \$flags" \
|
|
"type = flag flags {\r\n *bool X @0;\r\n *uint32_t Y @2;\r\n}"
|
|
gdb_test "ptype \$mixed_flags" \
|
|
"type = flag mixed_flags {\r\n *bool A @0;\r\n *uint32_t B @1-3;\r\n *bool C @4;\r\n *uint32_t D @5;\r\n *uint32_t @6-7;\r\n *enum Z_values {yes = 1, no = 0, maybe = 2, so} Z @8-9;\r\n}"
|
|
# Reggroups should have at least general and the extra foo group
|
|
gdb_test "maintenance print reggroups" \
|
|
" Group\[ \t\]+Type\[ \t\]+\r\n.* general\[ \t\]+user\[ \t\]+\r\n.* foo\[ \t\]+user\[ \t\]+"
|
|
|
|
load_description "core-only.xml" "" "test-regs.xml"
|
|
# The extra register from the previous description should be gone.
|
|
gdb_test "ptype \$extrareg" "type = void"
|