Replace kind variable from validator API with Boolean stubout parameter.

src/trusted/service_runtime/sel_validate_image.c

Index: src/trusted/service_runtime/sel_validate_image.c
diff --git a/src/trusted/service_runtime/sel_validate_image.c b/src/trusted/service_runtime/sel_validate_image.c
index 02072b20d5965b127c859746ccbf372c473fdb08..a2af8cb79bd87f3f9429b3b587c293f1086f8834 100644
--- a/src/trusted/service_runtime/sel_validate_image.c
+++ b/src/trusted/service_runtime/sel_validate_image.c
@@ -71,22 +71,24 @@ int NaClValidateCode(struct NaClApp *nap, uintptr_t guest_addr,
                                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 */

[Mark Seaborn, 2012/04/10 19:04:09]

Capitalise 'Fixed' and 'CPU'

[Nick Bray (chromium), 2012/04/10 19:12:40]

Done.

+    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);
   }