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

Unified - adapt the generation of sha assembler to use GENERATE 



This gets rid of the BEGINRAW..ENDRAW sections in crypto/sha/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 3c9d51ce

crypto/sha/Makefile.in

+10 −10
Original line number Diff line number Diff line
@@ -40,32 +40,32 @@ lib: $(LIBOBJ) 
	@touch lib



sha1-586.s:	asm/sha1-586.pl ../perlasm/x86asm.pl

	$(PERL) asm/sha1-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

	$(PERL) asm/sha1-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@

sha256-586.s:	asm/sha256-586.pl ../perlasm/x86asm.pl

	$(PERL) asm/sha256-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

	$(PERL) asm/sha256-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@

sha512-586.s:	asm/sha512-586.pl ../perlasm/x86asm.pl

	$(PERL) asm/sha512-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

	$(PERL) asm/sha512-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@



sha1-ia64.s:   asm/sha1-ia64.pl

	(cd asm; $(PERL) sha1-ia64.pl ../$@ $(CFLAGS))

	(cd asm; $(PERL) sha1-ia64.pl $(CFLAGS) ../$@)

sha256-ia64.s: asm/sha512-ia64.pl

	(cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))

	(cd asm; $(PERL) sha512-ia64.pl $(CFLAGS) ../$@)

sha512-ia64.s: asm/sha512-ia64.pl

	(cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))

	(cd asm; $(PERL) sha512-ia64.pl $(CFLAGS) ../$@)



sha256-armv4.S: asm/sha256-armv4.pl

	$(PERL) $< $(PERLASM_SCHEME) $@



sha1-alpha.s:	asm/sha1-alpha.pl

	(preproc=$$$$.$@.S; trap "rm $$preproc" INT; \

	$(PERL) asm/sha1-alpha.pl > $$preproc && \

	$(PERL) asm/sha1-alpha.pl $$preproc && \

	$(CC) -E -P $$preproc > $@ && rm $$preproc)



# Solaris make has to be explicitly told

sha1-x86_64.s:	asm/sha1-x86_64.pl;	$(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@

sha1-mb-x86_64.s:	asm/sha1-mb-x86_64.pl;	$(PERL) asm/sha1-mb-x86_64.pl $(PERLASM_SCHEME) > $@

sha1-x86_64.s:	asm/sha1-x86_64.pl;	$(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) $@

sha1-mb-x86_64.s:	asm/sha1-mb-x86_64.pl;	$(PERL) asm/sha1-mb-x86_64.pl $(PERLASM_SCHEME) $@

sha256-x86_64.s:asm/sha512-x86_64.pl;	$(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@

sha256-mb-x86_64.s:	asm/sha256-mb-x86_64.pl;	$(PERL) asm/sha256-mb-x86_64.pl $(PERLASM_SCHEME) > $@

sha256-mb-x86_64.s:	asm/sha256-mb-x86_64.pl;	$(PERL) asm/sha256-mb-x86_64.pl $(PERLASM_SCHEME) $@

sha512-x86_64.s:asm/sha512-x86_64.pl;	$(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@

sha1-sparcv9.S:	asm/sha1-sparcv9.pl;	$(PERL) asm/sha1-sparcv9.pl $(PERLASM_SCHEME) $@

sha256-sparcv9.S:asm/sha512-sparcv9.pl;	$(PERL) asm/sha512-sparcv9.pl $(PERLASM_SCHEME) $@

crypto/sha/asm/sha1-586.pl

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

require "x86asm.pl";



$output=pop;

open STDOUT,">$output";



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



$xmm=$ymm=0;
@@ -1474,3 +1477,5 @@ sub Xtail_avx() 
&asciz("SHA1 block transform for x86, CRYPTOGAMS by <appro\@openssl.org>");



&asm_finish();



close STDOUT;

crypto/sha/asm/sha1-ia64.pl

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
# Performance under big-endian OS such as HP-UX is 179MBps*1GHz, which

# is >50% better than HP C and >2x better than gcc.



$output = pop;



$code=<<___;

.ident  \"sha1-ia64.s, version 1.3\"

.ident  \"IA-64 ISA artwork by Andy Polyakov <appro\@fy.chalmers.se>\"
@@ -301,5 +303,5 @@ $code.=<<___; 
stringz	"SHA1 block transform for IA64, CRYPTOGAMS by <appro\@openssl.org>"

___



$output=shift and open STDOUT,">$output";

open STDOUT,">$output" if $output;

print $code;

crypto/sha/asm/sha256-586.pl

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

require "x86asm.pl";



$output=pop;

open STDOUT,">$output";



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



$xmm=$avx=0;
@@ -1279,3 +1282,5 @@ sub bodyx_00_15 () { # +10% 
&function_end_B("sha256_block_data_order");



&asm_finish();



close STDOUT;

crypto/sha/asm/sha512-586.pl

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

require "x86asm.pl";



$output=pop;

open STDOUT,">$output";



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



$sse2=0;
@@ -909,3 +912,5 @@ sub BODY_00_15_ssse3 { # "phase-less" copy of BODY_00_15_sse2 
&asciz("SHA512 block transform for x86, CRYPTOGAMS by <appro\@openssl.org>");



&asm_finish();



close STDOUT;