Factor out duplicated GioMemoryFileSnapshotCtor() + NaClAppLoadFile() calls

src/trusted/service_runtime/mmap_test.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.
  */
 
 #include "native_client/src/include/portability.h"
 
 #include <stdio.h>
 #include <string.h>
 #if NACL_LINUX
 # include <sys/mman.h>
 #elif NACL_OSX
 # include <mach/mach.h>
 #endif
 
 #include "native_client/src/trusted/service_runtime/include/bits/mman.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 #include "native_client/src/trusted/service_runtime/include/sys/errno.h"
 
 #include "native_client/src/include/nacl_assert.h"
-#include "native_client/src/shared/gio/gio.h"
+#include "native_client/src/trusted/service_runtime/load_file.h"
 #include "native_client/src/trusted/service_runtime/mmap_test_check.h"
 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h"
 #include "native_client/src/trusted/service_runtime/nacl_app_thread.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_common.h"
-#include "native_client/src/trusted/service_runtime/nacl_valgrind_hooks.h"
 #include "native_client/src/trusted/service_runtime/sel_addrspace.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 
 /*
  * Perform some minimal initialisation of the NaClAppThread based on
  * what we need for the test.  Reusing NaClAppThreadMake() here is
  * difficult because it launches an untrusted thread.
  */
 static void InitThread(struct NaClApp *nap, struct NaClAppThread *natp) {
   memset(natp, 0xff, sizeof(*natp));
@@ skipping 24 matching lines @@
 #elif NACL_OSX
   CheckMapping(addr, expected_size, VM_PROT_NONE, SM_EMPTY);
 #else
 # error "Unrecognized OS"
 #endif
 }
 #endif
 
 int main(int argc, char **argv) {
   char *nacl_file;
-  struct GioMemoryFileSnapshot gf;
   struct NaClApp state;
   struct NaClApp *nap = &state;
   struct NaClAppThread nat, *natp = &nat;
   int errcode;
   uint32_t initial_addr;
   uint32_t addr;
   struct NaClVmmap *mem_map;
   struct NaClVmmapEntry *ent;
   char *nacl_verbosity = getenv("NACLVERBOSITY");
 
   NaClHandleBootstrapArgs(&argc, &argv);
 
   if (argc < 2) {
     printf("No nexe file!\n\nFAIL\n");
   }
   nacl_file = argv[1];
 
   NaClAllModulesInit();
 
   NaClLogSetVerbosity((NULL == nacl_verbosity)
                       ? 0
                       : strtol(nacl_verbosity, (char **) 0, 0));
 
-  NaClFileNameForValgrind(nacl_file);
-  errcode = GioMemoryFileSnapshotCtor(&gf, nacl_file);
-  ASSERT_NE(errcode, 0);
   errcode = NaClAppCtor(&state);
   ASSERT_NE(errcode, 0);
-  errcode = NaClAppLoadFile((struct Gio *) &gf,
-                            &state);
-  ASSERT_EQ(errcode, 0);
+  errcode = NaClAppLoadFileFromFilename(nap, nacl_file);
+  ASSERT_EQ(errcode, LOAD_OK);
 
   InitThread(&state, natp);
 
   /*
    * Initial mappings:
    * 0. --  Zero page
    * 1. rx  Static code segment
    * 2. r   Read-only data segment
    * 3. rw  Writable data segment
    * 4. rw  Stack
@@ skipping 346 matching lines @@
 #if NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 64
   CheckForGuardRegion(nap->mem_start - ((size_t) 40 << 30), (size_t) 40 << 30);
   CheckForGuardRegion(nap->mem_start + ((size_t) 4 << 30), (size_t) 40 << 30);
 #endif
 
   NaClAddrSpaceFree(nap);
 
   printf("PASS\n");
   return 0;
 }