Eliminate bundle_size parameter from validator interface.

src/trusted/validator_arm/ncvalidate.cc

 /*
  * 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/trusted/validator_arm/ncvalidate.h"
 
 
 #include <vector>
@@ skipping 52 matching lines @@
   bool success = validator.validate(segments, &sink);
   if (!success) return 2;  // for compatibility with old validator
   return 0;
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, arm, 32) (
     enum NaClSBKind sb_kind,
     uintptr_t guest_addr,
     uint8_t *data,
     size_t size,
-    int bundle_size,
     int stubout_mode,
     int readonly_text,
     const NaClCPUFeaturesArm *cpu_features,
     struct NaClValidationCache *cache) {
-  NaClValidationStatus status = NaClValidationFailedNotImplemented;
   UNREFERENCED_PARAMETER(cpu_features);
   UNREFERENCED_PARAMETER(sb_kind);
   /* The ARM validator is currently unsafe w.r.t. caching. */
   UNREFERENCED_PARAMETER(cache);
-  if (stubout_mode) return NaClValidationFailedNotImplemented;
-  if (readonly_text) return NaClValidationFailedNotImplemented;
-  if (bundle_size == 16) {
-    status = ((0 == NCValidateSegment(data, guest_addr, size))
-              ? NaClValidationSucceeded : NaClValidationFailed);
-  }
-  return status;
+
+  if (stubout_mode)
+    return NaClValidationFailedNotImplemented;
+  if (readonly_text)
+    return NaClValidationFailedNotImplemented;
+
+  return ((0 == NCValidateSegment(data, guest_addr, size))
+           ? NaClValidationSucceeded : NaClValidationFailed);
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement, arm, 32)
     (enum NaClSBKind sb_kind,
      uintptr_t guest_addr,
      uint8_t *data_old,
      uint8_t *data_new,
      size_t size,
-     int bundle_size,
      const NaClCPUFeaturesArm *cpu_features) {
   UNREFERENCED_PARAMETER(sb_kind);
   UNREFERENCED_PARAMETER(guest_addr);
   UNREFERENCED_PARAMETER(data_old);
   UNREFERENCED_PARAMETER(data_new);
   UNREFERENCED_PARAMETER(size);
-  UNREFERENCED_PARAMETER(bundle_size);
   UNREFERENCED_PARAMETER(cpu_features);
   return NaClValidationFailedNotImplemented;
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCopy, arm, 32)
     (enum NaClSBKind sb_kind,
      uintptr_t guest_addr,
      uint8_t *data_old,
      uint8_t *data_new,
      size_t size,
-     int bundle_size,
      const NaClCPUFeaturesArm *cpu_features) {
   UNREFERENCED_PARAMETER(sb_kind);
   UNREFERENCED_PARAMETER(guest_addr);
   UNREFERENCED_PARAMETER(data_old);
   UNREFERENCED_PARAMETER(data_new);
   UNREFERENCED_PARAMETER(size);
-  UNREFERENCED_PARAMETER(bundle_size);
   UNREFERENCED_PARAMETER(cpu_features);
   return NaClValidationFailedNotImplemented;
 }
 
 EXTERN_C_END