Commit e72f7677 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

crypto/perlasm: update from master.

parent e815d72b

crypto/perlasm/x86_64-xlate.pl

+44 −0
Original line number Diff line number Diff line
@@ -253,6 +253,11 @@ my %globals; 
	$self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;

	$self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;



	if (!$self->{label} && $self->{index} && $self->{scale}==1 &&

	    $self->{base} =~ /(rbp|r13)/) {

		$self->{base} = $self->{index}; $self->{index} = $1;

	}



	if ($gas) {

	    $self->{label} =~ s/^___imp_/__imp__/   if ($flavour eq "mingw64");
@@ -772,6 +777,45 @@ my $rdrand = sub { 
    }

};



sub rxb {

 local *opcode=shift;

 my ($dst,$src1,$src2,$rxb)=@_;



   $rxb|=0x7<<5;

   $rxb&=~(0x04<<5) if($dst>=8);

   $rxb&=~(0x01<<5) if($src1>=8);

   $rxb&=~(0x02<<5) if($src2>=8);

   push @opcode,$rxb;

}



my $vprotd = sub {

    if (shift =~ /\$([x0-9a-f]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {

      my @opcode=(0x8f);

	rxb(\@opcode,$3,$2,-1,0x08);

	push @opcode,0x78,0xc2;

	push @opcode,0xc0|($2&7)|(($3&7)<<3);		# ModR/M

	my $c=$1;

	push @opcode,$c=~/^0/?oct($c):$c;

	@opcode;

    } else {

	();

    }

};



my $vprotq = sub {

    if (shift =~ /\$([x0-9a-f]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {

      my @opcode=(0x8f);

	rxb(\@opcode,$3,$2,-1,0x08);

	push @opcode,0x78,0xc3;

	push @opcode,0xc0|($2&7)|(($3&7)<<3);		# ModR/M

	my $c=$1;

	push @opcode,$c=~/^0/?oct($c):$c;

	@opcode;

    } else {

	();

    }

};



if ($nasm) {

    print <<___;

default	rel

crypto/perlasm/x86asm.pl

+26 −0
Original line number Diff line number Diff line
@@ -131,6 +131,32 @@ sub ::rdrand 
    {	&::generic("rdrand",@_);	}

}



sub rxb {

 local *opcode=shift;

 my ($dst,$src1,$src2,$rxb)=@_;



   $rxb|=0x7<<5;

   $rxb&=~(0x04<<5) if($dst>=8);

   $rxb&=~(0x01<<5) if($src1>=8);

   $rxb&=~(0x02<<5) if($src2>=8);

   push @opcode,$rxb;

}



sub ::vprotd

{ my $args=join(',',@_);

    if ($args =~ /xmm([0-7]),xmm([0-7]),([x0-9a-f]+)/)

    { my @opcode=(0x8f);

	rxb(\@opcode,$1,$2,-1,0x08);

	push @opcode,0x78,0xc2;

	push @opcode,0xc0|($2&7)|(($1&7)<<3);		# ModR/M

	my $c=$3;

	push @opcode,$c=~/^0/?oct($c):$c;

	&::data_byte(@opcode);

    }

    else

    {	&::generic("vprotd",@_);	}

}



# label management

$lbdecor="L";		# local label decoration, set by package

$label="000";

crypto/perlasm/x86gas.pl

+6 −2
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ sub ::DWP 
{ my($addr,$reg1,$reg2,$idx)=@_;

  my $ret="";



    if (!defined($idx) && 1*$reg2) { $idx=$reg2; $reg2=$reg1; undef $reg1; }



    $addr =~ s/^\s+//;

    # prepend global references with optional underscore

    $addr =~ s/^([^\+\-0-9][^\+\-]*)/&::islabel($1) or "$nmdecor$1"/ige;
@@ -157,7 +159,7 @@ sub ::file_end 
	}

    }

    if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) {

	my $tmp=".comm\t${nmdecor}OPENSSL_ia32cap_P,8";

	my $tmp=".comm\t${nmdecor}OPENSSL_ia32cap_P,16";

	if ($::macosx)	{ push (@out,"$tmp,2\n"); }

	elsif ($::elf)	{ push (@out,"$tmp,4\n"); }

	else		{ push (@out,"$tmp\n"); }
@@ -181,7 +183,9 @@ sub ::align 
sub ::picmeup

{ my($dst,$sym,$base,$reflabel)=@_;



    if (($::pic && ($::elf || $::aout)) || $::macosx)

    if (defined($base) && $sym eq "OPENSSL_ia32cap_P" && !$::macosx)

    {	&::lea($dst,&::DWP("$sym-$reflabel",$base));	}

    elsif (($::pic && ($::elf || $::aout)) || $::macosx)

    {	if (!defined($base))

	{   &::call(&::label("PIC_me_up"));

	    &::set_label("PIC_me_up");

crypto/perlasm/x86masm.pl

+3 −1
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ sub get_mem 
{ my($size,$addr,$reg1,$reg2,$idx)=@_;

  my($post,$ret);



    if (!defined($idx) && 1*$reg2) { $idx=$reg2; $reg2=$reg1; undef $reg1; }



    $ret .= "$size PTR " if ($size ne "");



    $addr =~ s/^\s+//;
@@ -133,7 +135,7 @@ ___ 
    if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out)

    {	my $comm=<<___;

.bss	SEGMENT 'BSS'

COMM	${nmdecor}OPENSSL_ia32cap_P:QWORD

COMM	${nmdecor}OPENSSL_ia32cap_P:DWORD:4

.bss	ENDS

___

	# comment out OPENSSL_ia32cap_P declarations

crypto/perlasm/x86nasm.pl

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ sub get_mem 
{ my($size,$addr,$reg1,$reg2,$idx)=@_;

  my($post,$ret);



    if (!defined($idx) && 1*$reg2) { $idx=$reg2; $reg2=$reg1; undef $reg1; }



    if ($size ne "")

    {	$ret .= "$size";

	$ret .= " PTR" if ($::mwerks);
@@ -117,7 +119,7 @@ sub ::file_end 
{   if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out)

    {	my $comm=<<___;

${drdecor}segment	.bss

${drdecor}common	${nmdecor}OPENSSL_ia32cap_P 8

${drdecor}common	${nmdecor}OPENSSL_ia32cap_P 16

___

	# comment out OPENSSL_ia32cap_P declarations

	grep {s/(^extern\s+${nmdecor}OPENSSL_ia32cap_P)/\;$1/} @out;