Commit df0cb57c authored by Richard Levitte's avatar Richard Levitte
Browse files

Unified - adapt the generation of chacha assembler to use GENERATE 



This gets rid of the BEGINRAW..ENDRAW sections in crypto/chacha/build.info.

This also moves the assembler generating perl scripts to take the
output file name as last command line argument, where necessary.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent a4b4bb08

crypto/chacha/Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ lib: $(LIBOBJ) 
	@touch lib



chacha-x86.s:		asm/chacha-x86.pl

	$(PERL) asm/chacha-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

	$(PERL) asm/chacha-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@

chacha-x86_64.s:	asm/chacha-x86_64.pl

	$(PERL) asm/chacha-x86_64.pl $(PERLASM_SCHEME) > $@

	$(PERL) asm/chacha-x86_64.pl $(PERLASM_SCHEME) $@

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

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

crypto/chacha/asm/chacha-c64xplus.pl

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
# dependent on input length. This module on the other hand is free

# from such limiation.



$output=pop;

open STDOUT,">$output";



($OUT,$INP,$LEN,$KEYB,$COUNTERA)=("A4","B4","A6","B6","A8");

($KEYA,$COUNTERB,$STEP)=("A7","B7","A3");

crypto/chacha/asm/chacha-x86.pl

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; 
push(@INC,"${dir}","${dir}../../perlasm");

require "x86asm.pl";



$output=pop;

open STDOUT,">$output";



&asm_init($ARGV[0],"chacha-x86.pl",$ARGV[$#ARGV] eq "386");



$xmm=$ymm=0;
@@ -1130,3 +1133,5 @@ sub XOPROUND { 
}



&asm_finish();



close STDOUT;

crypto/chacha/build.info

+4 −7
Original line number Diff line number Diff line 
LIBS=../../libcrypto

SOURCE[../../libcrypto]={- $target{chacha_asm_src} -}



GENERATE[chacha-x86.s]=asm/chacha-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)

GENERATE[chacha-x86_64.s]=asm/chacha-x86_64.pl $(PERLASM_SCHEME)

GENERATE[chacha-ppc.s]=asm/chacha-ppc.pl $(PERLASM_SCHEME)



BEGINRAW[Makefile(unix)]

##### CHACHA assembler implementations



{- $builddir -}/chacha-x86.s:		{- $sourcedir -}/asm/chacha-x86.pl

	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/chacha-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

{- $builddir -}/chacha-x86_64.s:	{- $sourcedir -}/asm/chacha-x86_64.pl

	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/chacha-x86_64.pl $(PERLASM_SCHEME) > $@

{- $builddir -}/chacha-ppc.s:	{- $sourcedir -}/asm/chacha-ppc.pl

	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/chacha-ppc.pl $(PERLASM_SCHEME) $@



{- $builddir -}/chacha-%.S:	{- $sourcedir -}/asm/chacha-%.pl

	CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@

ENDRAW[Makefile(unix)]