Change table data_processing_immediate to use the new notation. Also

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
@@ skipping 33 matching lines @@
 };
 
 class Binary2RegisterImmedShiftedTest_Teq_Rule_228_A1_P450
     : public Binary2RegisterImmedShiftedTest {
 };
 
 class Binary2RegisterImmedShiftedTest_Tst_Rule_231_A1_P456
     : public Binary2RegisterImmedShiftedTest {
 };
 
-class Binary2RegisterImmediateOp_Adc_Rule_6_A1_P14
+class Binary2RegisterImmediateOp_ADC_immediate_A1
     : public Binary2RegisterImmediateOp {
 };
 
-class Binary2RegisterImmediateOp_Add_Rule_5_A1_P22
+class Binary2RegisterImmediateOp_ADD_immediate_A1
     : public Binary2RegisterImmediateOp {
 };
 
-class Binary2RegisterImmediateOp_And_Rule_11_A1_P34
+class Binary2RegisterImmediateOp_AND_immediate_A1
     : public Binary2RegisterImmediateOp {
 };
 
-class Binary2RegisterImmediateOp_Eor_Rule_44_A1_P94
+class Binary2RegisterImmediateOp_EOR_immediate_A1
     : public Binary2RegisterImmediateOp {
 };
 
-class Binary2RegisterImmediateOp_Orr_Rule_113_A1_P228
+class Binary2RegisterImmediateOp_ORR_immediate_A1
     : public Binary2RegisterImmediateOp {
 };
 
-class Binary2RegisterImmediateOp_Rsb_Rule_142_A1_P284
+class Binary2RegisterImmediateOp_RSB_immediate_A1
     : public Binary2RegisterImmediateOp {
 };
 
-class Binary2RegisterImmediateOp_Rsc_Rule_145_A1_P290
+class Binary2RegisterImmediateOp_RSC_immediate_A1
     : public Binary2RegisterImmediateOp {
 };
 
-class Binary2RegisterImmediateOp_Sbc_Rule_151_A1_P302
+class Binary2RegisterImmediateOp_SBC_immediate_A1
     : public Binary2RegisterImmediateOp {
 };
 
-class Binary2RegisterImmediateOp_Sub_Rule_212_A1_P420
+class Binary2RegisterImmediateOp_SUB_immediate_A1
     : public Binary2RegisterImmediateOp {
 };
 
 class Binary3RegisterImmedShiftedOp_Adc_Rule_2_A1_P16
     : public Binary3RegisterImmedShiftedOp {
 };
 
 class Binary3RegisterImmedShiftedOp_Add_Rule_6_A1_P24
     : public Binary3RegisterImmedShiftedOp {
 };
@@ skipping 391 matching lines @@
 };
 
 class Binary4RegisterShiftedOp_SBC_register_shifted_register_A1
     : public Binary4RegisterShiftedOp {
 };
 
 class Binary4RegisterShiftedOp_SUB_register_shifted_register_A1
     : public Binary4RegisterShiftedOp {
 };
 
-class BinaryRegisterImmediateTest_Cmn_Rule_32_A1_P74
+class BinaryRegisterImmediateTest_CMN_immediate_A1
     : public BinaryRegisterImmediateTest {
 };
 
-class BinaryRegisterImmediateTest_Cmp_Rule_35_A1_P80
+class BinaryRegisterImmediateTest_CMP_immediate_A1
     : public BinaryRegisterImmediateTest {
 };
 
-class BinaryRegisterImmediateTest_Teq_Rule_227_A1_P448
+class BinaryRegisterImmediateTest_TEQ_immediate_A1
     : public BinaryRegisterImmediateTest {
 };
 
 class BranchImmediate24_B_Rule_16_A1_P44
     : public BranchImmediate24 {
 };
 
 class BranchImmediate24_Bl_Blx_Rule_23_A1_P58
     : public BranchImmediate24 {
 };
@@ skipping 227 matching lines @@
 };
 
 class ForbiddenCondDecoder_Strtb_Rule_A1
     : public ForbiddenCondDecoder {
 };
 
 class ForbiddenCondDecoder_Strtb_Rule_A2
     : public ForbiddenCondDecoder {
 };
 
-class ForbiddenCondDecoder_Subs_Pc_Lr_and_related_instructions_Rule_A1a
-    : public ForbiddenCondDecoder {
-};
-
-class ForbiddenCondDecoder_Subs_Pc_Lr_and_related_instructions_Rule_A1b
-    : public ForbiddenCondDecoder {
-};
-
 class ForbiddenCondDecoder_Svc_Rule_A1
     : public ForbiddenCondDecoder {
 };
 
 class ForbiddenCondDecoder_Wfe_Rule_411_A1_P808
     : public ForbiddenCondDecoder {
 };
 
 class ForbiddenCondDecoder_Wfi_Rule_412_A1_P810
     : public ForbiddenCondDecoder {
@@ skipping 184 matching lines @@
 };
 
 class LoadVectorRegisterList_Vldm_Rule_319_A1_A2_P626
     : public LoadVectorRegisterList {
 };
 
 class LoadVectorRegisterList_Vpop_Rule_354_A1_A2_P694
     : public LoadVectorRegisterList {
 };
 
-class MaskedBinary2RegisterImmediateOp_Bic_Rule_19_A1_P50
+class MaskedBinary2RegisterImmediateOp_BIC_immediate_A1
     : public MaskedBinary2RegisterImmediateOp {
 };
 
-class MaskedBinaryRegisterImmediateTest_Tst_Rule_230_A1_P454
+class MaskedBinaryRegisterImmediateTest_TST_immediate_A1
     : public MaskedBinaryRegisterImmediateTest {
 };
 
 class MoveDoubleVfpRegisterOp_Vmov_one_D_Rule_A1
     : public MoveDoubleVfpRegisterOp {
 };
 
 class MoveDoubleVfpRegisterOp_Vmov_two_S_Rule_A1
     : public MoveDoubleVfpRegisterOp {
 };
@@ skipping 131 matching lines @@
 };
 
 class StoreVectorRegisterList_Vstm_Rule_399_A1_A2_P784
     : public StoreVectorRegisterList {
 };
 
 class Unary1RegisterBitRangeMsbGeLsb_Bfc_17_A1_P46
     : public Unary1RegisterBitRangeMsbGeLsb {
 };
 
-class Unary1RegisterImmediateOp_Adr_Rule_10_A1_P32
+class Unary1RegisterImmediateOp_ADR_A1
     : public Unary1RegisterImmediateOp {
 };
 
-class Unary1RegisterImmediateOp_Adr_Rule_10_A2_P32
+class Unary1RegisterImmediateOp_ADR_A2
     : public Unary1RegisterImmediateOp {
 };
 
-class Unary1RegisterImmediateOp_Mov_Rule_96_A1_P194
+class Unary1RegisterImmediateOp_MOV_immediate_A1
+    : public Unary1RegisterImmediateOp {
+};
+
+class Unary1RegisterImmediateOp_MVN_immediate_A1
     : public Unary1RegisterImmediateOp {
 };
 
 class Unary1RegisterImmediateOp_Mov_Rule_96_A2_P194
     : public Unary1RegisterImmediateOp {
 };
 
 class Unary1RegisterImmediateOp_Mov_Rule_99_A1_P200
     : public Unary1RegisterImmediateOp {
 };
 
