MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IBM Z: Implement instruction set extensions

Browse Source 
opcodes/

        * s390-mkopc.c (main): Accept arch14 as cpu string.
        * s390-opc.txt: Add new arch14 instructions.

include/

        * opcode/s390.h (enum s390_opcode_cpu_val): Add
        S390_OPCODE_ARCH14.

gas/

        * config/tc-s390.c (s390_parse_cpu): New entry for arch14.
        * doc/c-s390.texi: Document arch14 march option.
        * testsuite/gas/s390/s390.exp: Run the arch14 related tests.
        * testsuite/gas/s390/zarch-arch14.d: New test.
        * testsuite/gas/s390/zarch-arch14.s: New test.
This commit is contained in:
Andreas Krebbel 2021-02-15 14:20:00 +01:00
parent 8c6740616c
commit ba2b480f10
11 changed files with 111 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gas/ChangeLog
View File

@ -1,3 +1,11 @@
2021-02-15 Andreas Krebbel <krebbel@linux.ibm.com>
* config/tc-s390.c (s390_parse_cpu): New entry for arch14.
* doc/c-s390.texi: Document arch14 march option.
* testsuite/gas/s390/s390.exp: Run the arch14 related tests.
* testsuite/gas/s390/zarch-arch14.d: New test.
* testsuite/gas/s390/zarch-arch14.s: New test.
2021-02-12 Nick Clifton <nickc@redhat.com> 2021-02-12 Nick Clifton <nickc@redhat.com>
* testsuite/gas/mach-o/sections-1.d: Stop automatic debug link * testsuite/gas/mach-o/sections-1.d: Stop automatic debug link

2
gas/config/tc-s390.c
View File

