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

src/trusted/validator_arm/decoder_tester.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.
  */
 
 /*
  * Tests the decoder.
  */
 
 #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/decoder_tester.h"
 
 #include <string>
 #include "gtest/gtest.h"
 
 using nacl_arm_dec::kArm32InstSize;
 using nacl_arm_dec::kThumbWordSize;
 using nacl_arm_dec::Instruction;
 using nacl_arm_dec::MAY_BE_SAFE;
 
 namespace nacl_arm_test {
 
 DecoderTester::DecoderTester()
 {}
 
-void DecoderTester::ApplySanityChecks(Instruction inst,
+bool DecoderTester::ApplySanityChecks(Instruction inst,
                                       const NamedClassDecoder& decoder) {
   UNREFERENCED_PARAMETER(inst);
-  EXPECT_EQ(&decoder, &ExpectedDecoder())
+  bool test = (&decoder == &ExpectedDecoder());
+  EXPECT_TRUE(test)
       << "Expected " << ExpectedDecoder().name() << " but found "
       << decoder.name() << " for " << InstContents();
+  NC_PRECOND(test);
+  return true;
 }
 
 void DecoderTester::TestAtIndex(int index) {
   while (true) {
     // First see if we have completed generating test.
     if (index < 0) {
       ProcessMatch();
       return;
     }
 
@@ skipping 359 matching lines @@
 }
 
 void ThumbDecoderTester::SetBitRange(int index, int length, uint32_t value) {
   // This should never be called. The decoders word1_tester_
   // and word2_tester_ should be doing all of the bit setting.
   GTEST_FAIL() << "ThumbDecoderTester::SetBitRange(" << index <<
       ", " << length << ", " << value << ")";
 }
 
 }  // namespace