Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/validator/ncvalidate.h

Index: src/trusted/validator/ncvalidate.h
diff --git a/src/trusted/validator/ncvalidate.h b/src/trusted/validator/ncvalidate.h
index 92460c152e1d2b8ea5aa25bd448906097ea1e681..34a154f4d42c2cc54d927e52cbe2eb11bd671d40 100644
--- a/src/trusted/validator/ncvalidate.h
+++ b/src/trusted/validator/ncvalidate.h
@@ -96,7 +96,11 @@ extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator,
     uint8_t *data,
     size_t size,
     int bundle_size,
-    Bool local_cpu);
+    Bool local_cpu
+#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_arm
+, uint8_t thumb
+#endif
+);
 
 /* Applies the validator, as used in a command-line tool to report issues.
  * Note: This is intentionally separated from ApplyValidator, since it need
@@ -120,7 +124,11 @@ extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorVerbosely,
     uint8_t *data,
     size_t size,
     int bundle_size,
-    Bool local_cpu);
+    Bool local_cpu
+#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_arm
+, uint8_t thumb
+#endif
+);
 
 /* Applies validator to new code segment, assuming that it was updated
  * from the previously validated old code segment. Assumes that instruction
@@ -142,7 +150,11 @@ extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement,
       uint8_t *data_old,
       uint8_t *data_new,
       size_t size,
-      int bundle_size);
+      int bundle_size
+#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_arm
+, uint8_t thumb
+#endif
+);
 
 /* Runs the validator to copy code from an existing code segment to a new
  * code segment.
@@ -167,7 +179,11 @@ extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCopy,
     uint8_t *data_old,
     uint8_t *data_new,
     size_t size,
-    int bundle_size);
+    int bundle_size
+#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_arm
+, uint8_t thumb
+#endif
+);
 
 EXTERN_C_END