Eliminate bundle_size parameter from validator interface.

src/tools/validator_tools/ncstubout.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.
  */
 
 /*
  * This tool rewrites ELF files to replace instructions that will be
  * rejected by the validator with safe HLT instructions.  This is
  * useful if you have a large library in which many functions do not
  * validate but are not immediately required to work.  Replacing the
  * forbidden instructions with HLTs makes it easier to find the
  * instructions that are needed first, and fix and test them.
  */
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "native_client/src/include/elf.h"
 #include "native_client/src/shared/gio/gio.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/utils/types.h"
 #include "native_client/src/trusted/validator/cpufeatures.h"
 #include "native_client/src/trusted/validator/ncvalidate.h"
 
 static Bool FixUpSection(uintptr_t load_address,
                          unsigned char *code,
                          size_t code_size) {
-  int bundle_size = 32;
   enum NaClSBKind sb_kind = NACL_SB_DEFAULT;
   NaClValidationStatus status;
   NaClCPUFeatures cpu_features;
   /* Pretend that the CPU supports every feature so that we will only stub out
    * instructions that NaCl will never allow under any condition.
    */
   NaClSetAllCPUFeatures(&cpu_features);
 
   status = NACL_SUBARCH_NAME(ApplyValidator,
                              NACL_TARGET_ARCH,
                              NACL_TARGET_SUBARCH)
-      (sb_kind, load_address, code, code_size, bundle_size,
+      (sb_kind, load_address, code, code_size,
        /* stubout_mode= */ TRUE, /* readonly_text= */ FALSE,
        &cpu_features, NULL);
   if (status == NaClValidationSucceeded) {
     /* Now run the validator again, so that we report any errors
      * that were not fixed by stubbing out. This is done so that
      * the user knows that stubout doesn't fix all errors.
      */
     status = NACL_SUBARCH_NAME(ApplyValidatorVerbosely,
                                NACL_TARGET_ARCH,
                                NACL_TARGET_SUBARCH)
-        (sb_kind, load_address, code, code_size, bundle_size, &cpu_features);
+        (sb_kind, load_address, code, code_size, &cpu_features);
   }
 
   switch (status) {
     case NaClValidationSucceeded:
       return TRUE;
     default:
     case NaClValidationFailed:
       fprintf(stderr, "Errors still exist after attempting to stubout code\n");
       return FALSE;
     case NaClValidationFailedOutOfMemory:
@@ skipping 138 matching lines @@
     fprintf(stderr, "Usage: %s <input-file> -o <output-file>\n\n", argv[0]);
     fprintf(stderr,
             "This tool rewrites ELF objects to replace instructions that are\n"
             "rejected by the NaCl validator with safe HLT instructions.\n");
     GioFileDtor((struct Gio*) &err);
     return 1;
   }
   GioFileDtor((struct Gio*) &err);
   return FixUpELFFile(argv[1], argv[3]) ? 0 : 1;
 }