Change table data_processing_immediate to use the new notation. Also

src/trusted/validator_arm/problem_reporter.cc

 /*
  * 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.
  */
 
 #include "native_client/src/trusted/validator_arm/problem_reporter.h"
 
 
 #include <assert.h>
@@ skipping 12 matching lines @@
 // Returns UNKNOWN if unable to convert.
 static nacl_arm_dec::SafetyLevel Int2SafetyLevel(uint32_t index) {
   static nacl_arm_dec::SafetyLevel Int2SafetyLevelMap[] = {
     nacl_arm_dec::UNKNOWN,
     nacl_arm_dec::UNDEFINED,
     nacl_arm_dec::NOT_IMPLEMENTED,
     nacl_arm_dec::UNPREDICTABLE,
     nacl_arm_dec::DEPRECATED,
     nacl_arm_dec::FORBIDDEN,
     nacl_arm_dec::FORBIDDEN_OPERANDS,
+    nacl_arm_dec::DECODER_ERROR,
     nacl_arm_dec::MAY_BE_SAFE,
   };
   return (index < NACL_ARRAY_SIZE(Int2SafetyLevelMap))
       ? Int2SafetyLevelMap[index] : nacl_arm_dec::UNKNOWN;
 }
 
 void ProblemReporter::ExtractProblemSafety(
     const ValidatorProblemUserData user_data,
     nacl_arm_dec::SafetyLevel* safety) {
   if (safety != NULL)
@@ skipping 124 matching lines @@
   // UNPREDICTABLE - This instruction has unpredictable effects at
   // runtime.
   "Instruction has unpredictable effects at runtime.",
   // DEPRECATED - This instruction is deprecated in ARMv7.
   "Instruction is deprecated in ARMv7.",
   // FORBIDDEN - This instruction is forbidden by our SFI model.
   "Instruction not allowed by Native Client.",
   // FORBIDDEN_OPERANDS - This instruction's operands are forbidden by
   // our SFI model.
   "Instruction has operand(s) forbidden by Native Client.",
+  // DECODER_ERROR - This instruction was incorrectly decoded, and
+  // should have been a different instruciton.
+  "Instruction decoded incorrectly by NativeClient.",
 };
 
 // Error message to print for each type of ValidatorProblem. See
 // member function Render (below) for an explanation of $X directives.
 // TODO(karl): Add information from the collected
 // ValidatorInstructionPairProblem (for instruction pairs) to the
 // error messages printed.
 static const char* ValidatorProblemFormatDirective[kValidatorProblemSize] = {
   // kProblemUnsafe - An instruction is unsafe -- more information in
   // the SafetyLevel.
@@ skipping 408 matching lines @@
   assert(problem < kValidatorProblemSize);
   RenderText("ncval: ", &buffer, &buffer_size);
   RenderInstAddress(vaddr, &buffer, &buffer_size);
   RenderText(" ", &buffer, &buffer_size);
   Render(&buffer, &buffer_size,
          ValidatorProblemFormatDirective[problem],
          problem, method, user_data);
 }
 
 }  // namespace nacl_arm_val