From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 110612 invoked by alias); 12 Jan 2017 11:32:42 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 110515 invoked by uid 89); 12 Jan 2017 11:32:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 spammy=1631, WHICH, 75,8, royalty X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0b-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.158.5) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Jan 2017 11:32:31 +0000 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id v0CBUNAs109503 for ; Thu, 12 Jan 2017 06:32:29 -0500 Received: from e06smtp12.uk.ibm.com (e06smtp12.uk.ibm.com [195.75.94.108]) by mx0a-001b2d01.pphosted.com with ESMTP id 27x5h6g6kq-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 12 Jan 2017 06:32:28 -0500 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Jan 2017 11:32:27 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 12 Jan 2017 11:32:26 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id BEEBB219004D; Thu, 12 Jan 2017 11:31:32 +0000 (GMT) Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v0CBWPpu17105252; Thu, 12 Jan 2017 11:32:25 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DFCDF5204C; Thu, 12 Jan 2017 10:30:54 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id B052352041; Thu, 12 Jan 2017 10:30:54 +0000 (GMT) From: Philipp Rudo To: gdb-patches@sourceware.org Cc: peter.griffin@linaro.org, yao.qi@arm.com, arnez@linux.vnet.ibm.com Subject: [RFC 6/7] Add privileged registers for s390x Date: Thu, 12 Jan 2017 11:32:00 -0000 In-Reply-To: <20170112113217.48852-1-prudo@linux.vnet.ibm.com> References: <20170112113217.48852-1-prudo@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17011211-0008-0000-0000-000003CF2408 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17011211-0009-0000-0000-00001C12341B Message-Id: <20170112113217.48852-7-prudo@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-01-12_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=4 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1701120162 X-IsSubscribed: yes X-SW-Source: 2017-01/txt/msg00212.txt.bz2 The Linux kernel and thus the linux-kernel target needs access to S390x's privileged registers. So add them now. gdb/ChangeLog: * features/s390-cr.xml: New file. * features/s390x-cr-linux64.xml: New file * features/s390x-vxcr-linux64.xml: New file * features/Makefile: Add s390x-cr-linux64-expedite and s390x-vxcr-linux64-expedite (WICH): Add s390x-cr-linux64.xml and s390x-vxcr-linux64.xml (XMLTOC): Add s390x-cr-linux64.xml and s390x-vxcr-linux64.xml * features/s390x-cr-linux64.c: Generated. * features/s390x-vxcr-linux64.c: Generated. * regformats/s390x-cr-linux64.dat: Generated. * regformats/s390x-vxcr-linux64.dat: Generated. * s390-linux-tdep.h: Define regnums for control registers. (S390_NUM_REGS): Adjust. * s390-linux-tdep.c: Include features/s390x-cr-linux64.c and features/s390x-vxcr-linux64.c. (s390_dwarf_regmat): Add control registers. (s390_regmap_cr, s390_regmap_timer, s390_regmap_todcmp) (s390_regmap_todpreg, s390_regmap_prefix): New array. (s390_cr_regset, s390_timer_regset, s390_todcmp_regset) (s390_todpreg_regset, s390_prefix_regset): New type. (s390_iterate_over_regset_sections, s390_core_read_description) (s390_gdbarch_init, _initialize_s390_tdep): Adjust. --- gdb/features/Makefile | 11 ++- gdb/features/s390-cr.xml | 26 ++++++ gdb/features/s390x-cr-linux64.c | 99 ++++++++++++++++++++ gdb/features/s390x-cr-linux64.xml | 24 +++++ gdb/features/s390x-vxcr-linux64.c | 169 ++++++++++++++++++++++++++++++++++ gdb/features/s390x-vxcr-linux64.xml | 25 +++++ gdb/regformats/s390x-cr-linux64.dat | 76 +++++++++++++++ gdb/regformats/s390x-vxcr-linux64.dat | 108 ++++++++++++++++++++++ gdb/s390-linux-tdep.c | 120 +++++++++++++++++++++++- gdb/s390-linux-tdep.h | 24 ++++- 10 files changed, 674 insertions(+), 8 deletions(-) create mode 100644 gdb/features/s390-cr.xml create mode 100644 gdb/features/s390x-cr-linux64.c create mode 100644 gdb/features/s390x-cr-linux64.xml create mode 100644 gdb/features/s390x-vxcr-linux64.c create mode 100644 gdb/features/s390x-vxcr-linux64.xml create mode 100644 gdb/regformats/s390x-cr-linux64.dat create mode 100644 gdb/regformats/s390x-vxcr-linux64.dat diff --git a/gdb/features/Makefile b/gdb/features/Makefile index 63f8248..284692d 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -76,6 +76,7 @@ WHICH = aarch64 \ s390-linux32v2 s390-linux64v2 s390x-linux64v2 \ s390-te-linux64 s390x-te-linux64 s390-vx-linux64 s390x-vx-linux64 \ s390-tevx-linux64 s390x-tevx-linux64 \ + s390x-cr-linux64 s390x-vxcr-linux64 \ tic6x-c64xp tic6x-c64x tic6x-c62x \ tic6x-c64xp-linux tic6x-c64x-linux tic6x-c62x-linux @@ -109,6 +110,8 @@ s390x-linux64v2-expedite = r14,r15,pswa s390x-te-linux64-expedite = r14,r15,pswa s390x-vx-linux64-expedite = r14,r15,pswa s390x-tevx-linux64-expedite = r14,r15,pswa +s390x-cr-linux64-expedite = r14,r15,pswa +s390x-vxcr-linux64-expedite = r14,r15,pswa tic6x-c64xp-expedite = A15,PC tic6x-c64x-expedite = A15,PC tic6x-c62x-expedite = A15,PC @@ -214,14 +217,16 @@ XMLTOC = \ s390-linux64v1.xml \ s390-linux64v2.xml \ s390-te-linux64.xml \ + s390-vx-linux64.xml \ + s390-tevx-linux64.xml \ s390x-linux64.xml \ s390x-linux64v1.xml \ s390x-linux64v2.xml \ s390x-te-linux64.xml \ - s390-tevx-linux64.xml \ - s390-vx-linux64.xml \ - s390x-tevx-linux64.xml \ s390x-vx-linux64.xml \ + s390x-cr-linux64.xml \ + s390x-tevx-linux64.xml \ + s390x-vxcr-linux64.xml \ tic6x-c62x-linux.xml \ tic6x-c62x.xml \ tic6x-c64x-linux.xml \ diff --git a/gdb/features/s390-cr.xml b/gdb/features/s390-cr.xml new file mode 100644 index 0000000..15ae4f9 --- /dev/null +++ b/gdb/features/s390-cr.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/gdb/features/s390x-cr-linux64.c b/gdb/features/s390x-cr-linux64.c new file mode 100644 index 0000000..caf535b --- /dev/null +++ b/gdb/features/s390x-cr-linux64.c @@ -0,0 +1,99 @@ +/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: + Original: s390x-cr-linux64.xml */ + +#include "defs.h" +#include "osabi.h" +#include "target-descriptions.h" + +struct target_desc *tdesc_s390x_cr_linux64; +static void +initialize_tdesc_s390x_cr_linux64 (void) +{ + struct target_desc *result = allocate_target_description (); + struct tdesc_feature *feature; + + set_tdesc_architecture (result, bfd_scan_arch ("s390:64-bit")); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.core"); + tdesc_create_reg (feature, "pswm", 0, 1, "psw", 64, "uint64"); + tdesc_create_reg (feature, "pswa", 1, 1, "psw", 64, "uint64"); + tdesc_create_reg (feature, "r0", 2, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r1", 3, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r2", 4, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r3", 5, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r4", 6, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r5", 7, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r6", 8, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r7", 9, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r8", 10, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r9", 11, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r10", 12, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r11", 13, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r12", 14, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r13", 15, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r14", 16, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r15", 17, 1, "general", 64, "uint64"); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.acr"); + tdesc_create_reg (feature, "acr0", 18, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr1", 19, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr2", 20, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr3", 21, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr4", 22, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr5", 23, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr6", 24, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr7", 25, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr8", 26, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr9", 27, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr10", 28, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr11", 29, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr12", 30, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr13", 31, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr14", 32, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr15", 33, 1, "access", 32, "uint32"); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.fpr"); + tdesc_create_reg (feature, "fpc", 34, 1, "float", 32, "uint32"); + tdesc_create_reg (feature, "f0", 35, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f1", 36, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f2", 37, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f3", 38, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f4", 39, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f5", 40, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f6", 41, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f7", 42, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f8", 43, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f9", 44, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f10", 45, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f11", 46, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f12", 47, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f13", 48, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f14", 49, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f15", 50, 1, "float", 64, "ieee_double"); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.cr"); + tdesc_create_reg (feature, "cr0", 51, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr1", 52, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr2", 53, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr3", 54, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr4", 55, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr5", 56, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr6", 57, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr7", 58, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr8", 59, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr9", 60, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr10", 61, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr11", 62, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr12", 63, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr13", 64, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr14", 65, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr15", 66, 1, "control", 64, "uint64"); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.privileged"); + tdesc_create_reg (feature, "timer", 67, 1, "system", 64, "uint64"); + tdesc_create_reg (feature, "todcmp", 68, 1, "system", 64, "uint64"); + tdesc_create_reg (feature, "todpreg", 69, 1, "system", 32, "uint32"); + tdesc_create_reg (feature, "prefix", 70, 1, "system", 32, "uint32"); + + tdesc_s390x_cr_linux64 = result; +} diff --git a/gdb/features/s390x-cr-linux64.xml b/gdb/features/s390x-cr-linux64.xml new file mode 100644 index 0000000..d38bc35 --- /dev/null +++ b/gdb/features/s390x-cr-linux64.xml @@ -0,0 +1,24 @@ + + + + + + + + s390:64-bit + + + + + + + + + + + + diff --git a/gdb/features/s390x-vxcr-linux64.c b/gdb/features/s390x-vxcr-linux64.c new file mode 100644 index 0000000..36453d2 --- /dev/null +++ b/gdb/features/s390x-vxcr-linux64.c @@ -0,0 +1,169 @@ +/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: + Original: s390x-vxcr-linux64.xml */ + +#include "defs.h" +#include "osabi.h" +#include "target-descriptions.h" + +struct target_desc *tdesc_s390x_vxcr_linux64; +static void +initialize_tdesc_s390x_vxcr_linux64 (void) +{ + struct target_desc *result = allocate_target_description (); + struct tdesc_feature *feature; + struct tdesc_type *field_type; + struct tdesc_type *type; + + set_tdesc_architecture (result, bfd_scan_arch ("s390:64-bit")); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.core"); + tdesc_create_reg (feature, "pswm", 0, 1, "psw", 64, "uint64"); + tdesc_create_reg (feature, "pswa", 1, 1, "psw", 64, "uint64"); + tdesc_create_reg (feature, "r0", 2, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r1", 3, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r2", 4, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r3", 5, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r4", 6, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r5", 7, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r6", 8, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r7", 9, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r8", 10, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r9", 11, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r10", 12, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r11", 13, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r12", 14, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r13", 15, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r14", 16, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "r15", 17, 1, "general", 64, "uint64"); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.acr"); + tdesc_create_reg (feature, "acr0", 18, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr1", 19, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr2", 20, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr3", 21, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr4", 22, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr5", 23, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr6", 24, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr7", 25, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr8", 26, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr9", 27, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr10", 28, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr11", 29, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr12", 30, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr13", 31, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr14", 32, 1, "access", 32, "uint32"); + tdesc_create_reg (feature, "acr15", 33, 1, "access", 32, "uint32"); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.fpr"); + tdesc_create_reg (feature, "fpc", 34, 1, "float", 32, "uint32"); + tdesc_create_reg (feature, "f0", 35, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f1", 36, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f2", 37, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f3", 38, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f4", 39, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f5", 40, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f6", 41, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f7", 42, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f8", 43, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f9", 44, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f10", 45, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f11", 46, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f12", 47, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f13", 48, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f14", 49, 1, "float", 64, "ieee_double"); + tdesc_create_reg (feature, "f15", 50, 1, "float", 64, "ieee_double"); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.vx"); + field_type = tdesc_named_type (feature, "ieee_single"); + tdesc_create_vector (feature, "v4f", field_type, 4); + + field_type = tdesc_named_type (feature, "ieee_double"); + tdesc_create_vector (feature, "v2d", field_type, 2); + + field_type = tdesc_named_type (feature, "int8"); + tdesc_create_vector (feature, "v16i8", field_type, 16); + + field_type = tdesc_named_type (feature, "int16"); + tdesc_create_vector (feature, "v8i16", field_type, 8); + + field_type = tdesc_named_type (feature, "int32"); + tdesc_create_vector (feature, "v4i32", field_type, 4); + + field_type = tdesc_named_type (feature, "int64"); + tdesc_create_vector (feature, "v2i64", field_type, 2); + + type = tdesc_create_union (feature, "vec128"); + field_type = tdesc_named_type (feature, "v4f"); + tdesc_add_field (type, "v4_float", field_type); + field_type = tdesc_named_type (feature, "v2d"); + tdesc_add_field (type, "v2_double", field_type); + field_type = tdesc_named_type (feature, "v16i8"); + tdesc_add_field (type, "v16_int8", field_type); + field_type = tdesc_named_type (feature, "v8i16"); + tdesc_add_field (type, "v8_int16", field_type); + field_type = tdesc_named_type (feature, "v4i32"); + tdesc_add_field (type, "v4_int32", field_type); + field_type = tdesc_named_type (feature, "v2i64"); + tdesc_add_field (type, "v2_int64", field_type); + field_type = tdesc_named_type (feature, "uint128"); + tdesc_add_field (type, "uint128", field_type); + + tdesc_create_reg (feature, "v0l", 51, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v1l", 52, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v2l", 53, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v3l", 54, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v4l", 55, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v5l", 56, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v6l", 57, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v7l", 58, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v8l", 59, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v9l", 60, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v10l", 61, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v11l", 62, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v12l", 63, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v13l", 64, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v14l", 65, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v15l", 66, 1, NULL, 64, "uint64"); + tdesc_create_reg (feature, "v16", 67, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v17", 68, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v18", 69, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v19", 70, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v20", 71, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v21", 72, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v22", 73, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v23", 74, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v24", 75, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v25", 76, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v26", 77, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v27", 78, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v28", 79, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v29", 80, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v30", 81, 1, NULL, 128, "vec128"); + tdesc_create_reg (feature, "v31", 82, 1, NULL, 128, "vec128"); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.cr"); + tdesc_create_reg (feature, "cr0", 83, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr1", 84, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr2", 85, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr3", 86, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr4", 87, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr5", 88, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr6", 89, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr7", 90, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr8", 91, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr9", 92, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr10", 93, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr11", 94, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr12", 95, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr13", 96, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr14", 97, 1, "control", 64, "uint64"); + tdesc_create_reg (feature, "cr15", 98, 1, "control", 64, "uint64"); + + feature = tdesc_create_feature (result, "org.gnu.gdb.s390.privileged"); + tdesc_create_reg (feature, "timer", 99, 1, "system", 64, "uint64"); + tdesc_create_reg (feature, "todcmp", 100, 1, "system", 64, "uint64"); + tdesc_create_reg (feature, "todpreg", 101, 1, "system", 32, "uint32"); + tdesc_create_reg (feature, "prefix", 102, 1, "system", 32, "uint32"); + + tdesc_s390x_vxcr_linux64 = result; +} diff --git a/gdb/features/s390x-vxcr-linux64.xml b/gdb/features/s390x-vxcr-linux64.xml new file mode 100644 index 0000000..30a1ceb --- /dev/null +++ b/gdb/features/s390x-vxcr-linux64.xml @@ -0,0 +1,25 @@ + + + + + + + + s390:64-bit + + + + + + + + + + + + + diff --git a/gdb/regformats/s390x-cr-linux64.dat b/gdb/regformats/s390x-cr-linux64.dat new file mode 100644 index 0000000..e8a4dd7 --- /dev/null +++ b/gdb/regformats/s390x-cr-linux64.dat @@ -0,0 +1,76 @@ +# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro: +# Generated from: s390x-cr-linux64.xml +name:s390x_cr_linux64 +xmltarget:s390x-cr-linux64.xml +expedite:r14,r15,pswa +64:pswm +64:pswa +64:r0 +64:r1 +64:r2 +64:r3 +64:r4 +64:r5 +64:r6 +64:r7 +64:r8 +64:r9 +64:r10 +64:r11 +64:r12 +64:r13 +64:r14 +64:r15 +32:acr0 +32:acr1 +32:acr2 +32:acr3 +32:acr4 +32:acr5 +32:acr6 +32:acr7 +32:acr8 +32:acr9 +32:acr10 +32:acr11 +32:acr12 +32:acr13 +32:acr14 +32:acr15 +32:fpc +64:f0 +64:f1 +64:f2 +64:f3 +64:f4 +64:f5 +64:f6 +64:f7 +64:f8 +64:f9 +64:f10 +64:f11 +64:f12 +64:f13 +64:f14 +64:f15 +64:cr0 +64:cr1 +64:cr2 +64:cr3 +64:cr4 +64:cr5 +64:cr6 +64:cr7 +64:cr8 +64:cr9 +64:cr10 +64:cr11 +64:cr12 +64:cr13 +64:cr14 +64:cr15 +64:timer +64:todcmp +32:todpreg +32:prefix diff --git a/gdb/regformats/s390x-vxcr-linux64.dat b/gdb/regformats/s390x-vxcr-linux64.dat new file mode 100644 index 0000000..8c28fd1 --- /dev/null +++ b/gdb/regformats/s390x-vxcr-linux64.dat @@ -0,0 +1,108 @@ +# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro: +# Generated from: s390x-vxcr-linux64.xml +name:s390x_vxcr_linux64 +xmltarget:s390x-vxcr-linux64.xml +expedite:r14,r15,pswa +64:pswm +64:pswa +64:r0 +64:r1 +64:r2 +64:r3 +64:r4 +64:r5 +64:r6 +64:r7 +64:r8 +64:r9 +64:r10 +64:r11 +64:r12 +64:r13 +64:r14 +64:r15 +32:acr0 +32:acr1 +32:acr2 +32:acr3 +32:acr4 +32:acr5 +32:acr6 +32:acr7 +32:acr8 +32:acr9 +32:acr10 +32:acr11 +32:acr12 +32:acr13 +32:acr14 +32:acr15 +32:fpc +64:f0 +64:f1 +64:f2 +64:f3 +64:f4 +64:f5 +64:f6 +64:f7 +64:f8 +64:f9 +64:f10 +64:f11 +64:f12 +64:f13 +64:f14 +64:f15 +64:v0l +64:v1l +64:v2l +64:v3l +64:v4l +64:v5l +64:v6l +64:v7l +64:v8l +64:v9l +64:v10l +64:v11l +64:v12l +64:v13l +64:v14l +64:v15l +128:v16 +128:v17 +128:v18 +128:v19 +128:v20 +128:v21 +128:v22 +128:v23 +128:v24 +128:v25 +128:v26 +128:v27 +128:v28 +128:v29 +128:v30 +128:v31 +64:cr0 +64:cr1 +64:cr2 +64:cr3 +64:cr4 +64:cr5 +64:cr6 +64:cr7 +64:cr8 +64:cr9 +64:cr10 +64:cr11 +64:cr12 +64:cr13 +64:cr14 +64:cr15 +64:timer +64:todcmp +32:todpreg +32:prefix diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c index febdd14..054c6d5 100644 --- a/gdb/s390-linux-tdep.c +++ b/gdb/s390-linux-tdep.c @@ -75,6 +75,8 @@ #include "features/s390x-te-linux64.c" #include "features/s390x-vx-linux64.c" #include "features/s390x-tevx-linux64.c" +#include "features/s390x-cr-linux64.c" +#include "features/s390x-vxcr-linux64.c" #define XML_SYSCALL_FILENAME_S390 "syscalls/s390-linux.xml" #define XML_SYSCALL_FILENAME_S390X "syscalls/s390x-linux.xml" @@ -219,9 +221,11 @@ static const short s390_dwarf_regmap[] = S390_F8_REGNUM, S390_F10_REGNUM, S390_F12_REGNUM, S390_F14_REGNUM, S390_F9_REGNUM, S390_F11_REGNUM, S390_F13_REGNUM, S390_F15_REGNUM, - /* 32-47: Control Registers (not mapped). */ - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, + /* 32-47: Control Registers. */ + S390_CR0_REGNUM, S390_CR1_REGNUM, S390_CR2_REGNUM, S390_CR3_REGNUM, + S390_CR4_REGNUM, S390_CR5_REGNUM, S390_CR6_REGNUM, S390_CR7_REGNUM, + S390_CR8_REGNUM, S390_CR9_REGNUM, S390_CR10_REGNUM, S390_CR11_REGNUM, + S390_CR12_REGNUM, S390_CR13_REGNUM, S390_CR14_REGNUM, S390_CR15_REGNUM, /* 48-63: Access Registers. */ S390_A0_REGNUM, S390_A1_REGNUM, S390_A2_REGNUM, S390_A3_REGNUM, @@ -779,6 +783,36 @@ static const struct regcache_map_entry s390_gregmap[] = { 0 } }; +static const struct regcache_map_entry s390_regmap_cr [] = + { + { 16, S390_CR0_REGNUM, 8 }, + { 0 } + }; + +static const struct regcache_map_entry s390_regmap_timer [] = + { + { 1, S390_TIMER_REGNUM, 8 }, + { 0 } + }; + +static const struct regcache_map_entry s390_regmap_todcmp [] = + { + { 1, S390_TODCMP_REGNUM, 8 }, + { 0 } + }; + +static const struct regcache_map_entry s390_regmap_todpreg [] = + { + { 1, S390_TODPREG_REGNUM, 4 }, + { 0 } + }; + +static const struct regcache_map_entry s390_regmap_prefix [] = + { + { 1, S390_PREFIX_REGNUM, 4 }, + { 0 } + }; + static const struct regcache_map_entry s390_fpregmap[] = { { 1, S390_FPC_REGNUM, 8 }, @@ -857,6 +891,36 @@ const struct regset s390_gregset = { regcache_collect_regset }; +const struct regset s390_cr_regset = { + s390_regmap_cr, + regcache_supply_regset, + regcache_collect_regset +}; + +const struct regset s390_timer_regset = { + s390_regmap_timer, + regcache_supply_regset, + regcache_collect_regset +}; + +const struct regset s390_todcmp_regset = { + s390_regmap_todcmp, + regcache_supply_regset, + regcache_collect_regset +}; + +const struct regset s390_todpreg_regset = { + s390_regmap_todpreg, + regcache_supply_regset, + regcache_collect_regset +}; + +const struct regset s390_prefix_regset = { + s390_regmap_prefix, + regcache_supply_regset, + regcache_collect_regset +}; + const struct regset s390_fpregset = { s390_fpregmap, regcache_supply_regset, @@ -951,6 +1015,22 @@ s390_iterate_over_regset_sections (struct gdbarch *gdbarch, cb (".reg-s390-vxrs-high", 16 * 16, &s390_vxrs_high_regset, "s390 vector registers 16-31", cb_data); } + + /* Privileged registers for kernel debugging. */ + if (bfd_get_section_by_name (core_bfd, ".reg-s390-timer")) + cb (".reg-s390-timer", 8, &s390_timer_regset, "s390 timer", cb_data); + if (bfd_get_section_by_name (core_bfd, ".reg-s390-todcmp")) + cb (".reg-s390-todcmp", 8, &s390_todcmp_regset, + "s390 clock comperator", cb_data); + if (bfd_get_section_by_name (core_bfd, ".reg-s390-todpreg")) + cb (".reg-s390-todpreg", 4, &s390_todpreg_regset, + "s390 TOD programable register", cb_data); + if (bfd_get_section_by_name (core_bfd, ".reg-s390-ctrs")) + cb (".reg-s390-ctrs", 16 * 8, &s390_cr_regset, + "s390 control registers", cb_data); + if (bfd_get_section_by_name (core_bfd, ".reg-s390-prefix")) + cb (".reg-s390-prefix", 4, &s390_prefix_regset, + "s390 prefix area", cb_data); } static const struct target_desc * @@ -959,7 +1039,7 @@ s390_core_read_description (struct gdbarch *gdbarch, { asection *section = bfd_get_section_by_name (abfd, ".reg"); CORE_ADDR hwcap = 0; - int high_gprs, v1, v2, te, vx; + int high_gprs, v1, v2, te, vx, cr; target_auxv_search (target, AT_HWCAP, &hwcap); if (!section) @@ -971,6 +1051,7 @@ s390_core_read_description (struct gdbarch *gdbarch, v2 = (bfd_get_section_by_name (abfd, ".reg-s390-system-call") != NULL); vx = (hwcap & HWCAP_S390_VX); te = (hwcap & HWCAP_S390_TE); + cr = (bfd_get_section_by_name (abfd, ".reg-s390-ctrs") != NULL); switch (bfd_section_size (abfd, section)) { @@ -987,6 +1068,8 @@ s390_core_read_description (struct gdbarch *gdbarch, case s390x_sizeof_gregset: return (te && vx ? tdesc_s390x_tevx_linux64 : + vx && cr ? tdesc_s390x_vxcr_linux64 : + cr ? tdesc_s390x_cr_linux64 : vx ? tdesc_s390x_vx_linux64 : te ? tdesc_s390x_te_linux64 : v2 ? tdesc_s390x_linux64v2 : @@ -7809,6 +7892,10 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31", }; + static const char *const cr[] = { + "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7", + "cr8", "cr9", "cr10", "cr11", "cr12", "cr13", "cr14", "cr15" + }; const struct tdesc_feature *feature; int i, valid_p = 1; @@ -7912,6 +7999,29 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) have_vx = 1; } + /* Control registers. */ + feature = tdesc_find_feature (tdesc, "org.gnu.gdb.s390.cr"); + if (feature) + { + for (i = 0; i < 16; i++) + valid_p &= tdesc_numbered_register (feature, tdesc_data, + S390_CR0_REGNUM + i, cr[i]); + } + + /* Privileged registers. */ + feature = tdesc_find_feature (tdesc, "org.gnu.gdb.s390.privileged"); + if (feature) + { + valid_p &= tdesc_numbered_register (feature, tdesc_data, + S390_TIMER_REGNUM, "timer"); + valid_p &= tdesc_numbered_register (feature, tdesc_data, + S390_TODCMP_REGNUM, "todcmp"); + valid_p &= tdesc_numbered_register (feature, tdesc_data, + S390_TODPREG_REGNUM, "todpreg"); + valid_p &= tdesc_numbered_register (feature, tdesc_data, + S390_PREFIX_REGNUM, "prefix"); + } + if (!valid_p) { tdesc_data_cleanup (tdesc_data); @@ -8141,4 +8251,6 @@ _initialize_s390_tdep (void) initialize_tdesc_s390x_te_linux64 (); initialize_tdesc_s390x_vx_linux64 (); initialize_tdesc_s390x_tevx_linux64 (); + initialize_tdesc_s390x_cr_linux64 (); + initialize_tdesc_s390x_vxcr_linux64 (); } diff --git a/gdb/s390-linux-tdep.h b/gdb/s390-linux-tdep.h index 4f818b4..fdb3c3d 100644 --- a/gdb/s390-linux-tdep.h +++ b/gdb/s390-linux-tdep.h @@ -166,8 +166,30 @@ #define S390_V29_REGNUM 119 #define S390_V30_REGNUM 120 #define S390_V31_REGNUM 121 +/* Control registers. */ +#define S390_TIMER_REGNUM 122 +#define S390_TODCMP_REGNUM 123 +#define S390_TODPREG_REGNUM 124 +#define S390_CR0_REGNUM 125 +#define S390_CR1_REGNUM 126 +#define S390_CR2_REGNUM 127 +#define S390_CR3_REGNUM 128 +#define S390_CR4_REGNUM 129 +#define S390_CR5_REGNUM 130 +#define S390_CR6_REGNUM 131 +#define S390_CR7_REGNUM 132 +#define S390_CR8_REGNUM 133 +#define S390_CR9_REGNUM 134 +#define S390_CR10_REGNUM 135 +#define S390_CR11_REGNUM 136 +#define S390_CR12_REGNUM 137 +#define S390_CR13_REGNUM 138 +#define S390_CR14_REGNUM 139 +#define S390_CR15_REGNUM 140 +#define S390_PREFIX_REGNUM 141 + /* Total. */ -#define S390_NUM_REGS 122 +#define S390_NUM_REGS 142 /* Special register usage. */ #define S390_SP_REGNUM S390_R15_REGNUM -- 2.8.4