generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perlasm: update from HEAD.

Browse Source
This commit is contained in:
Andy Polyakov 2009-05-05 19:21:12 +00:00
parent 0f41ccf370
commit 8e92b1b9ce
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/perlasm/x86_64-xlate.pl
View File

@ -575,8 +575,8 @@ my %globals;
my @arr = split(',',$line); my @arr = split(',',$line);
my $last = pop(@arr); my $last = pop(@arr);
my $conv = sub { my $var=shift; my $conv = sub { my $var=shift;
$var=~s/(0b[0-1]+)/oct($1)/eig; $var=~s/^(0b[0-1]+)/oct($1)/eig;
$var=~s/0x([0-9a-f]+)/0$1h/ig if ($masm); $var=~s/^0x([0-9a-f]+)/0$1h/ig if ($masm);
if ($sz eq "D" && ($current_segment=~/.[px]data/ || $dir eq ".rva")) 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; $var;
@ -662,6 +662,7 @@ while($line=<>) {
$insn = $opcode->out($#args>=1?$args[$#args]->size():$sz); $insn = $opcode->out($#args>=1?$args[$#args]->size():$sz);
} else { } else {
$insn = $opcode->out(); $insn = $opcode->out();
$insn .= $sz if (map($_->out() =~ /xmm|mmx/,@args));
@args = reverse(@args); @args = reverse(@args);
undef $sz if ($nasm && $opcode->mnemonic() eq "lea"); undef $sz if ($nasm && $opcode->mnemonic() eq "lea");
} }
@ -831,6 +832,7 @@ close STDOUT;
# CONTEXT.R14 232 # CONTEXT.R14 232
# CONTEXT.R15 240 # CONTEXT.R15 240
# CONTEXT.Rip 248 # CONTEXT.Rip 248
# CONTEXT.Xmm6 512
# sizeof(CONTEXT) 1232 # sizeof(CONTEXT) 1232
# DISPATCHER_CONTEXT.ControlPc 0 # DISPATCHER_CONTEXT.ControlPc 0
# DISPATCHER_CONTEXT.ImageBase 8 # DISPATCHER_CONTEXT.ImageBase 8

8
crypto/perlasm/x86masm.pl
View File

@ -16,9 +16,11 @@ sub ::generic
# fix hexadecimal constants # fix hexadecimal constants
for (@arg) { s/0x([0-9a-f]+)/0$1h/oi; } for (@arg) { s/0x([0-9a-f]+)/0$1h/oi; }
# fix xmm references if ($opcode !~ /movq/)
$arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i); { # fix xmm references
$arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i); $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);
$arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
}
&::emit($opcode,@arg); &::emit($opcode,@arg);
1; 1;