From 0667c506823489f2fab1938d3fc8ee27f8a7c651 Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Fri, 19 Oct 2018 14:05:08 +0200 Subject: [PATCH] S390: Fix crash when remote tdesc doesn't define vec128 I've encountered a GDB crash when trying to read registers from a remote stub that provided a target.xml with vector registers, but without the 'vec128' data type. The crash is caused by NULL register type entries for the "concatenated" pseudo-registers v0-v15. These NULL entries are introduced by the logic in s390_pseudo_register_type(), where the tdesc type 'vec128' is returned unconditionally -- even if it doesn't exist (is NULL). The fixed logic for determining a "concatenated" vector register's type now returns the type of the raw register v16 instead. This also makes sure that all vector register have the same type. gdb/ChangeLog: * s390-tdep.c (s390_pseudo_register_type): For v0-v15 don't yield the possibly non-existent tdesc type 'vec128', but the type of raw register v16 instead. --- gdb/ChangeLog | 6 ++++++ gdb/s390-tdep.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d32cfd0c94..c2037996bf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2018-10-19 Andreas Arnez + + * s390-tdep.c (s390_pseudo_register_type): For v0-v15 don't yield + the possibly non-existent tdesc type 'vec128', but the type of raw + register v16 instead. + 2018-10-19 Gary Benson * cli/cli-interp.c (cli_interp::~cli_interp): New function. diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 81fa0329ea..23689aa71a 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1275,8 +1275,9 @@ s390_pseudo_register_type (struct gdbarch *gdbarch, int regnum) if (regnum_is_gpr_full (tdep, regnum)) return builtin_type (gdbarch)->builtin_uint64; + /* For the "concatenated" vector registers use the same type as v16. */ if (regnum_is_vxr_full (tdep, regnum)) - return tdesc_find_type (gdbarch, "vec128"); + return tdesc_register_type (gdbarch, S390_V16_REGNUM); internal_error (__FILE__, __LINE__, _("invalid regnum")); }