A mechanism to identify/forbid/"rewrite" non-temporal instructions (and other)

src/trusted/validator_ragel/dfa_validate_common.h

Index: src/trusted/validator_ragel/dfa_validate_common.h
diff --git a/src/trusted/validator_ragel/dfa_validate_common.h b/src/trusted/validator_ragel/dfa_validate_common.h
index 4835f2006ea7b4945f440b3be0a3b35ec5cc63a9..2288e3cfda6fc3fc14c3c385e29b12739c5234d3 100644
--- a/src/trusted/validator_ragel/dfa_validate_common.h
+++ b/src/trusted/validator_ragel/dfa_validate_common.h
@@ -31,10 +31,16 @@
 Bool NaClDfaProcessValidationError(const uint8_t *begin, const uint8_t *end,
                                    uint32_t info, void *callback_data);
 
-Bool NaClDfaStubOutCPUUnsupportedInstruction(const uint8_t *begin,
-                                             const uint8_t *end,
-                                             uint32_t info,
-                                             void *callback_data);
+struct ForbidRewriteCallbackData {

[Petr Hosek, 2015/07/20 23:58:57]

Nit: The name should be prefixed with NaCl.

[ruiq, 2015/07/21 00:39:44]

I followed the naming of 'CodeCopyCallbackData' on line 44. Shall I rename both
with 'NaCl' prefix?

[Petr Hosek, 2015/07/21 00:46:58]

In that case no, we should err on the side of consistency. We could rename both
in a separate cleanup CL if needed.

+  int pnacl_mode;
+  int did_rewrite;
+};
+
+Bool NaClDfaForbidOrRewriteInstruction(const uint8_t *begin,

[Petr Hosek, 2015/07/20 23:58:57]

There is no need to rename this function if we use the `nacl-unsupported`
attribute (we could possibly drop the CPU part).

[ruiq, 2015/07/21 02:52:24]

Done.

+                                       const uint8_t *end,
+                                       uint32_t info,
+                                       void *callback_data);
+
 struct CodeCopyCallbackData {
   NaClCopyInstructionFunc copy_func;
   /* Difference between addresses: dest - src.  */