[openssl] master update
Richard Levitte
levitte at openssl.org
Thu Apr 25 21:07:46 UTC 2019
The branch master has been updated
via 5ee08f45bcabc3cef0d7d7b2aa6ecad12ca4197b (commit)
via 302aa3c26d9e716ed4a3fba453faafa7acadf22c (commit)
via 3062468b0aa0eaa287e44689157d97774fd5817e (commit)
via 11aad862850cb2e639756e7126216b6cf38af26b (commit)
from bb5b3e6dd0575a4fa96f5085228b716062c00502 (commit)
- Log -----------------------------------------------------------------
commit 5ee08f45bcabc3cef0d7d7b2aa6ecad12ca4197b
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date: Mon Mar 25 18:23:59 2019 +0100
s390x assembly pack: remove poly1305 dependency on non-base memnonics
Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
Reviewed-by: Paul Dale <paul.dale at oracle.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8181)
commit 302aa3c26d9e716ed4a3fba453faafa7acadf22c
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date: Mon Mar 25 18:22:02 2019 +0100
s390x assembly pack: remove chacha20 dependency on non-base memnonics
Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
Reviewed-by: Paul Dale <paul.dale at oracle.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8181)
commit 3062468b0aa0eaa287e44689157d97774fd5817e
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date: Mon Mar 25 18:20:27 2019 +0100
s390x assembly pack: update perlasm module
Add non-base instructions which are used by the chacha20 and
poly1305 modules.
Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
Reviewed-by: Paul Dale <paul.dale at oracle.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8181)
commit 11aad862850cb2e639756e7126216b6cf38af26b
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date: Thu Feb 7 16:44:05 2019 +0100
s390x assembly pack: allow alignment hints for vector load/store
z14 introduced alignment hints to help vector load/store
performance. For its predecessors, alignment hint defaults
to 0 (no alignment indicated).
Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
Reviewed-by: Paul Dale <paul.dale at oracle.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8181)
-----------------------------------------------------------------------
Summary of changes:
crypto/chacha/asm/chacha-s390x.pl | 2 +-
crypto/perlasm/s390x.pm | 94 ++++++++++++++++++++++++++++++++---
crypto/poly1305/asm/poly1305-s390x.pl | 2 +-
3 files changed, 90 insertions(+), 8 deletions(-)
diff --git a/crypto/chacha/asm/chacha-s390x.pl b/crypto/chacha/asm/chacha-s390x.pl
index 51efe64..1f22b26 100755
--- a/crypto/chacha/asm/chacha-s390x.pl
+++ b/crypto/chacha/asm/chacha-s390x.pl
@@ -40,7 +40,7 @@
use strict;
use FindBin qw($Bin);
use lib "$Bin/../..";
-use perlasm::s390x qw(:DEFAULT :VX AUTOLOAD LABEL INCLUDE);
+use perlasm::s390x qw(:DEFAULT :VX :LD AUTOLOAD LABEL INCLUDE);
my $flavour = shift;
diff --git a/crypto/perlasm/s390x.pm b/crypto/perlasm/s390x.pm
index 5f3a49d..7fb55c7 100644
--- a/crypto/perlasm/s390x.pm
+++ b/crypto/perlasm/s390x.pm
@@ -6,23 +6,37 @@
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
-# Copyright IBM Corp. 2018
+# Copyright IBM Corp. 2018-2019
# Author: Patrick Steuer <patrick.steuer at de.ibm.com>
package perlasm::s390x;
use strict;
use warnings;
+use bigint;
use Carp qw(confess);
use Exporter qw(import);
our @EXPORT=qw(PERLASM_BEGIN PERLASM_END);
our @EXPORT_OK=qw(AUTOLOAD LABEL INCLUDE stfle);
our %EXPORT_TAGS=(
+ # long-displacement facility
+ LD => [qw(clgfi)],
+ # general-instruction-extension facility
+ GE => [qw(risbg)],
+ # extended-immediate facility
+ EI => [qw(lt)],
+ # miscellaneous-instruction-extensions facility 1
+ MI1 => [qw(risbgn)],
+ # message-security assist
MSA => [qw(kmac km kmc kimd klmd)],
+ # message-security-assist extension 4
MSA4 => [qw(kmf kmo pcc kmctr)],
+ # message-security-assist extension 5
MSA5 => [qw(ppno prno)],
+ # message-security-assist extension 8
MSA8 => [qw(kma)],
+ # vector facility
VX => [qw(vgef vgeg vgbm vzero vone vgm vgmb vgmh vgmf vgmg
vl vlr vlrep vlrepb vlreph vlrepf vlrepg vleb vleh vlef vleg vleib
vleih vleif vleig vlgv vlgvb vlgvh vlgvf vlgvg vllez vllezb vllezh
@@ -71,6 +85,7 @@ our %EXPORT_TAGS=(
wfmadb vfms vfmsdb wfmsdb vfpso vfpsodb wfpsodb vflcdb wflcdb
vflndb wflndb vflpdb wflpdb vfsq vfsqdb wfsqdb vfs vfsdb wfsdb
vftci vftcidb wftcidb)],
+ # vector-enhancements facility 1
VXE => [qw(vbperm vllezlf vmsl vmslg vnx vnn voc vpopctb vpopcth
vpopctf vpopctg vfasb wfasb wfaxb wfcsb wfcxb wfksb wfkxb vfcesb
vfcesbs wfcesb wfcesbs wfcexb wfcexbs vfchsb vfchsbs wfchsb wfchsbs
@@ -83,10 +98,11 @@ our %EXPORT_TAGS=(
wfnmsxb vfpsosb wfpsosb vflcsb wflcsb vflnsb wflnsb vflpsb wflpsb
vfpsoxb wfpsoxb vflcxb wflcxb vflnxb wflnxb vflpxb wflpxb vfsqsb
wfsqsb wfsqxb vfssb wfssb wfsxb vftcisb wftcisb wftcixb)],
+ # vector-packed-decimal facility
VXD => [qw(vlrlr vlrl vstrlr vstrl vap vcp vcvb vcvbg vcvd vcvdg vdp
vlip vmp vmsp vpkz vpsop vrp vsdp vsrp vsp vtp vupkz)],
);
-Exporter::export_ok_tags(qw(MSA MSA4 MSA5 MSA8 VX VXE VXD));
+Exporter::export_ok_tags(qw(LD GE EI MI1 MSA MSA4 MSA5 MSA8 VX VXE VXD));
our $AUTOLOAD;
@@ -143,6 +159,28 @@ sub stfle {
S(0xb2b0, at _);
}
+# MISC
+
+sub clgfi {
+ confess(err("ARGNUM")) if ($#_!=1);
+ RILa(0xc2e, at _);
+}
+
+sub lt {
+ confess(err("ARGNUM")) if ($#_!=1);
+ RXYa(0xe312, at _);
+}
+
+sub risbg {
+ confess(err("ARGNUM")) if ($#_<3||$#_>4);
+ RIEf(0xec55, at _);
+}
+
+sub risbgn {
+ confess(err("ARGNUM")) if ($#_<3||$#_>4);
+ RIEf(0xec59, at _);
+}
+
# MSA
sub kmac {
@@ -250,7 +288,7 @@ sub vgmg {
}
sub vl {
- confess(err("ARGNUM")) if ($#_!=1);
+ confess(err("ARGNUM")) if ($#_<1||$#_>2);
VRX(0xe706, at _);
}
@@ -345,7 +383,7 @@ sub vllezg {
}
sub vlm {
- confess(err("ARGNUM")) if ($#_!=2);
+ confess(err("ARGNUM")) if ($#_<2||$#_>3);
VRSa(0xe736, at _);
}
@@ -548,7 +586,7 @@ sub vsegf {
}
sub vst {
- confess(err("ARGNUM")) if ($#_!=1);
+ confess(err("ARGNUM")) if ($#_<1||$#_>2);
VRX(0xe70e, at _);
}
@@ -570,7 +608,7 @@ sub vsteg {
}
sub vstm {
- confess(err("ARGNUM")) if ($#_!=2);
+ confess(err("ARGNUM")) if ($#_<2||$#_>3);
VRSa(0xe73e, at _);
}
@@ -2486,6 +2524,36 @@ sub vupkz {
# Instruction Formats
#
+sub RIEf {
+ confess(err("ARGNUM")) if ($#_<4||5<$#_);
+ my $ops=join(',', at _[1..$#_]);
+ my $memn=(caller(1))[3];
+ $memn=~s/^.*:://;
+ my ($opcode,$r1,$r2,$i3,$i4,$i5)=(shift,get_R(shift),get_R(shift),
+ get_I(shift,8),get_I(shift,8),
+ get_I(shift,8));
+
+ $out.="\t.word\t";
+ $out.=sprintf("%#06x",(($opcode>>8)<<8|$r1<<4|$r2)).",";
+ $out.=sprintf("%#06x",($i3<<8)|$i4).",";
+ $out.=sprintf("%#06x",($i5<<8)|($opcode&0xff));
+ $out.="\t# $memn\t$ops\n"
+}
+
+sub RILa {
+ confess(err("ARGNUM")) if ($#_!=2);
+ my $ops=join(',', at _[1..$#_]);
+ my $memn=(caller(1))[3];
+ $memn=~s/^.*:://;
+ my ($opcode,$r1,$i2)=(shift,get_R(shift),get_I(shift,32));
+
+ $out.="\t.word\t";
+ $out.=sprintf("%#06x",(($opcode>>4)<<8|$r1<<4|($opcode&0xf))).",";
+ $out.=sprintf("%#06x",($i2>>16)).",";
+ $out.=sprintf("%#06x",($i2&0xffff));
+ $out.="\t# $memn\t$ops\n"
+}
+
sub RRE {
confess(err("ARGNUM")) if ($#_<0||2<$#_);
my $ops=join(',', at _[1..$#_]);
@@ -2510,6 +2578,20 @@ sub RRFb {
$out.="\t# $memn\t$ops\n"
}
+sub RXYa {
+ confess(err("ARGNUM")) if ($#_!=2);
+ my $ops=join(',', at _[1..$#_]);
+ my $memn=(caller(1))[3];
+ $memn=~s/^.*:://;
+ my ($opcode,$r1,$d2,$x2,$b2)=(shift,get_R(shift),get_DXB(shift));
+
+ $out.="\t.word\t";
+ $out.=sprintf("%#06x",(($opcode>>8)<<8|$r1<<4|$x2)).",";
+ $out.=sprintf("%#06x",($b2<<12|($d2&0xfff))).",";
+ $out.=sprintf("%#06x",(($d2>>12)<<8|$opcode&0xff));
+ $out.="\t# $memn\t$ops\n"
+}
+
sub S {
confess(err("ARGNUM")) if ($#_<0||1<$#_);
my $ops=join(',', at _[1..$#_]);
diff --git a/crypto/poly1305/asm/poly1305-s390x.pl b/crypto/poly1305/asm/poly1305-s390x.pl
index ea1c2d8..73efdd9 100755
--- a/crypto/poly1305/asm/poly1305-s390x.pl
+++ b/crypto/poly1305/asm/poly1305-s390x.pl
@@ -45,7 +45,7 @@
use strict;
use FindBin qw($Bin);
use lib "$Bin/../..";
-use perlasm::s390x qw(:DEFAULT :VX AUTOLOAD LABEL INCLUDE);
+use perlasm::s390x qw(:DEFAULT :LD :GE :EI :MI1 :VX AUTOLOAD LABEL INCLUDE);
my $flavour = shift;
More information about the openssl-commits
mailing list