The branch master has been updated
via 88be429f2ed04f0acc71f7fd5456174c274f2f76 (commit)
via fa3f83552f53447deced45579865cec9f55a947e (commit)
from 3f55ec6792dde6359a915f12aa0c792212bd954f (commit)
- Log -----------------------------------------------------------------
commit 88be429f2ed04f0acc71f7fd5456174c274f2f76
Author: Andy Polyakov <ap...@openssl.org>
Date: Fri Feb 10 11:27:54 2017 +0100
perlasm/x86_64-xlate.pl: fix pair of typo-bugs in the new cfi_directive.
.cfi_{start|end}proc and .cfi_def_cfa were not tracked.
Reviewed-by: Richard Levitte <levi...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2585)
commit fa3f83552f53447deced45579865cec9f55a947e
Author: Adam Langley <a...@chromium.org>
Date: Thu Feb 9 14:37:01 2017 -0800
perlasm/x86_64-xlate.pl: typo fix in comment.
CLA: trivial
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Andy Polyakov <ap...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2584)
-----------------------------------------------------------------------
Summary of changes:
crypto/perlasm/x86_64-xlate.pl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 09d293a..2013043 100755
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -279,7 +279,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;
@@ -633,7 +633,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 +656,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");
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
