Fix uses in ARM table media_instructions.

src/trusted/validator_arm/gen/arm32_decode_named_classes.h

 /*
  * 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
 #endif
 
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_GEN_ARM32_DECODE_NAMED_CLASSES_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_GEN_ARM32_DECODE_NAMED_CLASSES_H_
 
 #include "native_client/src/trusted/validator_arm/actual_classes.h"
 #include "native_client/src/trusted/validator_arm/baseline_classes.h"
 #include "native_client/src/trusted/validator_arm/named_class_decoder.h"
 
 /*
  * Define rule decoder classes.
  */
 namespace nacl_arm_dec {
 
-class Binary2RegisterBitRangeMsbGeLsb_Bfi_Rule_18_A1_P48
+class Binary2RegisterBitRangeMsbGeLsb_BFI
     : public Binary2RegisterBitRangeMsbGeLsb {
 };
 
-class Binary2RegisterBitRangeNotRnIsPcBitfieldExtract_Sbfx_Rule_154_A1_P308
-    : public Binary2RegisterBitRangeNotRnIsPcBitfieldExtract {
-};
-
-class Binary2RegisterBitRangeNotRnIsPcBitfieldExtract_Ubfx_Rule_236_A1_P466
+class Binary2RegisterBitRangeNotRnIsPcBitfieldExtract_SBFX
     : public Binary2RegisterBitRangeNotRnIsPcBitfieldExtract {
 };
 
 class Binary2RegisterImmedShiftedTest_CMN_register
     : public Binary2RegisterImmedShiftedTest {
 };
 
 class Binary2RegisterImmedShiftedTest_CMP_register
     : public Binary2RegisterImmedShiftedTest {
 };
@@ skipping 71 matching lines @@
 };
 
 class Binary3RegisterOpAltA_SMULBB_SMULBT_SMULTB_SMULTT
     : public Binary3RegisterOpAltA {
 };
 
 class Binary3RegisterOpAltA_SMULWB_SMULWT
     : public Binary3RegisterOpAltA {
 };
 
-class Binary3RegisterOpAltA_Usad8_Rule_253_A1_P500
+class Binary3RegisterOpAltA_USAD8
     : public Binary3RegisterOpAltA {
 };
 
 class Binary3RegisterOpAltANoCondsUpdate_SDIV
     : public Binary3RegisterOpAltANoCondsUpdate {
 };
 
 class Binary3RegisterOpAltANoCondsUpdate_SMMUL
     : public Binary3RegisterOpAltANoCondsUpdate {
 };
@@ skipping 255 matching lines @@
 };
 
 class Binary4RegisterDualOp_SMLABB_SMLABT_SMLATB_SMLATT
     : public Binary4RegisterDualOp {
 };
 
 class Binary4RegisterDualOp_SMLAWB_SMLAWT
     : public Binary4RegisterDualOp {
 };
 
-class Binary4RegisterDualOp_Usada8_Rule_254_A1_P502
+class Binary4RegisterDualOp_USADA8
     : public Binary4RegisterDualOp {
 };
 
 class Binary4RegisterDualOpLtV6RdNotRn_MLA_A1
     : public Binary4RegisterDualOpLtV6RdNotRn {
 };
 
 class Binary4RegisterDualOpNoCondsUpdate_SMLAD
     : public Binary4RegisterDualOpNoCondsUpdate {
 };
@@ skipping 563 matching lines @@
 };
 
 class MoveVfpRegisterOpWithTypeSel_Vmov_Rule_328_A1_P644
     : public MoveVfpRegisterOpWithTypeSel {
 };
 
 class MoveVfpRegisterOpWithTypeSel_Vmov_Rule_329_A1_P646
     : public MoveVfpRegisterOpWithTypeSel {
 };
 
-class PermanentlyUndefined_Udf_Rule_A1
+class PermanentlyUndefined_UDF
     : public PermanentlyUndefined {
 };
 
 class PreloadRegisterImm12Op_Pld_Rule_117_A1_P236
     : public PreloadRegisterImm12Op {
 };
 
 class PreloadRegisterImm12Op_Pld_Rule_118_A1_P238
     : public PreloadRegisterImm12Op {
 };
@@ skipping 95 matching lines @@
 };
 
 class StoreVectorRegisterList_Vpush_355_A1_A2_P696
     : public StoreVectorRegisterList {
 };
 
 class StoreVectorRegisterList_Vstm_Rule_399_A1_A2_P784
     : public StoreVectorRegisterList {
 };
 
