X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fgenmdesc.pl;h=8c8e7eac6407e0513297e1527c1f4a45cd8b5a0d;hb=79e94c43dcb8576f6e8c817ce13ae7bb2c196538;hp=b3a4cc8b78b06658dd2f1bf7734dd35beb801c54;hpb=10fa44a5e6ab5b6cc4c4a79da9a2a032d0901af5;p=mono.git

diff --git a/mono/mini/genmdesc.pl b/mono/mini/genmdesc.pl
index b3a4cc8b78b..8c8e7eac640 100644
--- a/mono/mini/genmdesc.pl
+++ b/mono/mini/genmdesc.pl
@@ -20,7 +20,7 @@ sub INST_MAX   () {return 6;}
 
 # this must include all the #defines used in mini-ops.h
 my @defines = qw (__i386__ __x86_64__ __ppc__ __powerpc__ __ppc64__ __arm__ 
-	__sparc__ sparc __s390__ s390 __ia64__ __alpha__ __mips__ __aarch64__);
+	__sparc__ sparc __s390__ s390 __alpha__ __mips__ __aarch64__);
 my %table =();
 my %template_table =();
 my @opcodes = ();
@@ -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;