Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/validator_arm/ncvalidate.cc

 /*
  * 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.
  */
 
 #include "native_client/src/trusted/validator_arm/ncvalidate.h"
 
 
 #include <vector>
@@ skipping 28 matching lines @@
 
     problems_ = true;
   }
   virtual bool should_continue() {
     return !problems_;
   }
 };
 
 EXTERN_C_BEGIN
 
-int NCValidateSegment(uint8_t *mbase, uint32_t vbase, size_t size) {
+int NCValidateSegment(uint8_t *mbase, uint32_t vbase, size_t size,
+                      uint8_t thumb) {
+  nacl_arm_dec::RegisterList roRegs = Register(9);
+  if (thumb) {
+    roRegs = nacl_arm_dec::kRegisterListNothing;
+  }
   SfiValidator validator(
       16,  // bytes per bundle
       1U * 1024 * 1024 * 1024,  // bytes of code space
       1U * 1024 * 1024 * 1024,  // bytes of data space
-      Register(9),  // read only register(s)
-      kRegisterStack);  // data addressing register(s)
-
+      roRegs,  // read only register(s)
+      kRegisterStack,  // data addressing register(s)
+      thumb);
   EarlyExitProblemSink sink;
 
   vector<CodeSegment> segments;
   segments.push_back(CodeSegment(mbase, vbase, size));
 
   bool success = validator.validate(segments, &sink);
   if (!success) return 2;  // for compatibility with old validator
   return 0;
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, arm, 32) (

[Karl, 2011/08/30 19:53:52]

I would have two functions here, one for each subarchitecture.

     NaClApplyValidationKind kind,
     uintptr_t guest_addr,
     uint8_t *data,
     size_t size,
     int bundle_size,
-    Bool local_cpu) {
+    Bool local_cpu,
+    uint8_t thumb) {
   NaClValidationStatus status = NaClValidationFailedNotImplemented;
   UNREFERENCED_PARAMETER(local_cpu);
   if (bundle_size == 16) {
     if (kind == NaClApplyCodeValidation) {
-        status = ((0 == NCValidateSegment(data, guest_addr, size))
+        status = ((0 == NCValidateSegment(data, guest_addr, size, thumb))
                   ? NaClValidationSucceeded : NaClValidationFailed);
     }
   }
   return status;
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement, arm, 32)

[Karl, 2011/08/30 19:53:52]

Same here, and ApplyValidatorCopy below.

     (uintptr_t guest_addr,
      uint8_t *data_old,
      uint8_t *data_new,
      size_t size,
-     int bundle_size) {
+     int bundle_size,
+     uint8_t thumb) {
   UNREFERENCED_PARAMETER(guest_addr);
   UNREFERENCED_PARAMETER(data_old);
   UNREFERENCED_PARAMETER(data_new);
   UNREFERENCED_PARAMETER(size);
   UNREFERENCED_PARAMETER(bundle_size);
+  UNREFERENCED_PARAMETER(thumb);
   return NaClValidationFailedNotImplemented;
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCopy, arm, 32)
     (uintptr_t guest_addr,
      uint8_t *data_old,
      uint8_t *data_new,
      size_t size,
-     int bundle_size) {
+     int bundle_size,
+     uint8_t thumb) {
   UNREFERENCED_PARAMETER(guest_addr);
   UNREFERENCED_PARAMETER(data_old);
   UNREFERENCED_PARAMETER(data_new);
   UNREFERENCED_PARAMETER(size);
   UNREFERENCED_PARAMETER(bundle_size);
+  UNREFERENCED_PARAMETER(thumb);
   return NaClValidationFailedNotImplemented;
 }
 
 EXTERN_C_END