-class Unary1RegisterImmediateOp_Mvn_Rule_106_A1_P214
-    : public Unary1RegisterImmediateOp {
-};
-
 class Unary1RegisterSet_Mrs_Rule_102_A1_P206_Or_B6_10
     : public Unary1RegisterSet {
 };
 
 class Unary1RegisterUse_Msr_Rule_104_A1_P210
     : public Unary1RegisterUse {
 };
 
 class Unary2RegisterImmedShiftedOp_Asr_Rule_14_A1_P40
     : public Unary2RegisterImmedShiftedOp {
@@ skipping 128 matching lines @@
 };
 
 class BxBlx_Blx_Rule_24_A1_P60
     : public BxBlx {
 };
 
 class BxBlx_Bx_Rule_25_A1_P62
     : public BxBlx {
 };
 
-class Defs12To15_Adc_Rule_2_A1_P16
+class Defs12To15_ADC_immediate_A1
     : public Defs12To15 {
 };
 
-class Defs12To15_Adc_Rule_6_A1_P14
+class Defs12To15_ADD_immediate_A1
     : public Defs12To15 {
 };
 
-class Defs12To15_Add_Rule_5_A1_P22
+class Defs12To15_ADR_A1
+    : public Defs12To15 {
+};
+
+class Defs12To15_ADR_A2
+    : public Defs12To15 {
+};
+
+class Defs12To15_AND_immediate_A1
+    : public Defs12To15 {
+};
+
+class Defs12To15_Adc_Rule_2_A1_P16
     : public Defs12To15 {
 };
 
 class Defs12To15_Add_Rule_6_A1_P24
     : public Defs12To15 {
 };
 
-class Defs12To15_Adr_Rule_10_A1_P32
-    : public Defs12To15 {
-};
-
-class Defs12To15_Adr_Rule_10_A2_P32
-    : public Defs12To15 {
-};
-
-class Defs12To15_And_Rule_11_A1_P34
-    : public Defs12To15 {
-};
-
 class Defs12To15_And_Rule_7_A1_P36
     : public Defs12To15 {
 };
 
 class Defs12To15_Asr_Rule_14_A1_P40
     : public Defs12To15 {
 };
 
 class Defs12To15_Bic_Rule_20_A1_P52
     : public Defs12To15 {
 };
 
-class Defs12To15_Eor_Rule_44_A1_P94
+class Defs12To15_EOR_immediate_A1
     : public Defs12To15 {
 };
 
 class Defs12To15_Eor_Rule_45_A1_P96
     : public Defs12To15 {
 };
 
 class Defs12To15_Lsl_Rule_88_A1_P178
     : public Defs12To15 {
 };
 
 class Defs12To15_Lsr_Rule_90_A1_P182
     : public Defs12To15 {
 };
 
-class Defs12To15_Mov_Rule_96_A1_P194
+class Defs12To15_MOV_immediate_A1
+    : public Defs12To15 {
+};
+
+class Defs12To15_MVN_immediate_A1
     : public Defs12To15 {
 };
 
 class Defs12To15_Mov_Rule_96_A2_P194
     : public Defs12To15 {
 };
 
 class Defs12To15_Mov_Rule_97_A1_P196
     : public Defs12To15 {
 };
 
 class Defs12To15_Mov_Rule_99_A1_P200
     : public Defs12To15 {
 };
 
-class Defs12To15_Mvn_Rule_106_A1_P214
-    : public Defs12To15 {
-};
-
 class Defs12To15_Mvn_Rule_107_A1_P216
     : public Defs12To15 {
 };
 
-class Defs12To15_Orr_Rule_113_A1_P228
+class Defs12To15_ORR_immediate_A1
     : public Defs12To15 {
 };
 
 class Defs12To15_Orr_Rule_114_A1_P230
     : public Defs12To15 {
 };
 
+class Defs12To15_RSB_immediate_A1
+    : public Defs12To15 {
+};
+
+class Defs12To15_RSC_immediate_A1
+    : public Defs12To15 {
+};
+
 class Defs12To15_Ror_Rule_139_A1_P278
     : public Defs12To15 {
 };
 
 class Defs12To15_Rrx_Rule_141_A1_P282
     : public Defs12To15 {
 };
 
-class Defs12To15_Rsb_Rule_142_A1_P284
-    : public Defs12To15 {
-};
-
 class Defs12To15_Rsb_Rule_143_P286
     : public Defs12To15 {
 };
 
-class Defs12To15_Rsc_Rule_145_A1_P290
-    : public Defs12To15 {
-};
-
 class Defs12To15_Rsc_Rule_146_A1_P292
     : public Defs12To15 {
 };
 
-class Defs12To15_Sbc_Rule_151_A1_P302
+class Defs12To15_SBC_immediate_A1
+    : public Defs12To15 {
+};
+
+class Defs12To15_SUB_immediate_A1
     : public Defs12To15 {
 };
 
 class Defs12To15_Sbc_Rule_152_A1_P304
     : public Defs12To15 {
 };
 
-class Defs12To15_Sub_Rule_212_A1_P420
-    : public Defs12To15 {
-};
-
 class Defs12To15_Sub_Rule_213_A1_P422
     : public Defs12To15 {
 };
 
 class Defs12To15CondsDontCareMsbGeLsb_Bfi_Rule_18_A1_P48
     : public Defs12To15CondsDontCareMsbGeLsb {
 };
 
 class Defs12To15CondsDontCareRdRnNotPc_Rbit_Rule_134_A1_P270
     : public Defs12To15CondsDontCareRdRnNotPc {
@@ skipping 412 matching lines @@
 };
 
 class Defs16To19CondsDontCareRdRmRnNotPc_Udiv_Rule_A1
     : public Defs16To19CondsDontCareRdRmRnNotPc {
 };
 
 class Defs16To19CondsDontCareRdRmRnNotPc_Usad8_Rule_253_A1_P500
     : public Defs16To19CondsDontCareRdRmRnNotPc {
 };
 
-class DontCareInst_Cmn_Rule_32_A1_P74
+class DontCareInst_CMN_immediate_A1
+    : public DontCareInst {
+};
+
+class DontCareInst_CMP_immediate_A1
     : public DontCareInst {
 };
 
 class DontCareInst_Cmn_Rule_33_A1_P76
     : public DontCareInst {
 };
 
-class DontCareInst_Cmp_Rule_35_A1_P80
-    : public DontCareInst {
-};
-
 class DontCareInst_Cmp_Rule_36_A1_P82
     : public DontCareInst {
 };
 
 class DontCareInst_Msr_Rule_103_A1_P208
     : public DontCareInst {
 };
 
 class DontCareInst_Nop_Rule_110_A1_P222
     : public DontCareInst {
 };
 
 class DontCareInst_Pld_Rule_117_A1_P236
     : public DontCareInst {
 };
 
 class DontCareInst_Pld_Rule_118_A1_P238
     : public DontCareInst {
 };
 
 class DontCareInst_Pldw_Rule_117_A1_P236
     : public DontCareInst {
 };
 
 class DontCareInst_Pli_Rule_120_A1_P242
     : public DontCareInst {
 };
 
-class DontCareInst_Teq_Rule_227_A1_P448
+class DontCareInst_TEQ_immediate_A1
     : public DontCareInst {
 };
 
 class DontCareInst_Teq_Rule_228_A1_P450
     : public DontCareInst {
 };
 
 class DontCareInst_Tst_Rule_231_A1_P456
     : public DontCareInst {
 };
