Initial implementation of Bare Metal Mode for NaCl.

components/nacl/loader/nacl_listener.cc

 // Copyright 2013 The Chromium 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 "components/nacl/loader/nacl_listener.h"
 
 #include <errno.h>
 #include <stdlib.h>
 
 #if defined(OS_POSIX)
@@ skipping 14 matching lines @@
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
 #include "native_client/src/trusted/validator/nacl_file_info.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 #if defined(OS_LINUX)
+#include "components/nacl/loader/nonsfi/nonsfi_main.h"
 #include "content/public/common/child_process_sandbox_support_linux.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 
 #include "content/public/common/sandbox_init.h"
 #endif
 
@@ skipping 279 matching lines @@
   args->debug_stub_server_bound_socket_fd = nacl::ToNativeHandle(
       params.debug_stub_server_bound_socket);
 #endif
 #if defined(OS_WIN)
   args->broker_duplicate_handle_func = BrokerDuplicateHandle;
   args->attach_debug_exception_handler_func = AttachDebugExceptionHandler;
 #endif
 #if defined(OS_LINUX)
   args->prereserved_sandbox_size = prereserved_sandbox_size_;
 #endif
-  NaClChromeMainStart(args);
+
+
+#if defined(OS_LINUX)
+  if (params.enable_nonsfi_mode) {
+    nacl::nonsfi::MainStart(args->imc_bootstrap_handle);
+  } else

[Mark Seaborn, 2013/12/10 19:56:44]

You could avoid the awkward dangling else by doing:
if (params.enable_nonsfi_mode) {
  nacl::nonsfi::MainStart(args->imc_bootstrap_handle);
  NOTREACHED();
  return;
}

[hidehiko, 2013/12/11 07:56:14]

Done.

+#endif
+  {
+    NaClChromeMainStart(args);
+  }
   NOTREACHED();
 }