generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unified - adapt the generation of rc4 assembler to use GENERATE

Browse Source 
This gets rid of the BEGINRAW..ENDRAW sections in crypto/rc4/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: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Richard Levitte 2016-03-07 15:48:49 +01:00
parent ac9888e5a9
commit 3c9d51ce8b
4 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/rc4/Makefile.in
View File

@ -39,15 +39,15 @@ lib: $(LIBOBJ)
@touch lib @touch lib
rc4-586.s: asm/rc4-586.pl ../perlasm/x86asm.pl rc4-586.s: asm/rc4-586.pl ../perlasm/x86asm.pl
$(PERL) asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ $(PERL) asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@
rc4-x86_64.s: asm/rc4-x86_64.pl rc4-x86_64.s: asm/rc4-x86_64.pl
$(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@ $(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) $@
rc4-md5-x86_64.s: asm/rc4-md5-x86_64.pl rc4-md5-x86_64.s: asm/rc4-md5-x86_64.pl
$(PERL) asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) > $@ $(PERL) asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) $@
rc4-ia64.S: asm/rc4-ia64.pl rc4-ia64.S: asm/rc4-ia64.pl
$(PERL) asm/rc4-ia64.pl $(CFLAGS) > $@ $(PERL) asm/rc4-ia64.pl $(CFLAGS) $@
rc4-parisc.s: asm/rc4-parisc.pl rc4-parisc.s: asm/rc4-parisc.pl
$(PERL) asm/rc4-parisc.pl $(PERLASM_SCHEME) $@ $(PERL) asm/rc4-parisc.pl $(PERLASM_SCHEME) $@

4
crypto/rc4/asm/rc4-586.pl
View File

@ -63,6 +63,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
push(@INC,"${dir}","${dir}../../perlasm"); push(@INC,"${dir}","${dir}../../perlasm");
require "x86asm.pl"; require "x86asm.pl";
$output=pop;
open STDOUT,">$output";
&asm_init($ARGV[0],"rc4-586.pl",$x86only = $ARGV[$#ARGV] eq "386"); &asm_init($ARGV[0],"rc4-586.pl",$x86only = $ARGV[$#ARGV] eq "386");
$xx="eax"; $xx="eax";
@ -415,3 +418,4 @@ $idx="edx";
&asm_finish(); &asm_finish();
close STDOUT;

5
crypto/rc4/asm/rc4-ia64.pl
View File

@ -164,6 +164,9 @@
# random input data). # random input data).
# #
$output = pop;
open STDOUT,">$output";
$phases = 4; # number of stages/phases in the pipelined-loop $phases = 4; # number of stages/phases in the pipelined-loop
$unroll_count = 6; # number of times we unrolled it $unroll_count = 6; # number of times we unrolled it
$pComI = (1 << 0); $pComI = (1 << 0);
@ -753,3 +756,5 @@ $code.=<<___;
___ ___
print $code; print $code;
close STDOUT;

24
crypto/rc4/build.info
View File

@ -2,21 +2,17 @@ LIBS=../../libcrypto
SOURCE[../../libcrypto]=\ SOURCE[../../libcrypto]=\
{- $target{rc4_asm_src} -} {- $target{rc4_asm_src} -}
GENERATE[rc4-586.s]=asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
DEPEND[rc4-586.s]=../perlasm/x86asm.pl
GENERATE[rc4-x86_64.s]=asm/rc4-x86_64.pl $(PERLASM_SCHEME)
GENERATE[rc4-md5-x86_64.s]=asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME)
GENERATE[rc4-ia64.S]=asm/rc4-ia64.pl $(CFLAGS)
GENERATE[rc4-parisc.s]=asm/rc4-parisc.pl $(PERLASM_SCHEME)
BEGINRAW[Makefile] BEGINRAW[Makefile]
{- $builddir -}/rc4-586.s: {- $sourcedir -}/asm/rc4-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
{- $builddir -}/rc4-x86_64.s: {- $sourcedir -}/asm/rc4-x86_64.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@
{- $builddir -}/rc4-md5-x86_64.s: {- $sourcedir -}/asm/rc4-md5-x86_64.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) > $@
{- $builddir -}/rc4-ia64.S: {- $sourcedir -}/asm/rc4-ia64.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-ia64.pl $(CFLAGS) > $@
{- $builddir -}/rc4-parisc.s: {- $sourcedir -}/asm/rc4-parisc.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-parisc.pl $(PERLASM_SCHEME) $@
{- $builddir -}/rc4-ia64.s: rc4-ia64.S {- $builddir -}/rc4-ia64.s: rc4-ia64.S
@case `awk '/^#define RC4_INT/{print$$NF}' $(SRCDIR)/include/openssl/opensslconf.h` in \ @case `awk '/^#define RC4_INT/{print$$NF}' $(SRCDIR)/include/openssl/opensslconf.h` in \
int) set -x; $(CC) $(CFLAGS) -DSZ=4 -E rc4-ia64.S > $@ ;; \ int) set -x; $(CC) $(CFLAGS) -DSZ=4 -E rc4-ia64.S > $@ ;; \