Commit 9c9c83cc authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Throw in ppccpuid module.

parent 1d42fb5f

Configure

+8 −8
Original line number Diff line number Diff line
@@ -320,14 +320,14 @@ my %table=( 
# *-generic* is endian-neutral target, but ./config is free to

# throw in -D[BL]_ENDIAN, whichever appropriate...

"linux-generic32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc32.o linux_ppc32-mont.o:::::sha1-ppc_linux32.o sha256-ppc_linux32.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:ppccpuid_linux32.o:linux_ppc32.o linux_ppc32-mont.o:::::sha1-ppc_linux32.o sha256-ppc_linux32.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

#### IA-32 targets...

"linux-ia32-icc",	"icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",

####

"linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o linux_ppc64-mont.o:::::sha1-ppc_linux64.o sha256-ppc_linux64.o sha512-ppc_linux64.o::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:ppccpuid_linux64.o:linux_ppc64.o linux_ppc64-mont.o:::::sha1-ppc_linux64.o sha256-ppc_linux64.o sha512-ppc_linux64.o::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -413,12 +413,12 @@ my %table=( 


#### IBM's AIX.

"aix3-cc",  "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",

"aix-gcc",  "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",

"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",

"aix-gcc",  "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR:ppccpuid_aix32.o:aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",

"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:ppccpuid_aix64.o:aix_ppc64.o aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",

# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE

# at build time. $OBJECT_MODE is respected at ./config stage!

"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",

"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o::::::dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",

"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:ppccpuid_aix32.o:aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",

"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:ppccpuid_aix64.o:aix_ppc64.o aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o::::::dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",



#

# Cray T90 and similar (SDSC)
@@ -510,8 +510,8 @@ my %table=( 


##### MacOS X (a.k.a. Rhapsody or Darwin) setup

"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",

"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o osx_ppc32-mont.o:::::sha1-ppc_osx32.o sha256-ppc_osx32.o::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin64-ppc-cc","cc:-m64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o osx_ppc64-mont.o:::::sha1-ppc_osx64.o sha256-ppc_osx64.o sha512-ppc_osx64.o::::::dlfcn:darwin-shared:-fPIC -fno-common:-m64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:ppccpuid_osx32.o:osx_ppc32.o osx_ppc32-mont.o:::::sha1-ppc_osx32.o sha256-ppc_osx32.o::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin64-ppc-cc","cc:-m64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:ppccpuid_osx64.o:osx_ppc64.o osx_ppc64-mont.o:::::sha1-ppc_osx64.o sha256-ppc_osx64.o sha512-ppc_osx64.o::::::dlfcn:darwin-shared:-fPIC -fno-common:-m64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o osx_ppc32-mont.o:::::sha1-ppc_osx32.o::::::dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

TABLE

+8 −8
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ $thread_cflag = -qthreaded 
$sys_id       = AIX

$lflags       = 

$bn_ops       = BN_LLONG RC4_CHAR

$cpuid_obj    = 

$cpuid_obj    = ppccpuid_aix32.o

$bn_obj       = aix_ppc32.o aix_ppc32-mont.o

$des_obj      = 

$aes_obj      =
@@ -736,7 +736,7 @@ $thread_cflag = -D_THREAD_SAFE 
$sys_id       = AIX

$lflags       = 

$bn_ops       = BN_LLONG RC4_CHAR

$cpuid_obj    = 

$cpuid_obj    = ppccpuid_aix32.o

$bn_obj       = aix_ppc32.o aix_ppc32-mont.o

$des_obj      = 

$aes_obj      =
@@ -792,7 +792,7 @@ $thread_cflag = -qthreaded 
$sys_id       = AIX

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR

$cpuid_obj    = 

$cpuid_obj    = ppccpuid_aix64.o

$bn_obj       = aix_ppc64.o aix_ppc64-mont.o

$des_obj      = 

$aes_obj      =
@@ -820,7 +820,7 @@ $thread_cflag = -D_THREAD_SAFE 
$sys_id       = AIX

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR

$cpuid_obj    = 

$cpuid_obj    = ppccpuid_aix64.o

$bn_obj       = aix_ppc64.o aix_ppc64-mont.o

$des_obj      = 

$aes_obj      =
@@ -1072,7 +1072,7 @@ $thread_cflag = -D_REENTRANT 
$sys_id       = MACOSX

$lflags       = -Wl,-search_paths_first

$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR

$cpuid_obj    = 

$cpuid_obj    = ppccpuid_osx32.o

$bn_obj       = osx_ppc32.o osx_ppc32-mont.o

$des_obj      = 

$aes_obj      =
@@ -1100,7 +1100,7 @@ $thread_cflag = -D_REENTRANT 
$sys_id       = MACOSX

$lflags       = -Wl,-search_paths_first

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR

$cpuid_obj    = 

$cpuid_obj    = ppccpuid_osx64.o

$bn_obj       = osx_ppc64.o osx_ppc64-mont.o

$des_obj      = 

$aes_obj      =
@@ -3032,7 +3032,7 @@ $thread_cflag = -D_REENTRANT 
$sys_id       = 

$lflags       = -ldl

$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL

$cpuid_obj    = 

$cpuid_obj    = ppccpuid_linux32.o

$bn_obj       = linux_ppc32.o linux_ppc32-mont.o

$des_obj      = 

$aes_obj      =
@@ -3060,7 +3060,7 @@ $thread_cflag = -D_REENTRANT 
$sys_id       = 

$lflags       = -ldl

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL

$cpuid_obj    = 

$cpuid_obj    = ppccpuid_linux64.o

$bn_obj       = linux_ppc64.o linux_ppc64-mont.o

$des_obj      = 

$aes_obj      =

crypto/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ x86_64cpuid.s: x86_64cpuid.pl 
	$(PERL) x86_64cpuid.pl $@

ia64cpuid.s: ia64cpuid.S

	$(CC) $(CFLAGS) -E ia64cpuid.S > $@

ppccpuid_%.s:	ppccpuid.pl;	$(PERL) $< $@



testapps:

	[ -z "$(THIS)" ] || (	if echo ${SDIRS} | fgrep ' des '; \

crypto/ppccpuid.pl

0 → 100755
+94 −0
Original line number Diff line number Diff line 
#!/usr/bin/env perl



$output = shift;



$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;

( $xlate="${dir}ppc-xlate.pl" and -f $xlate ) or

( $xlate="${dir}perlasm/ppc-xlate.pl" and -f $xlate) or

die "can't locate ppc-xlate.pl";



( defined shift || open STDOUT,"| $^X $xlate $output" ) ||

	die "can't call $xlate: $!";



if ($output=~/64/) {

    $CMPLI="cmpldi";

    $SHRLI="srdi";

    $SIGNX="extsw";

} else {

    $CMPLI="cmplwi";

    $SHRLI="srwi";

    $SIGNX="mr";

}



$code=<<___;

.text



.globl	.OPENSSL_cpuid_setup

.align	4

.OPENSSL_cpuid_setup:

	blr



.globl	.OPENSSL_wipe_cpu

.align	4

.OPENSSL_wipe_cpu:

	xor	r0,r0,r0

	mr	r3,r1

	xor	r4,r4,r4

	xor	r5,r5,r5

	xor	r6,r6,r6

	xor	r7,r7,r7

	xor	r8,r8,r8

	xor	r9,r9,r9

	xor	r10,r10,r10

	xor	r11,r11,r11

	xor	r12,r12,r12

	blr



.globl	.OPENSSL_atomic_add

.align	4

.OPENSSL_atomic_add:

Loop:	lwarx	r5,0,r3

	add	r0,r4,r5

	stwcx.	r0,0,r3

	bne-	Loop

	$SIGNX	r3,r0

	blr



.globl	.OPENSSL_rdtsc

.align	4

.OPENSSL_rdtsc:

	mftb	r3

	mftbu	r4

	blr



.globl	.OPENSSL_cleanse

.align	4

.OPENSSL_cleanse:

	$CMPLI	r4,7

	li	r0,0

	bge	Lot

Little:	mtctr	r4

	stb	r0,0(r3)

	addi	r3,r3,1

	bdnz-	.-8

	blr

Lot:	andi.	r5,r3,3

	beq	Laligned

	stb	r0,0(r3)

	subi	r4,r4,1

	addi	r3,r3,1

	b	Lot

Laligned:

	$SHRLI	r5,r4,2

	mtctr	r5

	stw	r0,0(r3)

	addi	r3,r3,4

	bdnz-	.-8

	andi.	r4,r4,3

	bne	Little

	blr

___



$code =~ s/\`([^\`]*)\`/eval $1/gem;

print $code;

close STDOUT;