Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ef57db8

Browse filesBrowse files
Shigeki OhtsuMylesBorins
authored andcommitted
deps: fix asm build error of openssl in x86_win32
See https://mta.openssl.org/pipermail/openssl-dev/2015-February/000651.html iojs needs to stop using masm and move to nasm or yasm on Win32. Fixes: #589 PR-URL: #1389 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent 7b93a2f commit ef57db8
Copy full SHA for ef57db8

File tree

Expand file treeCollapse file tree

1 file changed

+6
-6
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+6
-6
lines changed
Open diff view settings
Collapse file

‎deps/openssl/openssl/crypto/perlasm/x86masm.pl‎

Copy file name to clipboardExpand all lines: deps/openssl/openssl/crypto/perlasm/x86masm.pl
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ sub ::generic
1818

1919
if ($opcode =~ /lea/ && @arg[1] =~ s/.*PTR\s+(\(.*\))$/OFFSET $1/) # no []
2020
{ $opcode="mov"; }
21-
elsif ($opcode !~ /movq/)
21+
elsif ($opcode !~ /mov[dq]$/)
2222
{ # fix xmm references
23-
$arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);
24-
$arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
23+
$arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[-1]=~/\bxmm[0-7]\b/i);
24+
$arg[-1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
2525
}
2626

2727
&::emit($opcode,@arg);
@@ -160,13 +160,13 @@ sub ::public_label
160160
{ push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n"); }
161161
162162
sub ::data_byte
163-
{ push(@out,("DB\t").join(',',@_)."\n"); }
163+
{ push(@out,("DB\t").join(',',splice(@_,0,16))."\n") while(@_); }
164164
165165
sub ::data_short
166-
{ push(@out,("DW\t").join(',',@_)."\n"); }
166+
{ push(@out,("DW\t").join(',',splice(@_,0,8))."\n") while(@_); }
167167
168168
sub ::data_word
169-
{ push(@out,("DD\t").join(',',@_)."\n"); }
169+
{ push(@out,("DD\t").join(',',splice(@_,0,4))."\n") while(@_); }
170170
171171
sub ::align
172172
{ push(@out,"ALIGN\t$_[0]\n"); }

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.