Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/validator/ncvalidate.h

 /*
  * 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_X86_NCVALIDATE_H__
 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NCVALIDATE_H__
 
 /* Defines the API to the native client validation code.
@@ skipping 78 matching lines @@
  *    bundle_size - The number of bytes in a code bundle.
  */
 extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator,
                                               NACL_TARGET_ARCH,
                                               NACL_TARGET_SUBARCH)(
     NaClApplyValidationKind kind,
     uintptr_t guest_addr,
     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
  * not be performance critical.
  * Parameters are:
  *    kind - The way the validator should be applied.
  *    local_cpu: True if local cpu rules should be applied.
  *           Otherwise, assume no cpu specific rules.
  *    guest_addr - The virtual pc to assume with the beginning address of the
  *           code segment. Typically, this is the corresponding addresss that
  *           will be used by objdump.
  *    data - The contents of the code segment to be validated.
  *    size - The size of the code segment to be validated.
  *    bundle_size - The number of bytes in a code bundle.
  */
 extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorVerbosely,
                                               NACL_TARGET_ARCH,
                                               NACL_TARGET_SUBARCH)(
     NaClApplyValidationKind kind,
     uintptr_t guest_addr,
     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
  * sizes are the same. Only allows changes in branches that don't change
  * instruction sizes.
  * Parameters are:
  *    guest_addr - The virtual pc to assume with the beginning address of the
  *           code segment. Typically, this is the corresponding addresss that
  *           will be used by objdump.
  *    data_old - The contents of the original code segment.
  *    data_new - The contents of the new code segment that should be validated.
  *    size - The size of the passed code segments.
  *    bundle_size - The number of bytes in a code bundle.
  */
 extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement,
                                               NACL_TARGET_ARCH,
                                               NACL_TARGET_SUBARCH)(
       uintptr_t guest_addr,
       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.
  *
  * Note: Current implementations uses the instruction decoders, which may
  * require that the code segment match native client rules.
  *
  * Parameters are:
  *    guest_addr - The virtual pc to assume with the beginning address of the
  *           code segment. Typically, this is the corresponding addresss that
  *           will be used by objdump.
  *    data_old - The contents of the original code segment.
  *    data_new - The addres of the new code segment for which the original
  *           code segment should be copied into.
  *    size - The size of the passed code segments.
  *    bundle_size - The number of bytes in a code bundle.
  */
 extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCopy,
                                               NACL_TARGET_ARCH,
                                               NACL_TARGET_SUBARCH)(
     uintptr_t guest_addr,
     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
 
 #endif  /*  NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NCVALIDATE_H__ */