Fix uses in ARM table media_instructions.

src/trusted/validator_arm/inst_classes_testers.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.
  */
 #ifndef NACL_TRUSTED_BUT_NOT_TCB
 #error This file is not meant for use in the TCB
 #endif
 
 #include "native_client/src/trusted/validator_arm/inst_classes_testers.h"
@@ skipping 395 matching lines @@
                   const NamedClassDecoder& decoder) {
   // Check that we don't parse when Rd=15 and S=1.
   if ((expected_decoder_.d.reg(inst).Equals(Register::Pc())) &&
       expected_decoder_.conditions.is_updated(inst)) {
     NC_EXPECT_NE_PRECOND(&ExpectedDecoder(), &decoder);
   }
 
   return Unary1RegisterImmediateOpTester::ApplySanityChecks(inst, decoder);
 }
 
-// Unary1RegisterBitRangeMsbGeLsbTesterRegsNotPc
-Unary1RegisterBitRangeMsbGeLsbTesterRegsNotPc::
-Unary1RegisterBitRangeMsbGeLsbTesterRegsNotPc(
+// Unary1RegisterBitRangeMsbGeLsbTester
+Unary1RegisterBitRangeMsbGeLsbTester::
+Unary1RegisterBitRangeMsbGeLsbTester(
     const NamedClassDecoder& decoder)
     : CondDecoderTester(decoder) {}
 
-bool Unary1RegisterBitRangeMsbGeLsbTesterRegsNotPc::
+bool Unary1RegisterBitRangeMsbGeLsbTester::
 ApplySanityChecks(Instruction inst,
                   const NamedClassDecoder& decoder) {
   // Check if expected class name found.
   NC_PRECOND(CondDecoderTester::ApplySanityChecks(inst, decoder));
 
   // Check registers and flags used.
   EXPECT_TRUE(expected_decoder_.d.reg(inst).Equals(inst.Reg(15, 12)));
   EXPECT_EQ(expected_decoder_.lsb.value(inst), inst.Bits(11, 7));
   EXPECT_EQ(expected_decoder_.msb.value(inst), inst.Bits(20, 16));
   EXPECT_FALSE(expected_decoder_.d.reg(inst).Equals(Register::Pc()))
         << "Expected UNPREDICTABLE for " << InstContents();
 
   EXPECT_FALSE(expected_decoder_.msb.value(inst) <
                expected_decoder_.lsb.value(inst))
       << "Expected UNPREDICTABLE for " << InstContents();
 
   return true;
 }
 
-// Binary2RegisterBitRangeMsbGeLsbTesterRegsNotPc
-Binary2RegisterBitRangeMsbGeLsbTesterRegsNotPc::
-Binary2RegisterBitRangeMsbGeLsbTesterRegsNotPc(
+// Binary2RegisterBitRangeMsbGeLsbTester
+Binary2RegisterBitRangeMsbGeLsbTester::
+Binary2RegisterBitRangeMsbGeLsbTester(
     const NamedClassDecoder& decoder)
     : CondDecoderTester(decoder) {}
 
-bool Binary2RegisterBitRangeMsbGeLsbTesterRegsNotPc::
+bool Binary2RegisterBitRangeMsbGeLsbTester::
 ApplySanityChecks(Instruction inst,
                   const NamedClassDecoder& decoder) {
   // Check if expected class name found.
   NC_PRECOND(CondDecoderTester::ApplySanityChecks(inst, decoder));
 
   // Check registers and flags used.
   EXPECT_TRUE(expected_decoder_.n.reg(inst).Equals(inst.Reg(3, 0)));
   EXPECT_TRUE(expected_decoder_.d.reg(inst).Equals(inst.Reg(15, 12)));
   EXPECT_EQ(expected_decoder_.lsb.value(inst), inst.Bits(11, 7));
   EXPECT_EQ(expected_decoder_.msb.value(inst), inst.Bits(20, 16));
   EXPECT_FALSE(expected_decoder_.n.reg(inst).Equals(Register::Pc()))
         << "Expected UNPREDICTABLE for " << InstContents();
   EXPECT_FALSE(expected_decoder_.d.reg(inst).Equals(Register::Pc()))
         << "Expected UNPREDICTABLE for " << InstContents();
 
   EXPECT_FALSE(expected_decoder_.msb.value(inst) <
                expected_decoder_.lsb.value(inst))
       << "Expected UNPREDICTABLE for " << InstContents();
 
   return true;
 }
 
-// Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTesterRegsNotPc
-Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTesterRegsNotPc::
-Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTesterRegsNotPc(
+// Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTester
+Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTester::
+Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTester(
     const NamedClassDecoder& decoder)
     : CondDecoderTester(decoder) {}
 
-bool Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTesterRegsNotPc::
+bool Binary2RegisterBitRangeNotRnIsPcBitfieldExtractTester::
 ApplySanityChecks(Instruction inst,
                   const NamedClassDecoder& decoder) {
   NC_PRECOND(CondDecoderTester::ApplySanityChecks(inst, decoder));
 
   EXPECT_FALSE(expected_decoder_.n.reg(inst).Equals(Register::Pc()))
       << "Expected UNPREDICTABLE for " << InstContents();
   EXPECT_FALSE(expected_decoder_.d.reg(inst).Equals(Register::Pc()))
       << "Expected UNPREDICTABLE for " << InstContents();
   EXPECT_FALSE(expected_decoder_.lsb.value(inst) +
                expected_decoder_.widthm1.value(inst) > 31)
@@ skipping 2125 matching lines @@
 // PermanentlyUndefinedTester
 bool PermanentlyUndefinedTester::ApplySanityChecks(Instruction inst,
                                         const NamedClassDecoder& decoder) {
   // Check if expected class name found.
   NC_PRECOND(CondDecoderTester::ApplySanityChecks(inst, decoder));
 
   return true;
 }
 
 }  // namespace nacl_arm_test