[Valgrind-developers] valgrind: r12805: When parsing guest_s390_toIR.c also recognize opcodes with digits

[<sv...@va...>]

florian	2012-07-30 17:16:24 +0100 (Mon, 30 Jul 2012)

  New Revision: 12805

  Log:
    When parsing guest_s390_toIR.c also recognize opcodes with digits
    in their name.
    Also add more alternate opcode spellings.

  Modified files:
    trunk/auxprogs/s390-check-opcodes.pl


  Modified: trunk/auxprogs/s390-check-opcodes.pl (+8 -2)
===================================================================
--- trunk/auxprogs/s390-check-opcodes.pl	2012-07-28 23:20:03 +01:00 (rev 12804)
+++ trunk/auxprogs/s390-check-opcodes.pl	2012-07-30 17:16:24 +01:00 (rev 12805)
@@ -52,6 +52,12 @@
     next if ($mnemonic eq "jg");    # special case of brcl
     next if ($mnemonic eq "tmh");   # alternate mnemonic for tmlh
     next if ($mnemonic eq "tml");   # alternate mnemonic for tmll
+    next if ($mnemonic eq "lrdr");  # alternate mnemonic for ldxr
+    next if ($mnemonic eq "lrer");  # alternate mnemonic for ledr
+    next if ($mnemonic eq "me");    # alternate mnemonic for mde
+    next if ($mnemonic eq "mer");   # alternate mnemonic for mder
+    next if ($mnemonic eq "cuutf"); # alternate mnemonic for cu21
+    next if ($mnemonic eq "cutfu"); # alternate mnemonic for cu12
 
     $description =~ s/^[\s]+//g;    # remove leading blanks
     $description =~ s/[\s]+$//g;    # remove trailing blanks
@@ -113,7 +119,7 @@
 while (my $line = <TOIR>) {
     chomp $line;
     next if (! ($line =~ /^s390_irgen_[A-Z]/));
-    $line =~ /^s390_irgen_([A-Z]+)/;
+    $line =~ /^s390_irgen_([A-Z][A-Z0-9]*)/;
     my $op = $1;
     $op =~ tr/A-Z/a-z/;
     $toir_implemented{$op} = 1;
@@ -135,7 +141,7 @@
 }
 
 #----------------------------------------------------
-# 2) Make sure opcodes descriptions are the same
+# 2) Make sure opcode descriptions are the same
 #----------------------------------------------------
 foreach my $opc (keys %opc_desc) {
     if ($opc_desc{$opc} ne $csv_desc{$opc}) {