[MIPS] Add thread-pointer to data addressing register list.

src/trusted/validator_mips/validator_tests.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.
  */
 
 /*
  * Unit tests for the MIPS validator
  *
  * These tests use the google-test framework (gtest for short) to exercise the
@@ skipping 27 matching lines @@
 
 using nacl_mips_dec::Register;
 using nacl_mips_dec::RegisterList;
 using nacl_mips_dec::Instruction;
 
 using nacl_mips_val::SfiValidator;
 using nacl_mips_val::ProblemSink;
 using nacl_mips_val::CodeSegment;
 using nacl_mips_dec::kInstrSize;
 using nacl_mips_dec::kNop;
-using nacl_mips_dec::kRegisterStack;
-using nacl_mips_dec::kRegListReserved;
 
 namespace {
 
 typedef uint32_t mips_inst;
 
 /*
  * We use these parameters to initialize the validator, below.  They are
  * somewhat different from the parameters used in real NaCl systems, to test
  * degrees of validator freedom that we don't currently exercise in prod.
  */
@@ skipping 77 matching lines @@
 };
 
 
 /*
  * Primitive tests checking various constructor properties.  Any of these
  * failing would be a very bad sign indeed.
  */
 
 TEST_F(ValidatorTests, RecognizesDataAddressRegisters) {
   /*
-   * Note that the logic below needs to be kept in sync with the definition
-   * of kAbiDataAddrRegisters at the top of this file.
+   * Note that the logic below needs to be kept in sync with the implementation
+   * of RegisterList::DataAddrRegs().
    *
    * This test is pretty trivial -- we can exercise the data_address_register
    * functionality more deeply with pattern tests below.
    */
   for (int i = 0; i < 31; i++) {
     Register reg(i);
-    if (reg.Equals(nacl_mips_dec::kRegisterStack)) {
+    if (reg.Equals(Register::Sp()) || reg.Equals(Register::Tls())) {
       EXPECT_TRUE(_validator.IsDataAddressRegister(reg))
-          << "Stack pointer must be a data address register.";
+          << "Stack pointer and TLS register must be data address registers.";
     } else {
       EXPECT_FALSE(_validator.IsDataAddressRegister(reg))
-          << "Only the stack pointer must be a data address register.";
+          << "Only the stack pointer and TLS register are data "
+             "address registers.";
     }
   }
 }
 
 /*
  * Code validation tests
  */
 
 // This is where untrusted code starts.  Most tests use this.
 static const uint32_t kDefaultBaseAddr = 0x20000;
@@ skipping 226 matching lines @@
 }
 
 /*
  * Implementation of the ValidatorTests utility methods.  These are documented
  * toward the top of this file.
  */
 ValidatorTests::ValidatorTests()
   : _validator(kBytesPerBundle,
                kCodeRegionSize,
                kDataRegionSize,
-               kRegListReserved,
-               RegisterList(kRegisterStack)) {}
+               RegisterList::ReservedRegs(),
+               RegisterList::DataAddrRegs()) {}
 
 bool ValidatorTests::Validate(const mips_inst *pattern,
                               size_t inst_count,
                               uint32_t start_addr,
                               ProblemSink *sink) {
   // We think in instructions; CodeSegment thinks in bytes.
   const uint8_t *bytes = reinterpret_cast<const uint8_t *>(pattern);
   CodeSegment segment(bytes, start_addr, inst_count * sizeof(mips_inst));
 
   vector<CodeSegment> segments;
@@ skipping 38 matching lines @@
   return problems;
 }
 
 };  // anonymous namespace
 
 // Test driver function.
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }