Replace kind variable from validator API with Boolean stubout parameter.

src/trusted/service_runtime/sel_validate_image.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.
  */
 
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/src/trusted/validator/ncvalidate.h"
 
@@ skipping 53 matching lines @@
   if (nap->validator_stub_out_mode) {
     /* Validation caching is currently incompatible with stubout. */
     cache = NULL;
     /* In stub out mode, we do two passes.  The second pass acts as a
        sanity check that bad instructions were indeed overwritten with
        allowable HLTs. */
     status = NACL_SUBARCH_NAME(ApplyValidator,
                                NACL_TARGET_ARCH,
                                NACL_TARGET_SUBARCH)(
                                    sb_kind,
-                                   NaClApplyValidationDoStubout,
                                    guest_addr, data, size,
                                    nap->bundle_size,
+                                   TRUE, /* stub out */
                                    FALSE, /* text is not read-only */
                                    &nap->cpu_features,
                                    cache);
   }
   if (status == NaClValidationSucceeded) {
+    /* Fixed feature CPU mode implies read-only */
+    int readonly_text = nap->fixed_feature_cpu_mode;
     status = NACL_SUBARCH_NAME(ApplyValidator,
                                NACL_TARGET_ARCH,
                                NACL_TARGET_SUBARCH)(
                                    sb_kind,
-                                   NaClApplyCodeValidation,
                                    guest_addr, data, size,
                                    nap->bundle_size,
-                                   nap->fixed_feature_cpu_mode,
+                                   FALSE, /* do not stub out */
+                                   readonly_text,
                                    &nap->cpu_features,
                                    cache);
   }
   return NaClValidateStatus(status);
 }
 
 int NaClValidateCodeReplacement(struct NaClApp *nap, uintptr_t guest_addr,
                                 uint8_t *data_old, uint8_t *data_new,
                                 size_t size) {
   enum NaClSBKind sb_kind = NACL_SB_DEFAULT;
@@ skipping 59 matching lines @@
         NaClLog(LOG_ERROR,
                 "Run sel_ldr in debug mode to ignore validation failure.\n");
         NaClLog(LOG_ERROR,
                 "Run ncval <module-name> for validation error details.\n");
         rcode = LOAD_VALIDATION_FAILED;
       }
     }
   }
   return rcode;
 }