@ -292,6 +292,8 @@ s390_parse_cpu (const char * arg,
{ STRING_COMMA_LEN ("z14"), STRING_COMMA_LEN ("arch12"), { STRING_COMMA_LEN ("z14"), STRING_COMMA_LEN ("arch12"),
S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }, S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
{ STRING_COMMA_LEN ("z15"), STRING_COMMA_LEN ("arch13"), { STRING_COMMA_LEN ("z15"), STRING_COMMA_LEN ("arch13"),
S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
{ STRING_COMMA_LEN (""), STRING_COMMA_LEN ("arch14"),
S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX } S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }
}; };
static struct static struct

7
gas/doc/c-s390.texi
View File

@ -18,7 +18,7 @@ and eleven chip levels. The architecture modes are the Enterprise System
Architecture (ESA) and the newer z/Architecture mode. The chip levels Architecture (ESA) and the newer z/Architecture mode. The chip levels
are g5 (or arch3), g6, z900 (or arch5), z990 (or arch6), z9-109, z9-ec are g5 (or arch3), g6, z900 (or arch5), z990 (or arch6), z9-109, z9-ec
(or arch7), z10 (or arch8), z196 (or arch9), zEC12 (or arch10), z13 (or arch7), z10 (or arch8), z196 (or arch9), zEC12 (or arch10), z13
(or arch11), z14 (or arch12), and z15 (or arch13). (or arch11), z14 (or arch12), z15 (or arch13), or arch14.
@menu @menu
* s390 Options:: Command-line Options. * s390 Options:: Command-line Options.
@ -70,8 +70,9 @@ are recognized:
@code{z196} (or @code{arch9}), @code{z196} (or @code{arch9}),
@code{zEC12} (or @code{arch10}), @code{zEC12} (or @code{arch10}),
@code{z13} (or @code{arch11}), @code{z13} (or @code{arch11}),
@code{z14} (or @code{arch12}), and @code{z14} (or @code{arch12}),
@code{z15} (or @code{arch13}). @code{z15} (or @code{arch13}), and
@code{arch14}.
Assembling an instruction that is not supported on the target Assembling an instruction that is not supported on the target
processor results in an error message. processor results in an error message.

1
gas/testsuite/gas/s390/s390.exp
View File

@ -31,6 +31,7 @@ if [expr [istarget "s390-*-*"] || [istarget "s390x-*-*"]] then {
run_dump_test "zarch-z13" "{as -m64} {as -march=z13}" run_dump_test "zarch-z13" "{as -m64} {as -march=z13}"
run_dump_test "zarch-arch12" "{as -m64} {as -march=arch12}" run_dump_test "zarch-arch12" "{as -m64} {as -march=arch12}"
run_dump_test "zarch-arch13" "{as -m64} {as -march=arch13}" run_dump_test "zarch-arch13" "{as -m64} {as -march=arch13}"
run_dump_test "zarch-arch14" "{as -m64} {as -march=arch14}"
run_dump_test "zarch-reloc" "{as -m64}" run_dump_test "zarch-reloc" "{as -m64}"
run_dump_test "zarch-operands" "{as -m64} {as -march=z9-109}" run_dump_test "zarch-operands" "{as -m64} {as -march=z9-109}"
run_dump_test "zarch-machine" "{as -m64} {as -march=z900}" run_dump_test "zarch-machine" "{as -m64} {as -march=z900}"

31
gas/testsuite/gas/s390/zarch-arch14.d Normal file
View File

@ -0,0 +1,31 @@
#name: s390x opcode
#objdump: -dr
.*: +file format .*
Disassembly of section .text:
.* <foo>:
.*: e6 f1 40 c0 d6 74 [ ]*vschp %v15,%v17,%v20,13,12
.*: e6 f1 40 d0 26 74 [ ]*vschsp %v15,%v17,%v20,13
.*: e6 f1 40 d0 36 74 [ ]*vschdp %v15,%v17,%v20,13
.*: e6 f1 40 d0 46 74 [ ]*vschxp %v15,%v17,%v20,13
.*: e6 f1 40 00 06 7c [ ]*vscshp %v15,%v17,%v20
.*: e6 f1 40 d0 06 7d [ ]*vcsph %v15,%v17,%v20,13
.*: e6 f1 00 d0 04 51 [ ]*vclzdp %v15,%v17,13
.*: e6 f1 40 cf d6 70 [ ]*vpkzr %v15,%v17,%v20,253,12
.*: e6 f1 40 cf d6 72 [ ]*vsrpr %v15,%v17,%v20,253,12
.*: e6 f1 00 d0 04 54 [ ]*vupkzh %v15,%v17,13
.*: e6 f1 00 d0 04 5c [ ]*vupkzl %v15,%v17,13
.*: b9 3b 00 00 [ ]*nnpa
.*: e6 f1 00 0c d4 56 [ ]*vclfnh %v15,%v17,13,12
.*: e6 f1 00 0c d4 5e [ ]*vclfnl %v15,%v17,13,12
.*: e6 f1 40 0c d6 75 [ ]*vcrnf %v15,%v17,%v20,13,12
.*: e6 f1 00 0c d4 5d [ ]*vcfn %v15,%v17,13,12
.*: e6 f1 00 0c d4 55 [ ]*vcnf %v15,%v17,13,12
.*: b9 8b 90 6b [ ]*rdp %r6,%r9,%r11
.*: b9 8b 9d 6b [ ]*rdp %r6,%r9,%r11,13
.*: eb fd 68 f0 fd 71 [ ]*lpswey -10000\(%r6\),253
.*: b2 00 6f a0 [ ]*lbear 4000\(%r6\)
.*: b2 01 6f a0 [ ]*stbear 4000\(%r6\)
.*: 07 07 [ ]*nopr %r7

24
gas/testsuite/gas/s390/zarch-arch14.s Normal file
View File

@ -0,0 +1,24 @@
.text
foo:
vschp %v15,%v17,%v20,13,12
vschsp %v15,%v17,%v20,13
vschdp %v15,%v17,%v20,13
vschxp %v15,%v17,%v20,13
vscshp %v15,%v17,%v20
vcsph %v15,%v17,%v20,13
vclzdp %v15,%v17,13
vpkzr %v15,%v17,%v20,253,12
vsrpr %v15,%v17,%v20,253,12
vupkzh %v15,%v17,13
vupkzl %v15,%v17,13
nnpa
vclfnh %v15,%v17,13,12
vclfnl %v15,%v17,13,12
vcrnf %v15,%v17,%v20,13,12
vcfn %v15,%v17,13,12
vcnf %v15,%v17,13,12
rdp %r6,%r9,%r11
rdp %r6,%r9,%r11,13
lpswey -10000(%r6),253
lbear 4000(%r6)
stbear 4000(%r6)

5
include/ChangeLog
View File

@ -1,3 +1,8 @@
2021-02-15 Andreas Krebbel <krebbel@linux.ibm.com>
* opcode/s390.h (enum s390_opcode_cpu_val): Add
S390_OPCODE_ARCH14.
2021-02-08 Mike Frysinger <vapier@gentoo.org> 2021-02-08 Mike Frysinger <vapier@gentoo.org>
* opcode/tic54x.h (mmregs): Rename to ... * opcode/tic54x.h (mmregs): Rename to ...

1
include/opcode/s390.h
View File

@ -44,6 +44,7 @@ enum s390_opcode_cpu_val
S390_OPCODE_Z13, S390_OPCODE_Z13,
S390_OPCODE_ARCH12, S390_OPCODE_ARCH12,
S390_OPCODE_ARCH13, S390_OPCODE_ARCH13,
S390_OPCODE_ARCH14,
S390_OPCODE_MAXCPU S390_OPCODE_MAXCPU
}; };