-class Unary1RegisterBitRangeMsbGeLsb_Bfc_17_A1_P46
+class Unary1RegisterBitRangeMsbGeLsb_BFC
+    : public Unary1RegisterBitRangeMsbGeLsb {
+};
+
+class Unary1RegisterBitRangeMsbGeLsb_UBFX
     : public Unary1RegisterBitRangeMsbGeLsb {
 };
 
 class Unary1RegisterImmediateOp12DynCodeReplace_MOV_immediate_A1
     : public Unary1RegisterImmediateOp12DynCodeReplace {
 };
 
 class Unary1RegisterImmediateOp12DynCodeReplace_MVN_immediate
     : public Unary1RegisterImmediateOp12DynCodeReplace {
 };
@@ skipping 791 matching lines @@
 };
 
 class Branch_B_Rule_16_A1_P44
     : public Branch {
 };
 
 class Branch_Bl_Blx_Rule_23_A1_P58
     : public Branch {
 };
 
-class Defs12To15CondsDontCareMsbGeLsb_Bfi_Rule_18_A1_P48
-    : public Defs12To15CondsDontCareMsbGeLsb {
-};
-
 class Defs12To15CondsDontCareRdRnNotPc_Rbit_Rule_134_A1_P270
     : public Defs12To15CondsDontCareRdRnNotPc {
 };
 
 class Defs12To15CondsDontCareRdRnNotPc_Rev16_Rule_136_A1_P274
     : public Defs12To15CondsDontCareRdRnNotPc {
 };
 
 class Defs12To15CondsDontCareRdRnNotPc_Rev_Rule_135_A1_P272
     : public Defs12To15CondsDontCareRdRnNotPc {
@@ skipping 36 matching lines @@
 };
 
 class Defs12To15CondsDontCareRdRnNotPc_Uxtb_Rule_263_A1_P520
     : public Defs12To15CondsDontCareRdRnNotPc {
 };
 
 class Defs12To15CondsDontCareRdRnNotPc_Uxth_Rule_265_A1_P524
     : public Defs12To15CondsDontCareRdRnNotPc {
 };
 
-class Defs12To15CondsDontCareRdRnNotPcBitfieldExtract_Sbfx_Rule_154_A1_P308
-    : public Defs12To15CondsDontCareRdRnNotPcBitfieldExtract {
-};
-
-class Defs12To15CondsDontCareRdRnNotPcBitfieldExtract_Ubfx_Rule_236_A1_P466
-    : public Defs12To15CondsDontCareRdRnNotPcBitfieldExtract {
-};
-
 class Defs12To15CondsDontCareRnRdRmNotPc_Pkh_Rule_116_A1_P234
     : public Defs12To15CondsDontCareRnRdRmNotPc {
 };
 
 class Defs12To15CondsDontCareRnRdRmNotPc_Qadd16_Rule_125_A1_P252
     : public Defs12To15CondsDontCareRnRdRmNotPc {
 };
 
 class Defs12To15CondsDontCareRnRdRmNotPc_Qadd8_Rule_126_A1_P254
     : public Defs12To15CondsDontCareRnRdRmNotPc {
@@ skipping 156 matching lines @@
 };
 
 class Defs12To15CondsDontCareRnRdRmNotPc_Uxtab_Rule_260_A1_P514
     : public Defs12To15CondsDontCareRnRdRmNotPc {
 };
 
 class Defs12To15CondsDontCareRnRdRmNotPc_Uxtah_Rule_262_A1_P518
     : public Defs12To15CondsDontCareRnRdRmNotPc {
 };
 
