• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

GNU Binutils with patches for OS216


Commit MetaInfo

Revisãod67d2e97621796c52dbf28d7e5ac6c24e27badb3 (tree)
Hora2017-03-17 01:01:49
AutorPhilipp Rudo <prudo@linu...>
CommiterAndreas Arnez

Mensagem de Log

Add privileged registers for s390x

The Linux kernel and thus the linux-kernel target needs access to S390x's
privileged registers. Define new features and prepare s390-tdep.* to use
them in new Linux kernel code.

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-tdep.h: Define regnums for control registers.
(S390_NUM_REGS): Adjust.
* s390-tdep.c: (s390_dwarf_regmat): Add control registers.

Mudança Sumário

Diff

--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -78,6 +78,7 @@ WHICH = aarch64 \
7878 s390-linux32v2 s390-linux64v2 s390x-linux64v2 \
7979 s390-te-linux64 s390x-te-linux64 s390-vx-linux64 s390x-vx-linux64 \
8080 s390-tevx-linux64 s390x-tevx-linux64 \
81+ s390x-cr-linux64 s390x-vxcr-linux64 \
8182 tic6x-c64xp tic6x-c64x tic6x-c62x \
8283 tic6x-c64xp-linux tic6x-c64x-linux tic6x-c62x-linux
8384
@@ -111,6 +112,8 @@ s390x-linux64v2-expedite = r14,r15,pswa
111112 s390x-te-linux64-expedite = r14,r15,pswa
112113 s390x-vx-linux64-expedite = r14,r15,pswa
113114 s390x-tevx-linux64-expedite = r14,r15,pswa
115+s390x-cr-linux64-expedite = r14,r15,pswa
116+s390x-vxcr-linux64-expedite = r14,r15,pswa
114117 tic6x-c64xp-expedite = A15,PC
115118 tic6x-c64x-expedite = A15,PC
116119 tic6x-c62x-expedite = A15,PC
@@ -220,14 +223,16 @@ XMLTOC = \
220223 s390-linux64v1.xml \
221224 s390-linux64v2.xml \
222225 s390-te-linux64.xml \
226+ s390-vx-linux64.xml \
227+ s390-tevx-linux64.xml \
223228 s390x-linux64.xml \
224229 s390x-linux64v1.xml \
225230 s390x-linux64v2.xml \
226231 s390x-te-linux64.xml \
227- s390-tevx-linux64.xml \
228- s390-vx-linux64.xml \
229- s390x-tevx-linux64.xml \
230232 s390x-vx-linux64.xml \
233+ s390x-cr-linux64.xml \
234+ s390x-tevx-linux64.xml \
235+ s390x-vxcr-linux64.xml \
231236 tic6x-c62x-linux.xml \
232237 tic6x-c62x.xml \
233238 tic6x-c64x-linux.xml \
--- /dev/null
+++ b/gdb/features/s390-cr.xml
@@ -0,0 +1,26 @@
1+<?xml version="1.0"?>
2+<!-- Copyright (C) 2016 Free Software Foundation, Inc.
3+
4+ Copying and distribution of this file, with or without modification,
5+ are permitted in any medium without royalty provided the copyright
6+ notice and this notice are preserved. -->
7+
8+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
9+<feature name="org.gnu.gdb.s390.cr">
10+ <reg name="cr0" bitsize="64" type="uint64" group="control"/>
11+ <reg name="cr1" bitsize="64" type="uint64" group="control"/>
12+ <reg name="cr2" bitsize="64" type="uint64" group="control"/>
13+ <reg name="cr3" bitsize="64" type="uint64" group="control"/>
14+ <reg name="cr4" bitsize="64" type="uint64" group="control"/>
15+ <reg name="cr5" bitsize="64" type="uint64" group="control"/>
16+ <reg name="cr6" bitsize="64" type="uint64" group="control"/>
17+ <reg name="cr7" bitsize="64" type="uint64" group="control"/>
18+ <reg name="cr8" bitsize="64" type="uint64" group="control"/>
19+ <reg name="cr9" bitsize="64" type="uint64" group="control"/>
20+ <reg name="cr10" bitsize="64" type="uint64" group="control"/>
21+ <reg name="cr11" bitsize="64" type="uint64" group="control"/>
22+ <reg name="cr12" bitsize="64" type="uint64" group="control"/>
23+ <reg name="cr13" bitsize="64" type="uint64" group="control"/>
24+ <reg name="cr14" bitsize="64" type="uint64" group="control"/>
25+ <reg name="cr15" bitsize="64" type="uint64" group="control"/>
26+</feature>
--- /dev/null
+++ b/gdb/features/s390x-cr-linux64.c
@@ -0,0 +1,99 @@
1+/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro:
2+ Original: s390x-cr-linux64.xml */
3+
4+#include "defs.h"
5+#include "osabi.h"
6+#include "target-descriptions.h"
7+
8+struct target_desc *tdesc_s390x_cr_linux64;
9+static void
10+initialize_tdesc_s390x_cr_linux64 (void)
11+{
12+ struct target_desc *result = allocate_target_description ();
13+ struct tdesc_feature *feature;
14+
15+ set_tdesc_architecture (result, bfd_scan_arch ("s390:64-bit"));
16+
17+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.core");
18+ tdesc_create_reg (feature, "pswm", 0, 1, "psw", 64, "uint64");
19+ tdesc_create_reg (feature, "pswa", 1, 1, "psw", 64, "uint64");
20+ tdesc_create_reg (feature, "r0", 2, 1, "general", 64, "uint64");
21+ tdesc_create_reg (feature, "r1", 3, 1, "general", 64, "uint64");
22+ tdesc_create_reg (feature, "r2", 4, 1, "general", 64, "uint64");
23+ tdesc_create_reg (feature, "r3", 5, 1, "general", 64, "uint64");
24+ tdesc_create_reg (feature, "r4", 6, 1, "general", 64, "uint64");
25+ tdesc_create_reg (feature, "r5", 7, 1, "general", 64, "uint64");
26+ tdesc_create_reg (feature, "r6", 8, 1, "general", 64, "uint64");
27+ tdesc_create_reg (feature, "r7", 9, 1, "general", 64, "uint64");
28+ tdesc_create_reg (feature, "r8", 10, 1, "general", 64, "uint64");
29+ tdesc_create_reg (feature, "r9", 11, 1, "general", 64, "uint64");
30+ tdesc_create_reg (feature, "r10", 12, 1, "general", 64, "uint64");
31+ tdesc_create_reg (feature, "r11", 13, 1, "general", 64, "uint64");
32+ tdesc_create_reg (feature, "r12", 14, 1, "general", 64, "uint64");
33+ tdesc_create_reg (feature, "r13", 15, 1, "general", 64, "uint64");
34+ tdesc_create_reg (feature, "r14", 16, 1, "general", 64, "uint64");
35+ tdesc_create_reg (feature, "r15", 17, 1, "general", 64, "uint64");
36+
37+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.acr");
38+ tdesc_create_reg (feature, "acr0", 18, 1, "access", 32, "uint32");
39+ tdesc_create_reg (feature, "acr1", 19, 1, "access", 32, "uint32");
40+ tdesc_create_reg (feature, "acr2", 20, 1, "access", 32, "uint32");
41+ tdesc_create_reg (feature, "acr3", 21, 1, "access", 32, "uint32");
42+ tdesc_create_reg (feature, "acr4", 22, 1, "access", 32, "uint32");
43+ tdesc_create_reg (feature, "acr5", 23, 1, "access", 32, "uint32");
44+ tdesc_create_reg (feature, "acr6", 24, 1, "access", 32, "uint32");
45+ tdesc_create_reg (feature, "acr7", 25, 1, "access", 32, "uint32");
46+ tdesc_create_reg (feature, "acr8", 26, 1, "access", 32, "uint32");
47+ tdesc_create_reg (feature, "acr9", 27, 1, "access", 32, "uint32");
48+ tdesc_create_reg (feature, "acr10", 28, 1, "access", 32, "uint32");
49+ tdesc_create_reg (feature, "acr11", 29, 1, "access", 32, "uint32");
50+ tdesc_create_reg (feature, "acr12", 30, 1, "access", 32, "uint32");
51+ tdesc_create_reg (feature, "acr13", 31, 1, "access", 32, "uint32");
52+ tdesc_create_reg (feature, "acr14", 32, 1, "access", 32, "uint32");
53+ tdesc_create_reg (feature, "acr15", 33, 1, "access", 32, "uint32");
54+
55+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.fpr");
56+ tdesc_create_reg (feature, "fpc", 34, 1, "float", 32, "uint32");
57+ tdesc_create_reg (feature, "f0", 35, 1, "float", 64, "ieee_double");
58+ tdesc_create_reg (feature, "f1", 36, 1, "float", 64, "ieee_double");
59+ tdesc_create_reg (feature, "f2", 37, 1, "float", 64, "ieee_double");
60+ tdesc_create_reg (feature, "f3", 38, 1, "float", 64, "ieee_double");
61+ tdesc_create_reg (feature, "f4", 39, 1, "float", 64, "ieee_double");
62+ tdesc_create_reg (feature, "f5", 40, 1, "float", 64, "ieee_double");
63+ tdesc_create_reg (feature, "f6", 41, 1, "float", 64, "ieee_double");
64+ tdesc_create_reg (feature, "f7", 42, 1, "float", 64, "ieee_double");
65+ tdesc_create_reg (feature, "f8", 43, 1, "float", 64, "ieee_double");
66+ tdesc_create_reg (feature, "f9", 44, 1, "float", 64, "ieee_double");
67+ tdesc_create_reg (feature, "f10", 45, 1, "float", 64, "ieee_double");
68+ tdesc_create_reg (feature, "f11", 46, 1, "float", 64, "ieee_double");
69+ tdesc_create_reg (feature, "f12", 47, 1, "float", 64, "ieee_double");
70+ tdesc_create_reg (feature, "f13", 48, 1, "float", 64, "ieee_double");
71+ tdesc_create_reg (feature, "f14", 49, 1, "float", 64, "ieee_double");
72+ tdesc_create_reg (feature, "f15", 50, 1, "float", 64, "ieee_double");
73+
74+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.cr");
75+ tdesc_create_reg (feature, "cr0", 51, 1, "control", 64, "uint64");
76+ tdesc_create_reg (feature, "cr1", 52, 1, "control", 64, "uint64");
77+ tdesc_create_reg (feature, "cr2", 53, 1, "control", 64, "uint64");
78+ tdesc_create_reg (feature, "cr3", 54, 1, "control", 64, "uint64");
79+ tdesc_create_reg (feature, "cr4", 55, 1, "control", 64, "uint64");
80+ tdesc_create_reg (feature, "cr5", 56, 1, "control", 64, "uint64");
81+ tdesc_create_reg (feature, "cr6", 57, 1, "control", 64, "uint64");
82+ tdesc_create_reg (feature, "cr7", 58, 1, "control", 64, "uint64");
83+ tdesc_create_reg (feature, "cr8", 59, 1, "control", 64, "uint64");
84+ tdesc_create_reg (feature, "cr9", 60, 1, "control", 64, "uint64");
85+ tdesc_create_reg (feature, "cr10", 61, 1, "control", 64, "uint64");
86+ tdesc_create_reg (feature, "cr11", 62, 1, "control", 64, "uint64");
87+ tdesc_create_reg (feature, "cr12", 63, 1, "control", 64, "uint64");
88+ tdesc_create_reg (feature, "cr13", 64, 1, "control", 64, "uint64");
89+ tdesc_create_reg (feature, "cr14", 65, 1, "control", 64, "uint64");
90+ tdesc_create_reg (feature, "cr15", 66, 1, "control", 64, "uint64");
91+
92+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.privileged");
93+ tdesc_create_reg (feature, "timer", 67, 1, "system", 64, "uint64");
94+ tdesc_create_reg (feature, "todcmp", 68, 1, "system", 64, "uint64");
95+ tdesc_create_reg (feature, "todpreg", 69, 1, "system", 32, "uint32");
96+ tdesc_create_reg (feature, "prefix", 70, 1, "system", 32, "uint32");
97+
98+ tdesc_s390x_cr_linux64 = result;
99+}
--- /dev/null
+++ b/gdb/features/s390x-cr-linux64.xml
@@ -0,0 +1,24 @@
1+<?xml version="1.0"?>
2+<!-- Copyright (C) 2016 Free Software Foundation, Inc.
3+
4+ Copying and distribution of this file, with or without modification,
5+ are permitted in any medium without royalty provided the copyright
6+ notice and this notice are preserved. -->
7+
8+<!-- S/390 64-bit kernel-level code. -->
9+
10+<!DOCTYPE target SYSTEM "gdb-target.dtd">
11+<target>
12+ <architecture>s390:64-bit</architecture>
13+ <xi:include href="s390x-core64.xml"/>
14+ <xi:include href="s390-acr.xml"/>
15+ <xi:include href="s390-fpr.xml"/>
16+ <xi:include href="s390-cr.xml"/>
17+
18+ <feature name="org.gnu.gdb.s390.privileged">
19+ <reg name="timer" bitsize="64" type="uint64" group="system"/>
20+ <reg name="todcmp" bitsize="64" type="uint64" group="system"/>
21+ <reg name="todpreg" bitsize="32" type="uint32" group="system"/>
22+ <reg name="prefix" bitsize="32" type="uint32" group="system"/>
23+ </feature>
24+</target>
--- /dev/null
+++ b/gdb/features/s390x-vxcr-linux64.c
@@ -0,0 +1,169 @@
1+/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro:
2+ Original: s390x-vxcr-linux64.xml */
3+
4+#include "defs.h"
5+#include "osabi.h"
6+#include "target-descriptions.h"
7+
8+struct target_desc *tdesc_s390x_vxcr_linux64;
9+static void
10+initialize_tdesc_s390x_vxcr_linux64 (void)
11+{
12+ struct target_desc *result = allocate_target_description ();
13+ struct tdesc_feature *feature;
14+ struct tdesc_type *field_type;
15+ struct tdesc_type *type;
16+
17+ set_tdesc_architecture (result, bfd_scan_arch ("s390:64-bit"));
18+
19+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.core");
20+ tdesc_create_reg (feature, "pswm", 0, 1, "psw", 64, "uint64");
21+ tdesc_create_reg (feature, "pswa", 1, 1, "psw", 64, "uint64");
22+ tdesc_create_reg (feature, "r0", 2, 1, "general", 64, "uint64");
23+ tdesc_create_reg (feature, "r1", 3, 1, "general", 64, "uint64");
24+ tdesc_create_reg (feature, "r2", 4, 1, "general", 64, "uint64");
25+ tdesc_create_reg (feature, "r3", 5, 1, "general", 64, "uint64");
26+ tdesc_create_reg (feature, "r4", 6, 1, "general", 64, "uint64");
27+ tdesc_create_reg (feature, "r5", 7, 1, "general", 64, "uint64");
28+ tdesc_create_reg (feature, "r6", 8, 1, "general", 64, "uint64");
29+ tdesc_create_reg (feature, "r7", 9, 1, "general", 64, "uint64");
30+ tdesc_create_reg (feature, "r8", 10, 1, "general", 64, "uint64");
31+ tdesc_create_reg (feature, "r9", 11, 1, "general", 64, "uint64");
32+ tdesc_create_reg (feature, "r10", 12, 1, "general", 64, "uint64");
33+ tdesc_create_reg (feature, "r11", 13, 1, "general", 64, "uint64");
34+ tdesc_create_reg (feature, "r12", 14, 1, "general", 64, "uint64");
35+ tdesc_create_reg (feature, "r13", 15, 1, "general", 64, "uint64");
36+ tdesc_create_reg (feature, "r14", 16, 1, "general", 64, "uint64");
37+ tdesc_create_reg (feature, "r15", 17, 1, "general", 64, "uint64");
38+
39+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.acr");
40+ tdesc_create_reg (feature, "acr0", 18, 1, "access", 32, "uint32");
41+ tdesc_create_reg (feature, "acr1", 19, 1, "access", 32, "uint32");
42+ tdesc_create_reg (feature, "acr2", 20, 1, "access", 32, "uint32");
43+ tdesc_create_reg (feature, "acr3", 21, 1, "access", 32, "uint32");
44+ tdesc_create_reg (feature, "acr4", 22, 1, "access", 32, "uint32");
45+ tdesc_create_reg (feature, "acr5", 23, 1, "access", 32, "uint32");
46+ tdesc_create_reg (feature, "acr6", 24, 1, "access", 32, "uint32");
47+ tdesc_create_reg (feature, "acr7", 25, 1, "access", 32, "uint32");
48+ tdesc_create_reg (feature, "acr8", 26, 1, "access", 32, "uint32");
49+ tdesc_create_reg (feature, "acr9", 27, 1, "access", 32, "uint32");
50+ tdesc_create_reg (feature, "acr10", 28, 1, "access", 32, "uint32");
51+ tdesc_create_reg (feature, "acr11", 29, 1, "access", 32, "uint32");
52+ tdesc_create_reg (feature, "acr12", 30, 1, "access", 32, "uint32");
53+ tdesc_create_reg (feature, "acr13", 31, 1, "access", 32, "uint32");
54+ tdesc_create_reg (feature, "acr14", 32, 1, "access", 32, "uint32");
55+ tdesc_create_reg (feature, "acr15", 33, 1, "access", 32, "uint32");
56+
57+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.fpr");
58+ tdesc_create_reg (feature, "fpc", 34, 1, "float", 32, "uint32");
59+ tdesc_create_reg (feature, "f0", 35, 1, "float", 64, "ieee_double");
60+ tdesc_create_reg (feature, "f1", 36, 1, "float", 64, "ieee_double");
61+ tdesc_create_reg (feature, "f2", 37, 1, "float", 64, "ieee_double");
62+ tdesc_create_reg (feature, "f3", 38, 1, "float", 64, "ieee_double");
63+ tdesc_create_reg (feature, "f4", 39, 1, "float", 64, "ieee_double");
64+ tdesc_create_reg (feature, "f5", 40, 1, "float", 64, "ieee_double");
65+ tdesc_create_reg (feature, "f6", 41, 1, "float", 64, "ieee_double");
66+ tdesc_create_reg (feature, "f7", 42, 1, "float", 64, "ieee_double");
67+ tdesc_create_reg (feature, "f8", 43, 1, "float", 64, "ieee_double");
68+ tdesc_create_reg (feature, "f9", 44, 1, "float", 64, "ieee_double");
69+ tdesc_create_reg (feature, "f10", 45, 1, "float", 64, "ieee_double");
70+ tdesc_create_reg (feature, "f11", 46, 1, "float", 64, "ieee_double");
71+ tdesc_create_reg (feature, "f12", 47, 1, "float", 64, "ieee_double");
72+ tdesc_create_reg (feature, "f13", 48, 1, "float", 64, "ieee_double");
73+ tdesc_create_reg (feature, "f14", 49, 1, "float", 64, "ieee_double");
74+ tdesc_create_reg (feature, "f15", 50, 1, "float", 64, "ieee_double");
75+
76+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.vx");
77+ field_type = tdesc_named_type (feature, "ieee_single");
78+ tdesc_create_vector (feature, "v4f", field_type, 4);
79+
80+ field_type = tdesc_named_type (feature, "ieee_double");
81+ tdesc_create_vector (feature, "v2d", field_type, 2);
82+
83+ field_type = tdesc_named_type (feature, "int8");
84+ tdesc_create_vector (feature, "v16i8", field_type, 16);
85+
86+ field_type = tdesc_named_type (feature, "int16");
87+ tdesc_create_vector (feature, "v8i16", field_type, 8);
88+
89+ field_type = tdesc_named_type (feature, "int32");
90+ tdesc_create_vector (feature, "v4i32", field_type, 4);
91+
92+ field_type = tdesc_named_type (feature, "int64");
93+ tdesc_create_vector (feature, "v2i64", field_type, 2);
94+
95+ type = tdesc_create_union (feature, "vec128");
96+ field_type = tdesc_named_type (feature, "v4f");
97+ tdesc_add_field (type, "v4_float", field_type);
98+ field_type = tdesc_named_type (feature, "v2d");
99+ tdesc_add_field (type, "v2_double", field_type);
100+ field_type = tdesc_named_type (feature, "v16i8");
101+ tdesc_add_field (type, "v16_int8", field_type);
102+ field_type = tdesc_named_type (feature, "v8i16");
103+ tdesc_add_field (type, "v8_int16", field_type);
104+ field_type = tdesc_named_type (feature, "v4i32");
105+ tdesc_add_field (type, "v4_int32", field_type);
106+ field_type = tdesc_named_type (feature, "v2i64");
107+ tdesc_add_field (type, "v2_int64", field_type);
108+ field_type = tdesc_named_type (feature, "uint128");
109+ tdesc_add_field (type, "uint128", field_type);
110+
111+ tdesc_create_reg (feature, "v0l", 51, 1, NULL, 64, "uint64");
112+ tdesc_create_reg (feature, "v1l", 52, 1, NULL, 64, "uint64");
113+ tdesc_create_reg (feature, "v2l", 53, 1, NULL, 64, "uint64");
114+ tdesc_create_reg (feature, "v3l", 54, 1, NULL, 64, "uint64");
115+ tdesc_create_reg (feature, "v4l", 55, 1, NULL, 64, "uint64");
116+ tdesc_create_reg (feature, "v5l", 56, 1, NULL, 64, "uint64");
117+ tdesc_create_reg (feature, "v6l", 57, 1, NULL, 64, "uint64");
118+ tdesc_create_reg (feature, "v7l", 58, 1, NULL, 64, "uint64");
119+ tdesc_create_reg (feature, "v8l", 59, 1, NULL, 64, "uint64");
120+ tdesc_create_reg (feature, "v9l", 60, 1, NULL, 64, "uint64");
121+ tdesc_create_reg (feature, "v10l", 61, 1, NULL, 64, "uint64");
122+ tdesc_create_reg (feature, "v11l", 62, 1, NULL, 64, "uint64");
123+ tdesc_create_reg (feature, "v12l", 63, 1, NULL, 64, "uint64");
124+ tdesc_create_reg (feature, "v13l", 64, 1, NULL, 64, "uint64");
125+ tdesc_create_reg (feature, "v14l", 65, 1, NULL, 64, "uint64");
126+ tdesc_create_reg (feature, "v15l", 66, 1, NULL, 64, "uint64");
127+ tdesc_create_reg (feature, "v16", 67, 1, NULL, 128, "vec128");
128+ tdesc_create_reg (feature, "v17", 68, 1, NULL, 128, "vec128");
129+ tdesc_create_reg (feature, "v18", 69, 1, NULL, 128, "vec128");
130+ tdesc_create_reg (feature, "v19", 70, 1, NULL, 128, "vec128");
131+ tdesc_create_reg (feature, "v20", 71, 1, NULL, 128, "vec128");
132+ tdesc_create_reg (feature, "v21", 72, 1, NULL, 128, "vec128");
133+ tdesc_create_reg (feature, "v22", 73, 1, NULL, 128, "vec128");
134+ tdesc_create_reg (feature, "v23", 74, 1, NULL, 128, "vec128");
135+ tdesc_create_reg (feature, "v24", 75, 1, NULL, 128, "vec128");
136+ tdesc_create_reg (feature, "v25", 76, 1, NULL, 128, "vec128");
137+ tdesc_create_reg (feature, "v26", 77, 1, NULL, 128, "vec128");
138+ tdesc_create_reg (feature, "v27", 78, 1, NULL, 128, "vec128");
139+ tdesc_create_reg (feature, "v28", 79, 1, NULL, 128, "vec128");
140+ tdesc_create_reg (feature, "v29", 80, 1, NULL, 128, "vec128");
141+ tdesc_create_reg (feature, "v30", 81, 1, NULL, 128, "vec128");
142+ tdesc_create_reg (feature, "v31", 82, 1, NULL, 128, "vec128");
143+
144+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.cr");
145+ tdesc_create_reg (feature, "cr0", 83, 1, "control", 64, "uint64");
146+ tdesc_create_reg (feature, "cr1", 84, 1, "control", 64, "uint64");
147+ tdesc_create_reg (feature, "cr2", 85, 1, "control", 64, "uint64");
148+ tdesc_create_reg (feature, "cr3", 86, 1, "control", 64, "uint64");
149+ tdesc_create_reg (feature, "cr4", 87, 1, "control", 64, "uint64");
150+ tdesc_create_reg (feature, "cr5", 88, 1, "control", 64, "uint64");
151+ tdesc_create_reg (feature, "cr6", 89, 1, "control", 64, "uint64");
152+ tdesc_create_reg (feature, "cr7", 90, 1, "control", 64, "uint64");
153+ tdesc_create_reg (feature, "cr8", 91, 1, "control", 64, "uint64");
154+ tdesc_create_reg (feature, "cr9", 92, 1, "control", 64, "uint64");
155+ tdesc_create_reg (feature, "cr10", 93, 1, "control", 64, "uint64");
156+ tdesc_create_reg (feature, "cr11", 94, 1, "control", 64, "uint64");
157+ tdesc_create_reg (feature, "cr12", 95, 1, "control", 64, "uint64");
158+ tdesc_create_reg (feature, "cr13", 96, 1, "control", 64, "uint64");
159+ tdesc_create_reg (feature, "cr14", 97, 1, "control", 64, "uint64");
160+ tdesc_create_reg (feature, "cr15", 98, 1, "control", 64, "uint64");
161+
162+ feature = tdesc_create_feature (result, "org.gnu.gdb.s390.privileged");
163+ tdesc_create_reg (feature, "timer", 99, 1, "system", 64, "uint64");
164+ tdesc_create_reg (feature, "todcmp", 100, 1, "system", 64, "uint64");
165+ tdesc_create_reg (feature, "todpreg", 101, 1, "system", 32, "uint32");
166+ tdesc_create_reg (feature, "prefix", 102, 1, "system", 32, "uint32");
167+
168+ tdesc_s390x_vxcr_linux64 = result;
169+}
--- /dev/null
+++ b/gdb/features/s390x-vxcr-linux64.xml
@@ -0,0 +1,25 @@
1+<?xml version="1.0"?>
2+<!-- Copyright (C) 2016 Free Software Foundation, Inc.
3+
4+ Copying and distribution of this file, with or without modification,
5+ are permitted in any medium without royalty provided the copyright
6+ notice and this notice are preserved. -->
7+
8+<!-- S/390 64-bit kernel-level code. -->
9+
10+<!DOCTYPE target SYSTEM "gdb-target.dtd">
11+<target>
12+ <architecture>s390:64-bit</architecture>
13+ <xi:include href="s390x-core64.xml"/>
14+ <xi:include href="s390-acr.xml"/>
15+ <xi:include href="s390-fpr.xml"/>
16+ <xi:include href="s390-vx.xml"/>
17+ <xi:include href="s390-cr.xml"/>
18+
19+ <feature name="org.gnu.gdb.s390.privileged">
20+ <reg name="timer" bitsize="64" type="uint64" group="system"/>
21+ <reg name="todcmp" bitsize="64" type="uint64" group="system"/>
22+ <reg name="todpreg" bitsize="32" type="uint32" group="system"/>
23+ <reg name="prefix" bitsize="32" type="uint32" group="system"/>
24+ </feature>
25+</target>
--- /dev/null
+++ b/gdb/regformats/s390x-cr-linux64.dat
@@ -0,0 +1,76 @@
1+# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro:
2+# Generated from: s390x-cr-linux64.xml
3+name:s390x_cr_linux64
4+xmltarget:s390x-cr-linux64.xml
5+expedite:r14,r15,pswa
6+64:pswm
7+64:pswa
8+64:r0
9+64:r1
10+64:r2
11+64:r3
12+64:r4
13+64:r5
14+64:r6
15+64:r7
16+64:r8
17+64:r9
18+64:r10
19+64:r11
20+64:r12
21+64:r13
22+64:r14
23+64:r15
24+32:acr0
25+32:acr1
26+32:acr2
27+32:acr3
28+32:acr4
29+32:acr5
30+32:acr6
31+32:acr7
32+32:acr8
33+32:acr9
34+32:acr10
35+32:acr11
36+32:acr12
37+32:acr13
38+32:acr14
39+32:acr15
40+32:fpc
41+64:f0
42+64:f1
43+64:f2
44+64:f3
45+64:f4
46+64:f5
47+64:f6
48+64:f7
49+64:f8
50+64:f9
51+64:f10
52+64:f11
53+64:f12
54+64:f13
55+64:f14
56+64:f15
57+64:cr0
58+64:cr1
59+64:cr2
60+64:cr3
61+64:cr4
62+64:cr5
63+64:cr6
64+64:cr7
65+64:cr8
66+64:cr9
67+64:cr10
68+64:cr11
69+64:cr12
70+64:cr13
71+64:cr14
72+64:cr15
73+64:timer
74+64:todcmp
75+32:todpreg
76+32:prefix
--- /dev/null
+++ b/gdb/regformats/s390x-vxcr-linux64.dat
@@ -0,0 +1,108 @@
1+# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro:
2+# Generated from: s390x-vxcr-linux64.xml
3+name:s390x_vxcr_linux64
4+xmltarget:s390x-vxcr-linux64.xml
5+expedite:r14,r15,pswa
6+64:pswm
7+64:pswa
8+64:r0
9+64:r1
10+64:r2
11+64:r3
12+64:r4
13+64:r5
14+64:r6
15+64:r7
16+64:r8
17+64:r9
18+64:r10
19+64:r11
20+64:r12
21+64:r13
22+64:r14
23+64:r15
24+32:acr0
25+32:acr1
26+32:acr2
27+32:acr3
28+32:acr4
29+32:acr5
30+32:acr6
31+32:acr7
32+32:acr8
33+32:acr9
34+32:acr10
35+32:acr11
36+32:acr12
37+32:acr13
38+32:acr14
39+32:acr15
40+32:fpc
41+64:f0
42+64:f1
43+64:f2
44+64:f3
45+64:f4
46+64:f5
47+64:f6
48+64:f7
49+64:f8
50+64:f9
51+64:f10
52+64:f11
53+64:f12
54+64:f13
55+64:f14
56+64:f15
57+64:v0l
58+64:v1l
59+64:v2l
60+64:v3l
61+64:v4l
62+64:v5l
63+64:v6l
64+64:v7l
65+64:v8l
66+64:v9l
67+64:v10l
68+64:v11l
69+64:v12l
70+64:v13l
71+64:v14l
72+64:v15l
73+128:v16
74+128:v17
75+128:v18
76+128:v19
77+128:v20
78+128:v21
79+128:v22
80+128:v23
81+128:v24
82+128:v25
83+128:v26
84+128:v27
85+128:v28
86+128:v29
87+128:v30
88+128:v31
89+64:cr0
90+64:cr1
91+64:cr2
92+64:cr3
93+64:cr4
94+64:cr5
95+64:cr6
96+64:cr7
97+64:cr8
98+64:cr9
99+64:cr10
100+64:cr11
101+64:cr12
102+64:cr13
103+64:cr14
104+64:cr15
105+64:timer
106+64:todcmp
107+32:todpreg
108+32:prefix
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -915,9 +915,11 @@ static const short s390_dwarf_regmap[] =
915915 S390_F8_REGNUM, S390_F10_REGNUM, S390_F12_REGNUM, S390_F14_REGNUM,
916916 S390_F9_REGNUM, S390_F11_REGNUM, S390_F13_REGNUM, S390_F15_REGNUM,
917917
918- /* 32-47: Control Registers (not mapped). */
919- -1, -1, -1, -1, -1, -1, -1, -1,
920- -1, -1, -1, -1, -1, -1, -1, -1,
918+ /* 32-47: Control Registers. */
919+ S390_CR0_REGNUM, S390_CR1_REGNUM, S390_CR2_REGNUM, S390_CR3_REGNUM,
920+ S390_CR4_REGNUM, S390_CR5_REGNUM, S390_CR6_REGNUM, S390_CR7_REGNUM,
921+ S390_CR8_REGNUM, S390_CR9_REGNUM, S390_CR10_REGNUM, S390_CR11_REGNUM,
922+ S390_CR12_REGNUM, S390_CR13_REGNUM, S390_CR14_REGNUM, S390_CR15_REGNUM,
921923
922924 /* 48-63: Access Registers. */
923925 S390_A0_REGNUM, S390_A1_REGNUM, S390_A2_REGNUM, S390_A3_REGNUM,
--- a/gdb/s390-tdep.h
+++ b/gdb/s390-tdep.h
@@ -274,9 +274,30 @@ enum
274274 #define S390_V29_REGNUM 119
275275 #define S390_V30_REGNUM 120
276276 #define S390_V31_REGNUM 121
277+/* Control registers. */
278+#define S390_TIMER_REGNUM 122
279+#define S390_TODCMP_REGNUM 123
280+#define S390_TODPREG_REGNUM 124
281+#define S390_CR0_REGNUM 125
282+#define S390_CR1_REGNUM 126
283+#define S390_CR2_REGNUM 127
284+#define S390_CR3_REGNUM 128
285+#define S390_CR4_REGNUM 129
286+#define S390_CR5_REGNUM 130
287+#define S390_CR6_REGNUM 131
288+#define S390_CR7_REGNUM 132
289+#define S390_CR8_REGNUM 133
290+#define S390_CR9_REGNUM 134
291+#define S390_CR10_REGNUM 135
292+#define S390_CR11_REGNUM 136
293+#define S390_CR12_REGNUM 137
294+#define S390_CR13_REGNUM 138
295+#define S390_CR14_REGNUM 139
296+#define S390_CR15_REGNUM 140
297+#define S390_PREFIX_REGNUM 141
277298
278299 /* Total. */
279-#define S390_NUM_REGS 122
300+#define S390_NUM_REGS 142
280301 #define S390_NUM_GPRS 16
281302 #define S390_NUM_FPRS 16
282303