Fix uses in ARM table media_instructions.

src/trusted/validator_arm/gen/arm32_decode_named.cc

 /*
  * Copyright 2012 The Native Client Authors.  All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 // DO NOT EDIT: GENERATED CODE
 
 #ifndef NACL_TRUSTED_BUT_NOT_TCB
 #error This file is not meant for use in the TCB
@@ skipping 1345 matching lines @@
 /*
  * Implementation of table media_instructions.
  * Specified by: ('See Section A5.4',)
  */
 const NamedClassDecoder& NamedArm32DecoderState::decode_media_instructions(
      const nacl_arm_dec::Instruction inst) const {
 
   if ((inst.Bits() & 0x01F00000) == 0x01800000 /* op1(24:20)=11000 */ &&
       (inst.Bits() & 0x000000E0) == 0x00000000 /* op2(7:5)=000 */ &&
       (inst.Bits() & 0x0000F000) != 0x0000F000 /* Rd(15:12)=~1111 */) {
-    return Binary4RegisterDualOp_Usada8_Rule_254_A1_P502_instance_;
+    return Binary4RegisterDualOp_USADA8_instance_;
   }
 
   if ((inst.Bits() & 0x01F00000) == 0x01800000 /* op1(24:20)=11000 */ &&
       (inst.Bits() & 0x000000E0) == 0x00000000 /* op2(7:5)=000 */ &&
       (inst.Bits() & 0x0000F000) == 0x0000F000 /* Rd(15:12)=1111 */) {
-    return Binary3RegisterOpAltA_Usad8_Rule_253_A1_P500_instance_;
+    return Binary3RegisterOpAltA_USAD8_instance_;
   }
 
   if ((inst.Bits() & 0x01F00000) == 0x01F00000 /* op1(24:20)=11111 */ &&
       (inst.Bits() & 0x000000E0) == 0x000000E0 /* op2(7:5)=111 */) {
-    return PermanentlyUndefined_Udf_Rule_A1_instance_;
+    return PermanentlyUndefined_UDF_instance_;
   }
 
   if ((inst.Bits() & 0x01E00000) == 0x01A00000 /* op1(24:20)=1101x */ &&
       (inst.Bits() & 0x00000060) == 0x00000040 /* op2(7:5)=x10 */) {
-    return Binary2RegisterBitRangeNotRnIsPcBitfieldExtract_Sbfx_Rule_154_A1_P308_instance_;
+    return Binary2RegisterBitRangeNotRnIsPcBitfieldExtract_SBFX_instance_;
   }
 
   if ((inst.Bits() & 0x01E00000) == 0x01C00000 /* op1(24:20)=1110x */ &&
       (inst.Bits() & 0x00000060) == 0x00000000 /* op2(7:5)=x00 */ &&
       (inst.Bits() & 0x0000000F) != 0x0000000F /* Rn(3:0)=~1111 */) {
-    return Binary2RegisterBitRangeMsbGeLsb_Bfi_Rule_18_A1_P48_instance_;
+    return Binary2RegisterBitRangeMsbGeLsb_BFI_instance_;
   }
 
   if ((inst.Bits() & 0x01E00000) == 0x01C00000 /* op1(24:20)=1110x */ &&
       (inst.Bits() & 0x00000060) == 0x00000000 /* op2(7:5)=x00 */ &&
       (inst.Bits() & 0x0000000F) == 0x0000000F /* Rn(3:0)=1111 */) {
-    return Unary1RegisterBitRangeMsbGeLsb_Bfc_17_A1_P46_instance_;
+    return Unary1RegisterBitRangeMsbGeLsb_BFC_instance_;
   }
 
   if ((inst.Bits() & 0x01E00000) == 0x01E00000 /* op1(24:20)=1111x */ &&
       (inst.Bits() & 0x00000060) == 0x00000040 /* op2(7:5)=x10 */) {
-    return Binary2RegisterBitRangeNotRnIsPcBitfieldExtract_Ubfx_Rule_236_A1_P466_instance_;
+    return Unary1RegisterBitRangeMsbGeLsb_UBFX_instance_;
   }
 
   if ((inst.Bits() & 0x01C00000) == 0x00000000 /* op1(24:20)=000xx */) {
     return decode_parallel_addition_and_subtraction_signed(inst);
   }
 
   if ((inst.Bits() & 0x01C00000) == 0x00400000 /* op1(24:20)=001xx */) {
     return decode_parallel_addition_and_subtraction_unsigned(inst);
   }
 
@@ skipping 2145 matching lines @@
 decode_named(const nacl_arm_dec::Instruction inst) const {
   return decode_ARMv7(inst);
 }
 
 const nacl_arm_dec::ClassDecoder& NamedArm32DecoderState::
 decode(const nacl_arm_dec::Instruction inst) const {
   return decode_named(inst).named_decoder();
 }
 
 }  // namespace nacl_arm_test