-class Defs16To19CondsDontCareRdRaRmRnNotPc_Usada8_Rule_254_A1_P502
-    : public Defs16To19CondsDontCareRdRaRmRnNotPc {
-};
-
-class Defs16To19CondsDontCareRdRmRnNotPc_Usad8_Rule_253_A1_P500
-    : public Defs16To19CondsDontCareRdRmRnNotPc {
-};
-
 class DontCareInst_Msr_Rule_103_A1_P208
     : public DontCareInst {
 };
 
 class DontCareInst_Nop_Rule_110_A1_P222
     : public DontCareInst {
 };
 
 class DontCareInst_Yield_Rule_413_A1_P812
     : public DontCareInst {
@@ skipping 343 matching lines @@
  * Define named class decoders for each class decoder.
  * The main purpose of these classes is to introduce
  * instances that are named specifically to the class decoder
  * and/or rule that was used to parse them. This makes testing
  * much easier in that error messages use these named classes
  * to clarify what row in the corresponding table was used
  * to select this decoder. Without these names, debugging the
  * output of the test code would be nearly impossible
  */
 
-class NamedBinary2RegisterBitRangeMsbGeLsb_Bfi_Rule_18_A1_P48
+class NamedBinary2RegisterBitRangeMsbGeLsb_BFI
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterBitRangeMsbGeLsb_Bfi_Rule_18_A1_P48()
-    : NamedClassDecoder(decoder_, "Binary2RegisterBitRangeMsbGeLsb Bfi_Rule_18_A1_P48")
+  NamedBinary2RegisterBitRangeMsbGeLsb_BFI()
+    : NamedClassDecoder(decoder_, "Binary2RegisterBitRangeMsbGeLsb BFI")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterBitRangeMsbGeLsb_Bfi_Rule_18_A1_P48 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterBitRangeMsbGeLsb_Bfi_Rule_18_A1_P48);
+  nacl_arm_dec::Binary2RegisterBitRangeMsbGeLsb_BFI decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterBitRangeMsbGeLsb_BFI);
 };
 
-class NamedBinary2RegisterBitRangeNotRnIsPcBitfieldExtract_Sbfx_Rule_154_A1_P308
+class NamedBinary2RegisterBitRangeNotRnIsPcBitfieldExtract_SBFX
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterBitRangeNotRnIsPcBitfieldExtract_Sbfx_Rule_154_A1_P308()
-    : NamedClassDecoder(decoder_, "Binary2RegisterBitRangeNotRnIsPcBitfieldExtract Sbfx_Rule_154_A1_P308")
+  NamedBinary2RegisterBitRangeNotRnIsPcBitfieldExtract_SBFX()
+    : NamedClassDecoder(decoder_, "Binary2RegisterBitRangeNotRnIsPcBitfieldExtract SBFX")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterBitRangeNotRnIsPcBitfieldExtract_Sbfx_Rule_154_A1_P308 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterBitRangeNotRnIsPcBitfieldExtract_Sbfx_Rule_154_A1_P308);
-};
-
-class NamedBinary2RegisterBitRangeNotRnIsPcBitfieldExtract_Ubfx_Rule_236_A1_P466
-    : public NamedClassDecoder {
- public:
-  NamedBinary2RegisterBitRangeNotRnIsPcBitfieldExtract_Ubfx_Rule_236_A1_P466()
-    : NamedClassDecoder(decoder_, "Binary2RegisterBitRangeNotRnIsPcBitfieldExtract Ubfx_Rule_236_A1_P466")
-  {}
-
- private:
-  nacl_arm_dec::Binary2RegisterBitRangeNotRnIsPcBitfieldExtract_Ubfx_Rule_236_A1_P466 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterBitRangeNotRnIsPcBitfieldExtract_Ubfx_Rule_236_A1_P466);
+  nacl_arm_dec::Binary2RegisterBitRangeNotRnIsPcBitfieldExtract_SBFX decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterBitRangeNotRnIsPcBitfieldExtract_SBFX);
 };
 
 class NamedBinary2RegisterImmedShiftedTest_CMN_register
     : public NamedClassDecoder {
  public:
   NamedBinary2RegisterImmedShiftedTest_CMN_register()
     : NamedClassDecoder(decoder_, "Binary2RegisterImmedShiftedTest CMN_register")
   {}
 
  private:
@@ skipping 246 matching lines @@
  public:
   NamedBinary3RegisterOpAltA_SMULWB_SMULWT()
     : NamedClassDecoder(decoder_, "Binary3RegisterOpAltA SMULWB_SMULWT")
   {}
 
  private:
   nacl_arm_dec::Binary3RegisterOpAltA_SMULWB_SMULWT decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary3RegisterOpAltA_SMULWB_SMULWT);
 };
 