5
opcodes/ChangeLog
View File

@ -1,3 +1,8 @@
2021-02-15 Andreas Krebbel <krebbel@linux.ibm.com>
* s390-mkopc.c (main): Accept arch14 as cpu string.
* s390-opc.txt: Add new arch14 instructions.
2021-02-04 Nick Alcock <nick.alcock@oracle.com> 2021-02-04 Nick Alcock <nick.alcock@oracle.com>
* configure.ac (SHARED_LIBADD): Remove explicit -lintl population in * configure.ac (SHARED_LIBADD): Remove explicit -lintl population in

2
opcodes/s390-mkopc.c
View File

@ -381,6 +381,8 @@ main (void)
else if (strcmp (cpu_string, "z15") == 0 else if (strcmp (cpu_string, "z15") == 0
|| strcmp (cpu_string, "arch13") == 0) || strcmp (cpu_string, "arch13") == 0)
min_cpu = S390_OPCODE_ARCH13; min_cpu = S390_OPCODE_ARCH13;
else if (strcmp (cpu_string, "arch14") == 0)
min_cpu = S390_OPCODE_ARCH14;
else { else {
fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string); fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);
exit (1); exit (1);

28
opcodes/s390-opc.txt
View File

@ -2016,3 +2016,31 @@ e60000000052 vcvbg VRR_RV0UU "vector convert to binary 64 bit" arch13 zarch optp
# Message Security Assist Extension 9 # Message Security Assist Extension 9
b93a kdsa RRE_RR "compute digital signature authentication" arch13 zarch b93a kdsa RRE_RR "compute digital signature authentication" arch13 zarch
# arch14 instructions
e60000000074 vschp VRR_VVV0U0U " " arch14 zarch
e60000002074 vschsp VRR_VVV0U0 " " arch14 zarch
e60000003074 vschdp VRR_VVV0U0 " " arch14 zarch
e60000004074 vschxp VRR_VVV0U0 " " arch14 zarch
e6000000007c vscshp VRR_VVV " " arch14 zarch
e6000000007d vcsph VRR_VVV0U0 " " arch14 zarch
e60000000051 vclzdp VRR_VV0U2 " " arch14 zarch
e60000000070 vpkzr VRI_VVV0UU2 " " arch14 zarch
e60000000072 vsrpr VRI_VVV0UU2 " " arch14 zarch
e60000000054 vupkzh VRR_VV0U2 " " arch14 zarch
e6000000005c vupkzl VRR_VV0U2 " " arch14 zarch
b93b nnpa RRE_00 " " arch14 zarch
e60000000056 vclfnh VRR_VV0UU2 " " arch14 zarch
e6000000005e vclfnl VRR_VV0UU2 " " arch14 zarch
e60000000075 vcrnf VRR_VVV0UU " " arch14 zarch
e6000000005d vcfn VRR_VV0UU2 " " arch14 zarch
e60000000055 vcnf VRR_VV0UU2 " " arch14 zarch
b98B rdp RRF_RURR2 " " arch14 zarch optparm
eb0000000071 lpswey SIY_URD " " arch14 zarch
b200 lbear S_RD " " arch14 zarch
b201 stbear S_RD " " arch14 zarch