Change table data_processing_immediate to use the new notation. Also

src/trusted/validator_arm/inst_classes.h

 /*
  * Copyright (c) 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.
  */
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_INST_CLASSES_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_INST_CLASSES_H_
 
 #include <stdint.h>
@@ skipping 24 matching lines @@
   // This instruction has unpredictable effects at runtime.
   UNPREDICTABLE,
   // This instruction is deprecated in ARMv7.
   DEPRECATED,
 
   // This instruction is forbidden by our SFI model.
   FORBIDDEN,
   // This instruction's operands are forbidden by our SFI model.
   FORBIDDEN_OPERANDS,
 
+  // This instruction was decoded incorrectly, because it should have decoded
+  // as a different instruction. This value should never occur, unless there
+  // is a bug in our decoder tables (in file armv7.table).
+  DECODER_ERROR,
+
   // This instruction may be safe in untrusted code: in isolation it contains
   // nothing scary, but the validator may overrule this during global analysis.
   MAY_BE_SAFE
 };
 
 // Returns the safety level associated with i (or UNKNOWN if no such safety
 // level exists).
 SafetyLevel Int2SafetyLevel(uint32_t i);
 
 // ------------------------------------------------------------------
@@ skipping 678 matching lines @@
   // Default assumes defs={}
   virtual RegisterList defs(Instruction i) const;
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(CoprocessorOp);
 };
 
 }  // namespace nacl_arm_dec
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_INST_CLASSES_H_