X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fgenmdesc.pl;h=ae49ecba9f28685169c6ef23c42d422e5898a540;hb=f98d0799d89401853f59e4427764932d633b8935;hp=8374fd7c5feb5df03435a8a35d2799fe53fa6200;hpb=333c06e191a33293b6662447d51b9c02f795ec49;p=mono.git diff --git a/mono/mini/genmdesc.pl b/mono/mini/genmdesc.pl old mode 100644 new mode 100755 index 8374fd7c5fe..ae49ecba9f2 --- a/mono/mini/genmdesc.pl +++ b/mono/mini/genmdesc.pl @@ -6,48 +6,98 @@ use strict; no locale; # must keep in sync with mini.h -my @spec_names = qw(dest src1 src2 len clob); +my @spec_names = qw(dest src1 src2 src3 len clob nacl); sub INST_DEST () {return 0;} sub INST_SRC1 () {return 1;} sub INST_SRC2 () {return 2;} -sub INST_LEN () {return 3;} -sub INST_CLOB () {return 4;} -sub INST_MAX () {return 5;} +sub INST_SRC3 () {return 3;} +sub INST_LEN () {return 4;} +sub INST_CLOB () {return 5;} +# making INST_NACL the same as INST_MAX is not a mistake, +# INST_NACL writes over INST_LEN, it's not its own field +sub INST_NACL () {return 6;} +sub INST_MAX () {return 6;} # this must include all the #defines used in mini-ops.h -my @defines = qw (__i386__ __x86_64__ __ppc__ __powerpc__ __arm__ - __sparc__ sparc __s390__ s390 __ia64__ __alpha__ __mips__); +my @defines = qw (__i386__ __x86_64__ __ppc__ __powerpc__ __ppc64__ __arm__ + __sparc__ sparc __s390__ s390 __alpha__ __mips__ __aarch64__ __wasm__); my %table =(); +my %template_table =(); my @opcodes = (); -sub load_opcodes +my $nacl = 0; + +sub parse_file { - my ($srcdir, $arch) = @_; - my $opcodes_def = "$srcdir/../cil/opcode.def"; + my ($define, $file) = @_; + my @enabled = (1); my $i = 0; - my $arch_found = 0; - - open (OPS, "$opcodes_def") || die "Cannot open $opcodes_def: $!"; + open (OPS, $file) || die "Cannot open $file: $!"; while () { - next unless /OPDEF\s*\(\s*(\S+?)\s*,\s*"(.*?)"/; + if (/^\s*#\s*if\s+(.*)/) { + my $defines = $1; + die "fix the genmdesc.pl cpp parser to handle all operators" if /(&&)|([!<>=])/; + unshift @enabled, scalar ($defines =~ /defined\s*\(\s*$define\s*\)/); + next; + } + if (/^\s*#\s*ifdef\s+(\S+)/) { + my $defines = $1; + unshift @enabled, $defines eq $define; + next; + } + if (/^\s*#\s*endif/) { + shift @enabled; + next; + } + next unless $enabled [0]; + next unless /MINI_OP3?\s*\(\s*(\S+?)\s*,\s*"(.*?)"/; my ($sym, $name) = ($1, $2); push @opcodes, [$sym, $name]; $table{$name} = {num => $i, name => $name}; $i++; } close (OPS); - my $cpp = "cpp -undef "; +} + +sub load_opcodes +{ + my ($srcdir, $arch) = @_; + my $opcodes_def = "$srcdir/../cil/opcode.def"; + my $i = 0; + my $arch_found = 0; + + my $cpp = $ENV{"CPP"}; + $cpp = "cpp" unless defined $cpp; + $cpp .= " -undef "; foreach (@defines) { $cpp .= " -U$_"; $arch_found = 1 if $arch eq $_; } die "$arch arch is not supported.\n" unless $arch_found; - $cpp .= " -D$arch $srcdir/mini-ops.h|"; + my $arch_define = $arch; + if ($arch =~ "__i386__") { + $arch_define = "TARGET_X86"; + } + if ($arch =~ "__x86_64__") { + $arch_define = "TARGET_AMD64"; + } + if ($arch =~ "__arm__") { + $arch_define = "TARGET_ARM"; + } + if ($arch =~ "__aarch64__") { + $arch_define = "TARGET_ARM64"; + } + if ($arch =~ "__wasm__") { + $arch_define = "TARGET_WASM"; + } + parse_file ($arch_define, "$srcdir/mini-ops.h"); + return; + $cpp .= " -D$arch_define $srcdir/mini-ops.h|"; #print "Running: $cpp\n"; open (OPS, $cpp) || die "Cannot execute cpp: $!"; while () { - next unless /MINI_OP\s*\(\s*(\S+?)\s*,\s*"(.*?)"/; + next unless /MINI_OP3?\s*\(\s*(\S+?)\s*,\s*"(.*?)"/; my ($sym, $name) = ($1, $2); push @opcodes, [$sym, $name]; $table{$name} = {num => $i, name => $name}; @@ -63,6 +113,7 @@ sub load_file { open (DESC, $name) || die "Cannot open $name: $!"; while () { + my $is_template = 0; $line++; next if /^\s*$/; if (/^\s*(#.*)?$/) { @@ -72,10 +123,16 @@ sub load_file { my @values = split (/\s+/); next unless ($values [0] =~ /(\S+?):/); my $name = $1; - my $desc = $table {$name}; + my $desc; + if ($name eq "template") { + $is_template = 1; + $desc = {}; + } else { + $desc = $table {$name}; + die "Invalid opcode $name at line $line\n" unless defined $desc; + die "Duplicated opcode $name at line $line\n" if $desc->{"desc"}; + } shift @values; - die "Invalid opcode $name at line $line\n" unless defined $desc; - die "Duplicated opcode $name at line $line\n" if $desc->{"desc"}; $desc->{"desc"} = $_; $desc->{"comment"} = $comment; $desc->{"spec"} = {}; @@ -83,9 +140,22 @@ sub load_file { #print "values for $name: " . join (' ', @values) . " num: " . int(@values), "\n"; for my $val (@values) { if ($val =~ /(\S+):(.*)/) { - $desc->{"spec"}->{$1} = $2; + if ($1 eq "name") { + die "name tag only valid in templates at line $line\n" unless $is_template; + die "Duplicated name tag in template $desc->{'name'} at line $line\n" if defined $desc->{'name'}; + die "Duplicated template $2 at line $line\n" if defined $template_table {$2}; + $desc->{'name'} = $2; + $template_table {$2} = $desc; + } elsif ($1 eq "template") { + my $tdesc = $template_table {$2}; + die "Invalid template name $2 at line $line\n" unless defined $tdesc; + $desc->{"spec"} = {%{$tdesc->{"spec"}}}; + } else { + $desc->{"spec"}->{$1} = $2; + } } } + die "Template without name at line $1" if ($is_template && !defined ($desc->{'name'})); } close (DESC); } @@ -104,10 +174,19 @@ sub build_spec { } #print "vals: " . join (' ', @vals) . "\n"; my $res = ""; + my $n = 0; for (my $i = 0; $i < @vals; ++$i) { + next if $i == INST_NACL; if (defined $vals [$i]) { if ($i == INST_LEN) { - $res .= sprintf ("\\x%x\" \"", +$vals [$i]); + $n = $vals [$i]; + if ($n =~ /[^0-9]/) { + die "Invalid instruction length $n\n"; + } + if ((defined $vals [INST_NACL]) and $nacl == 1){ + $n = $vals [INST_NACL]; + } + $res .= sprintf ("\\x%x\" \"", + $n); } else { if ($vals [$i] =~ /^[a-zA-Z0-9]$/) { $res .= $vals [$i]; @@ -125,10 +204,14 @@ sub build_spec { sub build_table { my ($fname, $name) = @_; my $i; + my $idx; + my $idx_array = "const guint16 mono_${name}_idx [] = {\n"; open (OUT, ">$fname") || die "Cannot open file $fname: $!"; print OUT "/* File automatically generated by genmdesc, don't change */\n\n"; - print OUT "const char * const $name [OP_LAST] = {\n"; + print OUT "const char mono_$name [] = {\n"; + print OUT "\t\"" . ("\\x0" x INST_MAX) . "\"\t/* null entry */\n"; + $idx = 1; for ($i = 0; $i < @opcodes; ++$i) { my $name = $opcodes [$i]->[1]; @@ -137,26 +220,38 @@ sub build_table { if (defined $spec) { print OUT "\t\""; print OUT build_spec ($spec); - print OUT "\",\t/* $name */\n"; + print OUT "\"\t/* $name */\n"; + my $pos = $idx * INST_MAX; + $idx_array .= "\t$pos,\t/* $name */\n"; + ++$idx; } else { - print OUT "\tNULL,\t/* $name */\n"; + $idx_array .= "\t0,\t/* $name */\n"; } } print OUT "};\n\n"; + print OUT "$idx_array};\n\n"; close (OUT); } sub usage { - die "genmdesc.pl arch srcdir desc output name\n"; + die "genmdesc.pl arch srcdir [--nacl] output name desc [desc2 ...]\n"; } my $arch = shift || usage (); my $srcdir = shift || usage (); -my $file = shift || usage (); my $output = shift || usage (); +if ($output eq "--nacl") +{ + $nacl = 1; + $output = shift || usage(); +} my $name = shift || usage (); +usage () unless @ARGV; +my @files = @ARGV; load_opcodes ($srcdir, $arch); -load_file ($file); +foreach my $file (@files) { + load_file ($file); +} build_table ($output, $name);