Commit 6d33da34 authored by Richard Levitte's avatar Richard Levitte
Browse files

Unified - adapt the generation of des assembler to use GENERATE 



This gets rid of the BEGINRAW..ENDRAW sections in crypto/des/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 73d2fb66

crypto/des/Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ dest4-sparcv9.S: asm/dest4-sparcv9.pl 
	$(PERL) asm/dest4-sparcv9.pl $(PERLASM_SCHEME) $@



des-586.s:	asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

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

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

crypt586.s:	asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	$(PERL) asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@

	$(PERL) asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS) $@



files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

crypto/des/asm/crypt586.pl

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

require "x86asm.pl";



$output=pop;

open STDOUT,">$output";



&asm_init($ARGV[0],"crypt586.pl");



$L="edi";
@@ -19,6 +22,8 @@ $R="esi"; 
&fcrypt_body("fcrypt_body");

&asm_finish();



close STDOUT;



sub fcrypt_body

	{

	local($name,$do_ip)=@_;

crypto/des/asm/des-586.pl

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ require "desboth.pl"; 
# format.

#



$output=pop;

open STDOUT,">$output";



&asm_init($ARGV[0],"des-586.pl");



$L="edi";
@@ -39,6 +42,8 @@ $small_footprint=1 if (grep(/\-DOPENSSL_SMALL_FOOTPRINT/,@ARGV)); 


&asm_finish();



close STDOUT;



sub DES_encrypt_internal()

	{

	&function_begin_B("_x86_DES_encrypt");

crypto/des/build.info

+6 −11
Original line number Diff line number Diff line
@@ -8,16 +8,11 @@ SOURCE[../../libcrypto]=\ 
        fcrypt.c xcbc_enc.c rpc_enc.c  cbc_cksm.c \

        read2pwd.c



BEGINRAW[Makefile]

##### DES assembler implementations

GENERATE[des_enc-sparc.S]=asm/des_enc.m4

GENERATE[dest4-sparcv9.S]=asm/dest4-sparcv9.pl $(PERLASM_SCHEME)



{- $builddir -}/des_enc-sparc.S:	{- $sourcedir -}/asm/des_enc.m4

	m4 -B 8192 {- $sourcedir -}/asm/des_enc.m4 > $@

{- $builddir -}/dest4-sparcv9.S:	{- $sourcedir -}/asm/dest4-sparcv9.pl

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

GENERATE[des-586.s]=asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS)

DEPEND[des-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl

GENERATE[crypt586.s]=asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS)

DEPEND[crypt586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl

{- $builddir -}/des-586.s:	{- $sourcedir -}/asm/des-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl {- $sourcetop -}/crypto/perlasm/cbc.pl

	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@

{- $builddir -}/crypt586.s:	{- $sourcedir -}/asm/crypt586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl {- $sourcetop -}/crypto/perlasm/cbc.pl

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

ENDRAW[Makefile]