Merge pull request #3262 from lindenlab/add_continuations_test

[mono.git] / mono / mini / genmdesc.pl

diff --git a/mono/mini/genmdesc.pl b/mono/mini/genmdesc.pl
index b3a4cc8b78b06658dd2f1bf7734dd35beb801c54..2247722107cbd07fa26bc1018f73c38090b5b32b 100644 (file)
--- a/mono/mini/genmdesc.pl
+++ b/mono/mini/genmdesc.pl
@@ -178,6 +178,9 @@ sub build_spec {
                if (defined $vals [$i]) {
                        if ($i == INST_LEN) {
                                $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];
                                }
@@ -200,11 +203,11 @@ sub build_table {
        my ($fname, $name) = @_;
        my $i;
        my $idx;
-       my $idx_array = "const guint16 ${name}_idx [] = {\n";
+       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 $name [] = {\n";
+       print OUT "const char mono_$name [] = {\n";
        print OUT "\t\"" . ("\\x0" x INST_MAX) . "\"\t/* null entry */\n";
        $idx = 1;