Eliminate bundle_size parameter from validator interface.

src/trusted/validator_x86/nccopycode.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.
  */
 
 /*
  * nccopycode.c
  * Copies two code streams in a thread-safe way
  *
@@ skipping 243 matching lines @@
                             NCDecoderInst *dinst_new) {
   NCRemainingMemory* mem_old = &dinst_old->dstate->memory;
   NCRemainingMemory* mem_new = &dinst_new->dstate->memory;
 
   return CopyInstructionInternal(mem_old->mpc,
                                  mem_new->mpc,
                                  mem_old->read_length);
 }
 
 int NCCopyCode(uint8_t *dst, uint8_t *src, NaClPcAddress vbase,
-               size_t sz, int bundle_size) {
+               size_t sz) {
   NCDecoderState dst_dstate;
   NCDecoderInst  dst_inst;
   NCDecoderState src_dstate;
   NCDecoderInst  src_inst;
   NCDecoderStatePair pair;
   int result = 0;
 
   NCDecoderStateConstruct(&dst_dstate, dst, vbase, sz, &dst_inst, 1);
   NCDecoderStateConstruct(&src_dstate, src, vbase, sz, &src_inst, 1);
   NCDecoderStatePairConstruct(&pair, &dst_dstate, &src_dstate);
   pair.action_fn = CopyInstruction;
   if (NCDecoderStatePairDecode(&pair)) result = 1;
   NCDecoderStatePairDestruct(&pair);
   NCDecoderStateDestruct(&src_dstate);
   NCDecoderStateDestruct(&dst_dstate);
 
   return result;
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCopy,
                                        NACL_TARGET_ARCH,
                                        NACL_TARGET_SUBARCH)
     (enum NaClSBKind sb_kind,
      uintptr_t guest_addr,
      uint8_t *data_old,
      uint8_t *data_new,
      size_t size,
-     int bundle_size,
      const NaClCPUFeaturesX86 *cpu_features) {
-  NaClValidationStatus status = NaClValidationFailedNotImplemented;
   assert(NACL_SB_DEFAULT == sb_kind);
-  if (bundle_size == 16 || bundle_size == 32) {
-    if (!NaClArchSupported(cpu_features)) {
-      status = NaClValidationFailedCpuNotSupported;
-    } else {
-      status = ((0 == NCCopyCode(data_old, data_new, guest_addr,
-                                size, bundle_size))
-                ? NaClValidationFailed : NaClValidationSucceeded);
-    }
-  }
-  return status;
+
+  if (!NaClArchSupported(cpu_features))
+    return NaClValidationFailedCpuNotSupported;
+
+  return ((0 == NCCopyCode(data_old, data_new, guest_addr,
+                           size))
+            ? NaClValidationFailed : NaClValidationSucceeded);
 }
 
 #elif NACL_TARGET_SUBARCH == 64
 
 int NaClCopyCodeIter(uint8_t *dst, uint8_t *src,
                      NaClPcAddress vbase, size_t size) {
   NaClSegment segment_old, segment_new;
   NaClInstIter *iter_old, *iter_new;
   NaClInstState *istate_old, *istate_new;
   int still_good = 1;
@@ skipping 58 matching lines @@
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCopy,
                                        NACL_TARGET_ARCH,
                                        NACL_TARGET_SUBARCH)
     (enum NaClSBKind sb_kind,
      uintptr_t guest_addr,
      uint8_t *data_old,
      uint8_t *data_new,
      size_t size,
-     int bundle_size,
      const NaClCPUFeaturesX86 *cpu_features) {
-  NaClValidationStatus status = NaClValidationFailedNotImplemented;
   assert(NACL_SB_DEFAULT == sb_kind);
-  if (bundle_size == 16 || bundle_size == 32) {
-    if (!NaClArchSupported(cpu_features)) {
-      status = NaClValidationFailedCpuNotSupported;
-    } else {
-      status = ((0 == NaClCopyCodeIter(data_old, data_new, guest_addr, size))
-                ? NaClValidationFailed : NaClValidationSucceeded);
-    }
-  }
-  return status;
+
+  if (!NaClArchSupported(cpu_features))
+    return NaClValidationFailedCpuNotSupported;
+
+  return (0 == NaClCopyCodeIter(data_old, data_new, guest_addr, size))
+      ? NaClValidationFailed : NaClValidationSucceeded;
 }
 
 #endif