7803799a0f
and s390x-linux64. (s390-linux32-expedite): Define. (s390-linux64-expedite): Define. (s390x-linux64-expedite): Define. * features/s390-acr.xml: New file. * features/s390-fpr.xml: New file. * features/s390-core32.xml: New file. * features/s390-core64.xml: New file. * features/s390x-core64.xml: New file. * features/s390-linux32.xml: New file. * features/s390-linux64.xml: New file. * features/s390x-linux64.xml: New file. * features/s390-linux32.c: New generated file. * features/s390-linux64.c: New generated file. * features/s390x-linux64.c: New generated file. * regformats/s390-linux32.dat: New generated file. * regformats/s390-linux64.dat: New generated file. * regformats/s390x-linux64.dat: New generated file. * regformats/reg-s390.dat: Remove. * regformats/reg-s390x.dat: Remove. * s390-nat.c: Include "auxv.h" and <elf.h>. (HWCAP_S390_HIGH_GPRS): Define if undefined. (s390_target_wordsize): New function. (s390_auxv_parse): Likewise. (s390_get_hwcap): Likewise. (s390_read_description): Likewise. (_initialize_s390_nat): Install s390_auxv_parse and s390_read_description. * s390-tdep.c: Include "features/s390-linux32.c", "features/s390-linux64.c", and "features/s390x-linux64.c". (struct gdbarch_tdep): Add gpr_full_regnum, pc_regnum, and cc_regnum. (s390_register_call_saved): New function. (s390_register_name): Remove. (s390_register_type): Remove. (s390_dwarf_regmap): Add lower half GPR pseudo DWARF CFI regnums. (s390_dwarf_reg_to_regnum): Remap GPR regnums to full GPRs. (s390_adjust_frame_regnum): Remap GPR regnums to lower halves for CFI. (s390_pseudo_register_name): New function. (s390_pseudo_register_type): New function. (s390_pseudo_register_read): Handle both 32-bit and 64-bit cases. Handle full GPR pesudos and varying pseudo register numbers. (s390_pseudo_register_write): Likewise (s390x_pseudo_register_read): Remove. (s390x_pseudo_register_write): Likewise. (s390_register_group): Remove. (s390_pseudo_register_group): New function. (s390_regmap_gregset): Add GPR upper halves. (s390x_regmap_gregset): Likewise. (s390_regmap_fpregset): Likewise. (s390_regmap_upper): New global variable. (s390_upper_regset): New global variable. (s390_upper_regset_sections): New global variable. (s390_regset_from_core_section): Handle GPR upper halves. (s390_core_read_description): New function. (s390_prologue_frame_unwind_cache): Set up ABI call-saved/clobbered register information. Handle varying pseudo register numbers. (s390_backchain_frame_unwind_cache): Likewise. (s390_frame_prev_register): Unwind full GPRs to show lower halves. (s390_stub_frame_unwind_cache): Handle varying pseudo register numbers. (s390_sigtramp_frame_unwind_cache): Unwind PSWM and PSWA as well as PC and CC pseudos. Unwind upper halves and full GPRs as appropriate. Handle varying pseudo register numbers. (s390_unwind_pc): Handle varying pseudo register numbers. (s390_dwarf2_prev_register): New function. (s390_dwarf2_frame_init_reg): Set up ABI call-saved/clobbered register information. Handle varying pseudo register numbers. Install s390_dwarf2_prev_register to unwind full GPRs. (s390_gdbarch_init): Handle target descriptions. Assign varying pseudo register numbers. Install s390_adjust_frame_regnum. (_initialize_s390_tdep): Initialize target descriptions. * s390-tdep.h (S390_R0_UPPER_REGNUM .. S390_R15_UPPER_REGNUM): Define. (S390_NUM_REGS): Redefine to include upper half registers. (S390_PC_REGNUM, S390_CC_REGNUM): Remove. (S390_NUM_PSEUDO_REGS, S390_NUM_TOTAL_REGS): Likewise. (tdesc_s390_linux32): Add declaration. (tdesc_s390_linux64): Likewise. (tdesc_s390x_linux64): Likewise. gdb/testsuite/ * gdb.xml/tdesc-regs.exp: Support s390*-*-* targets. gdbserver/ * Makefile.in (clean): Remove new generated files. (reg-s390.o, reg-s390.c): Remove rules. (reg-s390x.o, reg-s390x.c): Likewise. (s390-linux32.o, s390-linux32.c): Add rules. (s390-linux64.o, s390-linux64.c): Likewise. (s390x-linux64.o, s390x-linux64.c): Likewise. * configure.srv (s390*-*-linux*): Update srv_regobj and srv_xmlfiles. * linux-s390-low.c: Include <elf.h>. (HWCAP_S390_HIGH_GPRS): Define if undefined. (init_registers_s390): Remove prototype. (init_registers_s390x): Likewise. (init_registers_s390_linux32): Add prototype. (init_registers_s390_linux64): Likewise. (init_registers_s390x_linux64): Likewise. (s390_num_regs_3264): New define. (s390_regmap_3264): New global variable. (s390_cannot_fetch_register): Remove obsolete check. (s390_cannot_store_register): Likewise. (s390_collect_ptrace_register): Handle upper/lower register halves. (s390_supply_ptrace_register): Likewise. (s390_fill_gregset): Update to register number changes. (s390_get_hwcap): New routine. (s390_arch_setup): Detect 32-bit process running on 64-bit system. Install appropriate regmap and register set.
135 lines
4.1 KiB
Text
135 lines
4.1 KiB
Text
# Copyright 2007, 2008, 2009, 2010 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 ""
|
|
switch -glob -- [istarget] {
|
|
"*arm-*-*" {
|
|
set core-regs {arm-core.xml}
|
|
}
|
|
"xscale-*-*" {
|
|
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}
|
|
}
|
|
"powerpc*-*-*" {
|
|
set regdir "rs6000/"
|
|
set core-regs {power-core.xml}
|
|
}
|
|
"s390*-*-*" {
|
|
set core-regs {s390-core32.xml s390-acr.xml s390-fpr.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
|
|
}
|
|
}
|
|
|
|
# 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.
|
|
if {[string equal ${core-regs} ""]} {
|
|
gdb_test "set tdesc file $srcdir/$subdir/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 $srcdir/$subdir/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} {
|
|
file delete "$src"
|
|
file copy "$srcdir/../features/$regdir$src" "$src"
|
|
}
|
|
|
|
# Similarly, we need to copy files under test into the objdir.
|
|
proc load_description { file errmsg } {
|
|
global srcdir
|
|
global subdir
|
|
global gdb_prompt
|
|
global core-regs
|
|
|
|
file delete "regs.xml"
|
|
set ifd [open "$srcdir/$subdir/$file" r]
|
|
set ofd [open "regs.xml" w]
|
|
while {[gets $ifd line] >= 0} {
|
|
if {[regexp {<xi:include href="core-regs.xml"/>} $line]} {
|
|
foreach src ${core-regs} {
|
|
puts $ofd " <xi:include href=\"$src\"/>"
|
|
}
|
|
} else {
|
|
puts $ofd $line
|
|
}
|
|
}
|
|
close $ifd
|
|
close $ofd
|
|
|
|
# Anchor the test output, so that error messages are detected.
|
|
set cmd "set tdesc filename regs.xml"
|
|
set msg "set tdesc filename $file"
|
|
set cmd_regex [string_to_regexp $cmd]
|
|
gdb_test_multiple $cmd $msg {
|
|
-re "^$cmd_regex\r\n$errmsg$gdb_prompt $" {
|
|
pass $msg
|
|
}
|
|
}
|
|
}
|
|
|
|
load_description "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 \\\[4\\\]"
|
|
gdb_test "ptype \$unionreg" \
|
|
"type = union {\r\n *v4int8 v4;\r\n *v2int16 v2;\r\n}"
|
|
gdb_test "ptype \$unionreg.v4" "type = int8_t \\\[4\\\]"
|
|
|
|
load_description "core-only.xml" ""
|
|
# The extra register from the previous description should be gone.
|
|
gdb_test "ptype \$extrareg" "type = void"
|
|
|
|
foreach src ${core-regs} {
|
|
file delete "$src"
|
|
}
|
|
file delete "regs.xml"
|