Commit 894c04aa authored by Andy Polyakov's avatar Andy Polyakov
Browse files

PowerPC assembly pack: add POWER8 support. 



Reviewed-by: default avatarDr. Stephen Henson <steve@openssl.org>
(cherry picked from commit 4577871c)
parent 1278ce48

Configure

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ my $armv4_asm="armcap.o armv4cpuid.o:bn_asm.o armv4-mont.o armv4-gf2m.o::aes_cbc 
my $aarch64_asm="armcap.o arm64cpuid.o mem_clr.o:::aes_core.o aes_cbc.o aesv8-armx.o:::sha1-armv8.o sha256-armv8.o sha512-armv8.o:::::::ghashv8-armx.o:";

my $parisc11_asm="pariscid.o:bn_asm.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::32";

my $parisc20_asm="pariscid.o:pa-risc2W.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::64";

my $ppc32_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o::aes_core.o aes_cbc.o aes-ppc.o:::sha1-ppc.o sha256-ppc.o::::::::";

my $ppc64_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o::aes_core.o aes_cbc.o aes-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o::::::::";

my $ppc32_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o::aes_core.o aes_cbc.o aes-ppc.o aesp8-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o:::::::ghashp8-ppc.o:";

my $ppc64_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o::aes_core.o aes_cbc.o aes-ppc.o aesp8-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o:::::::ghashp8-ppc.o:";

my $no_asm=":::::::::::::::void";



# As for $BSDthreads. Idea is to maintain "collective" set of flags,

crypto/aes/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ aes-sparcv9.s: asm/aes-sparcv9.pl 


aes-ppc.s:	asm/aes-ppc.pl

	$(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@

aesp8-ppc.s:	asm/aesp8-ppc.pl

	$(PERL) asm/aesp8-ppc.pl $(PERLASM_SCHEME) $@



aes-parisc.s:	asm/aes-parisc.pl

	$(PERL) asm/aes-parisc.pl $(PERLASM_SCHEME) $@

crypto/aes/asm/aes-ppc.pl

+2 −2
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ Lenc_loop: 
	xor	$s2,$t2,$acc14

	xor	$s3,$t3,$acc15

	addi	$key,$key,16

	bdnz-	Lenc_loop

	bdnz	Lenc_loop



	addi	$Tbl2,$Tbl0,2048

	nop
@@ -982,7 +982,7 @@ Ldec_loop: 
	xor	$s2,$t2,$acc14

	xor	$s3,$t3,$acc15

	addi	$key,$key,16

	bdnz-	Ldec_loop

	bdnz	Ldec_loop



	addi	$Tbl2,$Tbl0,2048

	nop

crypto/aes/asm/aesp8-ppc.pl

0 → 100755
+3726 −0

File added.

Preview size limit exceeded, changes collapsed.

crypto/bn/asm/ppc-mont.pl

+5 −5
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ L1st: 


	addi	$j,$j,$BNSZ	; j++

	addi	$tp,$tp,$BNSZ	; tp++

	bdnz-	L1st

	bdnz	L1st

;L1st

	addc	$lo0,$alo,$hi0

	addze	$hi0,$ahi
@@ -253,7 +253,7 @@ Linner: 
	addze	$hi1,$hi1

	$ST	$lo1,0($tp)	; tp[j-1]

	addi	$tp,$tp,$BNSZ	; tp++

	bdnz-	Linner

	bdnz	Linner

;Linner

	$LD	$tj,$BNSZ($tp)	; tp[j]

	addc	$lo0,$alo,$hi0
@@ -276,7 +276,7 @@ Linner: 
	slwi	$tj,$num,`log($BNSZ)/log(2)`

	$UCMP	$i,$tj

	addi	$i,$i,$BNSZ

	ble-	Louter

	ble	Louter



	addi	$num,$num,2	; restore $num

	subfc	$j,$j,$j	; j=0 and "clear" XER[CA]
@@ -289,7 +289,7 @@ Lsub: $LDX $tj,$tp,$j 
	subfe	$aj,$nj,$tj	; tp[j]-np[j]

	$STX	$aj,$rp,$j

	addi	$j,$j,$BNSZ

	bdnz-	Lsub

	bdnz	Lsub



	li	$j,0

	mtctr	$num
@@ -304,7 +304,7 @@ Lcopy: ; copy or in-place refresh 
	$STX	$tj,$rp,$j

	$STX	$j,$tp,$j	; zap at once

	addi	$j,$j,$BNSZ

	bdnz-	Lcopy

	bdnz	Lcopy



	$POP	$tj,0($sp)

	li	r3,1