Make validator require read sandboxing on ARM.

src/trusted/validator_arm/validator.h

 /*
- * Copyright 2009 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.
- * Copyright 2009, Google Inc.
+ * Copyright (c) 2011 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 NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_V2_VALIDATOR_H
 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_V2_VALIDATOR_H
 
 /*
  * The SFI validator, and some utility classes it uses.
  */
 
 #include <stdint.h>
@@ skipping 237 matching lines @@
   }
 
   uint32_t branch_target() const {
     return vaddr_ + decoder_->branch_target_offset(inst_);
   }
 
   const nacl_arm_dec::Register base_address_register() const {
     return decoder_->base_address_register(inst_);
   }
 
+  bool offset_is_immediate() const {
+    return decoder_->offset_is_immediate(inst_);
+  }
+
   bool clears_bits(uint32_t mask) const {
     return decoder_->clears_bits(inst_, mask);
   }
 
   bool sets_Z_if_bits_clear(nacl_arm_dec::Register r, uint32_t mask) const {
     return decoder_->sets_Z_if_bits_clear(inst_, r, mask);
   }
 
   nacl_arm_dec::RegisterList immediate_addressing_defs() const {
     return decoder_->immediate_addressing_defs(inst_);
@@ skipping 104 matching lines @@
  * process them into localized messages without needing to pull in the whole
  * validator...we'll see.
  */
 
 // An instruction is unsafe -- more information in the SafetyLevel.
 const char * const kProblemUnsafe = "kProblemUnsafe";
 // A branch would break a pseudo-operation pattern.
 const char * const kProblemBranchSplitsPattern = "kProblemBranchSplitsPattern";
 // A branch targets an invalid code address (out of segment).
 const char * const kProblemBranchInvalidDest = "kProblemBranchInvalidDest";
-// A store uses an unsafe (non-masked) base address.
-const char * const kProblemUnsafeStore = "kProblemUnsafeStore";
+// A load/store uses an unsafe (non-masked) base address.
+const char * const kProblemUnsafeLoadStore = "kProblemUnsafeLoadStore";
 // A branch uses an unsafe (non-masked) destination address.
 const char * const kProblemUnsafeBranch = "kProblemUnsafeBranch";
 // An instruction updates a data-address register (e.g. SP) without masking.
 const char * const kProblemUnsafeDataWrite = "kProblemUnsafeDataWrite";
 // An instruction updates a read-only register (e.g. r9).
 const char * const kProblemReadOnlyRegister = "kProblemReadOnlyRegister";
 // A pseudo-op pattern crosses a bundle boundary.
 const char * const kProblemPatternCrossesBundle =
     "kProblemPatternCrossesBundle";
 // A linking branch instruction is not in the last bundle slot.
 const char * const kProblemMisalignedCall = "kProblemMisalignedCall";
 
 }  // namespace
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_V2_VALIDATOR_H