From: Florian Krohm <florian@eich-krohm.de>
Date: Thu, 6 Dec 2012 05:03:08 +0000 (+0000)
Subject: Accept blank lines in <binutils>/opcodes/s390-opc.txt.
X-Git-Tag: svn/VALGRIND_3_9_0~515
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=976cdf33743c3561abe021a9bc0e132d99806ae0;p=thirdparty%2Fvalgrind.git

Accept blank lines in <binutils>/opcodes/s390-opc.txt.
Bug fix: avoid reading something uninitialised


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13157
---

diff --git a/auxprogs/s390-check-opcodes.pl b/auxprogs/s390-check-opcodes.pl
index d38747690e..3a16d6c841 100755
--- a/auxprogs/s390-check-opcodes.pl
+++ b/auxprogs/s390-check-opcodes.pl
@@ -35,6 +35,7 @@ open(OPC, "$opc_file") || die "cannot open $opc_file\n";
 while (my $line = <OPC>) {
     chomp $line;
     next if ($line =~ "^[ ]*#");   # comments
+    next if ($line =~ /^\s*$/);    # blank line
     my $description = (split /"/,$line)[1];
     my ($encoding,$mnemonic,$format) = split /\s+/,$line;
 
@@ -144,8 +145,12 @@ foreach my $opc (keys %csv_desc) {
 # 2) Make sure opcode descriptions are the same
 #----------------------------------------------------
 foreach my $opc (keys %opc_desc) {
-    if ($opc_desc{$opc} ne $csv_desc{$opc}) {
-        print "*** opcode $opc differs: $opc_desc{$opc}\n";
+    if (defined $csv_desc{$opc}) {
+        if ($opc_desc{$opc} ne $csv_desc{$opc}) {
+            print "*** opcode $opc differs:\n";
+        print "    binutils:    $opc_desc{$opc}\n";
+            print "    opcodes.csv: $csv_desc{$opc}\n";
+        }
     }
 }