-class NamedBinary3RegisterOpAltA_Usad8_Rule_253_A1_P500
+class NamedBinary3RegisterOpAltA_USAD8
     : public NamedClassDecoder {
  public:
-  NamedBinary3RegisterOpAltA_Usad8_Rule_253_A1_P500()
-    : NamedClassDecoder(decoder_, "Binary3RegisterOpAltA Usad8_Rule_253_A1_P500")
+  NamedBinary3RegisterOpAltA_USAD8()
+    : NamedClassDecoder(decoder_, "Binary3RegisterOpAltA USAD8")
   {}
 
  private:
-  nacl_arm_dec::Binary3RegisterOpAltA_Usad8_Rule_253_A1_P500 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary3RegisterOpAltA_Usad8_Rule_253_A1_P500);
+  nacl_arm_dec::Binary3RegisterOpAltA_USAD8 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary3RegisterOpAltA_USAD8);
 };
 
 class NamedBinary3RegisterOpAltANoCondsUpdate_SDIV
     : public NamedClassDecoder {
  public:
   NamedBinary3RegisterOpAltANoCondsUpdate_SDIV()
     : NamedClassDecoder(decoder_, "Binary3RegisterOpAltANoCondsUpdate SDIV")
   {}
 
  private:
@@ skipping 798 matching lines @@
  public:
   NamedBinary4RegisterDualOp_SMLAWB_SMLAWT()
     : NamedClassDecoder(decoder_, "Binary4RegisterDualOp SMLAWB_SMLAWT")
   {}
 
  private:
   nacl_arm_dec::Binary4RegisterDualOp_SMLAWB_SMLAWT decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary4RegisterDualOp_SMLAWB_SMLAWT);
 };
 
-class NamedBinary4RegisterDualOp_Usada8_Rule_254_A1_P502
+class NamedBinary4RegisterDualOp_USADA8
     : public NamedClassDecoder {
  public:
-  NamedBinary4RegisterDualOp_Usada8_Rule_254_A1_P502()
-    : NamedClassDecoder(decoder_, "Binary4RegisterDualOp Usada8_Rule_254_A1_P502")
+  NamedBinary4RegisterDualOp_USADA8()
+    : NamedClassDecoder(decoder_, "Binary4RegisterDualOp USADA8")
   {}
 
  private:
-  nacl_arm_dec::Binary4RegisterDualOp_Usada8_Rule_254_A1_P502 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary4RegisterDualOp_Usada8_Rule_254_A1_P502);
+  nacl_arm_dec::Binary4RegisterDualOp_USADA8 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary4RegisterDualOp_USADA8);
 };
 
 class NamedBinary4RegisterDualOpLtV6RdNotRn_MLA_A1
     : public NamedClassDecoder {
  public:
   NamedBinary4RegisterDualOpLtV6RdNotRn_MLA_A1()
     : NamedClassDecoder(decoder_, "Binary4RegisterDualOpLtV6RdNotRn MLA_A1")
   {}
 
  private:
@@ skipping 1722 matching lines @@
  public:
   NamedMoveVfpRegisterOpWithTypeSel_Vmov_Rule_329_A1_P646()
     : NamedClassDecoder(decoder_, "MoveVfpRegisterOpWithTypeSel Vmov_Rule_329_A1_P646")
   {}
 
  private:
   nacl_arm_dec::MoveVfpRegisterOpWithTypeSel_Vmov_Rule_329_A1_P646 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedMoveVfpRegisterOpWithTypeSel_Vmov_Rule_329_A1_P646);
 };
 
-class NamedPermanentlyUndefined_Udf_Rule_A1
+class NamedPermanentlyUndefined_UDF
     : public NamedClassDecoder {
  public:
-  NamedPermanentlyUndefined_Udf_Rule_A1()
-    : NamedClassDecoder(decoder_, "PermanentlyUndefined Udf_Rule_A1")
+  NamedPermanentlyUndefined_UDF()
+    : NamedClassDecoder(decoder_, "PermanentlyUndefined UDF")
   {}
 
  private:
-  nacl_arm_dec::PermanentlyUndefined_Udf_Rule_A1 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedPermanentlyUndefined_Udf_Rule_A1);
+  nacl_arm_dec::PermanentlyUndefined_UDF decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedPermanentlyUndefined_UDF);
 };
 
 class NamedPreloadRegisterImm12Op_Pld_Rule_117_A1_P236
     : public NamedClassDecoder {
  public:
   NamedPreloadRegisterImm12Op_Pld_Rule_117_A1_P236()
     : NamedClassDecoder(decoder_, "PreloadRegisterImm12Op Pld_Rule_117_A1_P236")
   {}
 
  private:
@@ skipping 318 matching lines @@
  public:
   NamedStoreVectorRegisterList_Vstm_Rule_399_A1_A2_P784()
     : NamedClassDecoder(decoder_, "StoreVectorRegisterList Vstm_Rule_399_A1_A2_P784")
   {}
 
  private:
   nacl_arm_dec::StoreVectorRegisterList_Vstm_Rule_399_A1_A2_P784 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedStoreVectorRegisterList_Vstm_Rule_399_A1_A2_P784);
 };
 