@@ skipping 187 matching lines @@
 };
 
 class Forbidden_Strtb_Rule_A1
     : public Forbidden {
 };
 
 class Forbidden_Strtb_Rule_A2
     : public Forbidden {
 };
 
-class Forbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1a
-    : public Forbidden {
-};
-
-class Forbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1b
-    : public Forbidden {
-};
-
 class Forbidden_Svc_Rule_A1
     : public Forbidden {
 };
 
 class Forbidden_Unallocated_hints
     : public Forbidden {
 };
 
 class Forbidden_Wfe_Rule_411_A1_P808
     : public Forbidden {
@@ skipping 108 matching lines @@
 };
 
 class LoadMultiple_Ldmib_Ldmed_Rule_56_A1_P116
     : public LoadMultiple {
 };
 
 class LoadMultiple_Pop_Rule_A1
     : public LoadMultiple {
 };
 
-class MaskAddress_Bic_Rule_19_A1_P50
+class MaskAddress_BIC_immediate_A1
     : public MaskAddress {
 };
 
 class StoreBasedImmedMemory_Str_Rule_194_A1_P384
     : public StoreBasedImmedMemory {
 };
 
 class StoreBasedImmedMemory_Strb_Rule_197_A1_P390
     : public StoreBasedImmedMemory {
 };
@@ skipping 31 matching lines @@
 };
 
 class StoreBasedOffsetMemory_Strh_Rule_208_A1_P412
     : public StoreBasedOffsetMemory {
 };
 
 class StoreBasedOffsetMemoryDouble_Strd_Rule_201_A1_P398
     : public StoreBasedOffsetMemoryDouble {
 };
 
-class TestIfAddressMasked_Tst_Rule_230_A1_P454
+class TestIfAddressMasked_TST_immediate_A1
     : public TestIfAddressMasked {
 };
 
 class Undefined_Undefined_A5_2_5_0101
     : public Undefined {
 };
 
 class Undefined_Undefined_A5_2_5_0111
     : public Undefined {
 };
@@ skipping 178 matching lines @@
  public:
   NamedBinary2RegisterImmedShiftedTest_Tst_Rule_231_A1_P456()
     : NamedClassDecoder(decoder_, "Binary2RegisterImmedShiftedTest Tst_Rule_231_A1_P456")
   {}
 
  private:
   nacl_arm_dec::Binary2RegisterImmedShiftedTest_Tst_Rule_231_A1_P456 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmedShiftedTest_Tst_Rule_231_A1_P456);
 };
 
-class NamedBinary2RegisterImmediateOp_Adc_Rule_6_A1_P14
+class NamedBinary2RegisterImmediateOp_ADC_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterImmediateOp_Adc_Rule_6_A1_P14()
-    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp Adc_Rule_6_A1_P14")
+  NamedBinary2RegisterImmediateOp_ADC_immediate_A1()
+    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp ADC_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterImmediateOp_Adc_Rule_6_A1_P14 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_Adc_Rule_6_A1_P14);
+  nacl_arm_dec::Binary2RegisterImmediateOp_ADC_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_ADC_immediate_A1);
 };
 
-class NamedBinary2RegisterImmediateOp_Add_Rule_5_A1_P22
+class NamedBinary2RegisterImmediateOp_ADD_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterImmediateOp_Add_Rule_5_A1_P22()
-    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp Add_Rule_5_A1_P22")
+  NamedBinary2RegisterImmediateOp_ADD_immediate_A1()
+    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp ADD_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterImmediateOp_Add_Rule_5_A1_P22 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_Add_Rule_5_A1_P22);
+  nacl_arm_dec::Binary2RegisterImmediateOp_ADD_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_ADD_immediate_A1);
 };
 
-class NamedBinary2RegisterImmediateOp_And_Rule_11_A1_P34
+class NamedBinary2RegisterImmediateOp_AND_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterImmediateOp_And_Rule_11_A1_P34()
-    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp And_Rule_11_A1_P34")
+  NamedBinary2RegisterImmediateOp_AND_immediate_A1()
+    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp AND_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterImmediateOp_And_Rule_11_A1_P34 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_And_Rule_11_A1_P34);
+  nacl_arm_dec::Binary2RegisterImmediateOp_AND_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_AND_immediate_A1);
 };
 
-class NamedBinary2RegisterImmediateOp_Eor_Rule_44_A1_P94
+class NamedBinary2RegisterImmediateOp_EOR_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterImmediateOp_Eor_Rule_44_A1_P94()
-    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp Eor_Rule_44_A1_P94")
+  NamedBinary2RegisterImmediateOp_EOR_immediate_A1()
+    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp EOR_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterImmediateOp_Eor_Rule_44_A1_P94 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_Eor_Rule_44_A1_P94);
+  nacl_arm_dec::Binary2RegisterImmediateOp_EOR_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_EOR_immediate_A1);
 };
 
-class NamedBinary2RegisterImmediateOp_Orr_Rule_113_A1_P228
+class NamedBinary2RegisterImmediateOp_ORR_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterImmediateOp_Orr_Rule_113_A1_P228()
-    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp Orr_Rule_113_A1_P228")
+  NamedBinary2RegisterImmediateOp_ORR_immediate_A1()
+    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp ORR_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterImmediateOp_Orr_Rule_113_A1_P228 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_Orr_Rule_113_A1_P228);
+  nacl_arm_dec::Binary2RegisterImmediateOp_ORR_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_ORR_immediate_A1);
 };
 
-class NamedBinary2RegisterImmediateOp_Rsb_Rule_142_A1_P284
+class NamedBinary2RegisterImmediateOp_RSB_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterImmediateOp_Rsb_Rule_142_A1_P284()
-    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp Rsb_Rule_142_A1_P284")
+  NamedBinary2RegisterImmediateOp_RSB_immediate_A1()
+    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp RSB_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterImmediateOp_Rsb_Rule_142_A1_P284 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_Rsb_Rule_142_A1_P284);
+  nacl_arm_dec::Binary2RegisterImmediateOp_RSB_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_RSB_immediate_A1);
 };
 
-class NamedBinary2RegisterImmediateOp_Rsc_Rule_145_A1_P290
+class NamedBinary2RegisterImmediateOp_RSC_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterImmediateOp_Rsc_Rule_145_A1_P290()
-    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp Rsc_Rule_145_A1_P290")
+  NamedBinary2RegisterImmediateOp_RSC_immediate_A1()
+    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp RSC_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterImmediateOp_Rsc_Rule_145_A1_P290 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_Rsc_Rule_145_A1_P290);
+  nacl_arm_dec::Binary2RegisterImmediateOp_RSC_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_RSC_immediate_A1);
 };
 
-class NamedBinary2RegisterImmediateOp_Sbc_Rule_151_A1_P302
+class NamedBinary2RegisterImmediateOp_SBC_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterImmediateOp_Sbc_Rule_151_A1_P302()
-    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp Sbc_Rule_151_A1_P302")
+  NamedBinary2RegisterImmediateOp_SBC_immediate_A1()
+    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp SBC_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterImmediateOp_Sbc_Rule_151_A1_P302 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_Sbc_Rule_151_A1_P302);
+  nacl_arm_dec::Binary2RegisterImmediateOp_SBC_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_SBC_immediate_A1);
 };
 
-class NamedBinary2RegisterImmediateOp_Sub_Rule_212_A1_P420
+class NamedBinary2RegisterImmediateOp_SUB_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinary2RegisterImmediateOp_Sub_Rule_212_A1_P420()
-    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp Sub_Rule_212_A1_P420")
+  NamedBinary2RegisterImmediateOp_SUB_immediate_A1()
+    : NamedClassDecoder(decoder_, "Binary2RegisterImmediateOp SUB_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Binary2RegisterImmediateOp_Sub_Rule_212_A1_P420 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_Sub_Rule_212_A1_P420);
+  nacl_arm_dec::Binary2RegisterImmediateOp_SUB_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary2RegisterImmediateOp_SUB_immediate_A1);
 };
 
 class NamedBinary3RegisterImmedShiftedOp_Adc_Rule_2_A1_P16
     : public NamedClassDecoder {
  public:
   NamedBinary3RegisterImmedShiftedOp_Adc_Rule_2_A1_P16()
     : NamedClassDecoder(decoder_, "Binary3RegisterImmedShiftedOp Adc_Rule_2_A1_P16")
   {}
 
  private:
@@ skipping 1206 matching lines @@
  public:
   NamedBinary4RegisterShiftedOp_SUB_register_shifted_register_A1()
     : NamedClassDecoder(decoder_, "Binary4RegisterShiftedOp SUB_register_shifted_register_A1")
   {}
 
  private:
   nacl_arm_dec::Binary4RegisterShiftedOp_SUB_register_shifted_register_A1 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary4RegisterShiftedOp_SUB_register_shifted_register_A1);
 };
 
-class NamedBinaryRegisterImmediateTest_Cmn_Rule_32_A1_P74
+class NamedBinaryRegisterImmediateTest_CMN_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinaryRegisterImmediateTest_Cmn_Rule_32_A1_P74()
-    : NamedClassDecoder(decoder_, "BinaryRegisterImmediateTest Cmn_Rule_32_A1_P74")
+  NamedBinaryRegisterImmediateTest_CMN_immediate_A1()
+    : NamedClassDecoder(decoder_, "BinaryRegisterImmediateTest CMN_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::BinaryRegisterImmediateTest_Cmn_Rule_32_A1_P74 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinaryRegisterImmediateTest_Cmn_Rule_32_A1_P74);
+  nacl_arm_dec::BinaryRegisterImmediateTest_CMN_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinaryRegisterImmediateTest_CMN_immediate_A1);
 };
 
-class NamedBinaryRegisterImmediateTest_Cmp_Rule_35_A1_P80
+class NamedBinaryRegisterImmediateTest_CMP_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinaryRegisterImmediateTest_Cmp_Rule_35_A1_P80()
-    : NamedClassDecoder(decoder_, "BinaryRegisterImmediateTest Cmp_Rule_35_A1_P80")
+  NamedBinaryRegisterImmediateTest_CMP_immediate_A1()
+    : NamedClassDecoder(decoder_, "BinaryRegisterImmediateTest CMP_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::BinaryRegisterImmediateTest_Cmp_Rule_35_A1_P80 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinaryRegisterImmediateTest_Cmp_Rule_35_A1_P80);
+  nacl_arm_dec::BinaryRegisterImmediateTest_CMP_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinaryRegisterImmediateTest_CMP_immediate_A1);
 };
 
-class NamedBinaryRegisterImmediateTest_Teq_Rule_227_A1_P448
+class NamedBinaryRegisterImmediateTest_TEQ_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedBinaryRegisterImmediateTest_Teq_Rule_227_A1_P448()
-    : NamedClassDecoder(decoder_, "BinaryRegisterImmediateTest Teq_Rule_227_A1_P448")
+  NamedBinaryRegisterImmediateTest_TEQ_immediate_A1()
+    : NamedClassDecoder(decoder_, "BinaryRegisterImmediateTest TEQ_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::BinaryRegisterImmediateTest_Teq_Rule_227_A1_P448 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinaryRegisterImmediateTest_Teq_Rule_227_A1_P448);
+  nacl_arm_dec::BinaryRegisterImmediateTest_TEQ_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinaryRegisterImmediateTest_TEQ_immediate_A1);
 };
 
 class NamedBranchImmediate24_B_Rule_16_A1_P44
     : public NamedClassDecoder {
  public:
   NamedBranchImmediate24_B_Rule_16_A1_P44()
     : NamedClassDecoder(decoder_, "BranchImmediate24 B_Rule_16_A1_P44")
   {}
 
  private:
@@ skipping 714 matching lines @@
  public:
   NamedForbiddenCondDecoder_Strtb_Rule_A2()
     : NamedClassDecoder(decoder_, "ForbiddenCondDecoder Strtb_Rule_A2")
   {}
 
  private:
   nacl_arm_dec::ForbiddenCondDecoder_Strtb_Rule_A2 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedForbiddenCondDecoder_Strtb_Rule_A2);
 };
 
-class NamedForbiddenCondDecoder_Subs_Pc_Lr_and_related_instructions_Rule_A1a
-    : public NamedClassDecoder {
- public:
-  NamedForbiddenCondDecoder_Subs_Pc_Lr_and_related_instructions_Rule_A1a()
-    : NamedClassDecoder(decoder_, "ForbiddenCondDecoder Subs_Pc_Lr_and_related_instructions_Rule_A1a")
-  {}
-
- private:
-  nacl_arm_dec::ForbiddenCondDecoder_Subs_Pc_Lr_and_related_instructions_Rule_A1a decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedForbiddenCondDecoder_Subs_Pc_Lr_and_related_instructions_Rule_A1a);
-};
-
-class NamedForbiddenCondDecoder_Subs_Pc_Lr_and_related_instructions_Rule_A1b
-    : public NamedClassDecoder {
- public:
-  NamedForbiddenCondDecoder_Subs_Pc_Lr_and_related_instructions_Rule_A1b()
-    : NamedClassDecoder(decoder_, "ForbiddenCondDecoder Subs_Pc_Lr_and_related_instructions_Rule_A1b")
-  {}
-
- private:
-  nacl_arm_dec::ForbiddenCondDecoder_Subs_Pc_Lr_and_related_instructions_Rule_A1b decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedForbiddenCondDecoder_Subs_Pc_Lr_and_related_instructions_Rule_A1b);
-};
-
 class NamedForbiddenCondDecoder_Svc_Rule_A1
     : public NamedClassDecoder {
  public:
   NamedForbiddenCondDecoder_Svc_Rule_A1()
     : NamedClassDecoder(decoder_, "ForbiddenCondDecoder Svc_Rule_A1")
   {}
 
  private:
   nacl_arm_dec::ForbiddenCondDecoder_Svc_Rule_A1 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedForbiddenCondDecoder_Svc_Rule_A1);
@@ skipping 592 matching lines @@
  public:
   NamedLoadVectorRegisterList_Vpop_Rule_354_A1_A2_P694()
     : NamedClassDecoder(decoder_, "LoadVectorRegisterList Vpop_Rule_354_A1_A2_P694")
   {}
 
  private:
   nacl_arm_dec::LoadVectorRegisterList_Vpop_Rule_354_A1_A2_P694 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedLoadVectorRegisterList_Vpop_Rule_354_A1_A2_P694);
 };
 
-class NamedMaskedBinary2RegisterImmediateOp_Bic_Rule_19_A1_P50
+class NamedMaskedBinary2RegisterImmediateOp_BIC_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedMaskedBinary2RegisterImmediateOp_Bic_Rule_19_A1_P50()
-    : NamedClassDecoder(decoder_, "MaskedBinary2RegisterImmediateOp Bic_Rule_19_A1_P50")
+  NamedMaskedBinary2RegisterImmediateOp_BIC_immediate_A1()
+    : NamedClassDecoder(decoder_, "MaskedBinary2RegisterImmediateOp BIC_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::MaskedBinary2RegisterImmediateOp_Bic_Rule_19_A1_P50 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedMaskedBinary2RegisterImmediateOp_Bic_Rule_19_A1_P50);
+  nacl_arm_dec::MaskedBinary2RegisterImmediateOp_BIC_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedMaskedBinary2RegisterImmediateOp_BIC_immediate_A1);
 };
 
-class NamedMaskedBinaryRegisterImmediateTest_Tst_Rule_230_A1_P454
+class NamedMaskedBinaryRegisterImmediateTest_TST_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedMaskedBinaryRegisterImmediateTest_Tst_Rule_230_A1_P454()
-    : NamedClassDecoder(decoder_, "MaskedBinaryRegisterImmediateTest Tst_Rule_230_A1_P454")
+  NamedMaskedBinaryRegisterImmediateTest_TST_immediate_A1()
+    : NamedClassDecoder(decoder_, "MaskedBinaryRegisterImmediateTest TST_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::MaskedBinaryRegisterImmediateTest_Tst_Rule_230_A1_P454 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedMaskedBinaryRegisterImmediateTest_Tst_Rule_230_A1_P454);
+  nacl_arm_dec::MaskedBinaryRegisterImmediateTest_TST_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedMaskedBinaryRegisterImmediateTest_TST_immediate_A1);
 };
 
 class NamedMoveDoubleVfpRegisterOp_Vmov_one_D_Rule_A1
     : public NamedClassDecoder {
  public:
   NamedMoveDoubleVfpRegisterOp_Vmov_one_D_Rule_A1()
     : NamedClassDecoder(decoder_, "MoveDoubleVfpRegisterOp Vmov_one_D_Rule_A1")
   {}
 
  private:
@@ skipping 426 matching lines @@
  public:
   NamedUnary1RegisterBitRangeMsbGeLsb_Bfc_17_A1_P46()
     : NamedClassDecoder(decoder_, "Unary1RegisterBitRangeMsbGeLsb Bfc_17_A1_P46")
   {}
 
  private:
   nacl_arm_dec::Unary1RegisterBitRangeMsbGeLsb_Bfc_17_A1_P46 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterBitRangeMsbGeLsb_Bfc_17_A1_P46);
 };
 
-class NamedUnary1RegisterImmediateOp_Adr_Rule_10_A1_P32
+class NamedUnary1RegisterImmediateOp_ADR_A1
     : public NamedClassDecoder {
  public:
-  NamedUnary1RegisterImmediateOp_Adr_Rule_10_A1_P32()
-    : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp Adr_Rule_10_A1_P32")
+  NamedUnary1RegisterImmediateOp_ADR_A1()
+    : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp ADR_A1")
   {}
 
  private:
-  nacl_arm_dec::Unary1RegisterImmediateOp_Adr_Rule_10_A1_P32 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterImmediateOp_Adr_Rule_10_A1_P32);
+  nacl_arm_dec::Unary1RegisterImmediateOp_ADR_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterImmediateOp_ADR_A1);
 };
 
-class NamedUnary1RegisterImmediateOp_Adr_Rule_10_A2_P32
+class NamedUnary1RegisterImmediateOp_ADR_A2
     : public NamedClassDecoder {
  public:
-  NamedUnary1RegisterImmediateOp_Adr_Rule_10_A2_P32()
-    : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp Adr_Rule_10_A2_P32")
+  NamedUnary1RegisterImmediateOp_ADR_A2()
+    : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp ADR_A2")
   {}
 
  private:
-  nacl_arm_dec::Unary1RegisterImmediateOp_Adr_Rule_10_A2_P32 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterImmediateOp_Adr_Rule_10_A2_P32);
+  nacl_arm_dec::Unary1RegisterImmediateOp_ADR_A2 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterImmediateOp_ADR_A2);
 };
 
-class NamedUnary1RegisterImmediateOp_Mov_Rule_96_A1_P194
+class NamedUnary1RegisterImmediateOp_MOV_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedUnary1RegisterImmediateOp_Mov_Rule_96_A1_P194()
-    : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp Mov_Rule_96_A1_P194")
+  NamedUnary1RegisterImmediateOp_MOV_immediate_A1()
+    : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp MOV_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Unary1RegisterImmediateOp_Mov_Rule_96_A1_P194 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterImmediateOp_Mov_Rule_96_A1_P194);
+  nacl_arm_dec::Unary1RegisterImmediateOp_MOV_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterImmediateOp_MOV_immediate_A1);
+};
+
+class NamedUnary1RegisterImmediateOp_MVN_immediate_A1
+    : public NamedClassDecoder {
+ public:
+  NamedUnary1RegisterImmediateOp_MVN_immediate_A1()
+    : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp MVN_immediate_A1")
+  {}
+
+ private:
+  nacl_arm_dec::Unary1RegisterImmediateOp_MVN_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterImmediateOp_MVN_immediate_A1);
 };
 
 class NamedUnary1RegisterImmediateOp_Mov_Rule_96_A2_P194
     : public NamedClassDecoder {
  public:
   NamedUnary1RegisterImmediateOp_Mov_Rule_96_A2_P194()
     : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp Mov_Rule_96_A2_P194")
   {}
 
  private:
   nacl_arm_dec::Unary1RegisterImmediateOp_Mov_Rule_96_A2_P194 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterImmediateOp_Mov_Rule_96_A2_P194);
 };
 
 class NamedUnary1RegisterImmediateOp_Mov_Rule_99_A1_P200
     : public NamedClassDecoder {
  public:
   NamedUnary1RegisterImmediateOp_Mov_Rule_99_A1_P200()
     : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp Mov_Rule_99_A1_P200")
   {}
 
  private:
   nacl_arm_dec::Unary1RegisterImmediateOp_Mov_Rule_99_A1_P200 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterImmediateOp_Mov_Rule_99_A1_P200);
 };
 
-class NamedUnary1RegisterImmediateOp_Mvn_Rule_106_A1_P214
-    : public NamedClassDecoder {
- public:
-  NamedUnary1RegisterImmediateOp_Mvn_Rule_106_A1_P214()
-    : NamedClassDecoder(decoder_, "Unary1RegisterImmediateOp Mvn_Rule_106_A1_P214")
-  {}
-
- private:
-  nacl_arm_dec::Unary1RegisterImmediateOp_Mvn_Rule_106_A1_P214 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterImmediateOp_Mvn_Rule_106_A1_P214);
-};
-
 class NamedUnary1RegisterSet_Mrs_Rule_102_A1_P206_Or_B6_10
     : public NamedClassDecoder {
  public:
   NamedUnary1RegisterSet_Mrs_Rule_102_A1_P206_Or_B6_10()
     : NamedClassDecoder(decoder_, "Unary1RegisterSet Mrs_Rule_102_A1_P206_Or_B6_10")
   {}
 
  private:
   nacl_arm_dec::Unary1RegisterSet_Mrs_Rule_102_A1_P206_Or_B6_10 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedUnary1RegisterSet_Mrs_Rule_102_A1_P206_Or_B6_10);
