Move validator_x86_XX.rl out of unreviewed.

src/trusted/validator_ragel/decoder_x86_64.rl

 /*
  * 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.
  */
 
 /*
  * Full-blown decoder for amd64 case.  Can be used to decode instruction
  * sequence and process it, but right now is only used in tests.
  *
  * The code is in [hand-written] "parse_instruction.rl" and in [auto-generated]
  * "decoder_x86_64_instruction.rl" file.  This file only includes tiny amount
  * of the glue code.
  */
 
 #include <assert.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "native_client/src/include/elf32.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/decoder_internal.h"
 
-/*
- * These prefixes are only useful in AMD64 mode, but they will "cleaned up" by
- * decoder's cleanup procedure in IA32 mode anyway.  That's why we define them
- * twice: "real" version here and "do-nothing" in decoder_x86_32.rl.
- */
 #define SET_REX_PREFIX(P) instruction.prefix.rex = (P)
 #define SET_VEX_PREFIX2(P) vex_prefix2 = (P)
 #define CLEAR_SPURIOUS_REX_B() \
   instruction.prefix.rex_b_spurious = FALSE
 #define SET_SPURIOUS_REX_B() \
   if (GET_REX_PREFIX() & REX_B) instruction.prefix.rex_b_spurious = TRUE
 #define CLEAR_SPURIOUS_REX_X() \
   instruction.prefix.rex_x_spurious = FALSE
 #define SET_SPURIOUS_REX_X() \
   if (GET_REX_PREFIX() & REX_X) instruction.prefix.rex_x_spurious = TRUE
@@ skipping 52 matching lines @@
     "native_client/src/trusted/validator_ragel/unreviewed/parse_instruction.rl";
 
   include decode_x86_64 "decoder_x86_64_instruction.rl";
 
   include decoder
     "native_client/src/trusted/validator_ragel/unreviewed/parse_instruction.rl";
 
   main := decoder;
 }%%
 
+/*
+ * The "write data" statement causes Ragel to emit the constant static data
+ * needed by the ragel machine.
+ */
 %% write data;
 
 int DecodeChunkAMD64(const uint8_t *data, size_t size,
                      ProcessInstructionFunc process_instruction,
                      ProcessDecodingErrorFunc process_error,
                      void *userdata) {
   const uint8_t *current_position = data;
   const uint8_t *end_of_data = data + size;
   const uint8_t *instruction_begin = current_position;
   uint8_t vex_prefix2 = 0xe0;
   uint8_t vex_prefix3 = 0x00;
   enum ImmediateMode imm_operand = IMMNONE;
   enum ImmediateMode imm2_operand = IMMNONE;
   struct Instruction instruction;
   int result = TRUE;
 
   int current_state;
 
   SET_DISP_TYPE(DISPNONE);
   SET_IMM_TYPE(IMMNONE);
-  SET_IMM2_TYPE(IMMNONE);
+  SET_SECOND_IMM_TYPE(IMMNONE);
   SET_REX_PREFIX(FALSE);
   SET_DATA16_PREFIX(FALSE);
   SET_LOCK_PREFIX(FALSE);
   SET_REPNZ_PREFIX(FALSE);
   SET_REPZ_PREFIX(FALSE);
   SET_BRANCH_NOT_TAKEN(FALSE);
   SET_BRANCH_TAKEN(FALSE);
   SET_ATT_INSTRUCTION_SUFFIX(NULL);
   instruction.prefix.rex_b_spurious = FALSE;
   instruction.prefix.rex_x_spurious = FALSE;
   instruction.prefix.rex_r_spurious = FALSE;
   instruction.prefix.rex_w_spurious = FALSE;
 
+  /*
+   * The "write init" statement causes Ragel to emit initialization code.
+   * This should be executed once before the ragel machine is started.
+   */
   %% write init;
+  /*
+   * The "write exec" statement causes Ragel to emit the ragel machine's
+   * execution code.
+   */
   %% write exec;
 
 error_detected:
   return result;
 }