From cd904815e4f4e377faeacc01627aa3f15b6fb217 Mon Sep 17 00:00:00 2001

From: Daiki Ueno <dueno@redhat.com>

Date: Mon, 8 Jun 2020 10:26:34 +0200

Subject: [PATCH] Revert "Bug 1613238 - POWER SHA-2 digest vector acceleration.

 r=jcj,kjacobs"

This reverts commit 7d4b0ba0256aed6879008f87d9a3b4f6bfbc7817.

---

 lib/freebl/Makefile                |   3 -

 lib/freebl/freebl.gyp              |  58 +-

 lib/freebl/freebl_base.gypi        |   9 +-

 lib/freebl/gcm.h                   |  22 +-

 lib/freebl/ppc-crypto.h            |  31 --

 lib/freebl/scripts/LICENSE         |  36 --

 lib/freebl/scripts/gen.sh          |  19 -

 lib/freebl/scripts/ppc-xlate.pl    | 352 ------------

 lib/freebl/scripts/sha512p8-ppc.pl | 413 --------------

 lib/freebl/sha512-p8.s             | 851 -----------------------------

 lib/freebl/sha512.c                | 248 +++------

 11 files changed, 101 insertions(+), 1941 deletions(-)

 delete mode 100644 lib/freebl/ppc-crypto.h

 delete mode 100644 lib/freebl/scripts/LICENSE

 delete mode 100755 lib/freebl/scripts/gen.sh

 delete mode 100644 lib/freebl/scripts/ppc-xlate.pl

 delete mode 100644 lib/freebl/scripts/sha512p8-ppc.pl

 delete mode 100644 lib/freebl/sha512-p8.s

diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile

index 5f7384429..a8ea6936a 100644

--- a/lib/freebl/Makefile

+++ b/lib/freebl/Makefile

@@ -267,7 +267,6 @@ ifeq ($(CPU_ARCH),arm)

 endif

 ifeq ($(CPU_ARCH),ppc)

     EXTRA_SRCS += gcm-ppc.c

-    ASFILES += sha512-p8.s

 ifdef USE_64

     DEFINES += -DNSS_NO_INIT_SUPPORT

 endif # USE_64

@@ -727,8 +726,6 @@ ifndef NSS_DISABLE_ALTIVEC

 $(OBJDIR)/$(PROG_PREFIX)gcm-ppc$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx

 $(OBJDIR)/$(PROG_PREFIX)gcm$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx

 $(OBJDIR)/$(PROG_PREFIX)rijndael$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx

-$(OBJDIR)/$(PROG_PREFIX)sha512$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx \

-					-funroll-loops -fpeel-loops

 endif

 endif

diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp

index f3bb8a71a..1df25f88e 100644

--- a/lib/freebl/freebl.gyp

+++ b/lib/freebl/freebl.gyp

@@ -258,8 +258,7 @@

       'target_name': 'gcm-aes-ppc_c_lib',

       'type': 'static_library',

       'sources': [

-        'gcm-ppc.c',

-        'sha512-p8.s',

+        'gcm-ppc.c'

       ],

       'dependencies': [

         '<(DEPTH)/exports.gyp:nss_exports'

@@ -271,58 +270,7 @@

       'cflags_mozilla': [

         '-mcrypto',

         '-maltivec'

-      ],

-    },

-    {

-      'target_name': 'gcm-sha512-nodepend-ppc_c_lib',

-      'type': 'static_library',

-      'sources': [

-        'sha512.c',

-      ],

-      'dependencies': [

-        '<(DEPTH)/exports.gyp:nss_exports'

-      ],

-      'cflags': [

-        '-mcrypto',

-        '-maltivec',

-        '-mvsx',

-        '-funroll-loops',

-        '-fpeel-loops',

-      ],

-      'cflags_mozilla': [

-        '-mcrypto',

-        '-maltivec',

-        '-mvsx',

-        '-funroll-loops',

-        '-fpeel-loops',

-      ],

-    },

