Rewrite non-temporal instructions

src/trusted/validator_ragel/dfa_validate_32.c

 /*
  * 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.
  */
 
 /* Implement the Validator API for the x86-32 architecture. */
 #include <errno.h>
 #include <string.h>
 
@@ skipping 21 matching lines @@
     int stubout_mode,
     uint32_t flags,
     int readonly_text,
     const NaClCPUFeatures *f,
     const struct NaClValidationMetadata *metadata,
     struct NaClValidationCache *cache) {
   /* TODO(jfb) Use a safe cast here. */
   NaClCPUFeaturesX86 *cpu_features = (NaClCPUFeaturesX86 *) f;
   enum NaClValidationStatus status = NaClValidationFailed;
   void *query = NULL;
+  uint32_t options;
   struct StubOutCallbackData callback_data;
-  callback_data.flags = flags;
-  callback_data.did_rewrite = 0;
+
   UNREFERENCED_PARAMETER(guest_addr);
 
   if (stubout_mode)
     return NaClValidationFailedNotImplemented;
   if (!NaClArchSupportedX86(cpu_features))
     return NaClValidationFailedCpuNotSupported;
   if (size & kBundleMask)
     return NaClValidationFailed;
 
   /*
    * If the validation caching interface is available and it would be
    * inexpensive to do so, perform a query.
    */
   if (cache != NULL && NaClCachingIsInexpensive(cache, metadata))
     query = cache->CreateQuery(cache->handle);
   if (query != NULL) {
     const char validator_id[] = "x86-32 dfa";
     cache->AddData(query, (uint8_t *) validator_id, sizeof(validator_id));
     cache->AddData(query, (uint8_t *) cpu_features, sizeof(*cpu_features));
     NaClAddCodeIdentity(data, size, metadata, cache, query);
     if (cache->QueryKnownToValidate(query)) {
       cache->DestroyQuery(query);
       return NaClValidationSucceeded;
     }
   }
 
+  options = 0;
+  callback_data.flags = flags;
+  callback_data.chunk_processed_as_a_contiguous_stream =
+    options & PROCESS_CHUNK_AS_A_CONTIGUOUS_STREAM;

[Mark Seaborn, 2015/08/14 21:12:59]

Use "(x & b) != 0".  NaCl style is don't implicitly convert to a boolean. 
*Especially* where you store the result of an "&" as an int. :-)

[ruiq, 2015/08/15 04:46:41]

Done.

+  callback_data.bundle_begin_offset = (uintptr_t) data & kBundleMask;
+  callback_data.cpu_features = cpu_features;
+  callback_data.did_rewrite = 0;
+
   if (readonly_text) {
-    if (ValidateChunkIA32(data, size, 0 /*options*/, cpu_features,
+    if (ValidateChunkIA32(data, size, options, cpu_features,
                           NaClDfaProcessValidationError,
                           NULL))
       status = NaClValidationSucceeded;
   } else {
-    if (ValidateChunkIA32(data, size, 0 /*options*/, cpu_features,
+    if (ValidateChunkIA32(data, size, options, cpu_features,
                           NaClDfaStubOutUnsupportedInstruction,
                           &callback_data))
       status = NaClValidationSucceeded;
   }
+
   if (status != NaClValidationSucceeded && errno == ENOMEM)
     status = NaClValidationFailedOutOfMemory;
 
   /* Cache the result if validation succeeded and the code was not modified. */
   if (query != NULL) {
     if (status == NaClValidationSucceeded && callback_data.did_rewrite == 0)
       cache->SetKnownToValidate(query);
     cache->DestroyQuery(query);
   }
 
@@ skipping 272 matching lines @@
   sizeof(NaClCPUFeaturesX86),
   NaClSetAllCPUFeaturesX86,
   NaClGetCurrentCPUFeaturesX86,
   NaClFixCPUFeaturesX86,
   IsOnInstBoundary_x86_32,
 };
 
 const struct NaClValidatorInterface *NaClDfaValidatorCreate_x86_32(void) {
   return &validator;
 }