@@ skipping 424 matching lines @@
  public:
   NamedBxBlx_Bx_Rule_25_A1_P62()
     : NamedClassDecoder(decoder_, "BxBlx Bx_Rule_25_A1_P62")
   {}
 
  private:
   nacl_arm_dec::BxBlx_Bx_Rule_25_A1_P62 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedBxBlx_Bx_Rule_25_A1_P62);
 };
 
+class NamedDefs12To15_ADC_immediate_A1
+    : public NamedClassDecoder {
+ public:
+  NamedDefs12To15_ADC_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 ADC_immediate_A1")
+  {}
+
+ private:
+  nacl_arm_dec::Defs12To15_ADC_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_ADC_immediate_A1);
+};
+
+class NamedDefs12To15_ADD_immediate_A1
+    : public NamedClassDecoder {
+ public:
+  NamedDefs12To15_ADD_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 ADD_immediate_A1")
+  {}
+
+ private:
+  nacl_arm_dec::Defs12To15_ADD_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_ADD_immediate_A1);
+};
+
+class NamedDefs12To15_ADR_A1
+    : public NamedClassDecoder {
+ public:
+  NamedDefs12To15_ADR_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 ADR_A1")
+  {}
+
+ private:
+  nacl_arm_dec::Defs12To15_ADR_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_ADR_A1);
+};
+
+class NamedDefs12To15_ADR_A2
+    : public NamedClassDecoder {
+ public:
+  NamedDefs12To15_ADR_A2()
+    : NamedClassDecoder(decoder_, "Defs12To15 ADR_A2")
+  {}
+
+ private:
+  nacl_arm_dec::Defs12To15_ADR_A2 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_ADR_A2);
+};
+
+class NamedDefs12To15_AND_immediate_A1
+    : public NamedClassDecoder {
+ public:
+  NamedDefs12To15_AND_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 AND_immediate_A1")
+  {}
+
+ private:
+  nacl_arm_dec::Defs12To15_AND_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_AND_immediate_A1);
+};
+
 class NamedDefs12To15_Adc_Rule_2_A1_P16
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Adc_Rule_2_A1_P16()
     : NamedClassDecoder(decoder_, "Defs12To15 Adc_Rule_2_A1_P16")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Adc_Rule_2_A1_P16 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Adc_Rule_2_A1_P16);
 };
 
-class NamedDefs12To15_Adc_Rule_6_A1_P14
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15_Adc_Rule_6_A1_P14()
-    : NamedClassDecoder(decoder_, "Defs12To15 Adc_Rule_6_A1_P14")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15_Adc_Rule_6_A1_P14 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Adc_Rule_6_A1_P14);
-};
-
-class NamedDefs12To15_Add_Rule_5_A1_P22
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15_Add_Rule_5_A1_P22()
-    : NamedClassDecoder(decoder_, "Defs12To15 Add_Rule_5_A1_P22")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15_Add_Rule_5_A1_P22 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Add_Rule_5_A1_P22);
-};
-
 class NamedDefs12To15_Add_Rule_6_A1_P24
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Add_Rule_6_A1_P24()
     : NamedClassDecoder(decoder_, "Defs12To15 Add_Rule_6_A1_P24")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Add_Rule_6_A1_P24 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Add_Rule_6_A1_P24);
 };
 
-class NamedDefs12To15_Adr_Rule_10_A1_P32
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15_Adr_Rule_10_A1_P32()
-    : NamedClassDecoder(decoder_, "Defs12To15 Adr_Rule_10_A1_P32")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15_Adr_Rule_10_A1_P32 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Adr_Rule_10_A1_P32);
-};
-
-class NamedDefs12To15_Adr_Rule_10_A2_P32
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15_Adr_Rule_10_A2_P32()
-    : NamedClassDecoder(decoder_, "Defs12To15 Adr_Rule_10_A2_P32")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15_Adr_Rule_10_A2_P32 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Adr_Rule_10_A2_P32);
-};
-
-class NamedDefs12To15_And_Rule_11_A1_P34
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15_And_Rule_11_A1_P34()
-    : NamedClassDecoder(decoder_, "Defs12To15 And_Rule_11_A1_P34")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15_And_Rule_11_A1_P34 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_And_Rule_11_A1_P34);
-};
-
 class NamedDefs12To15_And_Rule_7_A1_P36
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_And_Rule_7_A1_P36()
     : NamedClassDecoder(decoder_, "Defs12To15 And_Rule_7_A1_P36")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_And_Rule_7_A1_P36 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_And_Rule_7_A1_P36);
@@ skipping 16 matching lines @@
  public:
   NamedDefs12To15_Bic_Rule_20_A1_P52()
     : NamedClassDecoder(decoder_, "Defs12To15 Bic_Rule_20_A1_P52")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Bic_Rule_20_A1_P52 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Bic_Rule_20_A1_P52);
 };
 
-class NamedDefs12To15_Eor_Rule_44_A1_P94
+class NamedDefs12To15_EOR_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedDefs12To15_Eor_Rule_44_A1_P94()
-    : NamedClassDecoder(decoder_, "Defs12To15 Eor_Rule_44_A1_P94")
+  NamedDefs12To15_EOR_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 EOR_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Defs12To15_Eor_Rule_44_A1_P94 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Eor_Rule_44_A1_P94);
+  nacl_arm_dec::Defs12To15_EOR_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_EOR_immediate_A1);
 };
 
 class NamedDefs12To15_Eor_Rule_45_A1_P96
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Eor_Rule_45_A1_P96()
     : NamedClassDecoder(decoder_, "Defs12To15 Eor_Rule_45_A1_P96")
   {}
 
  private:
@@ skipping 18 matching lines @@
  public:
   NamedDefs12To15_Lsr_Rule_90_A1_P182()
     : NamedClassDecoder(decoder_, "Defs12To15 Lsr_Rule_90_A1_P182")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Lsr_Rule_90_A1_P182 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Lsr_Rule_90_A1_P182);
 };
 
-class NamedDefs12To15_Mov_Rule_96_A1_P194
+class NamedDefs12To15_MOV_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedDefs12To15_Mov_Rule_96_A1_P194()
-    : NamedClassDecoder(decoder_, "Defs12To15 Mov_Rule_96_A1_P194")
+  NamedDefs12To15_MOV_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 MOV_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Defs12To15_Mov_Rule_96_A1_P194 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Mov_Rule_96_A1_P194);
+  nacl_arm_dec::Defs12To15_MOV_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_MOV_immediate_A1);
+};
+
+class NamedDefs12To15_MVN_immediate_A1
+    : public NamedClassDecoder {
+ public:
+  NamedDefs12To15_MVN_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 MVN_immediate_A1")
+  {}
+
+ private:
+  nacl_arm_dec::Defs12To15_MVN_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_MVN_immediate_A1);
 };
 
 class NamedDefs12To15_Mov_Rule_96_A2_P194
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Mov_Rule_96_A2_P194()
     : NamedClassDecoder(decoder_, "Defs12To15 Mov_Rule_96_A2_P194")
   {}
 
  private:
@@ skipping 18 matching lines @@
  public:
   NamedDefs12To15_Mov_Rule_99_A1_P200()
     : NamedClassDecoder(decoder_, "Defs12To15 Mov_Rule_99_A1_P200")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Mov_Rule_99_A1_P200 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Mov_Rule_99_A1_P200);
 };
 
