Rebase x86_64-xlate.pl atop master.
This functionally pulls in a number of changes from upstream, including:
4e3d2866b6e8e7a700ea22e05840a093bfd7a4b1
1eb12c437bbeb2c748291bcd23733d4a59d5d1ca
6a4ea0022c475bbc2c7ad98a6f05f6e2e850575b
c25278db8e4c21772a0cd81f7873e767cbc6d219
e0a651945cb5a70a2abd9902c0fd3e9759d35867
d405aa2ff265965c71ce7331cf0e49d634a06924
ce3d25d3e5a7e82fd59fd30dff7acc39baed8b5e
9ba96fbb2523cb12747c559c704c58bd8f9e7982
Notably, c25278db8e4c21772a0cd81f7873e767cbc6d219 makes it enable 'use strict'.
To avoid having to deal with complex conflicts, this was done by taking a diff
of our copy of the file with the point just before
c25278db8e4c21772a0cd81f7873e767cbc6d219, and reapplying the non-reverting
parts of our diff on top of upstream's current version.
Confirmed with generate_build_files.py that this makes no changes *except*
d405aa2ff265965c71ce7331cf0e49d634a06924 causes this sort of change throughout
chacha-x86_64.pl's nasm output:
@@ -1179,7 +1179,7 @@ $L$oop8x:
vpslld ymm14,ymm0,12
vpsrld ymm0,ymm0,20
vpor ymm0,ymm14,ymm0
- vbroadcasti128 ymm14,YMMWORD[r11]
+ vbroadcasti128 ymm14,XMMWORD[r11]
vpaddd ymm13,ymm13,ymm5
vpxor ymm1,ymm13,ymm1
vpslld ymm15,ymm1,12
This appears to be correct. vbroadcasti128 takes a 128-bit-wide second
argument, so it wants XMMWORD, not YMMWORD. I suppose nasm just didn't care.
(Looking at a diff-diff may be a more useful way to review this CL.)
Change-Id: I61be0d225ddf13b5f05d1369ddda84b2f322ef9d
Reviewed-on: https://boringssl-review.googlesource.com/8392
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin
Adam Langley
parent
bde00394f0
commit
b111f7a0e4
@ -1,4 +1,11 @@
|
||||
#!/usr/bin/env perl
|
||||
#! /usr/bin/env perl
|
||||
# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the OpenSSL license (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
|
||||
|
||||
|
||||
# Ascetic x86_64 AT&T to MASM/NASM assembler translator by <appro>.
|
||||
#
|
||||
@ -58,6 +65,9 @@
|
||||
# a. If function accepts more than 4 arguments *and* >4th argument
|
||||
# is declared as non 64-bit value, do clear its upper part.
|
||||
|
||||
|
||||
use strict;
|
||||
|
||||
my $flavour = shift;
|
||||
my $output = shift;
|
||||
if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
|
||||
@ -84,12 +94,12 @@ if ($flavour eq "mingw64") { $gas=1; $elf=0; $win64=1;
|
||||
# environment variable check.
|
||||
die "mingw64 not supported";
|
||||
$prefix=`echo __USER_LABEL_PREFIX__ | $ENV{CC} -E -P -`;
|
||||
chomp($prefix);
|
||||
$prefix =~ s|\R$||; # Better chomp
|
||||
}
|
||||
elsif ($flavour eq "macosx") { $gas=1; $elf=0; $prefix="_"; $decor="L\$"; }
|
||||
elsif ($flavour eq "masm") { $gas=0; $elf=0; $masm=$masmref; $win64=1; $decor="\$L\$"; }
|
||||
elsif ($flavour eq "nasm") { $gas=0; $elf=0; $nasm=$nasmref; $win64=1; $decor="\$L\$"; $PTR=""; }
|
||||
elsif (!$gas) { die "unknown flavour $flavour"; }
|
||||
elsif (!$gas) { die "unknown flavour $flavour"; }
|
||||
|
||||
my $current_segment;
|
||||
my $current_function;
|
||||
@ -97,14 +107,15 @@ my %globals;
|
||||
|
||||
{ package opcode; # pick up opcodes
|
||||
sub re {
|
||||
my $self = shift; # single instance in enough...
|
||||
local *line = shift;
|
||||
undef $ret;
|
||||
my ($class, $line) = @_;
|
||||
my $self = {};
|
||||
my $ret;
|
||||
|
||||
if ($line =~ /^([a-z][a-z0-9]*)/i) {
|
||||
if ($$line =~ /^([a-z][a-z0-9]*)/i) {
|
||||
bless $self,$class;
|
||||
$self->{op} = $1;
|
||||
$ret = $self;
|
||||
$line = substr($line,@+[0]); $line =~ s/^\s+//;
|
||||
$$line = substr($$line,@+[0]); $$line =~ s/^\s+//;
|
||||
|
||||
undef $self->{sz};
|
||||
if ($self->{op} =~ /^(movz)x?([bw]).*/) { # movz is pain...
|
||||
@ -116,7 +127,7 @@ my %globals;
|
||||
$self->{sz} = "";
|
||||
} elsif ($self->{op} =~ /^v/) { # VEX
|
||||
$self->{sz} = "";
|
||||
} elsif ($self->{op} =~ /mov[dq]/ && $line =~ /%xmm/) {
|
||||
} elsif ($self->{op} =~ /mov[dq]/ && $$line =~ /%xmm/) {
|
||||
$self->{sz} = "";
|
||||
} elsif ($self->{op} =~ /([a-z]{3,})([qlwb])$/) {
|
||||
$self->{op} = $1;
|
||||
@ -126,8 +137,7 @@ my %globals;
|
||||
$ret;
|
||||
}
|
||||
sub size {
|
||||
my $self = shift;
|
||||
my $sz = shift;
|
||||
my ($self, $sz) = @_;
|
||||
$self->{sz} = $sz if (defined($sz) && !defined($self->{sz}));
|
||||
$self->{sz};
|
||||
}
|
||||
@ -168,22 +178,22 @@ my %globals;
|
||||
}
|
||||
}
|
||||
sub mnemonic {
|
||||
my $self=shift;
|
||||
my $op=shift;
|
||||
my ($self, $op) = @_;
|
||||
$self->{op}=$op if (defined($op));
|
||||
$self->{op};
|
||||
}
|
||||
}
|
||||
{ package const; # pick up constants, which start with $
|
||||
sub re {
|
||||
my $self = shift; # single instance in enough...
|
||||
local *line = shift;
|
||||
undef $ret;
|
||||
my ($class, $line) = @_;
|
||||
my $self = {};
|
||||
my $ret;
|
||||
|
||||
if ($line =~ /^\$([^,]+)/) {
|
||||
if ($$line =~ /^\$([^,]+)/) {
|
||||
bless $self, $class;
|
||||
$self->{value} = $1;
|
||||
$ret = $self;
|
||||
$line = substr($line,@+[0]); $line =~ s/^\s+//;
|
||||
$$line = substr($$line,@+[0]); $$line =~ s/^\s+//;
|
||||
}
|
||||
$ret;
|
||||
}
|
||||
@ -197,7 +207,7 @@ my %globals;
|
||||
my $value = $self->{value};
|
||||
$value =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
|
||||
if ($value =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg) {
|
||||
$self->{value} = $value;
|
||||
$self->{value} = $value;
|
||||
}
|
||||
sprintf "\$%s",$self->{value};
|
||||
} else {
|
||||
@ -208,32 +218,33 @@ my %globals;
|
||||
}
|
||||
{ package ea; # pick up effective addresses: expr(%reg,%reg,scale)
|
||||
sub re {
|
||||
my $self = shift; # single instance in enough...
|
||||
local *line = shift;
|
||||
undef $ret;
|
||||
my ($class, $line, $opcode) = @_;
|
||||
my $self = {};
|
||||
my $ret;
|
||||
|
||||
# optional * ---vvv--- appears in indirect jmp/call
|
||||
if ($line =~ /^(\*?)([^\(,]*)\(([%\w,]+)\)/) {
|
||||
if ($$line =~ /^(\*?)([^\(,]*)\(([%\w,]+)\)/) {
|
||||
bless $self, $class;
|
||||
$self->{asterisk} = $1;
|
||||
$self->{label} = $2;
|
||||
($self->{base},$self->{index},$self->{scale})=split(/,/,$3);
|
||||
$self->{scale} = 1 if (!defined($self->{scale}));
|
||||
$ret = $self;
|
||||
$line = substr($line,@+[0]); $line =~ s/^\s+//;
|
||||
$$line = substr($$line,@+[0]); $$line =~ s/^\s+//;
|
||||
|
||||
if ($win64 && $self->{label} =~ s/\@GOTPCREL//) {
|
||||
die if (opcode->mnemonic() ne "mov");
|
||||
opcode->mnemonic("lea");
|
||||
die if ($opcode->mnemonic() ne "mov");
|
||||
$opcode->mnemonic("lea");
|
||||
}
|
||||
$self->{base} =~ s/^%//;
|
||||
$self->{index} =~ s/^%// if (defined($self->{index}));
|
||||
$self->{opcode} = $opcode;
|
||||
}
|
||||
$ret;
|
||||
}
|
||||
sub size {}
|
||||
sub out {
|
||||
my $self = shift;
|
||||
my $sz = shift;
|
||||
my ($self, $sz) = @_;
|
||||
|
||||
$self->{label} =~ s/([_a-z][_a-z0-9]*)/$globals{$1} or $1/gei;
|
||||
$self->{label} =~ s/\.L/$decor/g;
|
||||
@ -268,7 +279,7 @@ my %globals;
|
||||
sprintf "%s%s(%%%s)", $self->{asterisk},$self->{label},$self->{base};
|
||||
}
|
||||
} else {
|
||||
%szmap = ( b=>"BYTE$PTR", w=>"WORD$PTR",
|
||||
my %szmap = ( b=>"BYTE$PTR", w=>"WORD$PTR",
|
||||
l=>"DWORD$PTR", d=>"DWORD$PTR",
|
||||
q=>"QWORD$PTR", o=>"OWORD$PTR",
|
||||
x=>"XMMWORD$PTR", y=>"YMMWORD$PTR", z=>"ZMMWORD$PTR" );
|
||||
@ -277,11 +288,12 @@ my %globals;
|
||||
$self->{label} =~ s/(?<![\w\$\.])0x([0-9a-f]+)/0$1h/ig;
|
||||
$self->{label} = "($self->{label})" if ($self->{label} =~ /[\*\+\-\/]/);
|
||||
|
||||
($self->{asterisk}) && ($sz="q") ||
|
||||
(opcode->mnemonic() =~ /^v?mov([qd])$/) && ($sz=$1) ||
|
||||
(opcode->mnemonic() =~ /^v?pinsr([qdwb])$/) && ($sz=$1) ||
|
||||
(opcode->mnemonic() =~ /^vpbroadcast([qdwb])$/) && ($sz=$1) ||
|
||||
(opcode->mnemonic() =~ /^vinsert[fi]128$/) && ($sz="x");
|
||||
my $mnemonic = $self->{opcode}->mnemonic();
|
||||
($self->{asterisk}) && ($sz="q") ||
|
||||
($mnemonic =~ /^v?mov([qd])$/) && ($sz=$1) ||
|
||||
($mnemonic =~ /^v?pinsr([qdwb])$/) && ($sz=$1) ||
|
||||
($mnemonic =~ /^vpbroadcast([qdwb])$/) && ($sz=$1) ||
|
||||
($mnemonic =~ /^v(?!perm)[a-z]+[fi]128$/) && ($sz="x");
|
||||
|
||||
if (defined($self->{index})) {
|
||||
sprintf "%s[%s%s*%d%s]",$szmap{$sz},
|
||||
@ -300,24 +312,24 @@ my %globals;
|
||||
}
|
||||
{ package register; # pick up registers, which start with %.
|
||||
sub re {
|
||||
my $class = shift; # muliple instances...
|
||||
my ($class, $line, $opcode) = @_;
|
||||
my $self = {};
|
||||
local *line = shift;
|
||||
undef $ret;
|
||||
my $ret;
|
||||
|
||||
# optional * ---vvv--- appears in indirect jmp/call
|
||||
if ($line =~ /^(\*?)%(\w+)/) {
|
||||
# optional * ----vvv--- appears in indirect jmp/call
|
||||
if ($$line =~ /^(\*?)%(\w+)/) {
|
||||
bless $self,$class;
|
||||
$self->{asterisk} = $1;
|
||||
$self->{value} = $2;
|
||||
$opcode->size($self->size());
|
||||
$ret = $self;
|
||||
$line = substr($line,@+[0]); $line =~ s/^\s+//;
|
||||
$$line = substr($$line,@+[0]); $$line =~ s/^\s+//;
|
||||
}
|
||||
$ret;
|
||||
}
|
||||
sub size {
|
||||
my $self = shift;
|
||||
undef $ret;
|
||||
my $ret;
|
||||
|
||||
if ($self->{value} =~ /^r[\d]+b$/i) { $ret="b"; }
|
||||
elsif ($self->{value} =~ /^r[\d]+w$/i) { $ret="w"; }
|
||||
@ -338,14 +350,15 @@ my %globals;
|
||||
}
|
||||
{ package label; # pick up labels, which end with :
|
||||
sub re {
|
||||
my $self = shift; # single instance is enough...
|
||||
local *line = shift;
|
||||
undef $ret;
|
||||
my ($class, $line) = @_;
|
||||
my $self = {};
|
||||
my $ret;
|
||||
|
||||
if ($line =~ /(^[\.\w]+)\:/) {
|
||||
if ($$line =~ /(^[\.\w]+)\:/) {
|
||||
bless $self,$class;
|
||||
$self->{value} = $1;
|
||||
$ret = $self;
|
||||
$line = substr($line,@+[0]); $line =~ s/^\s+//;
|
||||
$$line = substr($$line,@+[0]); $$line =~ s/^\s+//;
|
||||
|
||||
$self->{value} =~ s/^\.L/$decor/;
|
||||
}
|
||||
@ -375,7 +388,8 @@ my %globals;
|
||||
}
|
||||
$func;
|
||||
} elsif ($self->{value} ne "$current_function->{name}") {
|
||||
$self->{value} .= ":" if ($masm && $ret!~m/^\$/);
|
||||
# Make all labels in masm global.
|
||||
$self->{value} .= ":" if ($masm);
|
||||
$self->{value} . ":";
|
||||
} elsif ($win64 && $current_function->{abi} eq "svr4") {
|
||||
my $func = "$current_function->{name}" .
|
||||
@ -404,24 +418,26 @@ my %globals;
|
||||
}
|
||||
{ package expr; # pick up expressioins
|
||||
sub re {
|
||||
my $self = shift; # single instance is enough...
|
||||
local *line = shift;
|
||||
undef $ret;
|
||||
my ($class, $line, $opcode) = @_;
|
||||
my $self = {};
|
||||
my $ret;
|
||||
|
||||
if ($line =~ /(^[^,]+)/) {
|
||||
if ($$line =~ /(^[^,]+)/) {
|
||||
bless $self,$class;
|
||||
$self->{value} = $1;
|
||||
$ret = $self;
|
||||
$line = substr($line,@+[0]); $line =~ s/^\s+//;
|
||||
$$line = substr($$line,@+[0]); $$line =~ s/^\s+//;
|
||||
|
||||
$self->{value} =~ s/\@PLT// if (!$elf);
|
||||
$self->{value} =~ s/([_a-z][_a-z0-9]*)/$globals{$1} or $1/gei;
|
||||
$self->{value} =~ s/\.L/$decor/g;
|
||||
$self->{opcode} = $opcode;
|
||||
}
|
||||
$ret;
|
||||
}
|
||||
sub out {
|
||||
my $self = shift;
|
||||
if ($nasm && opcode->mnemonic()=~m/^j(?![re]cxz)/) {
|
||||
if ($nasm && $self->{opcode}->mnemonic()=~m/^j(?![re]cxz)/) {
|
||||
"NEAR ".$self->{value};
|
||||
} else {
|
||||
$self->{value};
|
||||
@ -430,9 +446,9 @@ my %globals;
|
||||
}
|
||||
{ package directive; # pick up directives, which start with .
|
||||
sub re {
|
||||
my $self = shift; # single instance is enough...
|
||||
local *line = shift;
|
||||
undef $ret;
|
||||
my ($class, $line) = @_;
|
||||
my $self = {};
|
||||
my $ret;
|
||||
my $dir;
|
||||
my %opcode = # lea 2f-1f(%rip),%dst; 1: nop; 2:
|
||||
( "%rax"=>0x01058d48, "%rcx"=>0x010d8d48,
|
||||
@ -444,25 +460,26 @@ my %globals;
|
||||
"%r12"=>0x01258d4c, "%r13"=>0x012d8d4c,
|
||||
"%r14"=>0x01358d4c, "%r15"=>0x013d8d4c );
|
||||
|
||||
if ($line =~ /^\s*(\.\w+)/) {
|
||||
if ($$line =~ /^\s*(\.\w+)/) {
|
||||
bless $self,$class;
|
||||
$dir = $1;
|
||||
$ret = $self;
|
||||
undef $self->{value};
|
||||
$line = substr($line,@+[0]); $line =~ s/^\s+//;
|
||||
$$line = substr($$line,@+[0]); $$line =~ s/^\s+//;
|
||||
|
||||
SWITCH: for ($dir) {
|
||||
/\.picmeup/ && do { if ($line =~ /(%r[\w]+)/i) {
|
||||
/\.picmeup/ && do { if ($$line =~ /(%r[\w]+)/i) {
|
||||
$dir="\t.long";
|
||||
$line=sprintf "0x%x,0x90000000",$opcode{$1};
|
||||
$$line=sprintf "0x%x,0x90000000",$opcode{$1};
|
||||
}
|
||||
last;
|
||||
};
|
||||
/\.global|\.globl|\.extern/
|
||||
&& do { $globals{$line} = $prefix . $line;
|
||||
$line = $globals{$line} if ($prefix);
|
||||
&& do { $globals{$$line} = $prefix . $$line;
|
||||
$$line = $globals{$$line} if ($prefix);
|
||||
last;
|
||||
};
|
||||
/\.type/ && do { ($sym,$type,$narg) = split(',',$line);
|
||||
/\.type/ && do { my ($sym,$type,$narg) = split(',',$$line);
|
||||
if ($type eq "\@function") {
|
||||
undef $current_function;
|
||||
$current_function->{name} = $sym;
|
||||
@ -474,29 +491,29 @@ my %globals;
|
||||
$current_function->{name} = $sym;
|
||||
$current_function->{scope} = defined($globals{$sym})?"PUBLIC":"PRIVATE";
|
||||
}
|
||||
$line =~ s/\@abi\-omnipotent/\@function/;
|
||||
$line =~ s/\@function.*/\@function/;
|
||||
$$line =~ s/\@abi\-omnipotent/\@function/;
|
||||
$$line =~ s/\@function.*/\@function/;
|
||||
last;
|
||||
};
|
||||
/\.asciz/ && do { if ($line =~ /^"(.*)"$/) {
|
||||
/\.asciz/ && do { if ($$line =~ /^"(.*)"$/) {
|
||||
$dir = ".byte";
|
||||
$line = join(",",unpack("C*",$1),0);
|
||||
$$line = join(",",unpack("C*",$1),0);
|
||||
}
|
||||
last;
|
||||
};
|
||||
/\.rva|\.long|\.quad/
|
||||
&& do { $line =~ s/([_a-z][_a-z0-9]*)/$globals{$1} or $1/gei;
|
||||
$line =~ s/\.L/$decor/g;
|
||||
&& do { $$line =~ s/([_a-z][_a-z0-9]*)/$globals{$1} or $1/gei;
|
||||
$$line =~ s/\.L/$decor/g;
|
||||
last;
|
||||
};
|
||||
}
|
||||
|
||||
if ($gas) {
|
||||
$self->{value} = $dir . "\t" . $line;
|
||||
$self->{value} = $dir . "\t" . $$line;
|
||||
|
||||
if ($dir =~ /\.extern/) {
|
||||
if ($flavour eq "elf") {
|
||||
$self->{value} .= "\n.hidden $line";
|
||||
$self->{value} .= "\n.hidden $$line";
|
||||
} else {
|
||||
$self->{value} = "";
|
||||
}
|
||||
@ -505,7 +522,7 @@ my %globals;
|
||||
$self->{value} = ".def\t" . ($globals{$1} or $1) . ";\t" .
|
||||
(defined($globals{$1})?".scl 2;":".scl 3;") .
|
||||
"\t.type 32;\t.endef"
|
||||
if ($win64 && $line =~ /([^,]+),\@function/);
|
||||
if ($win64 && $$line =~ /([^,]+),\@function/);
|
||||
} elsif (!$elf && $dir =~ /\.size/) {
|
||||
$self->{value} = "";
|
||||
if (defined($current_function)) {
|
||||
@ -514,9 +531,9 @@ my %globals;
|
||||
undef $current_function;
|
||||
}
|
||||
} elsif (!$elf && $dir =~ /\.align/) {
|
||||
$self->{value} = ".p2align\t" . (log($line)/log(2));
|
||||
$self->{value} = ".p2align\t" . (log($$line)/log(2));
|
||||
} elsif ($dir eq ".section") {
|
||||
$current_segment=$line;
|
||||
$current_segment=$$line;
|
||||
if (!$elf && $current_segment eq ".init") {
|
||||
if ($flavour eq "macosx") { $self->{value} = ".mod_init_func"; }
|
||||
elsif ($flavour eq "mingw64") { $self->{value} = ".section\t.ctors"; }
|
||||
@ -525,18 +542,18 @@ my %globals;
|
||||
$current_segment=".$1";
|
||||
} elsif ($dir =~ /\.global|\.globl|\.extern/) {
|
||||
if ($flavour eq "macosx") {
|
||||
$self->{value} .= "\n.private_extern $line";
|
||||
$self->{value} .= "\n.private_extern $$line";
|
||||
} else {
|
||||
$self->{value} .= "\n.hidden $line";
|
||||
$self->{value} .= "\n.hidden $$line";
|
||||
}
|
||||
} elsif ($dir =~ /\.hidden/) {
|
||||
if ($flavour eq "macosx") { $self->{value} = ".private_extern\t$prefix$line"; }
|
||||
if ($flavour eq "macosx") { $self->{value} = ".private_extern\t$prefix$$line"; }
|
||||
elsif ($flavour eq "mingw64") { $self->{value} = ""; }
|
||||
} elsif ($dir =~ /\.comm/) {
|
||||
$self->{value} = "$dir\t$prefix$line";
|
||||
$self->{value} = "$dir\t$prefix$$line";
|
||||
$self->{value} =~ s|,([0-9]+),([0-9]+)$|",$1,".log($2)/log(2)|e if ($flavour eq "macosx");
|
||||
}
|
||||
$line = "";
|
||||
$$line = "";
|
||||
return $self;
|
||||
}
|
||||
|
||||
@ -567,38 +584,38 @@ my %globals;
|
||||
last;
|
||||
};
|
||||
/\.section/ && do { my $v=undef;
|
||||
$line =~ s/([^,]*).*/$1/;
|
||||
$line = ".CRT\$XCU" if ($line eq ".init");
|
||||
$$line =~ s/([^,]*).*/$1/;
|
||||
$$line = ".CRT\$XCU" if ($$line eq ".init");
|
||||
if ($nasm) {
|
||||
$v="section $line";
|
||||
if ($line=~/\.([px])data/) {
|
||||
$v="section $$line";
|
||||
if ($$line=~/\.([px])data/) {
|
||||
$v.=" rdata align=";
|
||||
$v.=$1 eq "p"? 4 : 8;
|
||||
} elsif ($line=~/\.CRT\$/i) {
|
||||
} elsif ($$line=~/\.CRT\$/i) {
|
||||
$v.=" rdata align=8";
|
||||
}
|
||||
} else {
|
||||
$v="$current_segment\tENDS\n" if ($current_segment);
|
||||
$v.="$line\tSEGMENT";
|
||||
if ($line=~/\.([px])data/) {
|
||||
$v.="$$line\tSEGMENT";
|
||||
if ($$line=~/\.([px])data/) {
|
||||
$v.=" READONLY";
|
||||
$v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref);
|
||||
} elsif ($line=~/\.CRT\$/i) {
|
||||
} elsif ($$line=~/\.CRT\$/i) {
|
||||
$v.=" READONLY ";
|
||||
$v.=$masm>=$masmref ? "ALIGN(8)" : "DWORD";
|
||||
}
|
||||
}
|
||||
$current_segment = $line;
|
||||
$current_segment = $$line;
|
||||
$self->{value} = $v;
|
||||
last;
|
||||
};
|
||||
/\.extern/ && do { $self->{value} = "EXTERN\t".$line;
|
||||
/\.extern/ && do { $self->{value} = "EXTERN\t".$$line;
|
||||
$self->{value} .= ":NEAR" if ($masm);
|
||||
last;
|
||||
};
|
||||
/\.globl|.global/
|
||||
&& do { $self->{value} = $masm?"PUBLIC":"global";
|
||||
$self->{value} .= "\t".$line;
|
||||
$self->{value} .= "\t".$$line;
|
||||
last;
|
||||
};
|
||||
/\.size/ && do { if (defined($current_function)) {
|
||||
@ -612,10 +629,13 @@ my %globals;
|
||||
}
|
||||
last;
|
||||
};
|
||||
/\.align/ && do { $self->{value} = "ALIGN\t".$line; last; };
|
||||
/\.align/ && do { my $max = ($masm && $masm>=$masmref) ? 256 : 4096;
|
||||
$self->{value} = "ALIGN\t".($$line>$max?$max:$$line);
|
||||
last;
|
||||
};
|
||||
/\.(value|long|rva|quad)/
|
||||
&& do { my $sz = substr($1,0,1);
|
||||
my @arr = split(/,\s*/,$line);
|
||||
my @arr = split(/,\s*/,$$line);
|
||||
my $last = pop(@arr);
|
||||
my $conv = sub { my $var=shift;
|
||||
$var=~s/^(0b[0-1]+)/oct($1)/eig;
|
||||
@ -631,7 +651,7 @@ my %globals;
|
||||
$self->{value} .= &$conv($last);
|
||||
last;
|
||||
};
|
||||
/\.byte/ && do { my @str=split(/,\s*/,$line);
|
||||
/\.byte/ && do { my @str=split(/,\s*/,$$line);
|
||||
map(s/(0b[0-1]+)/oct($1)/eig,@str);
|
||||
map(s/0x([0-9a-f]+)/0$1h/ig,@str) if ($masm);
|
||||
while ($#str>15) {
|
||||
@ -643,7 +663,7 @@ my %globals;
|
||||
.join(",",@str) if (@str);
|
||||
last;
|
||||
};
|
||||
/\.comm/ && do { my @str=split(/,\s*/,$line);
|
||||
/\.comm/ && do { my @str=split(/,\s*/,$$line);
|
||||
my $v=undef;
|
||||
if ($nasm) {
|
||||
$v.="common $prefix@str[0] @str[1]";
|
||||
@ -657,7 +677,7 @@ my %globals;
|
||||
last;
|
||||
};
|
||||
}
|
||||
$line = "";
|
||||
$$line = "";
|
||||
}
|
||||
|
||||
$ret;
|
||||
@ -669,15 +689,21 @@ my %globals;
|
||||
}
|
||||
|
||||
sub rex {
|
||||
local *opcode=shift;
|
||||
my $opcode=shift;
|
||||
my ($dst,$src,$rex)=@_;
|
||||
|
||||
$rex|=0x04 if($dst>=8);
|
||||
$rex|=0x01 if($src>=8);
|
||||
push @opcode,($rex|0x40) if ($rex);
|
||||
push @$opcode,($rex|0x40) if ($rex);
|
||||
}
|
||||
|
||||
# older gas and ml64 don't handle SSE>2 instructions
|
||||
# Upon initial x86_64 introduction SSE>2 extensions were not introduced
|
||||
# yet. In order not to be bothered by tracing exact assembler versions,
|
||||
# but at the same time to provide a bare security minimum of AES-NI, we
|
||||
# hard-code some instructions. Extensions past AES-NI on the other hand
|
||||
# are traced by examining assembler version in individual perlasm
|
||||
# modules...
|
||||
|
||||
my %regrm = ( "%eax"=>0, "%ecx"=>1, "%edx"=>2, "%ebx"=>3,
|
||||
"%esp"=>4, "%ebp"=>5, "%esi"=>6, "%edi"=>7 );
|
||||
|
||||
@ -706,9 +732,9 @@ my $movq = sub { # elderly gas can't handle inter-register movq
|
||||
my $pextrd = sub {
|
||||
if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*(%\w+)/) {
|
||||
my @opcode=(0x66);
|
||||
$imm=$1;
|
||||
$src=$2;
|
||||
$dst=$3;
|
||||
my $imm=$1;
|
||||
my $src=$2;
|
||||
my $dst=$3;
|
||||
if ($dst =~ /%r([0-9]+)d/) { $dst = $1; }
|
||||
elsif ($dst =~ /%e/) { $dst = $regrm{$dst}; }
|
||||
rex(\@opcode,$src,$dst);
|
||||
@ -724,9 +750,9 @@ my $pextrd = sub {
|
||||
my $pinsrd = sub {
|
||||
if (shift =~ /\$([0-9]+),\s*(%\w+),\s*%xmm([0-9]+)/) {
|
||||
my @opcode=(0x66);
|
||||
$imm=$1;
|
||||
$src=$2;
|
||||
$dst=$3;
|
||||
my $imm=$1;
|
||||
my $src=$2;
|
||||
my $dst=$3;
|
||||
if ($src =~ /%r([0-9]+)/) { $src = $1; }
|
||||
elsif ($src =~ /%e/) { $src = $regrm{$src}; }
|
||||
rex(\@opcode,$dst,$src);
|
||||
@ -805,14 +831,14 @@ my $rdseed = sub {
|
||||
};
|
||||
|
||||
sub rxb {
|
||||
local *opcode=shift;
|
||||
my $opcode=shift;
|
||||
my ($dst,$src1,$src2,$rxb)=@_;
|
||||
|
||||
$rxb|=0x7<<5;
|
||||
$rxb&=~(0x04<<5) if($dst>=8);
|
||||
$rxb&=~(0x01<<5) if($src1>=8);
|
||||
$rxb&=~(0x02<<5) if($src2>=8);
|
||||
push @opcode,$rxb;
|
||||
push @$opcode,$rxb;
|
||||
}
|
||||
|
||||
my $vprotd = sub {
|
||||
@ -843,6 +869,10 @@ my $vprotq = sub {
|
||||
}
|
||||
};
|
||||
|
||||
my $endbranch = sub {
|
||||
(0xf3,0x0f,0x1e,0xfa);
|
||||
};
|
||||
|
||||
if ($nasm) {
|
||||
print <<___;
|
||||
default rel
|
||||
@ -855,54 +885,49 @@ ___
|
||||
OPTION DOTNAME
|
||||
___
|
||||
}
|
||||
|
||||
print STDOUT "#if defined(__x86_64__)\n" if ($gas);
|
||||
|
||||
while($line=<>) {
|
||||
while(defined(my $line=<>)) {
|
||||
|
||||
chomp($line);
|
||||
$line =~ s|\R$||; # Better chomp
|
||||
|
||||
$line =~ s|[#!].*$||; # get rid of asm-style comments...
|
||||
$line =~ s|/\*.*\*/||; # ... and C-style comments...
|
||||
$line =~ s|^\s+||; # ... and skip white spaces in beginning
|
||||
$line =~ s|\s+$||; # ... and at the end
|
||||
|
||||
undef $label;
|
||||
undef $opcode;
|
||||
undef @args;
|
||||
if (my $label=label->re(\$line)) { print $label->out(); }
|
||||
|
||||
if ($label=label->re(\$line)) { print $label->out(); }
|
||||
|
||||
if (directive->re(\$line)) {
|
||||
printf "%s",directive->out();
|
||||
} elsif ($opcode=opcode->re(\$line)) {
|
||||
if (my $directive=directive->re(\$line)) {
|
||||
printf "%s",$directive->out();
|
||||
} elsif (my $opcode=opcode->re(\$line)) {
|
||||
my $asm = eval("\$".$opcode->mnemonic());
|
||||
undef @bytes;
|
||||
|
||||
if ((ref($asm) eq 'CODE') && scalar(@bytes=&$asm($line))) {
|
||||
if ((ref($asm) eq 'CODE') && scalar(my @bytes=&$asm($line))) {
|
||||
print $gas?".byte\t":"DB\t",join(',',@bytes),"\n";
|
||||
next;
|
||||
}
|
||||
|
||||
my @args;
|
||||
ARGUMENT: while (1) {
|
||||
my $arg;
|
||||
my $arg;
|
||||
|
||||
if ($arg=register->re(\$line)) { opcode->size($arg->size()); }
|
||||
elsif ($arg=const->re(\$line)) { }
|
||||
elsif ($arg=ea->re(\$line)) { }
|
||||
elsif ($arg=expr->re(\$line)) { }
|
||||
else { last ARGUMENT; }
|
||||
($arg=register->re(\$line, $opcode))||
|
||||
($arg=const->re(\$line)) ||
|
||||
($arg=ea->re(\$line, $opcode)) ||
|
||||
($arg=expr->re(\$line, $opcode)) ||
|
||||
last ARGUMENT;
|
||||
|
||||
push @args,$arg;
|
||||
push @args,$arg;
|
||||
|
||||
last ARGUMENT if ($line !~ /^,/);
|
||||
last ARGUMENT if ($line !~ /^,/);
|
||||
|
||||
$line =~ s/^,\s*//;
|
||||
$line =~ s/^,\s*//;
|
||||
} # ARGUMENT:
|
||||
|
||||
if ($#args>=0) {
|
||||
my $insn;
|
||||
my $sz=opcode->size();
|
||||
my $sz=$opcode->size();
|
||||
|
||||
if ($gas) {
|
||||
$insn = $opcode->out($#args>=1?$args[$#args]->size():$sz);
|
||||
@ -969,7 +994,7 @@ close STDOUT;
|
||||
# (#) Nth argument, volatile
|
||||
#
|
||||
# In Unix terms top of stack is argument transfer area for arguments
|
||||
# which could not be accomodated in registers. Or in other words 7th
|
||||
# which could not be accommodated in registers. Or in other words 7th
|
||||
# [integer] argument resides at 8(%rsp) upon function entry point.
|
||||
# 128 bytes above %rsp constitute a "red zone" which is not touched
|
||||
# by signal handlers and can be used as temporal storage without
|
||||
@ -1133,7 +1158,7 @@ close STDOUT;
|
||||
# .rva .LSEH_end_function
|
||||
# .rva function_unwind_info
|
||||
#
|
||||
# Reference to functon_unwind_info from .xdata segment is the anchor.
|
||||
# Reference to function_unwind_info from .xdata segment is the anchor.
|
||||
# In case you wonder why references are 32-bit .rvas and not 64-bit
|
||||
# .quads. References put into these two segments are required to be
|
||||
# *relative* to the base address of the current binary module, a.k.a.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user