Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP2:GA
gdb.783
0002-S390-Add-vector-register-support-to-gdb.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0002-S390-Add-vector-register-support-to-gdb.patch of Package gdb.783
Part of fate#318039 From 550bdf96cae94bc3e6c0f7e7e9a6793399dd8fe6 Mon Sep 17 00:00:00 2001 From: Andreas Arnez <arnez@linux.vnet.ibm.com> Date: Mon, 2 Mar 2015 10:57:39 +0100 Subject: [PATCH] S390: Add vector register support to gdb Recognize S/390 targets with the new vector feature and present their vector registers appropriately: as 32 new 128-bit wide registers v0-v31, where the first 16 embed the floating point registers f0-f15. Each of the full registers v0-v15 is modelled as a pseudo register. gdb/ChangeLog: * s390-linux-nat.c (have_regset_vxrs): New static variable. (s390_linux_fetch_inferior_registers): Handle vector registers, if present. (s390_linux_store_inferior_registers): Likewise. (s390_get_hwcap): Remove function. Embed its logic... (s390_read_description): ...here. Yield a target description with vector registers if applicable. * s390-linux-tdep.c: Include "features/s390-vx-linux64.c", "features/s390-tevx-linux64.c", "features/s390x-vx-linux64.c", and "features/s390x-tevx-linux64.c". (struct gdbarch_tdep) <v0_full_regnum>: New field. (s390_dwarf_regmap): Add vector registers. Remove bogus entries for "GNU/Linux-specific registers". (s390_dwarf_reg_r0l): New enum value. (s390_dwarf_reg_to_regnum): Support vector registers. (s390_adjust_frame_regnum): Adjust pseudo DWARF register numbers of GPR lower halves. (regnum_is_vxr_full): New function. (s390_register_name): New function. (s390_pseudo_register_name): Handle v0-v15, which are composed of f0-f15 and v0l-v15l. (s390_pseudo_register_type): Likewise. (s390_pseudo_register_read): Likewise. (s390_pseudo_register_write): Likewise. (s390_value_from_register): Account for the fact that values are placed left-justified in vector registers. (s390_pseudo_register_reggroup_p): Add pseudo registers v0-v15 to the vector reggroup and omit them from the general reggroup. (s390_regmap_vxrs_low, s390_regmap_vxrs_high): New register maps. (s390_vxrs_low_regset, s390_vxrs_high_regset): New regsets. (s390_iterate_over_regset_sections): Add iterations for the two new vector regsets. (s390_core_read_description): Yield a target description with vector registers if applicable. (s390_gdbarch_init): Handle target descriptions with vector registers. Add "register_name" gdbarch method. (_initialize_s390_tdep): Call new tdesc initialization functions. * s390-linux-tdep.h (HWCAP_S390_VX): New macro. (S390_V0_LOWER_REGNUM, S390_V1_LOWER_REGNUM, S390_V2_LOWER_REGNUM) (S390_V3_LOWER_REGNUM, S390_V4_LOWER_REGNUM, S390_V5_LOWER_REGNUM) (S390_V6_LOWER_REGNUM, S390_V7_LOWER_REGNUM, S390_V8_LOWER_REGNUM) (S390_V9_LOWER_REGNUM, S390_V10_LOWER_REGNUM) (S390_V11_LOWER_REGNUM, S390_V12_LOWER_REGNUM) (S390_V13_LOWER_REGNUM, S390_V14_LOWER_REGNUM) (S390_V15_LOWER_REGNUM, S390_V16_REGNUM, S390_V17_REGNUM) (S390_V18_REGNUM, S390_V19_REGNUM, S390_V20_REGNUM) (S390_V21_REGNUM, S390_V22_REGNUM, S390_V23_REGNUM) (S390_V24_REGNUM, S390_V25_REGNUM, S390_V26_REGNUM) (S390_V27_REGNUM, S390_V28_REGNUM, S390_V29_REGNUM) (S390_V30_REGNUM, S390_V31_REGNUM): New macros. (S390_NUM_REGS): Adjust value. (s390_vxrs_low_regset, s390_vxrs_high_regset): Declare. (tdesc_s390_vx_linux64, tdesc_s390_tevx_linux64) (tdesc_s390x_vx_linux64, tdesc_s390x_tevx_linux64): Likewise. * NEWS: Announce S/390 vector register support. --- gdb/ChangeLog | 58 +++++++++++++ gdb/NEWS | 3 + gdb/s390-linux-nat.c | 84 +++++++++++------- gdb/s390-linux-tdep.c | 229 +++++++++++++++++++++++++++++++++++++++++++------- gdb/s390-linux-tdep.h | 45 +++++++++- 5 files changed, 359 insertions(+), 60 deletions(-) Index: gdb-7.9.1/gdb/NEWS =================================================================== --- gdb-7.9.1.orig/gdb/NEWS 2015-07-10 16:18:29.000000000 +0200 +++ gdb-7.9.1/gdb/NEWS 2015-07-10 16:18:36.000000000 +0200 @@ -7,6 +7,9 @@ ** Xmethods can now specify a result type. +* GDB now supports access to vector registers on S/390 GNU/Linux + targets. + *** Changes in GDB 7.9 * GDB now supports hardware watchpoints on x86 GNU Hurd. Index: gdb-7.9.1/gdb/s390-linux-nat.c =================================================================== --- gdb-7.9.1.orig/gdb/s390-linux-nat.c 2015-07-10 16:18:29.000000000 +0200 +++ gdb-7.9.1/gdb/s390-linux-nat.c 2015-07-10 16:18:36.000000000 +0200 @@ -49,6 +49,7 @@ static int have_regset_last_break = 0; static int have_regset_system_call = 0; static int have_regset_tdb = 0; +static int have_regset_vxrs = 0; /* Register map for 32-bit executables running under a 64-bit kernel. */ @@ -367,6 +368,18 @@ s390_linux_fetch_inferior_registers (str if (regnum == -1 || S390_IS_TDBREGSET_REGNUM (regnum)) fetch_regset (regcache, tid, NT_S390_TDB, s390_sizeof_tdbregset, &s390_tdb_regset); + + if (have_regset_vxrs) + { + if (regnum == -1 || (regnum >= S390_V0_LOWER_REGNUM + && regnum <= S390_V15_LOWER_REGNUM)) + fetch_regset (regcache, tid, NT_S390_VXRS_LOW, 16 * 8, + &s390_vxrs_low_regset); + if (regnum == -1 || (regnum >= S390_V16_REGNUM + && regnum <= S390_V31_REGNUM)) + fetch_regset (regcache, tid, NT_S390_VXRS_HIGH, 16 * 16, + &s390_vxrs_high_regset); + } } /* Store register REGNUM back into the child process. If REGNUM is @@ -389,6 +402,18 @@ s390_linux_store_inferior_registers (str if (regnum == -1 || regnum == S390_SYSTEM_CALL_REGNUM) store_regset (regcache, tid, NT_S390_SYSTEM_CALL, 4, &s390_system_call_regset); + + if (have_regset_vxrs) + { + if (regnum == -1 || (regnum >= S390_V0_LOWER_REGNUM + && regnum <= S390_V15_LOWER_REGNUM)) + store_regset (regcache, tid, NT_S390_VXRS_LOW, 16 * 8, + &s390_vxrs_low_regset); + if (regnum == -1 || (regnum >= S390_V16_REGNUM + && regnum <= S390_V31_REGNUM)) + store_regset (regcache, tid, NT_S390_VXRS_HIGH, 16 * 16, + &s390_vxrs_high_regset); + } } @@ -591,19 +616,6 @@ s390_auxv_parse (struct target_ops *ops, return 1; } -#ifdef __s390x__ -static unsigned long -s390_get_hwcap (void) -{ - CORE_ADDR field; - - if (target_auxv_search (¤t_target, AT_HWCAP, &field)) - return (unsigned long) field; - - return 0; -} -#endif - static const struct target_desc * s390_read_description (struct target_ops *ops) { @@ -614,27 +626,41 @@ s390_read_description (struct target_ops have_regset_system_call = check_regset (tid, NT_S390_SYSTEM_CALL, 4); -#ifdef __s390x__ /* If GDB itself is compiled as 64-bit, we are running on a machine in z/Architecture mode. If the target is running in 64-bit addressing mode, report s390x architecture. If the target is running in 31-bit addressing mode, but the kernel supports using 64-bit registers in that mode, report s390 architecture with 64-bit GPRs. */ +#ifdef __s390x__ + { + CORE_ADDR hwcap = 0; - have_regset_tdb = (s390_get_hwcap () & HWCAP_S390_TE) ? - check_regset (tid, NT_S390_TDB, s390_sizeof_tdbregset) : 0; - - if (s390_target_wordsize () == 8) - return (have_regset_tdb ? tdesc_s390x_te_linux64 : - have_regset_system_call? tdesc_s390x_linux64v2 : - have_regset_last_break? tdesc_s390x_linux64v1 : - tdesc_s390x_linux64); - - if (s390_get_hwcap () & HWCAP_S390_HIGH_GPRS) - return (have_regset_tdb ? tdesc_s390_te_linux64 : - have_regset_system_call? tdesc_s390_linux64v2 : - have_regset_last_break? tdesc_s390_linux64v1 : - tdesc_s390_linux64); + target_auxv_search (¤t_target, AT_HWCAP, &hwcap); + have_regset_tdb = (hwcap & HWCAP_S390_TE) + && check_regset (tid, NT_S390_TDB, s390_sizeof_tdbregset); + + have_regset_vxrs = (hwcap & HWCAP_S390_VX) + && check_regset (tid, NT_S390_VXRS_LOW, 16 * 8) + && check_regset (tid, NT_S390_VXRS_HIGH, 16 * 16); + + if (s390_target_wordsize () == 8) + return (have_regset_vxrs ? + (have_regset_tdb ? tdesc_s390x_tevx_linux64 : + tdesc_s390x_vx_linux64) : + have_regset_tdb ? tdesc_s390x_te_linux64 : + have_regset_system_call ? tdesc_s390x_linux64v2 : + have_regset_last_break ? tdesc_s390x_linux64v1 : + tdesc_s390x_linux64); + + if (hwcap & HWCAP_S390_HIGH_GPRS) + return (have_regset_vxrs ? + (have_regset_tdb ? tdesc_s390_tevx_linux64 : + tdesc_s390_vx_linux64) : + have_regset_tdb ? tdesc_s390_te_linux64 : + have_regset_system_call ? tdesc_s390_linux64v2 : + have_regset_last_break ? tdesc_s390_linux64v1 : + tdesc_s390_linux64); + } #endif /* If GDB itself is compiled as 31-bit, or if we're running a 31-bit inferior Index: gdb-7.9.1/gdb/s390-linux-tdep.c =================================================================== --- gdb-7.9.1.orig/gdb/s390-linux-tdep.c 2015-07-10 16:18:29.000000000 +0200 +++ gdb-7.9.1/gdb/s390-linux-tdep.c 2015-07-10 16:18:36.000000000 +0200 @@ -62,10 +62,14 @@ #include "features/s390-linux64v1.c" #include "features/s390-linux64v2.c" #include "features/s390-te-linux64.c" +#include "features/s390-vx-linux64.c" +#include "features/s390-tevx-linux64.c" #include "features/s390x-linux64.c" #include "features/s390x-linux64v1.c" #include "features/s390x-linux64v2.c" #include "features/s390x-te-linux64.c" +#include "features/s390x-vx-linux64.c" +#include "features/s390x-tevx-linux64.c" #define XML_SYSCALL_FILENAME_S390 "syscalls/s390-linux.xml" #define XML_SYSCALL_FILENAME_S390X "syscalls/s390x-linux.xml" @@ -81,6 +85,7 @@ struct gdbarch_tdep int gpr_full_regnum; int pc_regnum; int cc_regnum; + int v0_full_regnum; int have_linux_v1; int have_linux_v2; @@ -148,61 +153,83 @@ s390_write_pc (struct regcache *regcache static const short s390_dwarf_regmap[] = { - /* General Purpose Registers. */ + /* 0-15: General Purpose Registers. */ S390_R0_REGNUM, S390_R1_REGNUM, S390_R2_REGNUM, S390_R3_REGNUM, S390_R4_REGNUM, S390_R5_REGNUM, S390_R6_REGNUM, S390_R7_REGNUM, S390_R8_REGNUM, S390_R9_REGNUM, S390_R10_REGNUM, S390_R11_REGNUM, S390_R12_REGNUM, S390_R13_REGNUM, S390_R14_REGNUM, S390_R15_REGNUM, - /* Floating Point Registers. */ + /* 16-31: Floating Point Registers / Vector Registers 0-15. */ S390_F0_REGNUM, S390_F2_REGNUM, S390_F4_REGNUM, S390_F6_REGNUM, S390_F1_REGNUM, S390_F3_REGNUM, S390_F5_REGNUM, S390_F7_REGNUM, S390_F8_REGNUM, S390_F10_REGNUM, S390_F12_REGNUM, S390_F14_REGNUM, S390_F9_REGNUM, S390_F11_REGNUM, S390_F13_REGNUM, S390_F15_REGNUM, - /* Control Registers (not mapped). */ + /* 32-47: Control Registers (not mapped). */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - /* Access Registers. */ + /* 48-63: Access Registers. */ S390_A0_REGNUM, S390_A1_REGNUM, S390_A2_REGNUM, S390_A3_REGNUM, S390_A4_REGNUM, S390_A5_REGNUM, S390_A6_REGNUM, S390_A7_REGNUM, S390_A8_REGNUM, S390_A9_REGNUM, S390_A10_REGNUM, S390_A11_REGNUM, S390_A12_REGNUM, S390_A13_REGNUM, S390_A14_REGNUM, S390_A15_REGNUM, - /* Program Status Word. */ + /* 64-65: Program Status Word. */ S390_PSWM_REGNUM, S390_PSWA_REGNUM, + /* 66-67: Reserved. */ + -1, -1, + + /* 68-83: Vector Registers 16-31. */ + S390_V16_REGNUM, S390_V18_REGNUM, S390_V20_REGNUM, S390_V22_REGNUM, + S390_V17_REGNUM, S390_V19_REGNUM, S390_V21_REGNUM, S390_V23_REGNUM, + S390_V24_REGNUM, S390_V26_REGNUM, S390_V28_REGNUM, S390_V30_REGNUM, + S390_V25_REGNUM, S390_V27_REGNUM, S390_V29_REGNUM, S390_V31_REGNUM, + + /* End of "official" DWARF registers. The remainder of the map is + for GDB internal use only. */ + /* GPR Lower Half Access. */ S390_R0_REGNUM, S390_R1_REGNUM, S390_R2_REGNUM, S390_R3_REGNUM, S390_R4_REGNUM, S390_R5_REGNUM, S390_R6_REGNUM, S390_R7_REGNUM, S390_R8_REGNUM, S390_R9_REGNUM, S390_R10_REGNUM, S390_R11_REGNUM, S390_R12_REGNUM, S390_R13_REGNUM, S390_R14_REGNUM, S390_R15_REGNUM, - - /* GNU/Linux-specific registers (not mapped). */ - -1, -1, -1, }; +enum { s390_dwarf_reg_r0l = ARRAY_SIZE (s390_dwarf_regmap) - 16 }; + /* Convert DWARF register number REG to the appropriate register number used by GDB. */ static int s390_dwarf_reg_to_regnum (struct gdbarch *gdbarch, int reg) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + int gdb_reg = -1; - /* In a 32-on-64 debug scenario, debug info refers to the full 64-bit - GPRs. Note that call frame information still refers to the 32-bit - lower halves, because s390_adjust_frame_regnum uses register numbers - 66 .. 81 to access GPRs. */ + /* In a 32-on-64 debug scenario, debug info refers to the full + 64-bit GPRs. Note that call frame information still refers to + the 32-bit lower halves, because s390_adjust_frame_regnum uses + special register numbers to access GPRs. */ if (tdep->gpr_full_regnum != -1 && reg >= 0 && reg < 16) return tdep->gpr_full_regnum + reg; if (reg >= 0 && reg < ARRAY_SIZE (s390_dwarf_regmap)) - return s390_dwarf_regmap[reg]; + gdb_reg = s390_dwarf_regmap[reg]; + + if (tdep->v0_full_regnum == -1) + { + if (gdb_reg >= S390_V16_REGNUM && gdb_reg <= S390_V31_REGNUM) + gdb_reg = -1; + } + else + { + if (gdb_reg >= S390_F0_REGNUM && gdb_reg <= S390_F15_REGNUM) + gdb_reg = gdb_reg - S390_F0_REGNUM + tdep->v0_full_regnum; + } - warning (_("Unmapped DWARF Register #%d encountered."), reg); - return -1; + return gdb_reg; } /* Translate a .eh_frame register to DWARF register, or adjust a @@ -211,7 +238,7 @@ static int s390_adjust_frame_regnum (struct gdbarch *gdbarch, int num, int eh_frame_p) { /* See s390_dwarf_reg_to_regnum for comments. */ - return (num >= 0 && num < 16)? num + 66 : num; + return (num >= 0 && num < 16) ? num + s390_dwarf_reg_r0l : num; } @@ -225,6 +252,29 @@ regnum_is_gpr_full (struct gdbarch_tdep && regnum <= tdep->gpr_full_regnum + 15); } +/* Check whether REGNUM indicates a full vector register (v0-v15). + These pseudo-registers are composed of f0-f15 and v0l-v15l. */ + +static int +regnum_is_vxr_full (struct gdbarch_tdep *tdep, int regnum) +{ + return (tdep->v0_full_regnum != -1 + && regnum >= tdep->v0_full_regnum + && regnum <= tdep->v0_full_regnum + 15); +} + +/* Return the name of register REGNO. Return NULL for registers that + shouldn't be visible. */ + +static const char * +s390_register_name (struct gdbarch *gdbarch, int regnum) +{ + if (regnum >= S390_V0_LOWER_REGNUM + && regnum <= S390_V15_LOWER_REGNUM) + return NULL; + return tdesc_register_name (gdbarch, regnum); +} + static const char * s390_pseudo_register_name (struct gdbarch *gdbarch, int regnum) { @@ -245,6 +295,15 @@ s390_pseudo_register_name (struct gdbarc return full_name[regnum - tdep->gpr_full_regnum]; } + if (regnum_is_vxr_full (tdep, regnum)) + { + static const char *full_name[] = { + "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", + "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15" + }; + return full_name[regnum - tdep->v0_full_regnum]; + } + internal_error (__FILE__, __LINE__, _("invalid regnum")); } @@ -262,6 +321,9 @@ s390_pseudo_register_type (struct gdbarc if (regnum_is_gpr_full (tdep, regnum)) return builtin_type (gdbarch)->builtin_uint64; + if (regnum_is_vxr_full (tdep, regnum)) + return tdesc_find_type (gdbarch, "vec128"); + internal_error (__FILE__, __LINE__, _("invalid regnum")); } @@ -323,6 +385,19 @@ s390_pseudo_register_read (struct gdbarc return status; } + if (regnum_is_vxr_full (tdep, regnum)) + { + enum register_status status; + + regnum -= tdep->v0_full_regnum; + + status = regcache_raw_read (regcache, S390_F0_REGNUM + regnum, buf); + if (status == REG_VALID) + status = regcache_raw_read (regcache, + S390_V0_LOWER_REGNUM + regnum, buf + 8); + return status; + } + internal_error (__FILE__, __LINE__, _("invalid regnum")); } @@ -370,22 +445,34 @@ s390_pseudo_register_write (struct gdbar return; } + if (regnum_is_vxr_full (tdep, regnum)) + { + regnum -= tdep->v0_full_regnum; + regcache_raw_write (regcache, S390_F0_REGNUM + regnum, buf); + regcache_raw_write (regcache, S390_V0_LOWER_REGNUM + regnum, buf + 8); + return; + } + internal_error (__FILE__, __LINE__, _("invalid regnum")); } /* 'float' values are stored in the upper half of floating-point - registers, even though we are otherwise a big-endian platform. */ + registers, even though we are otherwise a big-endian platform. The + same applies to a 'float' value within a vector. */ static struct value * s390_value_from_register (struct gdbarch *gdbarch, struct type *type, int regnum, struct frame_id frame_id) { + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct value *value = default_value_from_register (gdbarch, type, regnum, frame_id); check_typedef (type); - if (regnum >= S390_F0_REGNUM && regnum <= S390_F15_REGNUM - && TYPE_LENGTH (type) < 8) + if ((regnum >= S390_F0_REGNUM && regnum <= S390_F15_REGNUM + && TYPE_LENGTH (type) < 8) + || regnum_is_vxr_full (tdep, regnum) + || (regnum >= S390_V16_REGNUM && regnum <= S390_V31_REGNUM)) set_value_offset (value, 0); return value; @@ -410,6 +497,12 @@ s390_pseudo_register_reggroup_p (struct if (group == save_reggroup || group == restore_reggroup) return regnum == tdep->pc_regnum || regnum == tdep->cc_regnum; + if (group == vector_reggroup) + return regnum_is_vxr_full (tdep, regnum); + + if (group == general_reggroup && regnum_is_vxr_full (tdep, regnum)) + return 0; + return default_register_reggroup_p (gdbarch, regnum, group); } @@ -469,6 +562,18 @@ static const struct regcache_map_entry s { 0 } }; +static const struct regcache_map_entry s390_regmap_vxrs_low[] = + { + { 16, S390_V0_LOWER_REGNUM, 8 }, + { 0 } + }; + +static const struct regcache_map_entry s390_regmap_vxrs_high[] = + { + { 16, S390_V16_REGNUM, 16 }, + { 0 } + }; + /* Supply the TDB regset. Like regcache_supply_regset, but invalidate the TDB registers unless the TDB format field is valid. */ @@ -529,6 +634,18 @@ const struct regset s390_tdb_regset = { regcache_collect_regset }; +const struct regset s390_vxrs_low_regset = { + s390_regmap_vxrs_low, + regcache_supply_regset, + regcache_collect_regset +}; + +const struct regset s390_vxrs_high_regset = { + s390_regmap_vxrs_high, + regcache_supply_regset, + regcache_collect_regset +}; + /* Iterate over supported core file register note sections. */ static void @@ -567,37 +684,54 @@ s390_iterate_over_regset_sections (struc S390_TDB_DWORD0_REGNUM))) cb (".reg-s390-tdb", s390_sizeof_tdbregset, &s390_tdb_regset, "s390 TDB", cb_data); + + if (tdep->v0_full_regnum != -1) + { + cb (".reg-s390-vxrs-low", 16 * 8, &s390_vxrs_low_regset, + "s390 vector registers 0-15 lower half", cb_data); + cb (".reg-s390-vxrs-high", 16 * 16, &s390_vxrs_high_regset, + "s390 vector registers 16-31", cb_data); + } } static const struct target_desc * s390_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) { - asection *high_gprs = bfd_get_section_by_name (abfd, ".reg-s390-high-gprs"); - asection *v1 = bfd_get_section_by_name (abfd, ".reg-s390-last-break"); - asection *v2 = bfd_get_section_by_name (abfd, ".reg-s390-system-call"); asection *section = bfd_get_section_by_name (abfd, ".reg"); CORE_ADDR hwcap = 0; + int high_gprs, v1, v2, te, vx; target_auxv_search (target, AT_HWCAP, &hwcap); if (!section) return NULL; + high_gprs = (bfd_get_section_by_name (abfd, ".reg-s390-high-gprs") + != NULL); + v1 = (bfd_get_section_by_name (abfd, ".reg-s390-last-break") != NULL); + v2 = (bfd_get_section_by_name (abfd, ".reg-s390-system-call") != NULL); + vx = (hwcap & HWCAP_S390_VX); + te = (hwcap & HWCAP_S390_TE); + switch (bfd_section_size (abfd, section)) { case s390_sizeof_gregset: if (high_gprs) - return ((hwcap & HWCAP_S390_TE) ? tdesc_s390_te_linux64 : - v2? tdesc_s390_linux64v2 : - v1? tdesc_s390_linux64v1 : tdesc_s390_linux64); + return (te && vx ? tdesc_s390_tevx_linux64 : + vx ? tdesc_s390_vx_linux64 : + te ? tdesc_s390_te_linux64 : + v2 ? tdesc_s390_linux64v2 : + v1 ? tdesc_s390_linux64v1 : tdesc_s390_linux64); else - return (v2? tdesc_s390_linux32v2 : - v1? tdesc_s390_linux32v1 : tdesc_s390_linux32); + return (v2 ? tdesc_s390_linux32v2 : + v1 ? tdesc_s390_linux32v1 : tdesc_s390_linux32); case s390x_sizeof_gregset: - return ((hwcap & HWCAP_S390_TE) ? tdesc_s390x_te_linux64 : - v2? tdesc_s390x_linux64v2 : - v1? tdesc_s390x_linux64v1 : tdesc_s390x_linux64); + return (te && vx ? tdesc_s390x_tevx_linux64 : + vx ? tdesc_s390x_vx_linux64 : + te ? tdesc_s390x_te_linux64 : + v2 ? tdesc_s390x_linux64v2 : + v1 ? tdesc_s390x_linux64v1 : tdesc_s390x_linux64); default: return NULL; @@ -2842,6 +2976,7 @@ s390_gdbarch_init (struct gdbarch_info i int have_linux_v1 = 0; int have_linux_v2 = 0; int have_tdb = 0; + int have_vx = 0; int first_pseudo_reg, last_pseudo_reg; static const char *const stap_register_prefixes[] = { "%", NULL }; static const char *const stap_register_indirection_prefixes[] = { "(", @@ -2901,6 +3036,14 @@ s390_gdbarch_init (struct gdbarch_info i "tr0", "tr1", "tr2", "tr3", "tr4", "tr5", "tr6", "tr7", "tr8", "tr9", "tr10", "tr11", "tr12", "tr13", "tr14", "tr15" }; + static const char *const vxrs_low[] = { + "v0l", "v1l", "v2l", "v3l", "v4l", "v5l", "v6l", "v7l", "v8l", + "v9l", "v10l", "v11l", "v12l", "v13l", "v14l", "v15l", + }; + static const char *const vxrs_high[] = { + "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", + "v25", "v26", "v27", "v28", "v29", "v30", "v31", + }; const struct tdesc_feature *feature; int i, valid_p = 1; @@ -2989,6 +3132,21 @@ s390_gdbarch_init (struct gdbarch_info i have_tdb = 1; } + /* Vector registers. */ + feature = tdesc_find_feature (tdesc, "org.gnu.gdb.s390.vx"); + if (feature) + { + for (i = 0; i < 16; i++) + valid_p &= tdesc_numbered_register (feature, tdesc_data, + S390_V0_LOWER_REGNUM + i, + vxrs_low[i]); + for (i = 0; i < 16; i++) + valid_p &= tdesc_numbered_register (feature, tdesc_data, + S390_V16_REGNUM + i, + vxrs_high[i]); + have_vx = 1; + } + if (!valid_p) { tdesc_data_cleanup (tdesc_data); @@ -3058,6 +3216,7 @@ s390_gdbarch_init (struct gdbarch_info i set_tdesc_pseudo_register_reggroup_p (gdbarch, s390_pseudo_register_reggroup_p); tdesc_use_registers (gdbarch, tdesc, tdesc_data); + set_gdbarch_register_name (gdbarch, s390_register_name); /* Assign pseudo register numbers. */ first_pseudo_reg = gdbarch_num_regs (gdbarch); @@ -3068,6 +3227,12 @@ s390_gdbarch_init (struct gdbarch_info i tdep->gpr_full_regnum = last_pseudo_reg; last_pseudo_reg += 16; } + tdep->v0_full_regnum = -1; + if (have_vx) + { + tdep->v0_full_regnum = last_pseudo_reg; + last_pseudo_reg += 16; + } tdep->pc_regnum = last_pseudo_reg++; tdep->cc_regnum = last_pseudo_reg++; set_gdbarch_pc_regnum (gdbarch, tdep->pc_regnum); @@ -3173,8 +3338,12 @@ _initialize_s390_tdep (void) initialize_tdesc_s390_linux64v1 (); initialize_tdesc_s390_linux64v2 (); initialize_tdesc_s390_te_linux64 (); + initialize_tdesc_s390_vx_linux64 (); + initialize_tdesc_s390_tevx_linux64 (); initialize_tdesc_s390x_linux64 (); initialize_tdesc_s390x_linux64v1 (); initialize_tdesc_s390x_linux64v2 (); initialize_tdesc_s390x_te_linux64 (); + initialize_tdesc_s390x_vx_linux64 (); + initialize_tdesc_s390x_tevx_linux64 (); } Index: gdb-7.9.1/gdb/s390-linux-tdep.h =================================================================== --- gdb-7.9.1.orig/gdb/s390-linux-tdep.h 2015-07-10 16:18:29.000000000 +0200 +++ gdb-7.9.1/gdb/s390-linux-tdep.h 2015-07-10 16:18:36.000000000 +0200 @@ -29,6 +29,10 @@ #define HWCAP_S390_TE 1024 #endif +#ifndef HWCAP_S390_VX +#define HWCAP_S390_VX 2048 +#endif + /* Register information. */ /* Program Status Word. */ @@ -129,8 +133,41 @@ #define S390_TDB_R13_REGNUM 87 #define S390_TDB_R14_REGNUM 88 #define S390_TDB_R15_REGNUM 89 +/* Vector registers. */ +#define S390_V0_LOWER_REGNUM 90 +#define S390_V1_LOWER_REGNUM 91 +#define S390_V2_LOWER_REGNUM 92 +#define S390_V3_LOWER_REGNUM 93 +#define S390_V4_LOWER_REGNUM 94 +#define S390_V5_LOWER_REGNUM 95 +#define S390_V6_LOWER_REGNUM 96 +#define S390_V7_LOWER_REGNUM 97 +#define S390_V8_LOWER_REGNUM 98 +#define S390_V9_LOWER_REGNUM 99 +#define S390_V10_LOWER_REGNUM 100 +#define S390_V11_LOWER_REGNUM 101 +#define S390_V12_LOWER_REGNUM 102 +#define S390_V13_LOWER_REGNUM 103 +#define S390_V14_LOWER_REGNUM 104 +#define S390_V15_LOWER_REGNUM 105 +#define S390_V16_REGNUM 106 +#define S390_V17_REGNUM 107 +#define S390_V18_REGNUM 108 +#define S390_V19_REGNUM 109 +#define S390_V20_REGNUM 110 +#define S390_V21_REGNUM 111 +#define S390_V22_REGNUM 112 +#define S390_V23_REGNUM 113 +#define S390_V24_REGNUM 114 +#define S390_V25_REGNUM 115 +#define S390_V26_REGNUM 116 +#define S390_V27_REGNUM 117 +#define S390_V28_REGNUM 118 +#define S390_V29_REGNUM 119 +#define S390_V30_REGNUM 120 +#define S390_V31_REGNUM 121 /* Total. */ -#define S390_NUM_REGS 90 +#define S390_NUM_REGS 122 /* Special register usage. */ #define S390_SP_REGNUM S390_R15_REGNUM @@ -159,6 +196,8 @@ extern const struct regset s390x_last_br extern const struct regset s390_system_call_regset; extern const struct regset s390_tdb_regset; #define s390_sizeof_tdbregset 0x100 +extern const struct regset s390_vxrs_low_regset; +extern const struct regset s390_vxrs_high_regset; /* GNU/Linux target descriptions. */ extern struct target_desc *tdesc_s390_linux32; @@ -168,9 +207,13 @@ extern struct target_desc *tdesc_s390_li extern struct target_desc *tdesc_s390_linux64v1; extern struct target_desc *tdesc_s390_linux64v2; extern struct target_desc *tdesc_s390_te_linux64; +extern struct target_desc *tdesc_s390_vx_linux64; +extern struct target_desc *tdesc_s390_tevx_linux64; extern struct target_desc *tdesc_s390x_linux64; extern struct target_desc *tdesc_s390x_linux64v1; extern struct target_desc *tdesc_s390x_linux64v2; extern struct target_desc *tdesc_s390x_te_linux64; +extern struct target_desc *tdesc_s390x_vx_linux64; +extern struct target_desc *tdesc_s390x_tevx_linux64; #endif
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