-class NamedDefs12To15_Mvn_Rule_106_A1_P214
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15_Mvn_Rule_106_A1_P214()
-    : NamedClassDecoder(decoder_, "Defs12To15 Mvn_Rule_106_A1_P214")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15_Mvn_Rule_106_A1_P214 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Mvn_Rule_106_A1_P214);
-};
-
 class NamedDefs12To15_Mvn_Rule_107_A1_P216
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Mvn_Rule_107_A1_P216()
     : NamedClassDecoder(decoder_, "Defs12To15 Mvn_Rule_107_A1_P216")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Mvn_Rule_107_A1_P216 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Mvn_Rule_107_A1_P216);
 };
 
-class NamedDefs12To15_Orr_Rule_113_A1_P228
+class NamedDefs12To15_ORR_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedDefs12To15_Orr_Rule_113_A1_P228()
-    : NamedClassDecoder(decoder_, "Defs12To15 Orr_Rule_113_A1_P228")
+  NamedDefs12To15_ORR_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 ORR_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Defs12To15_Orr_Rule_113_A1_P228 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Orr_Rule_113_A1_P228);
+  nacl_arm_dec::Defs12To15_ORR_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_ORR_immediate_A1);
 };
 
 class NamedDefs12To15_Orr_Rule_114_A1_P230
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Orr_Rule_114_A1_P230()
     : NamedClassDecoder(decoder_, "Defs12To15 Orr_Rule_114_A1_P230")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Orr_Rule_114_A1_P230 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Orr_Rule_114_A1_P230);
 };
 
+class NamedDefs12To15_RSB_immediate_A1
+    : public NamedClassDecoder {
+ public:
+  NamedDefs12To15_RSB_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 RSB_immediate_A1")
+  {}
+
+ private:
+  nacl_arm_dec::Defs12To15_RSB_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_RSB_immediate_A1);
+};
+
+class NamedDefs12To15_RSC_immediate_A1
+    : public NamedClassDecoder {
+ public:
+  NamedDefs12To15_RSC_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 RSC_immediate_A1")
+  {}
+
+ private:
+  nacl_arm_dec::Defs12To15_RSC_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_RSC_immediate_A1);
+};
+
 class NamedDefs12To15_Ror_Rule_139_A1_P278
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Ror_Rule_139_A1_P278()
     : NamedClassDecoder(decoder_, "Defs12To15 Ror_Rule_139_A1_P278")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Ror_Rule_139_A1_P278 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Ror_Rule_139_A1_P278);
 };
 
 class NamedDefs12To15_Rrx_Rule_141_A1_P282
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Rrx_Rule_141_A1_P282()
     : NamedClassDecoder(decoder_, "Defs12To15 Rrx_Rule_141_A1_P282")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Rrx_Rule_141_A1_P282 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Rrx_Rule_141_A1_P282);
 };
 
-class NamedDefs12To15_Rsb_Rule_142_A1_P284
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15_Rsb_Rule_142_A1_P284()
-    : NamedClassDecoder(decoder_, "Defs12To15 Rsb_Rule_142_A1_P284")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15_Rsb_Rule_142_A1_P284 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Rsb_Rule_142_A1_P284);
-};
-
 class NamedDefs12To15_Rsb_Rule_143_P286
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Rsb_Rule_143_P286()
     : NamedClassDecoder(decoder_, "Defs12To15 Rsb_Rule_143_P286")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Rsb_Rule_143_P286 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Rsb_Rule_143_P286);
 };
 
-class NamedDefs12To15_Rsc_Rule_145_A1_P290
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15_Rsc_Rule_145_A1_P290()
-    : NamedClassDecoder(decoder_, "Defs12To15 Rsc_Rule_145_A1_P290")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15_Rsc_Rule_145_A1_P290 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Rsc_Rule_145_A1_P290);
-};
-
 class NamedDefs12To15_Rsc_Rule_146_A1_P292
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Rsc_Rule_146_A1_P292()
     : NamedClassDecoder(decoder_, "Defs12To15 Rsc_Rule_146_A1_P292")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Rsc_Rule_146_A1_P292 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Rsc_Rule_146_A1_P292);
 };
 
-class NamedDefs12To15_Sbc_Rule_151_A1_P302
+class NamedDefs12To15_SBC_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedDefs12To15_Sbc_Rule_151_A1_P302()
-    : NamedClassDecoder(decoder_, "Defs12To15 Sbc_Rule_151_A1_P302")
+  NamedDefs12To15_SBC_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 SBC_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::Defs12To15_Sbc_Rule_151_A1_P302 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Sbc_Rule_151_A1_P302);
+  nacl_arm_dec::Defs12To15_SBC_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_SBC_immediate_A1);
+};
+
+class NamedDefs12To15_SUB_immediate_A1
+    : public NamedClassDecoder {
+ public:
+  NamedDefs12To15_SUB_immediate_A1()
+    : NamedClassDecoder(decoder_, "Defs12To15 SUB_immediate_A1")
+  {}
+
+ private:
+  nacl_arm_dec::Defs12To15_SUB_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_SUB_immediate_A1);
 };
 
 class NamedDefs12To15_Sbc_Rule_152_A1_P304
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Sbc_Rule_152_A1_P304()
     : NamedClassDecoder(decoder_, "Defs12To15 Sbc_Rule_152_A1_P304")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Sbc_Rule_152_A1_P304 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Sbc_Rule_152_A1_P304);
 };
 
-class NamedDefs12To15_Sub_Rule_212_A1_P420
-    : public NamedClassDecoder {
- public:
-  NamedDefs12To15_Sub_Rule_212_A1_P420()
-    : NamedClassDecoder(decoder_, "Defs12To15 Sub_Rule_212_A1_P420")
-  {}
-
- private:
-  nacl_arm_dec::Defs12To15_Sub_Rule_212_A1_P420 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Sub_Rule_212_A1_P420);
-};
-
 class NamedDefs12To15_Sub_Rule_213_A1_P422
     : public NamedClassDecoder {
  public:
   NamedDefs12To15_Sub_Rule_213_A1_P422()
     : NamedClassDecoder(decoder_, "Defs12To15 Sub_Rule_213_A1_P422")
   {}
 
  private:
   nacl_arm_dec::Defs12To15_Sub_Rule_213_A1_P422 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDefs12To15_Sub_Rule_213_A1_P422);
@@ skipping 1276 matching lines @@
  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_Cmn_Rule_32_A1_P74
+class NamedDontCareInst_CMN_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedDontCareInst_Cmn_Rule_32_A1_P74()
-    : NamedClassDecoder(decoder_, "DontCareInst Cmn_Rule_32_A1_P74")
+  NamedDontCareInst_CMN_immediate_A1()
+    : NamedClassDecoder(decoder_, "DontCareInst CMN_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::DontCareInst_Cmn_Rule_32_A1_P74 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDontCareInst_Cmn_Rule_32_A1_P74);
+  nacl_arm_dec::DontCareInst_CMN_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDontCareInst_CMN_immediate_A1);
+};
+
+class NamedDontCareInst_CMP_immediate_A1
+    : public NamedClassDecoder {
+ public:
+  NamedDontCareInst_CMP_immediate_A1()
+    : NamedClassDecoder(decoder_, "DontCareInst CMP_immediate_A1")
+  {}
+
+ private:
+  nacl_arm_dec::DontCareInst_CMP_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDontCareInst_CMP_immediate_A1);
 };
 
 class NamedDontCareInst_Cmn_Rule_33_A1_P76
     : public NamedClassDecoder {
  public:
   NamedDontCareInst_Cmn_Rule_33_A1_P76()
     : NamedClassDecoder(decoder_, "DontCareInst Cmn_Rule_33_A1_P76")
   {}
 
  private:
   nacl_arm_dec::DontCareInst_Cmn_Rule_33_A1_P76 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDontCareInst_Cmn_Rule_33_A1_P76);
 };
 
