Make validator require read sandboxing on ARM.

src/trusted/validator_arm/validator_tests.cc

 /*
- * Copyright 2010 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 (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.
  */
 
 /*
  * Unit tests for the ARM validator
  *
  * These tests use the google-test framework (gtest for short) to exercise the
  * ARM validator.  The tests currently fall into two rough categories:
  *  1. Simple method-level tests that exercise the validator's primitive
  *     capabilities, and
  *  2. Instruction pattern tests that run the entire validator.
@@ skipping 400 matching lines @@
         EXPECT_EQ(1U, problems.size());
         if (problems.size() != 1) continue;
 
         ProblemRecord first = problems[0];
         EXPECT_EQ(kDefaultBaseAddr + 4, first.vaddr)
             << "Problem report must point to the store: "
             << message.str();
         EXPECT_EQ(nacl_arm_dec::MAY_BE_SAFE, first.safety)
             << "Store should not be unsafe even though mask is bogus: "
             << message.str();
-        EXPECT_EQ(nacl::string(nacl_arm_val::kProblemUnsafeStore),
+        EXPECT_EQ(nacl::string(nacl_arm_val::kProblemUnsafeLoadStore),
                   first.problem_code)
             << message;
       }
     }
   }
 }
 
 TEST_F(ValidatorTests, InvalidGuardsOnSafeStores) {
   static const AnnotatedInstruction invalid_guards[] = {
     { 0x03110100, "tst r1, #0: always sets Z" },
@@ skipping 33 matching lines @@
       EXPECT_EQ(1U, problems.size());
       if (problems.size() != 1) continue;
 
       ProblemRecord first = problems[0];
       EXPECT_EQ(kDefaultBaseAddr + 4, first.vaddr)
           << "Problem report must point to the store: "
           << message.str();
       EXPECT_EQ(nacl_arm_dec::MAY_BE_SAFE, first.safety)
           << "Store should not be unsafe even though guard is bogus: "
           << message.str();
-      EXPECT_EQ(nacl::string(nacl_arm_val::kProblemUnsafeStore),
+      EXPECT_EQ(nacl::string(nacl_arm_val::kProblemUnsafeLoadStore),
                 first.problem_code)
           << message;
     }
   }
 }
 
 TEST_F(ValidatorTests, ValidMasksOnUnsafeStores) {
   static const AnnotatedInstruction invalid_stores[] = {
     { 0x07810002, "str r0, [r1, r2]: register-plus-register addressing" },
     { 0x07010002, "str r0, [r1, -r2]: register-minus-register addressing" },
@@ skipping 32 matching lines @@
 
         ProblemRecord first = problems[0];
         EXPECT_EQ(kDefaultBaseAddr + 4, first.vaddr)
             << "Problem report must point to the store: "
             << message.str();
         EXPECT_NE(nacl_arm_dec::MAY_BE_SAFE, first.safety)
             << "Store must be flagged by the decoder as unsafe: "
             << message.str();
 
         /*
-         * Note that we expect kProblemUnsafe, *not* kProblemUnsafeStore.  This
-         * is because the store instructions themselves, in isolation, are
-         * unsafe to appear anywhere in a Native Client program -- whereas
-         * kProblemUnsafeStore indicates a legitimate store used in an unsafe
-         * manner.
+         * Note that we expect kProblemUnsafe, *not* kProblemUnsafeLoadStore.
+         * This is because the load/store instructions themselves, in
+         * isolation, are unsafe to appear anywhere in a Native Client
+         * program -- whereas kProblemUnsafeLoadStore indicates a legitimate
+         * load/store used in an unsafe manner.
          */
         EXPECT_EQ(nacl::string(nacl_arm_val::kProblemUnsafe),
                   first.problem_code)
             << message;
       }
     }
   }
 }
 
 TEST_F(ValidatorTests, ScaryUndefinedInstructions) {
@@ skipping 152 matching lines @@
   return problems;
 }
 
 };  // anonymous namespace
 
 // Test driver function.
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }