Clean up testing of instructions. Allow testing to quit if test pattern tests

src/trusted/validator_arm/gen/arm32_decode_named_classes.h

Index: src/trusted/validator_arm/gen/arm32_decode_named_classes.h
===================================================================
--- src/trusted/validator_arm/gen/arm32_decode_named_classes.h	(revision 8517)
+++ src/trusted/validator_arm/gen/arm32_decode_named_classes.h	(working copy)
@@ -53,12 +53,6 @@
   virtual ~Binary3RegisterImmedShiftedOp_Adc_Rule_2_A1_P16() {}
 };
 
-class Binary3RegisterImmedShiftedOp_Add_Rule_6_A1_P24
-   : public Binary3RegisterImmedShiftedOp {
- public:
-  virtual ~Binary3RegisterImmedShiftedOp_Add_Rule_6_A1_P24() {}
-};
-
 class Binary3RegisterImmedShiftedOp_And_Rule_7_A1_P36
    : public Binary3RegisterImmedShiftedOp {
  public:
@@ -101,12 +95,18 @@
   virtual ~Binary3RegisterImmedShiftedOp_Sbc_Rule_152_A1_P304() {}
 };
 
-class Binary3RegisterImmedShiftedOp_SubRule_213_A1_P422
-   : public Binary3RegisterImmedShiftedOp {
+class Binary3RegisterImmedShiftedOpRnNotSp_Add_Rule_6_A1_P24
+   : public Binary3RegisterImmedShiftedOpRnNotSp {
  public:
-  virtual ~Binary3RegisterImmedShiftedOp_SubRule_213_A1_P422() {}
+  virtual ~Binary3RegisterImmedShiftedOpRnNotSp_Add_Rule_6_A1_P24() {}
 };
 
+class Binary3RegisterImmedShiftedOpRnNotSp_SubRule_213_A1_P422
+   : public Binary3RegisterImmedShiftedOpRnNotSp {
+ public:
+  virtual ~Binary3RegisterImmedShiftedOpRnNotSp_SubRule_213_A1_P422() {}
+};
+
 class Binary3RegisterOp_Asr_Rule_15_A1_P42
    : public Binary3RegisterOp {
  public:
@@ -583,19 +583,6 @@
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary3RegisterImmedShiftedOp_Adc_Rule_2_A1_P16);
 };
 
-class NamedBinary3RegisterImmedShiftedOp_Add_Rule_6_A1_P24
-    : public NamedClassDecoder {
- public:
-  inline NamedBinary3RegisterImmedShiftedOp_Add_Rule_6_A1_P24()
-    : NamedClassDecoder(decoder_, "Binary3RegisterImmedShiftedOp Add_Rule_6_A1_P24")
-  {}
-  virtual ~NamedBinary3RegisterImmedShiftedOp_Add_Rule_6_A1_P24() {}
-
- private:
-  nacl_arm_dec::Binary3RegisterImmedShiftedOp_Add_Rule_6_A1_P24 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary3RegisterImmedShiftedOp_Add_Rule_6_A1_P24);
-};
-
 class NamedBinary3RegisterImmedShiftedOp_And_Rule_7_A1_P36
     : public NamedClassDecoder {
  public:
@@ -687,19 +674,32 @@
   NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary3RegisterImmedShiftedOp_Sbc_Rule_152_A1_P304);
 };
 
-class NamedBinary3RegisterImmedShiftedOp_SubRule_213_A1_P422
+class NamedBinary3RegisterImmedShiftedOpRnNotSp_Add_Rule_6_A1_P24
     : public NamedClassDecoder {
  public:
-  inline NamedBinary3RegisterImmedShiftedOp_SubRule_213_A1_P422()
-    : NamedClassDecoder(decoder_, "Binary3RegisterImmedShiftedOp SubRule_213_A1_P422")
+  inline NamedBinary3RegisterImmedShiftedOpRnNotSp_Add_Rule_6_A1_P24()
+    : NamedClassDecoder(decoder_, "Binary3RegisterImmedShiftedOpRnNotSp Add_Rule_6_A1_P24")
   {}
-  virtual ~NamedBinary3RegisterImmedShiftedOp_SubRule_213_A1_P422() {}
+  virtual ~NamedBinary3RegisterImmedShiftedOpRnNotSp_Add_Rule_6_A1_P24() {}
 
  private:
-  nacl_arm_dec::Binary3RegisterImmedShiftedOp_SubRule_213_A1_P422 decoder_;
-  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary3RegisterImmedShiftedOp_SubRule_213_A1_P422);
+  nacl_arm_dec::Binary3RegisterImmedShiftedOpRnNotSp_Add_Rule_6_A1_P24 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary3RegisterImmedShiftedOpRnNotSp_Add_Rule_6_A1_P24);
 };
 
+class NamedBinary3RegisterImmedShiftedOpRnNotSp_SubRule_213_A1_P422
+    : public NamedClassDecoder {
+ public:
+  inline NamedBinary3RegisterImmedShiftedOpRnNotSp_SubRule_213_A1_P422()
+    : NamedClassDecoder(decoder_, "Binary3RegisterImmedShiftedOpRnNotSp SubRule_213_A1_P422")
+  {}
+  virtual ~NamedBinary3RegisterImmedShiftedOpRnNotSp_SubRule_213_A1_P422() {}
+
+ private:
+  nacl_arm_dec::Binary3RegisterImmedShiftedOpRnNotSp_SubRule_213_A1_P422 decoder_;
+  NACL_DISALLOW_COPY_AND_ASSIGN(NamedBinary3RegisterImmedShiftedOpRnNotSp_SubRule_213_A1_P422);
+};
+
 class NamedBinary3RegisterOp_Asr_Rule_15_A1_P42
     : public NamedClassDecoder {
  public: