Engage AES x86 assembler module for COFF and a.out targets.

This commit is contained in:
Andy Polyakov 2004-12-26 10:58:39 +00:00
parent 045d3285e2
commit 556b8f3f77
5 changed files with 14 additions and 14 deletions

View File

@ -115,8 +115,8 @@ my $bits1="THIRTY_TWO_BIT ";
my $bits2="SIXTY_FOUR_BIT "; my $bits2="SIXTY_FOUR_BIT ";
my $x86_elf_asm="x86cpuid-elf.o:asm/bn86-elf.o asm/co86-elf.o:asm/dx86-elf.o asm/yx86-elf.o:asm/ax86-elf.o:asm/bx86-elf.o:asm/mx86-elf.o:asm/sx86-elf.o asm/s512sse2-elf.o:asm/cx86-elf.o:asm/rx86-elf.o:asm/rm86-elf.o:asm/r586-elf.o"; my $x86_elf_asm="x86cpuid-elf.o:asm/bn86-elf.o asm/co86-elf.o:asm/dx86-elf.o asm/yx86-elf.o:asm/ax86-elf.o:asm/bx86-elf.o:asm/mx86-elf.o:asm/sx86-elf.o asm/s512sse2-elf.o:asm/cx86-elf.o:asm/rx86-elf.o:asm/rm86-elf.o:asm/r586-elf.o";
my $x86_coff_asm="x86cpuid-cof.o:asm/bn86-cof.o asm/co86-cof.o:asm/dx86-cof.o asm/yx86-cof.o::asm/bx86-cof.o:asm/mx86-cof.o:asm/sx86-cof.o asm/s512sse2-cof.o:asm/cx86-cof.o:asm/rx86-cof.o:asm/rm86-cof.o:asm/r586-cof.o"; my $x86_coff_asm="x86cpuid-cof.o:asm/bn86-cof.o asm/co86-cof.o:asm/dx86-cof.o asm/yx86-cof.o:asm/ax86-cof.o:asm/bx86-cof.o:asm/mx86-cof.o:asm/sx86-cof.o asm/s512sse2-cof.o:asm/cx86-cof.o:asm/rx86-cof.o:asm/rm86-cof.o:asm/r586-cof.o";
my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o:dx86-out.o yx86-out.o::bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o"; my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o";
my $ia64_asm=":asm/ia64.o::asm/aes-ia64.o:::asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o::asm/rc4-ia64.o::"; my $ia64_asm=":asm/ia64.o::asm/aes-ia64.o:::asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o::asm/rc4-ia64.o::";

12
TABLE
View File

