projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix Solaris 10_x86 shared build. -Bsymbolic is required to avoid
[openssl.git] / crypto / perlasm / x86unix.pl
diff --git a/crypto/perlasm/x86unix.pl b/crypto/perlasm/x86unix.pl
index 12ff816ebfbc5137d4e8c1ae7d8ed457046fbc4d..7d87eb1701bf53edf35ab407b3b438b38dad7577 100644 (file)
--- a/crypto/perlasm/x86unix.pl
+++ b/crypto/perlasm/x86unix.pl
@@ -1,14 +1,15 @@
 #!/usr/local/bin/perl
 
-package x86unix;
+package x86unix;       # GAS actually...
 
 $label="L000";
 $const="";
 $constl=0;
 
 $align=($main'aout)?"4":"16";
-$under=($main'aout)?"_":"";
-$com_start=($main'sol)?"/":"#";
+$under=($main'aout or $main'coff)?"_":"";
+$dot=($main'aout)?"":".";
+$com_start="#" if ($main'aout or $main'coff);
 
 sub main'asm_init_output { @out=(); }
 sub main'asm_get_output { return(@out); }
@@ -163,6 +164,7 @@ sub main'xorb       { &out2("xorb",@_); }
 sub main'add   { &out2("addl",@_); }
 sub main'adc   { &out2("adcl",@_); }
 sub main'sub   { &out2("subl",@_); }
+sub main'sbb   { &out2("sbbl",@_); }
 sub main'rotl  { &out2("roll",@_); }
 sub main'rotr  { &out2("rorl",@_); }
 sub main'exch  { &out2("xchg",@_); }
@@ -190,17 +192,22 @@ sub main'dec      { &out1("decl",@_); }
 sub main'inc   { &out1("incl",@_); }
 sub main'push  { &out1("pushl",@_); $stack+=4; }
 sub main'pop   { &out1("popl",@_); $stack-=4; }
-sub main'pushf { &out0("pushf"); $stack+=4; }
-sub main'popf  { &out0("popf"); $stack-=4; }
+sub main'pushf { &out0("pushfl"); $stack+=4; }
+sub main'popf  { &out0("popfl"); $stack-=4; }
 sub main'not   { &out1("notl",@_); }
-sub main'call  { &out1("call",($_[0]=~/^\.L/?'':$under).$_[0]); }
+sub main'call  {       my $pre=$under;
+                       foreach $i (%label)
+                       { if ($label{$i} eq $_[0]) { $pre=''; last; } }
+                       &out1("call",$pre.$_[0]);
+               }
 sub main'ret   { &out0("ret"); }
 sub main'nop   { &out0("nop"); }
 sub main'test  { &out2("testl",@_); }
 sub main'bt    { &out2("btl",@_); }
 sub main'leave { &out0("leave"); }
-sub main'cpuid { &out0(".word\t0xa20f"); }
-sub main'rdtsc { &out0(".word\t0x310f"); }
+sub main'cpuid { &out0(".byte 0x0f; .byte 0xa2"); }
+sub main'rdtsc { &out0(".byte 0x0f; .byte 0x31"); }
+sub main'halt  { &out0("hlt"); }
 
 # SSE2
 sub main'emms  { &out0("emms"); }
@@ -322,8 +329,6 @@ sub main'file
 
        local($tmp)=<<"EOF";
        .file   "$file.s"
-       .version        "01.01"
-gcc2_compiled.:
 EOF
        push(@out,$tmp);
        }
@@ -337,15 +342,17 @@ sub main'function_begin
 
        local($tmp)=<<"EOF";
 .text
-       .align $align
-.globl $func
+.globl $func
 EOF
        push(@out,$tmp);
        if ($main'cpp)
-               { $tmp=push(@out,"\tTYPE($func,\@function)\n"); }
-       elsif ($main'gaswin)
-               { $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
-       else    { $tmp=push(@out,"\t.type\t$func,\@function\n"); }
+               { $tmp=push(@out,"TYPE($func,\@function)\n"); }
+       elsif ($main'coff)
+               { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
+       elsif ($main'aout and !$main'pic)
+               { }
+       else    { $tmp=push(@out,".type\t$func,\@function\n"); }
+       push(@out,".align\t$align\n");
        push(@out,"$func:\n");
        $tmp=<<"EOF";
        pushl   %ebp
@@ -367,15 +374,17 @@ sub main'function_begin_B
 
        local($tmp)=<<"EOF";
 .text
-       .align $align
-.globl $func
+.globl $func
 EOF
        push(@out,$tmp);
        if ($main'cpp)
-               { push(@out,"\tTYPE($func,\@function)\n"); }
-       elsif ($main'gaswin)
-               { $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
-       else    { push(@out,"\t.type    $func,\@function\n"); }
+               { push(@out,"TYPE($func,\@function)\n"); }
+       elsif ($main'coff)
+               { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
+       elsif ($main'aout and !$main'pic)
+               { }
+       else    { push(@out,".type      $func,\@function\n"); }
+       push(@out,".align\t$align\n");
        push(@out,"$func:\n");
        $stack=4;
        }
@@ -392,15 +401,15 @@ sub main'function_end
        popl    %ebx
        popl    %ebp
        ret
-.L_${func}_end:
+${dot}L_${func}_end:
 EOF
        push(@out,$tmp);
 
        if ($main'cpp)
-               { push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); }
-       elsif ($main'gaswin)
-                { $tmp=push(@out,"\t.align 4\n"); }
-       else    { push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); }
+               { push(@out,"SIZE($func,${dot}L_${func}_end-$func)\n"); }
+       elsif ($main'coff or $main'aout)
+                { }
+       else    { push(@out,".size\t$func,${dot}L_${func}_end-$func\n"); }
        push(@out,".ident       \"$func\"\n");
        $stack=0;
        %label=();
@@ -426,12 +435,12 @@ sub main'function_end_B
 
        $func=$under.$func;
 
-       push(@out,".L_${func}_end:\n");
+       push(@out,"${dot}L_${func}_end:\n");
        if ($main'cpp)
-               { push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); }
-        elsif ($main'gaswin)
-                { push(@out,"\t.align 4\n"); }
-       else    { push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); }
+               { push(@out,"SIZE($func,${dot}L_${func}_end-$func)\n"); }
+        elsif ($main'coff or $main'aout)
+                { }
+       else    { push(@out,".size\t$func,${dot}L_${func}_end-$func\n"); }
        push(@out,".ident       \"$func\"\n");
        $stack=0;
        %label=();
@@ -473,9 +482,10 @@ sub main'swtmp
 
 sub main'comment
        {
-       if ($main'elf)  # GNU and SVR4 as'es use different comment delimiters,
-               {       # so we just skip comments...
-               push(@out,"\n");
+       if (!defined($com_start) or $main'elf)
+               {       # Regarding $main'elf above...
+                       # GNU and SVR4 as'es use different comment delimiters,
+               push(@out,"\n");        # so we just skip ELF comments...
                return;
                }
        foreach (@_)
@@ -491,7 +501,7 @@ sub main'label
        {
        if (!defined($label{$_[0]}))
                {
-               $label{$_[0]}=".${label}${_[0]}";
+               $label{$_[0]}="${dot}${label}${_[0]}";
                $label++;
                }
        return($label{$_[0]});
@@ -501,10 +511,14 @@ sub main'set_label
        {
        if (!defined($label{$_[0]}))
                {
-               $label{$_[0]}=".${label}${_[0]}";
+               $label{$_[0]}="${dot}${label}${_[0]}";
                $label++;
                }
-       push(@out,".align $align\n") if ($_[1] != 0);
+       if ($_[1]!=0)
+               {
+               if ($_[1]>1)    { main'align($_[1]);            }
+               else            { push(@out,".align $align\n"); }
+               }
        push(@out,"$label{$_[0]}:\n");
        }
 
@@ -514,7 +528,7 @@ sub main'file_end
        if ($main'elf && grep {/%[x]*mm[0-7]/i} @out) {
                local($tmp);
 
-               push (@out,"\n.comm\t".$under."OPENSSL_ia32cap,8,4\n");
+               push (@out,"\n.comm\t${under}OPENSSL_ia32cap_P,4,4\n");
 
                push (@out,".section\t.init\n");
                # One can argue that it's wasteful to craft every
@@ -524,7 +538,7 @@ sub main'file_end
                #
                # $1<<10 sets a reserved bit to signal that variable
                # was initialized already...
-               &main'picmeup("edx","OPENSSL_ia32cap");
+               &main'picmeup("edx","OPENSSL_ia32cap_P");
                $tmp=<<___;
                cmpl    \$0,(%edx)
                jne     1f
@@ -538,19 +552,18 @@ sub main'file_end
                pushf
                popl    %eax
                xorl    %ecx,%eax
-               bt      \$21,%eax
+               btl     \$21,%eax
                jnc     1f
                pushl   %edi
                pushl   %ebx
                movl    %edx,%edi
                movl    \$1,%eax
-               .word   0xa20f
+               .byte 0x0f; .byte 0xa2
                orl     \$1<<10,%edx
                movl    %edx,0(%edi)
-               movl    %ecx,4(%edi)
                popl    %ebx
                popl    %edi
-       .align  4
+       .align  $align
        1:
 ___
                push (@out,$tmp);
@@ -571,7 +584,13 @@ sub main'data_word
 
 sub main'align
        {
-       push(@out,".align $_[0]\n");
+       my $val=$_[0],$p2,$i;
+       if ($main'aout) {
+               for ($p2=0;$val!=0;$val>>=1) { $p2++; }
+               $val=$p2-1;
+               $val.=",0x90";
+       }
+       push(@out,".align\t$val\n");
        }
 
 # debug output functions: puts, putx, printf
@@ -653,7 +672,6 @@ sub main'picmeup
                {
                local($tmp)=<<___;
 #if (defined(ELF) || defined(SOL)) && defined(PIC)
-       .align  4
        call    1f
 1:     popl    $regs{$dst}
        addl    \$_GLOBAL_OFFSET_TABLE_+[.-1b],$regs{$dst}
@@ -666,13 +684,12 @@ ___
                }
        elsif ($main'pic && ($main'elf || $main'aout))
                {
-               push(@out,"\t.align\t4\n");
                &main'call(&main'label("PIC_me_up"));
                &main'set_label("PIC_me_up");
                &main'blindpop($dst);
-               &main'add($dst,"\$$under"."_GLOBAL_OFFSET_TABLE_+[.-".
+               &main'add($dst,"\$${under}_GLOBAL_OFFSET_TABLE_+[.-".
                                &main'label("PIC_me_up") . "]");
-               &main'mov($dst,&main'DWP($sym."\@GOT",$dst));
+               &main'mov($dst,&main'DWP($under.$sym."\@GOT",$dst));
                }
        else
                {
@@ -685,13 +702,35 @@ sub main'blindpop { &out1("popl",@_); }
 sub main'initseg
        {
        local($f)=@_;
+       local($tmp);
        if ($main'elf)
                {
-               local($tmp)=<<___;
-.pushsection   .init
+               $tmp=<<___;
+.section       .init
        call    $under$f
-.popsection
+       .align  $align
 ___
-               push(@out,$tmp);
                }
+       elsif ($main'coff)
+               {
+               $tmp=<<___;     # applies to both Cygwin and Mingw
+.section       .ctors
+.long  $under$f
+___
+               }
+       elsif ($main'aout)
+               {
+               local($ctor)="${under}_GLOBAL_\$I\$$f";
+               $tmp=".text\n";
+               $tmp.=".type    $ctor,\@function\n" if ($main'pic);
+               $tmp.=<<___;    # OpenBSD way...
+.globl $ctor
+.align 2
+$ctor:
+       jmp     $under$f
+___
+               }
+       push(@out,$tmp) if ($tmp);
        }
+
+1;
Unnamed repository; edit this file 'description' to name the repository.