From patchwork Thu Sep 21 16:40:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 23066 Received: (qmail 93933 invoked by alias); 21 Sep 2017 16:43:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 93923 invoked by uid 89); 21 Sep 2017 16:43:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy= X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0a-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.156.1) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 21 Sep 2017 16:43:06 +0000 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v8LGdoh6078207 for ; Thu, 21 Sep 2017 12:43:05 -0400 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0a-001b2d01.pphosted.com with ESMTP id 2d4e39tenj-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 21 Sep 2017 12:43:05 -0400 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 21 Sep 2017 17:43:02 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 21 Sep 2017 17:43:01 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v8LGh1GB13172858 for ; Thu, 21 Sep 2017 16:43:01 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E79034C044 for ; Thu, 21 Sep 2017 17:39:23 +0100 (BST) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C68B34C040 for ; Thu, 21 Sep 2017 17:39:23 +0100 (BST) Received: from oc1027705133.ibm.com (unknown [9.152.212.164]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Thu, 21 Sep 2017 17:39:23 +0100 (BST) From: Andreas Arnez To: gdb-patches@sourceware.org Subject: [PATCH 3/4] S390: Add guarded-storage register support to gdbserver Date: Thu, 21 Sep 2017 18:40:15 +0200 In-Reply-To: <1506012057-7965-1-git-send-email-arnez@linux.vnet.ibm.com> References: <1506012057-7965-1-git-send-email-arnez@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17092116-0040-0000-0000-000003FC0D8F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17092116-0041-0000-0000-0000209D4A7E Message-Id: <1506012057-7965-4-git-send-email-arnez@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-09-21_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709210225 X-IsSubscribed: yes --- gdb/gdbserver/configure.srv | 8 +++++ gdb/gdbserver/linux-s390-low.c | 68 ++++++++++++++++++++++++++++++++++++++-- gdb/gdbserver/linux-s390-tdesc.h | 9 ++++++ 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 2a0c2b2..80b4b37 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -285,12 +285,14 @@ case "${target}" in srv_regobj="${srv_regobj} s390-te-linux64.o" srv_regobj="${srv_regobj} s390-vx-linux64.o" srv_regobj="${srv_regobj} s390-tevx-linux64.o" + srv_regobj="${srv_regobj} s390-gs-linux64.o" srv_regobj="${srv_regobj} s390x-linux64.o" srv_regobj="${srv_regobj} s390x-linux64v1.o" srv_regobj="${srv_regobj} s390x-linux64v2.o" srv_regobj="${srv_regobj} s390x-te-linux64.o" srv_regobj="${srv_regobj} s390x-vx-linux64.o" srv_regobj="${srv_regobj} s390x-tevx-linux64.o" + srv_regobj="${srv_regobj} s390x-gs-linux64.o" srv_tgtobj="$srv_linux_obj linux-s390-low.o" srv_xmlfiles="s390-linux32.xml" srv_xmlfiles="${srv_xmlfiles} s390-linux32v1.xml" @@ -301,12 +303,14 @@ case "${target}" in srv_xmlfiles="${srv_xmlfiles} s390-te-linux64.xml" srv_xmlfiles="${srv_xmlfiles} s390-vx-linux64.xml" srv_xmlfiles="${srv_xmlfiles} s390-tevx-linux64.xml" + srv_xmlfiles="${srv_xmlfiles} s390-gs-linux64.xml" srv_xmlfiles="${srv_xmlfiles} s390x-linux64.xml" srv_xmlfiles="${srv_xmlfiles} s390x-linux64v1.xml" srv_xmlfiles="${srv_xmlfiles} s390x-linux64v2.xml" srv_xmlfiles="${srv_xmlfiles} s390x-te-linux64.xml" srv_xmlfiles="${srv_xmlfiles} s390x-vx-linux64.xml" srv_xmlfiles="${srv_xmlfiles} s390x-tevx-linux64.xml" + srv_xmlfiles="${srv_xmlfiles} s390x-gs-linux64.xml" srv_xmlfiles="${srv_xmlfiles} s390-core32.xml" srv_xmlfiles="${srv_xmlfiles} s390-core64.xml" srv_xmlfiles="${srv_xmlfiles} s390x-core64.xml" @@ -314,6 +318,8 @@ case "${target}" in srv_xmlfiles="${srv_xmlfiles} s390-fpr.xml" srv_xmlfiles="${srv_xmlfiles} s390-tdb.xml" srv_xmlfiles="${srv_xmlfiles} s390-vx.xml" + srv_xmlfiles="${srv_xmlfiles} s390-gs.xml" + srv_xmlfiles="${srv_xmlfiles} s390-gsbc.xml" srv_linux_usrregs=yes srv_linux_regsets=yes srv_linux_thread_db=yes @@ -327,12 +333,14 @@ case "${target}" in ipa_obj="${ipa_obj} s390-vx-linux64-ipa.o" ipa_obj="${ipa_obj} s390-te-linux64-ipa.o" ipa_obj="${ipa_obj} s390-tevx-linux64-ipa.o" + ipa_obj="${ipa_obj} s390-gs-linux64-ipa.o" ipa_obj="${ipa_obj} s390x-linux64-ipa.o" ipa_obj="${ipa_obj} s390x-linux64v1-ipa.o" ipa_obj="${ipa_obj} s390x-linux64v2-ipa.o" ipa_obj="${ipa_obj} s390x-vx-linux64-ipa.o" ipa_obj="${ipa_obj} s390x-te-linux64-ipa.o" ipa_obj="${ipa_obj} s390x-tevx-linux64-ipa.o" + ipa_obj="${ipa_obj} s390x-gs-linux64-ipa.o" ;; sh*-*-linux*) srv_regobj=reg-sh.o srv_tgtobj="$srv_linux_obj linux-sh-low.o" diff --git a/gdb/gdbserver/linux-s390-low.c b/gdb/gdbserver/linux-s390-low.c index f02c2d3..d7aa31c 100644 --- a/gdb/gdbserver/linux-s390-low.c +++ b/gdb/gdbserver/linux-s390-low.c @@ -45,6 +45,10 @@ #define HWCAP_S390_VX 2048 #endif +#ifndef HWCAP_S390_GS +#define HWCAP_S390_GS 16384 +#endif + #define s390_num_regs 52 static int s390_regmap[] = { @@ -370,6 +374,46 @@ s390_store_vxrs_high (struct regcache *regcache, const void *buf) supply_register (regcache, v16 + i, (const char *) buf + 16 * i); } +static void +s390_fill_gs (struct regcache *regcache, void *buf) +{ + int gsd = find_regno (regcache->tdesc, "gsd"); + int i; + + for (i = 0; i < 3; i++) + collect_register (regcache, gsd + i, (char *) buf + 8 * (i + 1)); +} + +static void +s390_store_gs (struct regcache *regcache, const void *buf) +{ + int gsd = find_regno (regcache->tdesc, "gsd"); + int i; + + for (i = 0; i < 3; i++) + supply_register (regcache, gsd + i, (const char *) buf + 8 * (i + 1)); +} + +static void +s390_fill_gsbc (struct regcache *regcache, void *buf) +{ + int bc_gsd = find_regno (regcache->tdesc, "bc_gsd"); + int i; + + for (i = 0; i < 3; i++) + collect_register (regcache, bc_gsd + i, (char *) buf + 8 * (i + 1)); +} + +static void +s390_store_gsbc (struct regcache *regcache, const void *buf) +{ + int bc_gsd = find_regno (regcache->tdesc, "bc_gsd"); + int i; + + for (i = 0; i < 3; i++) + supply_register (regcache, bc_gsd + i, (const char *) buf + 8 * (i + 1)); +} + static struct regset_info s390_regsets[] = { { 0, 0, 0, 0, GENERAL_REGS, s390_fill_gregset, NULL }, #ifndef __s390x__ @@ -388,6 +432,10 @@ static struct regset_info s390_regsets[] = { EXTENDED_REGS, s390_fill_vxrs_low, s390_store_vxrs_low }, { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_S390_VXRS_HIGH, 0, EXTENDED_REGS, s390_fill_vxrs_high, s390_store_vxrs_high }, + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_S390_GS_CB, 0, + EXTENDED_REGS, s390_fill_gs, s390_store_gs }, + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_S390_GS_BC, 0, + EXTENDED_REGS, s390_fill_gsbc, s390_store_gsbc }, NULL_REGSET }; @@ -501,6 +549,8 @@ s390_arch_setup (void) int have_regset_tdb = s390_check_regset (pid, NT_S390_TDB, 256); int have_regset_vxrs = s390_check_regset (pid, NT_S390_VXRS_LOW, 128) && s390_check_regset (pid, NT_S390_VXRS_HIGH, 256); + int have_regset_gs = s390_check_regset (pid, NT_S390_GS_CB, 32) + && s390_check_regset (pid, NT_S390_GS_BC, 32); /* Assume 31-bit inferior process. */ if (have_regset_system_call) @@ -529,8 +579,13 @@ s390_arch_setup (void) if (have_regset_vxrs) have_regset_vxrs = (s390_get_hwcap (tdesc_s390x_linux64v2) & HWCAP_S390_VX) != 0; + if (have_regset_gs) + have_regset_gs = + (s390_get_hwcap (tdesc_s390x_linux64v2) & HWCAP_S390_GS) != 0; - if (have_regset_vxrs) + if (have_regset_gs) + tdesc = tdesc_s390x_gs_linux64; + else if (have_regset_vxrs) tdesc = (have_regset_tdb ? tdesc_s390x_tevx_linux64 : tdesc_s390x_vx_linux64); else if (have_regset_tdb) @@ -554,8 +609,12 @@ s390_arch_setup (void) have_regset_tdb = (s390_get_hwcap (tdesc) & HWCAP_S390_TE) != 0; if (have_regset_vxrs) have_regset_vxrs = (s390_get_hwcap (tdesc) & HWCAP_S390_VX) != 0; + if (have_regset_gs) + have_regset_gs = (s390_get_hwcap (tdesc) & HWCAP_S390_GS) != 0; - if (have_regset_vxrs) + if (have_regset_gs) + tdesc = tdesc_s390_gs_linux64; + else if (have_regset_vxrs) tdesc = (have_regset_tdb ? tdesc_s390_tevx_linux64 : tdesc_s390_vx_linux64); else if (have_regset_tdb) @@ -596,6 +655,9 @@ s390_arch_setup (void) case NT_S390_VXRS_HIGH: regset->size = have_regset_vxrs ? 256 : 0; break; + case NT_S390_GS_CB: + case NT_S390_GS_BC: + regset->size = have_regset_gs ? 32 : 0; default: break; } @@ -2797,6 +2859,7 @@ initialize_low_arch (void) init_registers_s390_te_linux64 (); init_registers_s390_vx_linux64 (); init_registers_s390_tevx_linux64 (); + init_registers_s390_gs_linux64 (); #ifdef __s390x__ init_registers_s390x_linux64 (); init_registers_s390x_linux64v1 (); @@ -2804,6 +2867,7 @@ initialize_low_arch (void) init_registers_s390x_te_linux64 (); init_registers_s390x_vx_linux64 (); init_registers_s390x_tevx_linux64 (); + init_registers_s390x_gs_linux64 (); #endif initialize_regsets_info (&s390_regsets_info); diff --git a/gdb/gdbserver/linux-s390-tdesc.h b/gdb/gdbserver/linux-s390-tdesc.h index 6dc3899..170ab8a 100644 --- a/gdb/gdbserver/linux-s390-tdesc.h +++ b/gdb/gdbserver/linux-s390-tdesc.h @@ -31,6 +31,7 @@ enum s390_linux_tdesc { S390_TDESC_TE, S390_TDESC_VX, S390_TDESC_TEVX, + S390_TDESC_GS, }; #ifdef __s390x__ @@ -59,6 +60,10 @@ extern const struct target_desc *tdesc_s390x_vx_linux64; void init_registers_s390x_tevx_linux64 (void); extern const struct target_desc *tdesc_s390x_tevx_linux64; +/* Defined in auto-generated file s390x-gs-linux64.c. */ +void init_registers_s390x_gs_linux64 (void); +extern const struct target_desc *tdesc_s390x_gs_linux64; + #endif #if !defined __s390x__ || !defined IN_PROCESS_AGENT @@ -99,4 +104,8 @@ extern const struct target_desc *tdesc_s390_vx_linux64; void init_registers_s390_tevx_linux64 (void); extern const struct target_desc *tdesc_s390_tevx_linux64; +/* Defined in auto-generated file s390-gs-linux64.c. */ +void init_registers_s390_gs_linux64 (void); +extern const struct target_desc *tdesc_s390_gs_linux64; + #endif