Allow sel_ldr to continue without the IRT, when nexe doesn't have segment gap

src/trusted/service_runtime/sel_main.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.
  */
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
  */
 #include "native_client/src/include/portability.h"
@@ skipping 26 matching lines @@
 #include "native_client/src/trusted/perf_counter/nacl_perf_counter.h"
 #include "native_client/src/trusted/service_runtime/env_cleanser.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 #include "native_client/src/trusted/service_runtime/nacl_app.h"
 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h"
 #include "native_client/src/trusted/service_runtime/nacl_debug_init.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_log_hook.h"
 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
 #include "native_client/src/trusted/service_runtime/nacl_signal.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_common.h"
+#include "native_client/src/trusted/service_runtime/nacl_text.h"
 #include "native_client/src/trusted/service_runtime/nacl_valgrind_hooks.h"
 #include "native_client/src/trusted/service_runtime/osx/mach_exception_handler.h"
 #include "native_client/src/trusted/service_runtime/outer_sandbox.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/src/trusted/service_runtime/sel_qualify.h"
 #include "native_client/src/trusted/service_runtime/win/exception_patch/ntdll_patch.h"
 #if NACL_WINDOWS
 #include "native_client/src/trusted/service_runtime/win/debug_exception_handler.h"
 #endif
 
@@ skipping 614 matching lines @@
         fprintf(stderr, "NaClAppPrepareToLaunch returned %d", errcode);
       }
       NaClPerfCounterMark(&time_all_main, "AppPrepLaunch");
       NaClPerfCounterIntervalLast(&time_all_main);
     }
 
     /* Give debuggers a well known point at which xlate_base is known.  */
     NaClGdbHook(&state);
   }
 
-
   if (NULL != blob_library_file) {
     if (LOAD_OK == errcode) {
-      NaClLog(2, "Loading blob file %s\n", blob_library_file);
-      errcode = NaClAppLoadFileDynamically(nap, (struct Gio *) &blob_file);
-      if (LOAD_OK != errcode) {
-        fprintf(stderr, "Error while loading \"%s\": %s\n",
-                blob_library_file,
-                NaClErrorString(errcode));
+      if (NaClHasSegmentGapForDyncode(nap)) {
+        NaClLog(2, "Loading blob file %s\n", blob_library_file);
+        errcode = NaClAppLoadFileDynamically(nap, (struct Gio *) &blob_file);
+        if (LOAD_OK != errcode) {
+          fprintf(stderr, "Error while loading \"%s\": %s\n",
+                  blob_library_file,
+                  NaClErrorString(errcode));
+        }
+        NaClPerfCounterMark(&time_all_main, "BlobLoaded");
+        NaClPerfCounterIntervalLast(&time_all_main);
+      } else {
+        fprintf(

[Mark Seaborn, 2012/06/28 22:05:11]

Can you use NaClLog() instead of fprintf(), please?  Also, can you add a similar
TODO(mseaborn) here for omitting "-B" when the IRT is not wanted.

[jvoung (off chromium), 2012/06/28 22:41:56]

Done.  The other code around here used fprintf for some reason, so I stuck with
that originally...

+            stderr,
+            "WARNING: NaCl app doesn't have a segment gap, not loading IRT.\n"
+            "This is expected for PNaCl's translator nexes.\n");
       }
-      NaClPerfCounterMark(&time_all_main, "BlobLoaded");
-      NaClPerfCounterIntervalLast(&time_all_main);
     }
 
     if (-1 == (*((struct Gio *) &blob_file)->vtbl->Close)((struct Gio *)
                                                           &blob_file)) {
       fprintf(stderr, "Error while closing \"%s\".\n", blob_library_file);
     }
     (*((struct Gio *) &blob_file)->vtbl->Dtor)((struct Gio *) &blob_file);
     if (verbosity) {
       gprintf((struct Gio *) &gout, "printing post-IRT NaClApp details\n");
       NaClAppPrintDetails(nap, (struct Gio *) &gout);
@@ skipping 170 matching lines @@
   fflush(stdout);
 
   if (handle_signals) NaClSignalHandlerFini();
   NaClAllModulesFini();
 
   NaClExit(ret_code);
 
   /* Unreachable, but having the return prevents a compiler error. */
   return ret_code;
 }