-    {

-      'target_name': 'gcm-sha512-ppc_c_lib',

-      'type': 'static_library',

-      'sources': [

-        'sha512.c',

-      ],

-      'dependencies': [

-        '<(DEPTH)/exports.gyp:nss_exports'

-      ],

-      'cflags': [

-        '-mcrypto',

-        '-maltivec',

-        '-mvsx',

-        '-funroll-loops',

-        '-fpeel-loops',

-      ],

-      'cflags_mozilla': [

-        '-mcrypto',

-        '-maltivec',

-        '-mvsx',

-        '-funroll-loops',

-        '-fpeel-loops',

-      ],

-      'defines!': [

-        'FREEBL_NO_DEPEND',

-      ],

+      ]

     },

     {

       'target_name': 'armv8_c_lib',

@@ -407,7 +355,6 @@

         [ 'disable_altivec==0 and (target_arch=="ppc64" or target_arch=="ppc64le")', {

           'dependencies': [

             'gcm-aes-ppc_c_lib',

-            'gcm-sha512-ppc_c_lib',

           ],

         }],

         [ 'disable_altivec==1 and (target_arch=="ppc64" or target_arch=="ppc64le")', {

@@ -475,7 +422,6 @@

         [ 'disable_altivec==0 and (target_arch=="ppc64" or target_arch=="ppc64le")', {

           'dependencies': [

             'gcm-aes-ppc_c_lib',

-            'gcm-sha512-nodepend-ppc_c_lib',

           ],

         }],

         [ 'disable_altivec==1 and (target_arch=="ppc64" or target_arch=="ppc64le")', {

diff --git a/lib/freebl/freebl_base.gypi b/lib/freebl/freebl_base.gypi

index 9ba9169f4..e1e4c88dc 100644

--- a/lib/freebl/freebl_base.gypi

+++ b/lib/freebl/freebl_base.gypi

@@ -55,6 +55,8 @@

     'rijndael.c',

     'rsa.c',

     'rsapkcs.c',

+    'seed.c',

+    'sha512.c',

     'sha_fast.c',

     'shvfy.c',

     'sysrand.c',

@@ -144,13 +146,6 @@

         'ecl/curve25519_32.c',

       ],

     }],

-    ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {

-      'sources': [

-        # Gyp does not support per-file cflags, so working around like this.

-        # ppc performance greatly benefits from specific flags.

-        'sha512.c',

-      ],

-    }],

     [ 'disable_chachapoly==0', {

       # The ChaCha20 code is linked in through the static ssse3-crypto lib on

       # all platforms that support SSSE3. There are runtime checks in place to

diff --git a/lib/freebl/gcm.h b/lib/freebl/gcm.h

index 21792e0b3..38b066580 100644

--- a/lib/freebl/gcm.h

+++ b/lib/freebl/gcm.h

@@ -31,8 +31,26 @@

 #include <arm_neon.h>

 #endif

-#if defined(__powerpc64__)

-#include "ppc-crypto.h"

+#if defined(__powerpc64__) && !defined(NSS_DISABLE_ALTIVEC)

+#include "altivec-types.h"

+

+/* The ghash freebl test tries to use this in C++, and gcc defines conflict. */

+#ifdef __cplusplus

+#undef pixel

+#undef vector

+#undef bool

+#endif

+

+/*

+ * PPC CRYPTO requires at least gcc 8 or clang. The LE check is purely

+ * because it's only been tested on LE. If you're interested in BE,

+ * please send a patch.

+ */

+#if (defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 8)) && \

+    defined(IS_LITTLE_ENDIAN)

+#define USE_PPC_CRYPTO

+#endif

+

 #endif

 SEC_BEGIN_PROTOS

diff --git a/lib/freebl/ppc-crypto.h b/lib/freebl/ppc-crypto.h

deleted file mode 100644

index 4d283895f..000000000

--- a/lib/freebl/ppc-crypto.h

+++ /dev/null

@@ -1,31 +0,0 @@

-/* This Source Code Form is subject to the terms of the Mozilla Public

- * License, v. 2.0. If a copy of the MPL was not distributed with this

- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-

-#ifndef PPC_CRYPTO_H

-#define PPC_CRYPTO_H 1

-

-#if defined(__powerpc64__) && defined(__ALTIVEC__) && \

-    !defined(NSS_DISABLE_ALTIVEC)

-#include "altivec-types.h"

-

-/* The ghash freebl test tries to use this in C++, and gcc defines conflict. */

-#ifdef __cplusplus

-#undef pixel

-#undef vector

-#undef bool

-#endif

-

-/*

- * PPC CRYPTO requires at least gcc 8 or clang. The LE check is purely

- * because it's only been tested on LE. If you're interested in BE,

- * please send a patch.

- */

-#if (defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 8)) && \

-    defined(IS_LITTLE_ENDIAN) && defined(__VSX__)

-#define USE_PPC_CRYPTO

-#endif

-

-#endif /* defined(__powerpc64__) && !defined(NSS_DISABLE_ALTIVEC) && defined(__ALTIVEC__) */

-

-#endif

diff --git a/lib/freebl/scripts/LICENSE b/lib/freebl/scripts/LICENSE

deleted file mode 100644

index a9335c22f..000000000

--- a/lib/freebl/scripts/LICENSE

+++ /dev/null

@@ -1,36 +0,0 @@

-Copyright (c) 2006, CRYPTOGAMS by <appro@openssl.org>

-All rights reserved.

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions

-are met:

-

-      *	Redistributions of source code must retain copyright notices,

-	this list of conditions and the following disclaimer.

-

-      *	Redistributions in binary form must reproduce the above

-	copyright notice, this list of conditions and the following

-	disclaimer in the documentation and/or other materials

-	provided with the distribution.

-

-      *	Neither the name of the CRYPTOGAMS nor the names of its

-	copyright holder and contributors may be used to endorse or

-	promote products derived from this software without specific

-	prior written permission.

-

-ALTERNATIVELY, provided that this notice is retained in full, this

-product may be distributed under the terms of the GNU General Public

-License (GPL), in which case the provisions of the GPL apply INSTEAD OF

-those given above.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS

-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/lib/freebl/scripts/gen.sh b/lib/freebl/scripts/gen.sh

deleted file mode 100755

index ea415cc94..000000000

--- a/lib/freebl/scripts/gen.sh

+++ /dev/null

@@ -1,19 +0,0 @@

-#!/bin/sh

-#

-# Run the scripts in this folder, generating the assembly,

-#

-

-perl sha512p8-ppc.pl linux64le sha512-p8.s

-

-# Add the license mention

-cat > hdr << "EOF"

-# Copyright (c) 2006, CRYPTOGAMS by <appro@openssl.org>

-# All rights reserved.

-# See the full LICENSE under scripts/.

-

-EOF

-

-cat hdr sha512-p8.s > ../sha512-p8.s

-

-# Cleanup

-rm hdr sha512-p8.s

diff --git a/lib/freebl/scripts/ppc-xlate.pl b/lib/freebl/scripts/ppc-xlate.pl

deleted file mode 100644

index a0fcf6a31..000000000

--- a/lib/freebl/scripts/ppc-xlate.pl

+++ /dev/null

@@ -1,352 +0,0 @@

-#!/usr/bin/env perl

-

-# PowerPC assembler distiller by \@dot-asm.

-

-################################################################

-# Recognized "flavour"-s are:

-#

-# linux{32|64}[le]  GNU assembler and ELF symbol decorations,

-#                   with little-endian option

-# linux64v2         GNU asssembler and big-endian instantiation

-#                   of latest ELF specification

-# aix{32|64}        AIX assembler and symbol decorations

-# osx{32|64}        Mac OS X assembler and symbol decoratons

-

-my $flavour = shift;

-my $output = shift;

-open STDOUT,">$output" || die "can't open $output: $!";

-

-my %GLOBALS;

-my %TYPES;

-my $dotinlocallabels=($flavour=~/linux/)?1:0;

-

-################################################################

-# directives which need special treatment on different platforms

-################################################################

-my $type = sub {

-    my ($dir,$name,$type) = @_;

-

-    $TYPES{$name} = $type;

-    if ($flavour =~ /linux/) {

-	$name =~ s|^\.||;

-	".type	$name,$type";

-    } else {

-	"";

-    }

-};

-my $globl = sub {

-    my $junk = shift;

-    my $name = shift;

-    my $global = \$GLOBALS{$name};

-    my $type = \$TYPES{$name};

-    my $ret;

-

-    $name =~ s|^\.||;

-

-    SWITCH: for ($flavour) {

-	/aix/		&& do { if (!$$type) {

-				    $$type = "\@function";

-				}

-				if ($$type =~ /function/) {

-				    $name = ".$name";

-				}

-				last;

-			      };

-	/osx/		&& do { $name = "_$name";

-				last;

-			      };

-	/linux.*(32|64(le|v2))/

-			&& do {	$ret .= ".globl	$name";

-				if (!$$type) {

-				    $ret .= "\n.type	$name,\@function";

-				    $$type = "\@function";

-				}

-				last;

-			      };

-	/linux.*64/	&& do {	$ret .= ".globl	$name";

-				if (!$$type) {

-				    $ret .= "\n.type	$name,\@function";

-				    $$type = "\@function";

-				}

-				if ($$type =~ /function/) {

-				    $ret .= "\n.section	\".opd\",\"aw\"";

-				    $ret .= "\n.align	3";

-				    $ret .= "\n$name:";

-				    $ret .= "\n.quad	.$name,.TOC.\@tocbase,0";

-				    $ret .= "\n.previous";

-				    $name = ".$name";

-				}

-				last;

-			      };

-    }

-

-    $ret = ".globl	$name" if (!$ret);

-    $$global = $name;

-    $ret;

-};

-my $text = sub {

-    my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";

-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);

-    $ret;

-};

-my $machine = sub {

-    my $junk = shift;

-    my $arch = shift;

-    if ($flavour =~ /osx/)

-    {	$arch =~ s/\"//g;

-	$arch = ($flavour=~/64/) ? "ppc970-64" : "ppc970" if ($arch eq "any");

-    }

-    ".machine	$arch";

-};

-my $size = sub {

-    if ($flavour =~ /linux/)

-    {	shift;

-	my $name = shift;

-	my $real = $GLOBALS{$name} ? \$GLOBALS{$name} : \$name;

-	my $ret  = ".size	$$real,.-$$real";

-	$name =~ s|^\.||;

-	if ($$real ne $name) {

-	    $ret .= "\n.size	$name,.-$$real";

-	}

-	$ret;

-    }

-    else

-    {	"";	}

-};

-my $asciz = sub {

-    shift;

-    my $line = join(",",@_);

-    if ($line =~ /^"(.*)"$/)

-    {	".byte	" . join(",",unpack("C*",$1),0) . "\n.align	2";	}

-    else

-    {	"";	}

-};

-my $quad = sub {

-    shift;

-    my @ret;

-    my ($hi,$lo);

-    for (@_) {

-	if (/^0x([0-9a-f]*?)([0-9a-f]{1,8})$/io)

-	{  $hi=$1?"0x$1":"0"; $lo="0x$2";  }

-	elsif (/^([0-9]+)$/o)

-	{  $hi=$1>>32; $lo=$1&0xffffffff;  } # error-prone with 32-bit perl

-	else

-	{  $hi=undef; $lo=$_; }

-

-	if (defined($hi))

-	{  push(@ret,$flavour=~/le$/o?".long\t$lo,$hi":".long\t$hi,$lo");  }

-	else

-	{  push(@ret,".quad	$lo");  }

-    }

-    join("\n",@ret);

-};

-

-################################################################

-# simplified mnemonics not handled by at least one assembler

-################################################################

-my $cmplw = sub {

-    my $f = shift;

-    my $cr = 0; $cr = shift if ($#_>1);

-    # Some out-of-date 32-bit GNU assembler just can't handle cmplw...

-    ($flavour =~ /linux.*32/) ?

-	"	.long	".sprintf "0x%x",31<<26|$cr<<23|$_[0]<<16|$_[1]<<11|64 :

-	"	cmplw	".join(',',$cr,@_);

-};

-my $bdnz = sub {

-    my $f = shift;

-    my $bo = $f=~/[\+\-]/ ? 16+9 : 16;	# optional "to be taken" hint

-    "	bc	$bo,0,".shift;

-} if ($flavour!~/linux/);

-my $bltlr = sub {

-    my $f = shift;

-    my $bo = $f=~/\-/ ? 12+2 : 12;	# optional "not to be taken" hint

-    ($flavour =~ /linux/) ?		# GNU as doesn't allow most recent hints

-	"	.long	".sprintf "0x%x",19<<26|$bo<<21|16<<1 :

-	"	bclr	$bo,0";

-};

-my $bnelr = sub {

-    my $f = shift;

-    my $bo = $f=~/\-/ ? 4+2 : 4;	# optional "not to be taken" hint

-    ($flavour =~ /linux/) ?		# GNU as doesn't allow most recent hints

-	"	.long	".sprintf "0x%x",19<<26|$bo<<21|2<<16|16<<1 :

-	"	bclr	$bo,2";

-};

-my $beqlr = sub {

-    my $f = shift;

-    my $bo = $f=~/-/ ? 12+2 : 12;	# optional "not to be taken" hint

-    ($flavour =~ /linux/) ?		# GNU as doesn't allow most recent hints

-	"	.long	".sprintf "0x%X",19<<26|$bo<<21|2<<16|16<<1 :

-	"	bclr	$bo,2";

-};

-# GNU assembler can't handle extrdi rA,rS,16,48, or when sum of last two

-# arguments is 64, with "operand out of range" error.

-my $extrdi = sub {

-    my ($f,$ra,$rs,$n,$b) = @_;

-    $b = ($b+$n)&6;; $n = 64-$n;

-    "	rldicl	$ra,$rs,$b,$n";

-};

-my $vmr = sub {

-    my ($f,$vx,$vy) = @_;

-    "	vor	$vx,$vy,$vy";

-};

-

-# Some ABIs specify vrsave, special-purpose register #256, as reserved

-# for system use.

-my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);

-my $mtspr = sub {

-    my ($f,$idx,$ra) = @_;

-    if ($idx == 256 && $no_vrsave) {

-	"	or	$ra,$ra,$ra";

-    } else {

-	"	mtspr	$idx,$ra";

-    }

-};

-my $mfspr = sub {

-    my ($f,$rd,$idx) = @_;

-    if ($idx == 256 && $no_vrsave) {

-	"	li	$rd,-1";

-    } else {

-	"	mfspr	$rd,$idx";

-    }

-};

-

-# PowerISA 2.06 stuff

-sub vsxmem_op {

-    my ($f, $vrt, $ra, $rb, $op) = @_;

-    "	.long	".sprintf "0x%X",(31<<26)|($vrt<<21)|($ra<<16)|($rb<<11)|($op*2+1);

-}

-# made-up unaligned memory reference AltiVec/VMX instructions

-my $lvx_u	= sub {	vsxmem_op(@_, 844); };	# lxvd2x

-my $stvx_u	= sub {	vsxmem_op(@_, 972); };	# stxvd2x

-my $lvdx_u	= sub {	vsxmem_op(@_, 588); };	# lxsdx

-my $stvdx_u	= sub {	vsxmem_op(@_, 716); };	# stxsdx

-my $lvx_4w	= sub { vsxmem_op(@_, 780); };	# lxvw4x

-my $stvx_4w	= sub { vsxmem_op(@_, 908); };	# stxvw4x

-my $lvx_splt	= sub { vsxmem_op(@_, 332); };	# lxvdsx

-# VSX instruction[s] masqueraded as made-up AltiVec/VMX

-my $vpermdi	= sub {				# xxpermdi

-    my ($f, $vrt, $vra, $vrb, $dm) = @_;

-    $dm = oct($dm) if ($dm =~ /^0/);

-    "	.long	".sprintf "0x%X",(60<<26)|($vrt<<21)|($vra<<16)|($vrb<<11)|($dm<<8)|(10<<3)|7;

-};

-

-# PowerISA 2.07 stuff

-sub vcrypto_op {

-    my ($f, $vrt, $vra, $vrb, $op) = @_;

-    "	.long	".sprintf "0x%X",(4<<26)|($vrt<<21)|($vra<<16)|($vrb<<11)|$op;

-}

-sub vfour {

-    my ($f, $vrt, $vra, $vrb, $vrc, $op) = @_;

-    "	.long	".sprintf "0x%X",(4<<26)|($vrt<<21)|($vra<<16)|($vrb<<11)|($vrc<<6)|$op;

-};

-my $vcipher	= sub { vcrypto_op(@_, 1288); };

-my $vcipherlast	= sub { vcrypto_op(@_, 1289); };

-my $vncipher	= sub { vcrypto_op(@_, 1352); };

-my $vncipherlast= sub { vcrypto_op(@_, 1353); };

-my $vsbox	= sub { vcrypto_op(@_, 0, 1480); };

-my $vshasigmad	= sub { my ($st,$six)=splice(@_,-2); vcrypto_op(@_, $st<<4|$six, 1730); };

-my $vshasigmaw	= sub { my ($st,$six)=splice(@_,-2); vcrypto_op(@_, $st<<4|$six, 1666); };

-my $vpmsumb	= sub { vcrypto_op(@_, 1032); };

-my $vpmsumd	= sub { vcrypto_op(@_, 1224); };

-my $vpmsubh	= sub { vcrypto_op(@_, 1096); };

-my $vpmsumw	= sub { vcrypto_op(@_, 1160); };

-# These are not really crypto, but vcrypto_op template works

-my $vaddudm	= sub { vcrypto_op(@_, 192);  };

-my $vadduqm	= sub { vcrypto_op(@_, 256);  };

-my $vmuleuw	= sub { vcrypto_op(@_, 648);  };

-my $vmulouw	= sub { vcrypto_op(@_, 136);  };

-my $vrld	= sub { vcrypto_op(@_, 196);  };

-my $vsld	= sub { vcrypto_op(@_, 1476); };

-my $vsrd	= sub { vcrypto_op(@_, 1732); };

-my $vsubudm	= sub { vcrypto_op(@_, 1216); };

-my $vaddcuq	= sub { vcrypto_op(@_, 320);  };

-my $vaddeuqm	= sub { vfour(@_,60); };

-my $vaddecuq	= sub { vfour(@_,61); };

-my $vmrgew	= sub { vfour(@_,0,1932); };

-my $vmrgow	= sub { vfour(@_,0,1676); };

-

-my $mtsle	= sub {

-    my ($f, $arg) = @_;

-    "	.long	".sprintf "0x%X",(31<<26)|($arg<<21)|(147*2);

-};

-

-# VSX instructions masqueraded as AltiVec/VMX

-my $mtvrd	= sub {

-    my ($f, $vrt, $ra) = @_;

-    "	.long	".sprintf "0x%X",(31<<26)|($vrt<<21)|($ra<<16)|(179<<1)|1;

-};

-my $mtvrwz	= sub {

-    my ($f, $vrt, $ra) = @_;

-    "	.long	".sprintf "0x%X",(31<<26)|($vrt<<21)|($ra<<16)|(243<<1)|1;

-};

-my $lvwzx_u	= sub { vsxmem_op(@_, 12); };	# lxsiwzx

-my $stvwx_u	= sub { vsxmem_op(@_, 140); };	# stxsiwx

-

-# PowerISA 3.0 stuff

-my $maddhdu	= sub { vfour(@_,49); };

-my $maddld	= sub { vfour(@_,51); };

-my $darn = sub {

-    my ($f, $rt, $l) = @_;

-    "	.long	".sprintf "0x%X",(31<<26)|($rt<<21)|($l<<16)|(755<<1);

-};

-my $iseleq = sub {

-    my ($f, $rt, $ra, $rb) = @_;

-    "	.long	".sprintf "0x%X",(31<<26)|($rt<<21)|($ra<<16)|($rb<<11)|(2<<6)|30;

-};

-# VSX instruction[s] masqueraded as made-up AltiVec/VMX

-my $vspltib	= sub {				# xxspltib

-    my ($f, $vrt, $imm8) = @_;

-    $imm8 = oct($imm8) if ($imm8 =~ /^0/);

-    $imm8 &= 0xff;

-    "	.long	".sprintf "0x%X",(60<<26)|($vrt<<21)|($imm8<<11)|(360<<1)|1;

-};

-

-# PowerISA 3.0B stuff

-my $addex = sub {

-    my ($f, $rt, $ra, $rb, $cy) = @_;	# only cy==0 is specified in 3.0B

-    "	.long	".sprintf "0x%X",(31<<26)|($rt<<21)|($ra<<16)|($rb<<11)|($cy<<9)|(170<<1);

-};

-my $vmsumudm	= sub { vfour(@_,35); };

-

-while($line=<>) {

-

-    $line =~ s|[#!;].*$||;	# get rid of asm-style comments...

-    $line =~ s|/\*.*\*/||;	# ... and C-style comments...

-    $line =~ s|^\s+||;		# ... and skip white spaces in beginning...

-    $line =~ s|\s+$||;		# ... and at the end

-

-    {

-	$line =~ s|\.L(\w+)|L$1|g;	# common denominator for Locallabel

-	$line =~ s|\bL(\w+)|\.L$1|g	if ($dotinlocallabels);

-    }

-

-    {

-	$line =~ s|(^[\.\w]+)\:\s*||;

-	my $label = $1;

-	if ($label) {

-	    my $xlated = ($GLOBALS{$label} or $label);

-	    print "$xlated:";

-	    if ($flavour =~ /linux.*64(le|v2)/) {

-		if ($TYPES{$label} =~ /function/) {

-		    printf "\n.localentry	%s,0\n",$xlated;

-		}

-	    }

-	}

-    }

-

-    {

-	$line =~ s|^\s*(\.?)(\w+)([\.\+\-]?)\s*||;

-	my $c = $1; $c = "\t" if ($c eq "");

-	my $mnemonic = $2;

-	my $f = $3;

-	my $opcode = eval("\$$mnemonic");

-	$line =~ s/\b(c?[rf]|v|vs)([0-9]+)\b/$2/g if ($c ne "." and $flavour !~ /osx/);

-	if (ref($opcode) eq 'CODE') { $line = &$opcode($f,split(/,\s*/,$line)); }

-	elsif ($mnemonic)           { $line = $c.$mnemonic.$f."\t".$line; }

-    }

-

-    print $line if ($line);

-    print "\n";

-}

-

-close STDOUT;

diff --git a/lib/freebl/scripts/sha512p8-ppc.pl b/lib/freebl/scripts/sha512p8-ppc.pl

deleted file mode 100644

index 3bef98be7..000000000

--- a/lib/freebl/scripts/sha512p8-ppc.pl

+++ /dev/null

@@ -1,413 +0,0 @@

-#!/usr/bin/env perl

-

-# ====================================================================

-# Written by Andy Polyakov, @dot-asm, initially for use in the OpenSSL

-# project. The module is dual licensed under OpenSSL and CRYPTOGAMS

-# licenses depending on where you obtain it. For further details see

-# https://github.com/dot-asm/cryptogams/.

-# ====================================================================

-

-# SHA256/512 for PowerISA v2.07.

-#

-# Accurate performance measurements are problematic, because it's

-# always virtualized setup with possibly throttled processor.

-# Relative comparison is therefore more informative. This module is

-# ~60% faster than integer-only sha512-ppc.pl. To anchor to something

-# else, SHA256 is 24% slower than sha1-ppc.pl and 2.5x slower than

-# hardware-assisted aes-128-cbc encrypt. SHA512 is 20% faster than

-# sha1-ppc.pl and 1.6x slower than aes-128-cbc. Another interesting

-# result is degree of computational resources' utilization. POWER8 is

-# "massively multi-threaded chip" and difference between single- and

-# maximum multi-process benchmark results tells that utilization is

-# whooping 94%. For sha512-ppc.pl we get [not unimpressive] 84% and

-# for sha1-ppc.pl - 73%. 100% means that multi-process result equals

-# to single-process one, given that all threads end up on the same

-# physical core.

-#

-######################################################################

-# Believed-to-be-accurate results in cycles per processed byte [on

-# little-endian system]. Numbers in square brackets are for 64-bit

-# build of sha512-ppc.pl, presented for reference.

-#

-#		POWER8		POWER9

-# SHA256	9.7 [15.8]	11.2 [12.5]

-# SHA512	6.1 [10.3]	7.0 [7.9]

-

-$flavour=shift;

-$output =shift;

-

-if ($flavour =~ /64/) {

-	$SIZE_T=8;

-	$LRSAVE=2*$SIZE_T;

-	$STU="stdu";

-	$POP="ld";

-	$PUSH="std";

-} elsif ($flavour =~ /32/) {

-	$SIZE_T=4;

-	$LRSAVE=$SIZE_T;

-	$STU="stwu";

-	$POP="lwz";

-	$PUSH="stw";

-} else { die "nonsense $flavour"; }

-

-$LENDIAN=($flavour=~/le/);