-class NamedUnary1RegisterBitRangeMsbGeLsb_Bfc_17_A1_P46
+class NamedUnary1RegisterBitRangeMsbGeLsb_BFC
     : public NamedClassDecoder {
  public:
-  NamedUnary1RegisterBitRangeMsbGeLsb_Bfc_17_A1_P46()
-    : NamedClassDecoder(decoder_, "Unary1RegisterBitRangeMsbGeLsb Bfc_17_A1_P46")
+  NamedUnary1RegisterBitRangeMsbGeLsb_BFC()
+    : NamedClassDecoder(decoder_, "Unary1RegisterBitRangeMsbGeLsb BFC")
   {}
 
  private:
-  nacl_arm_dec::Unary1RegisterBitRangeMsbGeLsb_Bfc_17_A1_P46 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterBitRangeMsbGeLsb_Bfc_17_A1_P46);
+  nacl_arm_dec::Unary1RegisterBitRangeMsbGeLsb_BFC decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterBitRangeMsbGeLsb_BFC);
+};
+
+class NamedUnary1RegisterBitRangeMsbGeLsb_UBFX
+    : public NamedClassDecoder {
+ public:
+  NamedUnary1RegisterBitRangeMsbGeLsb_UBFX()
+    : NamedClassDecoder(decoder_, "Unary1RegisterBitRangeMsbGeLsb UBFX")
+  {}
+
+ private:
+  nacl_arm_dec::Unary1RegisterBitRangeMsbGeLsb_UBFX decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterBitRangeMsbGeLsb_UBFX);
 };
 
 class NamedUnary1RegisterImmediateOp12DynCodeReplace_MOV_immediate_A1
     : public NamedClassDecoder {
  public:
   NamedUnary1RegisterImmediateOp12DynCodeReplace_MOV_immediate_A1()
     : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp12DynCodeReplace MOV_immediate_A1")
   {}
 
  private:
@@ skipping 2406 matching lines @@
  public:
   NamedBranch_Bl_Blx_Rule_23_A1_P58()
     : NamedClassDecoder(decoder_, "Branch Bl_Blx_Rule_23_A1_P58")
   {}
 
  private:
   nacl_arm_dec::Branch_Bl_Blx_Rule_23_A1_P58 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedBranch_Bl_Blx_Rule_23_A1_P58);
 };
 
-class NamedDefs12To15CondsDontCareMsbGeLsb_Bfi_Rule_18_A1_P48
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15CondsDontCareMsbGeLsb_Bfi_Rule_18_A1_P48()
-    : NamedClassDecoder(decoder_, "Defs12To15CondsDontCareMsbGeLsb Bfi_Rule_18_A1_P48")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15CondsDontCareMsbGeLsb_Bfi_Rule_18_A1_P48 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15CondsDontCareMsbGeLsb_Bfi_Rule_18_A1_P48);
-};
-
 class NamedDefs12To15CondsDontCareRdRnNotPc_Rbit_Rule_134_A1_P270
     : public NamedClassDecoder {
  public:
   NamedDefs12To15CondsDontCareRdRnNotPc_Rbit_Rule_134_A1_P270()
     : NamedClassDecoder(decoder_, "Defs12To15CondsDontCareRdRnNotPc Rbit_Rule_134_A1_P270")
   {}
 
  private:
   nacl_arm_dec::Defs12To15CondsDontCareRdRnNotPc_Rbit_Rule_134_A1_P270 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15CondsDontCareRdRnNotPc_Rbit_Rule_134_A1_P270);
@@ skipping 148 matching lines @@
  public:
   NamedDefs12To15CondsDontCareRdRnNotPc_Uxth_Rule_265_A1_P524()
     : NamedClassDecoder(decoder_, "Defs12To15CondsDontCareRdRnNotPc Uxth_Rule_265_A1_P524")
   {}
 
  private:
   nacl_arm_dec::Defs12To15CondsDontCareRdRnNotPc_Uxth_Rule_265_A1_P524 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15CondsDontCareRdRnNotPc_Uxth_Rule_265_A1_P524);
 };
 