-class NamedDontCareInst_Cmp_Rule_35_A1_P80
-    : public NamedClassDecoder {
- public:
-  NamedDontCareInst_Cmp_Rule_35_A1_P80()
-    : NamedClassDecoder(decoder_, "DontCareInst Cmp_Rule_35_A1_P80")
-  {}
-
- private:
-  nacl_arm_dec::DontCareInst_Cmp_Rule_35_A1_P80 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDontCareInst_Cmp_Rule_35_A1_P80);
-};
-
 class NamedDontCareInst_Cmp_Rule_36_A1_P82
     : public NamedClassDecoder {
  public:
   NamedDontCareInst_Cmp_Rule_36_A1_P82()
     : NamedClassDecoder(decoder_, "DontCareInst Cmp_Rule_36_A1_P82")
   {}
 
  private:
   nacl_arm_dec::DontCareInst_Cmp_Rule_36_A1_P82 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDontCareInst_Cmp_Rule_36_A1_P82);
@@ skipping 64 matching lines @@
  public:
   NamedDontCareInst_Pli_Rule_120_A1_P242()
     : NamedClassDecoder(decoder_, "DontCareInst Pli_Rule_120_A1_P242")
   {}
 
  private:
   nacl_arm_dec::DontCareInst_Pli_Rule_120_A1_P242 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedDontCareInst_Pli_Rule_120_A1_P242);
 };
 
-class NamedDontCareInst_Teq_Rule_227_A1_P448
+class NamedDontCareInst_TEQ_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedDontCareInst_Teq_Rule_227_A1_P448()
-    : NamedClassDecoder(decoder_, "DontCareInst Teq_Rule_227_A1_P448")
+  NamedDontCareInst_TEQ_immediate_A1()
+    : NamedClassDecoder(decoder_, "DontCareInst TEQ_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::DontCareInst_Teq_Rule_227_A1_P448 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDontCareInst_Teq_Rule_227_A1_P448);
+  nacl_arm_dec::DontCareInst_TEQ_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedDontCareInst_TEQ_immediate_A1);
 };
 
 class NamedDontCareInst_Teq_Rule_228_A1_P450
     : public NamedClassDecoder {
  public:
   NamedDontCareInst_Teq_Rule_228_A1_P450()
     : NamedClassDecoder(decoder_, "DontCareInst Teq_Rule_228_A1_P450")
   {}
 
  private:
@@ skipping 594 matching lines @@
  public:
   NamedForbidden_Strtb_Rule_A2()
     : NamedClassDecoder(decoder_, "Forbidden Strtb_Rule_A2")
   {}
 
  private:
   nacl_arm_dec::Forbidden_Strtb_Rule_A2 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedForbidden_Strtb_Rule_A2);
 };
 
-class NamedForbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1a
-    : public NamedClassDecoder {
- public:
-  NamedForbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1a()
-    : NamedClassDecoder(decoder_, "Forbidden Subs_Pc_Lr_and_related_instructions_Rule_A1a")
-  {}
-
- private:
-  nacl_arm_dec::Forbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1a decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedForbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1a);
-};
-
-class NamedForbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1b
-    : public NamedClassDecoder {
- public:
-  NamedForbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1b()
-    : NamedClassDecoder(decoder_, "Forbidden Subs_Pc_Lr_and_related_instructions_Rule_A1b")
-  {}
-
- private:
-  nacl_arm_dec::Forbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1b decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedForbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1b);
-};
-
 class NamedForbidden_Svc_Rule_A1
     : public NamedClassDecoder {
  public:
   NamedForbidden_Svc_Rule_A1()
     : NamedClassDecoder(decoder_, "Forbidden Svc_Rule_A1")
   {}
 
  private:
   nacl_arm_dec::Forbidden_Svc_Rule_A1 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedForbidden_Svc_Rule_A1);
@@ skipping 364 matching lines @@
  public:
   NamedLoadMultiple_Pop_Rule_A1()
     : NamedClassDecoder(decoder_, "LoadMultiple Pop_Rule_A1")
   {}
 
  private:
   nacl_arm_dec::LoadMultiple_Pop_Rule_A1 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedLoadMultiple_Pop_Rule_A1);
 };
 
-class NamedMaskAddress_Bic_Rule_19_A1_P50
+class NamedMaskAddress_BIC_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedMaskAddress_Bic_Rule_19_A1_P50()
-    : NamedClassDecoder(decoder_, "MaskAddress Bic_Rule_19_A1_P50")
+  NamedMaskAddress_BIC_immediate_A1()
+    : NamedClassDecoder(decoder_, "MaskAddress BIC_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::MaskAddress_Bic_Rule_19_A1_P50 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedMaskAddress_Bic_Rule_19_A1_P50);
+  nacl_arm_dec::MaskAddress_BIC_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedMaskAddress_BIC_immediate_A1);
 };
 
 class NamedStoreBasedImmedMemory_Str_Rule_194_A1_P384
     : public NamedClassDecoder {
  public:
   NamedStoreBasedImmedMemory_Str_Rule_194_A1_P384()
     : NamedClassDecoder(decoder_, "StoreBasedImmedMemory Str_Rule_194_A1_P384")
   {}
 
  private:
@@ skipping 126 matching lines @@
  public:
   NamedStoreBasedOffsetMemoryDouble_Strd_Rule_201_A1_P398()
     : NamedClassDecoder(decoder_, "StoreBasedOffsetMemoryDouble Strd_Rule_201_A1_P398")
   {}
 
  private:
   nacl_arm_dec::StoreBasedOffsetMemoryDouble_Strd_Rule_201_A1_P398 decoder_;
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedStoreBasedOffsetMemoryDouble_Strd_Rule_201_A1_P398);
 };
 
-class NamedTestIfAddressMasked_Tst_Rule_230_A1_P454
+class NamedTestIfAddressMasked_TST_immediate_A1
     : public NamedClassDecoder {
  public:
-  NamedTestIfAddressMasked_Tst_Rule_230_A1_P454()
-    : NamedClassDecoder(decoder_, "TestIfAddressMasked Tst_Rule_230_A1_P454")
+  NamedTestIfAddressMasked_TST_immediate_A1()
+    : NamedClassDecoder(decoder_, "TestIfAddressMasked TST_immediate_A1")
   {}
 
  private:
-  nacl_arm_dec::TestIfAddressMasked_Tst_Rule_230_A1_P454 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedTestIfAddressMasked_Tst_Rule_230_A1_P454);
+  nacl_arm_dec::TestIfAddressMasked_TST_immediate_A1 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedTestIfAddressMasked_TST_immediate_A1);
 };
 
 class NamedUndefined_Undefined_A5_2_5_0101
     : public NamedClassDecoder {
  public:
   NamedUndefined_Undefined_A5_2_5_0101()
     : NamedClassDecoder(decoder_, "Undefined Undefined_A5_2_5_0101")
   {}
 
  private:
@@ skipping 286 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_