Refactor the process of choosing validators.

src/trusted/validator/x86/64/ncvalidate.c

Index: src/trusted/validator/x86/64/ncvalidate.c
diff --git a/src/trusted/validator/x86/64/ncvalidate.c b/src/trusted/validator/x86/64/ncvalidate.c
index 7d9c9b363f6e08f2d79be66c16cbb4a1b332a8c2..3e2d8184c1f2e3ced5718e58d8064daa957de577 100644
--- a/src/trusted/validator/x86/64/ncvalidate.c
+++ b/src/trusted/validator/x86/64/ncvalidate.c
@@ -33,7 +33,7 @@ NaClValidationStatus NaClValidatorSetup_x86_64(
       : NaClValidationSucceeded;     /* or at least to this point! */
 }
 
-NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, x86, 64) (
+static NaClValidationStatus ApplyValidator_x86_64(
     uintptr_t guest_addr,
     uint8_t *data,
     size_t size,
@@ -98,12 +98,12 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, x86, 64) (
   return status;
 }
 
-NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement, x86, 64)
-    (uintptr_t guest_addr,
-     uint8_t *data_old,
-     uint8_t *data_new,
-     size_t size,
-     const NaClCPUFeaturesX86 *cpu_features) {
+static NaClValidationStatus ApplyValidatorCodeReplacement_x86_64(
+    uintptr_t guest_addr,
+    uint8_t *data_old,
+    uint8_t *data_new,
+    size_t size,
+    const NaClCPUFeaturesX86 *cpu_features) {
   NaClValidationStatus status;
   struct NaClValidatorState *vstate;
 
@@ -126,3 +126,20 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement, x86, 64)
   NaClValidatorStateDestroy(vstate);
   return status;
 }
+
+extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCopy, x86, 64)
+(uintptr_t guest_addr,

[Nick Bray, 2012/04/27 22:21:36]

'(' on previous line; indent.

[pasko-google - do not use, 2012/05/12 12:18:40]

Done.

+ uint8_t *data_old,
+ uint8_t *data_new,
+ size_t size,
+ const NaClCPUFeaturesX86 *cpu_features);
+
+static struct NaClValidatorInterface validator = {

[Nick Bray, 2012/04/27 22:21:36]

const?

[pasko-google - do not use, 2012/05/12 12:18:40]

Done.

+  ApplyValidator_x86_64,
+  NACL_SUBARCH_NAME(ApplyValidatorCopy, x86, 64),
+  ApplyValidatorCodeReplacement_x86_64,
+};
+
+void NaClValidatorInit_x86_64(struct NaClValidatorInterface **val) {

[Nick Bray, 2012/04/27 22:21:36]

Maybe this should be a getter (returns the pointer) instead of a setter?

[pasko-google - do not use, 2012/05/12 12:18:40]

yep, cleaner
also has a viral effect on NaClSelectValidator() which now turns into
NaClCreateValidator.

+  *val = &validator;
+}