Move validator_x86_XX.rl out of unreviewed.

src/trusted/validator_ragel/validator_internal.h

 /*
  * 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.
  */
 
 /*
  * This file contains common parts of x86-32 and x86-64 internals (inline
  * functions and defines).
  */
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_RAGEL_VALIDATOR_INTERNAL_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_RAGEL_VALIDATOR_INTERNAL_H_
 
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/utils/types.h"
-#include "native_client/src/trusted/validator_ragel/unreviewed/decoder_internal.h"
+#include "native_client/src/trusted/validator_ragel/unreviewed/decoding.h"
 #include "native_client/src/trusted/validator_ragel/unreviewed/validator.h"
 
 /* Maximum set of R-DFA allowable CPUID features.  */
 extern const NaClCPUFeaturesX86 validator_cpuid_features;
 
 /* Macroses to suppport CPUID handling.  */
 #define SET_CPU_FEATURE(F) \
   if (!(F##_Allowed)) { \
     instruction_info_collected |= UNRECOGNIZED_INSTRUCTION; \
   } \
@@ skipping 269 matching lines @@
        (((((bitmap_word)1) << bits) - 1) << (index % NACL_HOST_WORDSIZE))) != 0;
 }
 
 /* All the bits must be in a single 32-bit bundle. */
 static FORCEINLINE void BitmapSetBits(bitmap_word *bitmap,
                                       size_t index, size_t bits) {
   bitmap[index / NACL_HOST_WORDSIZE] |=
                ((((bitmap_word)1) << bits) - 1) << (index % NACL_HOST_WORDSIZE);
 }
 
-/* Mark the destination of a jump instruction and make an early validity check:
+/*
+ * Mark the destination of a jump instruction and make an early validity check:
  * to jump outside given code region, the target address must be aligned.
  *
  * Returns TRUE iff the jump passes the early validity check.
  */
 static FORCEINLINE int MarkJumpTarget(size_t jump_dest,
                                       bitmap_word *jump_dests,
                                       size_t size) {
   if ((jump_dest & kBundleMask) == 0) {
     return TRUE;
   }
   if (jump_dest >= size) {
     return FALSE;
   }
   BitmapSetBit(jump_dests, jump_dest);
   return TRUE;
 }
 
+/*
+ * Mark the gived address as valid jump target address.
+ */
+static FORCEINLINE void MakeJumpTargetValid(size_t address,
+                                            bitmap_word *valid_targets) {
+  BitmapSetBit(valid_targets, address);
+}
+
+/*
+ * Mark the gived address as invalid jump target address.
+ */
+static FORCEINLINE void MakeJumpTargetInvalid(size_t address,
+                                              bitmap_word *valid_targets) {
+  BitmapClearBit(valid_targets, address);
+}
 
 static INLINE Bool ProcessInvalidJumpTargets(
     const uint8_t *data,
     size_t size,
     bitmap_word *valid_targets,
     bitmap_word *jump_dests,
     validation_callback_func user_callback,
     void *callback_data) {
   size_t elements = (size + NACL_HOST_WORDSIZE - 1) / NACL_HOST_WORDSIZE;
   size_t i, j;
@@ skipping 221 matching lines @@
       *instruction_info_collected |= RESTRICTED_RBP_UNPROCESSED;
     }
   /* Take 2 bits of operand type from operand_states as *restricted_register,
    * make sure operand_states denotes a register (12th bit == 0).  */
   } else if ((operand_states & 0x7000) == (OperandSandboxRestricted << 13)) {
     *restricted_register = (operand_states & 0x0f00) >> 8;
   }
 }
 
 #endif  /* NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_RAGEL_VALIDATOR_INTERNAL_H_ */