validator_ragel: Use different actions for different types of commands

src/trusted/validator_ragel/unreviewed/gen-dfa.cc

 /*
  * 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.
  */
 
 #include <fcntl.h>
 #include <getopt.h>
 #include <libgen.h>
 #include <stdio.h>
@@ skipping 1673 matching lines @@
       print_legacy_prefixes();
       print_rex_prefix();
       print_opcode_nomodrm();
       if (opcode_in_imm) {
         print_immediate_opcode();
         print_opcode_recognition(false);
       } else {
         print_opcode_recognition(false);
         print_immediate_arguments();
       }
+      print_inst_end_actions(false);
     }
 
     void print_one_size_definition_modrm_register(void) {
       print_operator_delimiter();
       if (mod_reg_is_used()) {
         rex.r = true;
       }
       if (mod_rm_is_used()) {
         rex.b = true;
       }
@@ skipping 38 matching lines @@
       }
       if (opcode_in_modrm) {
         fprintf(out_file, ")");
       }
       if (opcode_in_imm) {
         print_immediate_opcode();
         print_opcode_recognition(false);
       } else {
         print_immediate_arguments();
       }
+      print_inst_end_actions(false);
     }
 
     void print_one_size_definition_modrm_memory(void) {
       typedef std::tuple<const char *, bool, bool> T;
       static const T modes[] = {
         T { " operand_disp",            false,  true    },
         T { " operand_rip",             false,  false   },
         T { " single_register_memory",  false,  true    },
         T { " operand_sib_pure_index",  true,   false   },
         T { " operand_sib_base_index",  true,   true    }
@@ skipping 56 matching lines @@
         if (enabled(Actions::kCheckAccess) && !has_flag("no_memory_access")) {
           fprintf(out_file, " @check_access");
         }
         fprintf(out_file, ")");
         if (opcode_in_imm) {
           print_immediate_opcode();
           print_opcode_recognition(true);
         } else {
           print_immediate_arguments();
         }
+        print_inst_end_actions(true);
       }
     }
 
     static bool first_delimiter;
     void print_operator_delimiter(void) {
       if (first_delimiter) {
         fprintf(out_file, "\n    (");
       } else {
         fprintf(out_file, ") |\n    (");
       }
       first_delimiter = false;
     }
 
+    void print_inst_end_actions(bool memory_access) {
+      if (enabled(Actions::kParseOperands)) {
+        if (!enabled(Actions::kParseOperandPositions)) {
+          int operands_count = 0;
+          for (auto operand_it = operands.begin();
+               operand_it != operands.end(); ++operand_it) {
+            auto &operand = *operand_it;
+            if (operand.enabled) {
+              ++operands_count;
+              if (memory_access) {
+                static const char cc[] = { 'E', 'M', 'N', 'Q', 'R', 'U', 'W' };
+                for (size_t c_it = 0; c_it < arraysize(cc); ++c_it) {
+                  auto c = cc[c_it];
+                  if (operand.source == c) {
+                    --operands_count;

[pasko-google - do not use, 2012/05/12 15:16:06]

/* Memory operand is processed with action @check_access. */

[khim, 2012/05/12 15:19:53]

Done.

+                    break;
+                  }
+                }
+              }
+
+            }
+          }
+          fprintf(out_file, " @process_%d_operands", operands_count);
+        }
+      }
+    }
+
     bool mod_reg_is_used() {
       for (auto operand_it = operands.begin();
            operand_it != operands.end(); ++operand_it) {
         auto &operand = *operand_it;
         if (operand.source == 'C' &&
             required_prefixes.find("0xf0") == required_prefixes.end()) {
           return true;
         }
         static const char cc[] = { 'G', 'P', 'V' };
         for (size_t c_it = 0; c_it < arraysize(cc); ++c_it) {
@@ skipping 809 matching lines @@
 
   fprintf(out_file, "\n  one_instruction =");
 
   print_one_instruction_definition();
 
   fprintf(out_file, ");\n"
 "}%%%%\n"
 "");
   return 0;
 }