validator_ragel: Use different actions for different types of commands

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

Index: src/trusted/validator_ragel/unreviewed/gen-dfa.cc
===================================================================
--- src/trusted/validator_ragel/unreviewed/gen-dfa.cc	(revision 8571)
+++ src/trusted/validator_ragel/unreviewed/gen-dfa.cc	(working copy)
@@ -1691,6 +1691,7 @@
         print_opcode_recognition(false);
         print_immediate_arguments();
       }
+      print_inst_end_actions(false);
     }
 
     void print_one_size_definition_modrm_register(void) {
@@ -1749,6 +1750,7 @@
       } else {
         print_immediate_arguments();
       }
+      print_inst_end_actions(false);
     }
 
     void print_one_size_definition_modrm_memory(void) {
@@ -1825,6 +1827,7 @@
         } else {
           print_immediate_arguments();
         }
+        print_inst_end_actions(true);
       }
     }
 
@@ -1838,6 +1841,33 @@
       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) {