Fix uses in ARM table media_instructions.

src/trusted/validator_arm/inst_classes_testers.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.
  */
 
 // Defines decoder testers for decoder classes.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_INST_CLASSES_TESTERS_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_INST_CLASSES_TESTERS_H_
@@ skipping 424 matching lines @@
 // +--------+--------------+----------+--------+----------+--------------+
 // Definitions
 //    Rd = The destination register.
 //    lsb = The least significant bit to be modified.
 //    msb = lsb + width - 1 - The most significant bit to be modified
 //    width = msb - lsb + 1 - The number of bits to be modified.
 //
 // If Rd is R15 or msb < lsb, the instruction is unpredictable.
 // NaCl disallows writing to PC to cause a jump.
 // Note: Currently, only implements bfc. (A8-46).
-class Unary1RegisterBitRangeMsbGeLsbTesterRegsNotPc : public CondDecoderTester {
+class Unary1RegisterBitRangeMsbGeLsbTester : public CondDecoderTester {
  public:
-  explicit Unary1RegisterBitRangeMsbGeLsbTesterRegsNotPc(
+  explicit Unary1RegisterBitRangeMsbGeLsbTester(
       const NamedClassDecoder& decoder);
   virtual bool ApplySanityChecks(nacl_arm_dec::Instruction inst,
                                  const NamedClassDecoder& decoder);
 
  protected:
   nacl_arm_dec::Unary1RegisterBitRangeMsbGeLsb expected_decoder_;
 
  private:
-  NACL_DISALLOW_COPY_AND_ASSIGN(Unary1RegisterBitRangeMsbGeLsbTesterRegsNotPc);
+  NACL_DISALLOW_COPY_AND_ASSIGN(Unary1RegisterBitRangeMsbGeLsbTester);
 };
 
 // Models a 2-register binary operation with two immediate values
 // defining a bit range.
 // Op<c> Rd, Rn, #<lsb>, #width
 // +--------+--------------+----------+--------+----------+------+--------+
 // |31302928|27262524232221|2019181716|15141312|1110 9 8 7| 6 5 4| 3 2 1 0|
 // +--------+--------------+----------+--------+----------+------+--------+
 // |  cond  |              |    msb   |   Rd   |    lsb   |      |   Rn   |
 // +--------+--------------+----------+--------+----------+------+--------+
 // Definitions:
 //   Rd = The destination register.
 //   Rn = The first operand
 //   lsb = The least significant bit to be modified.
 //   msb = The most significant bit to be modified.
 //
 // If Rd=R15 or msb < lsb, the instruction is unpredictable.
 //
 // NaCl disallows writing Pc to cause a jump.
-class Binary2RegisterBitRangeMsbGeLsbTesterRegsNotPc
+class Binary2RegisterBitRangeMsbGeLsbTester
     : public CondDecoderTester {
  public:
-  explicit Binary2RegisterBitRangeMsbGeLsbTesterRegsNotPc(
+  explicit Binary2RegisterBitRangeMsbGeLsbTester(
       const NamedClassDecoder& decoder);
   virtual bool ApplySanityChecks(nacl_arm_dec::Instruction inst,
                                  const NamedClassDecoder& decoder);
 
  protected:
   nacl_arm_dec::Binary2RegisterBitRangeMsbGeLsb expected_decoder_;
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(
-      Binary2RegisterBitRangeMsbGeLsbTesterRegsNotPc);
+      Binary2RegisterBitRangeMsbGeLsbTester);
 };
 
-// Implements a Binary2RegisterBitRangeNotRnIsPcBitfieldExtract tester.
-class Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTesterRegsNotPc
+// Implements a Binary2RegisterBitRangeNotRnIsPcBitfieldExtracttester.
+class Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTester
     : public CondDecoderTester {
  public:
-  explicit Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTesterRegsNotPc(
+  explicit Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTester(
       const NamedClassDecoder& decoder);
   virtual bool ApplySanityChecks(nacl_arm_dec::Instruction inst,
                                  const NamedClassDecoder& decoder);
 
  protected:
   nacl_arm_dec::Binary2RegisterBitRangeNotRnIsPcBitfieldExtract
   expected_decoder_;
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(
-      Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTesterRegsNotPc);
+      Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTester);
 };
 
 // Implements a decoder tester for decoder BinaryRegisterImmediateTest
 // Op(S)<c> Rn, #<const>
 // +--------+--------------+--+--------+--------+------------------------+
 // |31302928|27262524232221|20|19181716|15141312|1110 9 8 7 6 5 4 3 2 1 0|
 // +--------+--------------+--+--------+--------+------------------------+
 // |  cond  |              | S|   Rn   |        |        imm12           |
 // +--------+--------------+--+--------+--------+------------------------+
 // Definitions:
@@ skipping 2205 matching lines @@
       nacl_arm_dec::Instruction inst,
       const NamedClassDecoder& decoder);
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(PermanentlyUndefinedTester);
 };
 
 }  // namespace nacl_arm_test
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_INST_CLASSES_TESTERS_H_