-class NamedDefs12To15CondsDontCareRdRnNotPcBitfieldExtract_Sbfx_Rule_154_A1_P308
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15CondsDontCareRdRnNotPcBitfieldExtract_Sbfx_Rule_154_A1_P308()
-    : NamedClassDecoder(decoder_, "Defs12To15CondsDontCareRdRnNotPcBitfieldExtract Sbfx_Rule_154_A1_P308")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15CondsDontCareRdRnNotPcBitfieldExtract_Sbfx_Rule_154_A1_P308 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15CondsDontCareRdRnNotPcBitfieldExtract_Sbfx_Rule_154_A1_P308);
-};
-
-class NamedDefs12To15CondsDontCareRdRnNotPcBitfieldExtract_Ubfx_Rule_236_A1_P466
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15CondsDontCareRdRnNotPcBitfieldExtract_Ubfx_Rule_236_A1_P466()
-    : NamedClassDecoder(decoder_, "Defs12To15CondsDontCareRdRnNotPcBitfieldExtract Ubfx_Rule_236_A1_P466")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15CondsDontCareRdRnNotPcBitfieldExtract_Ubfx_Rule_236_A1_P466 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15CondsDontCareRdRnNotPcBitfieldExtract_Ubfx_Rule_236_A1_P466);
-};
-
 class NamedDefs12To15CondsDontCareRnRdRmNotPc_Pkh_Rule_116_A1_P234
     : public NamedClassDecoder {
  public:
   NamedDefs12To15CondsDontCareRnRdRmNotPc_Pkh_Rule_116_A1_P234()
     : NamedClassDecoder(decoder_, "Defs12To15CondsDontCareRnRdRmNotPc Pkh_Rule_116_A1_P234")
   {}
 
  private:
   nacl_arm_dec::Defs12To15CondsDontCareRnRdRmNotPc_Pkh_Rule_116_A1_P234 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15CondsDontCareRnRdRmNotPc_Pkh_Rule_116_A1_P234);
@@ skipping 508 matching lines @@
  public:
   NamedDefs12To15CondsDontCareRnRdRmNotPc_Uxtah_Rule_262_A1_P518()
     : NamedClassDecoder(decoder_, "Defs12To15CondsDontCareRnRdRmNotPc Uxtah_Rule_262_A1_P518")
   {}
 
  private:
   nacl_arm_dec::Defs12To15CondsDontCareRnRdRmNotPc_Uxtah_Rule_262_A1_P518 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15CondsDontCareRnRdRmNotPc_Uxtah_Rule_262_A1_P518);
 };
 
-class NamedDefs16To19CondsDontCareRdRaRmRnNotPc_Usada8_Rule_254_A1_P502
-    : public NamedClassDecoder {
- public:
-  NamedDefs16To19CondsDontCareRdRaRmRnNotPc_Usada8_Rule_254_A1_P502()
-    : NamedClassDecoder(decoder_, "Defs16To19CondsDontCareRdRaRmRnNotPc Usada8_Rule_254_A1_P502")
-  {}
-
- private:
-  nacl_arm_dec::Defs16To19CondsDontCareRdRaRmRnNotPc_Usada8_Rule_254_A1_P502 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs16To19CondsDontCareRdRaRmRnNotPc_Usada8_Rule_254_A1_P502);
-};
-
-class NamedDefs16To19CondsDontCareRdRmRnNotPc_Usad8_Rule_253_A1_P500
-    : public NamedClassDecoder {
- public:
-  NamedDefs16To19CondsDontCareRdRmRnNotPc_Usad8_Rule_253_A1_P500()
-    : NamedClassDecoder(decoder_, "Defs16To19CondsDontCareRdRmRnNotPc Usad8_Rule_253_A1_P500")
-  {}
-
- private:
-  nacl_arm_dec::Defs16To19CondsDontCareRdRmRnNotPc_Usad8_Rule_253_A1_P500 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs16To19CondsDontCareRdRmRnNotPc_Usad8_Rule_253_A1_P500);
-};
-
 class NamedDontCareInst_Msr_Rule_103_A1_P208
     : public NamedClassDecoder {
  public:
   NamedDontCareInst_Msr_Rule_103_A1_P208()
     : NamedClassDecoder(decoder_, "DontCareInst Msr_Rule_103_A1_P208")
   {}
 
  private:
   nacl_arm_dec::DontCareInst_Msr_Rule_103_A1_P208 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDontCareInst_Msr_Rule_103_A1_P208);
@@ skipping 1040 matching lines @@
     : NamedClassDecoder(decoder_, "not implemented")
   {}
 
  private:
   nacl_arm_dec::NotImplemented decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NotImplementedNamed);
 };
 
 } // namespace nacl_arm_test
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_GEN_ARM32_DECODE_NAMED_CLASSES_H_