Following the license change, modify the boilerplates in crypto/perlasm/

[openssl.git] / crypto / perlasm / x86_64-xlate.pl

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 09d293a446f22347d110bd8e867bb5faf7a7c1f5..5e5d6cc0b10d1c5a0a73a0c34063438d16fd33f0 100755 (executable)
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
-# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
-# Licensed under the OpenSSL license (the "License").  You may not use
+# Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
@@ -212,8 +212,9 @@ my %globals;
            }
            sprintf "\$%s",$self->{value};
        } else {
-           $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm);
-           sprintf "%s",$self->{value};
+           my $value = $self->{value};
+           $value =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm);
+           sprintf "%s",$value;
        }
     }
 }
@@ -279,7 +280,7 @@ my %globals;
        }
 
        # if base register is %rbp or %r13, see if it's possible to
-       # flip base and ingex registers [for better performance]
+       # flip base and index registers [for better performance]
        if (!$self->{label} && $self->{index} && $self->{scale}==1 &&
            $self->{base} =~ /(rbp|r13)/) {
                $self->{base} = $self->{index}; $self->{index} = $1;
@@ -437,7 +438,7 @@ my %globals;
        }
     }
 }
-{ package expr;                # pick up expressioins
+{ package expr;                # pick up expressions
     sub re {
        my      ($class, $line, $opcode) = @_;
        my      $self = {};
@@ -530,7 +531,7 @@ my %globals;
        );
 
     # Following constants are defined in x86_64 ABI supplement, for
-    # example avaiable at https://www.uclibc.org/docs/psABI-x86_64.pdf,
+    # example available at https://www.uclibc.org/docs/psABI-x86_64.pdf,
     # see section 3.7 "Stack Unwind Algorithm".
     my %DW_reg_idx = (
        "%rax"=>0,  "%rdx"=>1,  "%rcx"=>2,  "%rbx"=>3,
@@ -543,7 +544,7 @@ my %globals;
 
     # [us]leb128 format is variable-length integer representation base
     # 2^128, with most significant bit of each byte being 0 denoting
-    # *last* most significat digit. See "Variable Length Data" in the
+    # *last* most significant digit. See "Variable Length Data" in the
     # DWARF specification, numbered 7.6 at least in versions 3 and 4.
     sub sleb128 {
        use integer;    # get right shift extend sign
@@ -610,6 +611,8 @@ my %globals;
        foreach my $token (split(/,\s*/,$line)) {
            if ($token =~ /^%r/) {
                push @ret,reg($token);
+           } elsif ($token =~ /((?:0x)?[0-9a-f]+)\((%r\w+)\)/) {
+               push @ret,reg("$2+$1");
            } elsif ($token =~ /(\w+):(\-?(?:0x)?[0-9a-f]+)(U?)/i) {
                my $i = 1*eval($2);
                push @ret,$DW_OP_complex{$1}, ($3 ? uleb128($i) : sleb128($i));
@@ -633,7 +636,7 @@ my %globals;
        my      $self = {};
        my      $ret;
 
-       if ($$line =~ s/^\s*\.cfi_(\w+)\s+//) {
+       if ($$line =~ s/^\s*\.cfi_(\w+)\s*//) {
            bless $self,$class;
            $ret = $self;
            undef $self->{value};
@@ -656,7 +659,7 @@ my %globals;
                        && do { $cfa_rsp -= 1*eval($$line) if ($cfa_reg eq "%rsp");
                                last;
                              };
-           /def_cfa/   && do { if ($$line =~ /(%r\w+)\s*,\s*(\.+)/) {
+           /def_cfa/   && do { if ($$line =~ /(%r\w+)\s*,\s*(.+)/) {
                                    $cfa_reg = $1;
                                    $cfa_rsp = -1*eval($2) if ($cfa_reg eq "%rsp");
                                }
@@ -874,7 +877,7 @@ my %globals;
                                                        $var=~s/^(0b[0-1]+)/oct($1)/eig;
                                                        $var=~s/^0x([0-9a-f]+)/0$1h/ig if ($masm);
                                                        if ($sz eq "D" && ($current_segment=~/.[px]data/ || $dir eq ".rva"))
-                                                       { $var=~s/([_a-z\$\@][_a-z0-9\$\@]*)/$nasm?"$1 wrt ..imagebase":"imagerel $1"/egi; }
+                                                       { $var=~s/^([_a-z\$\@][_a-z0-9\$\@]*)/$nasm?"$1 wrt ..imagebase":"imagerel $1"/egi; }
                                                        $var;
                                                    };
 
@@ -1243,7 +1246,7 @@ close STDOUT;
 # the area above user stack pointer in true asynchronous manner...
 #
 # All the above means that if assembler programmer adheres to Unix
-# register and stack layout, but disregards the "red zone" existense,
+# register and stack layout, but disregards the "red zone" existence,
 # it's possible to use following prologue and epilogue to "gear" from
 # Unix to Win64 ABI in leaf functions with not more than 6 arguments.
 #
@@ -1424,6 +1427,6 @@ close STDOUT;
 #
 # (*)  Note that we're talking about run-time, not debug-time. Lack of
 #      unwind information makes debugging hard on both Windows and
-#      Unix. "Unlike" referes to the fact that on Unix signal handler
+#      Unix. "Unlike" refers to the fact that on Unix signal handler
 #      will always be invoked, core dumped and appropriate exit code
 #      returned to parent (for user notification).