@ -92,7 +92,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
$cpuid_obj = x86cpuid-cof.o $cpuid_obj = x86cpuid-cof.o
$bn_obj = asm/bn86-cof.o asm/co86-cof.o $bn_obj = asm/bn86-cof.o asm/co86-cof.o
$des_obj = asm/dx86-cof.o asm/yx86-cof.o $des_obj = asm/dx86-cof.o asm/yx86-cof.o
$aes_obj = $aes_obj = asm/ax86-cof.o
$bf_obj = asm/bx86-cof.o $bf_obj = asm/bx86-cof.o
$md5_obj = asm/mx86-cof.o $md5_obj = asm/mx86-cof.o
$sha1_obj = asm/sx86-cof.o asm/s512sse2-cof.o $sha1_obj = asm/sx86-cof.o asm/s512sse2-cof.o
@ -146,7 +146,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
$cpuid_obj = x86cpuid-out.o $cpuid_obj = x86cpuid-out.o
$bn_obj = bn86-out.o co86-out.o $bn_obj = bn86-out.o co86-out.o
$des_obj = dx86-out.o yx86-out.o $des_obj = dx86-out.o yx86-out.o
$aes_obj = $aes_obj = ax86-out.o
$bf_obj = bx86-out.o $bf_obj = bx86-out.o
$md5_obj = mx86-out.o $md5_obj = mx86-out.o
$sha1_obj = sx86-out.o s512sse2-out.o $sha1_obj = sx86-out.o s512sse2-out.o
@ -173,7 +173,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
$cpuid_obj = x86cpuid-out.o $cpuid_obj = x86cpuid-out.o
$bn_obj = bn86-out.o co86-out.o $bn_obj = bn86-out.o co86-out.o
$des_obj = dx86-out.o yx86-out.o $des_obj = dx86-out.o yx86-out.o
$aes_obj = $aes_obj = ax86-out.o
$bf_obj = bx86-out.o $bf_obj = bx86-out.o
$md5_obj = mx86-out.o $md5_obj = mx86-out.o
$sha1_obj = sx86-out.o s512sse2-out.o $sha1_obj = sx86-out.o s512sse2-out.o
@ -551,7 +551,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
$cpuid_obj = x86cpuid-out.o $cpuid_obj = x86cpuid-out.o
$bn_obj = bn86-out.o co86-out.o $bn_obj = bn86-out.o co86-out.o
$des_obj = dx86-out.o yx86-out.o $des_obj = dx86-out.o yx86-out.o
$aes_obj = $aes_obj = ax86-out.o
$bf_obj = bx86-out.o $bf_obj = bx86-out.o
$md5_obj = mx86-out.o $md5_obj = mx86-out.o
$sha1_obj = sx86-out.o s512sse2-out.o $sha1_obj = sx86-out.o s512sse2-out.o
@ -3035,7 +3035,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
$cpuid_obj = x86cpuid-out.o $cpuid_obj = x86cpuid-out.o
$bn_obj = bn86-out.o co86-out.o $bn_obj = bn86-out.o co86-out.o
$des_obj = dx86-out.o yx86-out.o $des_obj = dx86-out.o yx86-out.o
$aes_obj = $aes_obj = ax86-out.o
$bf_obj = bx86-out.o $bf_obj = bx86-out.o
$md5_obj = mx86-out.o $md5_obj = mx86-out.o
$sha1_obj = sx86-out.o s512sse2-out.o $sha1_obj = sx86-out.o s512sse2-out.o
@ -3629,7 +3629,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
$cpuid_obj = x86cpuid-cof.o $cpuid_obj = x86cpuid-cof.o
$bn_obj = asm/bn86-cof.o asm/co86-cof.o $bn_obj = asm/bn86-cof.o asm/co86-cof.o
$des_obj = asm/dx86-cof.o asm/yx86-cof.o $des_obj = asm/dx86-cof.o asm/yx86-cof.o
$aes_obj = $aes_obj = asm/ax86-cof.o
$bf_obj = asm/bx86-cof.o $bf_obj = asm/bx86-cof.o
$md5_obj = asm/mx86-cof.o $md5_obj = asm/mx86-cof.o
$sha1_obj = asm/sx86-cof.o asm/s512sse2-cof.o $sha1_obj = asm/sx86-cof.o asm/s512sse2-cof.o

View File

@ -54,11 +54,11 @@ asm/aes-ia64.s: asm/aes-ia64.S
$(CC) $(CFLAGS) -E asm/aes-ia64.S > $@ $(CC) $(CFLAGS) -E asm/aes-ia64.S > $@
asm/ax86-elf.s: asm/aes-586.pl ../perlasm/x86asm.pl asm/ax86-elf.s: asm/aes-586.pl ../perlasm/x86asm.pl
(cd asm; $(PERL) aes-586.pl elf $(CFLAGS) > ../$@) (cd asm; $(PERL) aes-586.pl elf $(CFLAGS) $(PROCESSOR) > ../$@)
asm/ax86-cof.s: asm/aes-586.pl ../perlasm/x86asm.pl asm/ax86-cof.s: asm/aes-586.pl ../perlasm/x86asm.pl
(cd asm; $(PERL) aes-586.pl coff $(CFLAGS) > ../$@) (cd asm; $(PERL) aes-586.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
asm/ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl
(cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) > ../$@) (cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
files: files:
$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO

View File

@ -92,7 +92,7 @@ sub get_mem
$reg2=&conv($1); $reg2=&conv($1);
$addr="_$2"; $addr="_$2";
} }
elsif ($addr =~ /^[_a-zA-Z]$/) elsif ($addr =~ /^[_a-z][_a-z0-9]*$/i)
{ {
$addr="_$addr"; $addr="_$addr";
} }

View File

@ -106,7 +106,7 @@ sub get_mem
$reg2=&conv($1); $reg2=&conv($1);
$addr="$under$2"; $addr="$under$2";
} }
elsif ($addr =~ /^[_a-zA-Z]$/) elsif ($addr =~ /^[_a-z][_a-z0-9]*$/i)
{ {
$addr="$under$addr"; $addr="$under$addr";
} }