X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fgenmdesc.pl;h=2247722107cbd07fa26bc1018f73c38090b5b32b;hb=214a610172fafd91135575a1ebaec3322295da4a;hp=7d66e31d76193fdc3cc213a23c7cbd5cd60987c2;hpb=92f60fbffa1187be7dedf6a9286b5c35b2082815;p=mono.git

diff --git a/mono/mini/genmdesc.pl b/mono/mini/genmdesc.pl
index 7d66e31d761..2247722107c 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__);
+	__sparc__ sparc __s390__ s390 __ia64__ __alpha__ __mips__ __aarch64__);
 my %table =();
 my %template_table =();
 my @opcodes = ();
@@ -79,12 +79,15 @@ sub load_opcodes
 	if ($arch =~ "__i386__") {
 		$arch_define = "TARGET_X86";
 	}
-	if ($arch =~ " __x86_64__") {
+	if ($arch =~ "__x86_64__") {
 		$arch_define = "TARGET_AMD64";
 	}
 	if ($arch =~ "__arm__") {
 		$arch_define = "TARGET_ARM";
 	}
+	if ($arch =~ "__aarch64__") {
+		$arch_define = "TARGET_ARM64";
+	}
 
 	parse_file ($arch_define, "$srcdir/mini-ops.h");
 	return;
@@ -175,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];
 			        }
@@ -197,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;