Clean up code to clarify we are only tracking the condition flags of APSR.

src/trusted/validator_arm/validator.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/service_runtime/nacl_config.h"
 #include "native_client/src/trusted/validator_arm/validator.h"
 #include "native_client/src/include/nacl_macros.h"
 
 #include <assert.h>
 
 using nacl_arm_dec::Instruction;
 using nacl_arm_dec::ClassDecoder;
 using nacl_arm_dec::Register;
 using nacl_arm_dec::RegisterList;
 using nacl_arm_dec::kRegisterNone;
-using nacl_arm_dec::kRegisterFlags;
+using nacl_arm_dec::kConditions;
 using nacl_arm_dec::kRegisterPc;
 using nacl_arm_dec::kRegisterLink;
 
 using std::vector;
 
 namespace nacl_arm_val {
 
 /*********************************************************
  * Implementations of patterns used in the first pass.
  *
@@ skipping 34 matching lines @@
   }
 
   if (second.base_address_register() == kRegisterPc
       && second.offset_is_immediate()) {
     /* PC + immediate addressing is always safe. */
     return PATTERN_SAFE;
   }
 
   if (first.defines(second.base_address_register())
       && first.clears_bits(sfi.data_address_mask())
-      && !first.defs()[kRegisterFlags]
+      && !first.defs()[kConditions]
       && first.always_precedes(second)) {
     return PATTERN_SAFE_2;
   }
 
   if (first.sets_Z_if_bits_clear(second.base_address_register(),
                                  sfi.data_address_mask())
       && second.is_conditional_on(first)) {
     return PATTERN_SAFE_2;
   }
 
@@ skipping 388 matching lines @@
                                        Instruction inst,
                                        const ClassDecoder &decoder)
     : vaddr_(vaddr),
       inst_(inst),
       decoder_(&decoder),
       safety_(decoder.safety(inst_)),
       defs_(decoder.defs(inst_))
 {}
 
 }  // namespace