Commit 2f8d82d6 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

perlasm/x86masm.pl: make it work. 



Though this doesn't mean that masm becomes supported, the script is
still provided on don't-ask-in-case-of-doubt-use-nasm basis.
See RT#3650 for background.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 3372c4ff

crypto/perlasm/x86masm.pl

+6 −6
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ sub ::generic 


    if ($opcode =~ /lea/ && @arg[1] =~ s/.*PTR\s+(\(.*\))$/OFFSET $1/)	# no []

    {	$opcode="mov";	}

    elsif ($opcode !~ /movq/)

    elsif ($opcode !~ /mov[dq]$/)

    {	# fix xmm references

	$arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);

	$arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);

	$arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[-1]=~/\bxmm[0-7]\b/i);

	$arg[-1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);

    }



    &::emit($opcode,@arg);
@@ -160,13 +160,13 @@ sub ::public_label 
{   push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n");   }



sub ::data_byte

{   push(@out,("DB\t").join(',',@_)."\n");	}

{   push(@out,("DB\t").join(',',splice(@_,0,16))."\n") while(@_);	}



sub ::data_short

{   push(@out,("DW\t").join(',',@_)."\n");	}

{   push(@out,("DW\t").join(',',splice(@_,0,8))."\n") while(@_);	}



sub ::data_word

{   push(@out,("DD\t").join(',',@_)."\n");	}

{   push(@out,("DD\t").join(',',splice(@_,0,4))."\n") while(@_);	}



sub ::align

{   push(@out,"ALIGN\t$_[0]\n");	}