Creating a pexe content handler to translate and run pexes.

mojo/nacl/nonsfi/irt_mojo_nonsfi.cc

 // Copyright 2015 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 "mojo/nacl/nonsfi/irt_mojo_nonsfi.h"
 
 #include "mojo/public/c/system/functions.h"
 #include "mojo/public/platform/nacl/mgl_irt.h"
 #include "mojo/public/platform/nacl/mojo_irt.h"
 #include "native_client/src/public/irt_core.h"
+#include "native_client/src/untrusted/irt/irt_dev.h"
 
 namespace {
 
 MojoHandle g_mojo_handle = MOJO_HANDLE_INVALID;
-
-MojoResult _MojoGetInitialHandle(MojoHandle* handle) {
-  *handle = g_mojo_handle;
-  return MOJO_RESULT_OK;
-}
+bool g_running_translator = false;
+std::string g_base_path = "";

[Mark Seaborn, 2015/10/28 18:31:43]

This is a non-POD initialiser.  Chromium has a policy against those because of
their startup-time cost.

You could fix this by using base/lazy_instance.h.

See:
http://neugierig.org/software/chromium/notes/2011/08/static-initializers.html
https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/p6h3HC8Wro4

[Sean Klein, 2015/10/28 21:39:59]

This is interesting. Good to know! I'll be more careful about initializing
static variables.

In the process of adding LazyInitializer here, I ran into a runtime error:
"[1028/123526:FATAL:at_exit.cc(53)] Check failed: false. Tried to
RegisterCallback without an AtExitManager".

This was actually something I ran into while trying to use base::PathService to
determine the "out/Debug" path. Turns out, the fix is to add a
"base::AtExitManager" variable on the stack, which I did in MojoMain. This fixed
the PathService bug too!

Long story short -- g_base_path and all related functions/uses have been removed
from irt_mojo_nonsfi, and calls to PathService are being used instead.

 
 const struct nacl_irt_mojo kIrtMojo = {
     MojoCreateSharedBuffer,
     MojoDuplicateBufferHandle,
     MojoMapBuffer,
     MojoUnmapBuffer,
     MojoCreateDataPipe,
     MojoWriteData,
     MojoBeginWriteData,
     MojoEndWriteData,
     MojoReadData,
     MojoBeginReadData,
     MojoEndReadData,
     MojoGetTimeTicksNow,
     MojoClose,
     MojoWait,
     MojoWaitMany,
     MojoCreateMessagePipe,
     MojoWriteMessage,
     MojoReadMessage,
-    _MojoGetInitialHandle,
+    nacl::MojoGetInitialHandle,
 };
 
 const struct nacl_irt_mgl kIrtMGL = {
     MGLCreateContext,
     MGLDestroyContext,
     MGLMakeCurrent,
     MGLGetCurrentContext,
     MGLGetProcAddress,
 };
 
 const struct nacl_irt_mgl_onscreen kIrtMGLOnScreen = {
     MGLResizeSurface,
     MGLSwapBuffers,
 };
 
 const struct nacl_irt_mgl_signal_sync_point kIrtMGLSignalSyncPoint = {
     MGLSignalSyncPoint,
 };
 
+int NotPNaClFilter() {
+  return g_running_translator;
+}
+
 const struct nacl_irt_interface kIrtInterfaces[] = {
-    {NACL_IRT_MOJO_v0_1, &kIrtMojo, sizeof(kIrtMojo), nullptr},
-    {NACL_IRT_MGL_v0_1, &kIrtMGL, sizeof(kIrtMGL), nullptr},
-    {NACL_IRT_MGL_ONSCREEN_v0_1, &kIrtMGLOnScreen, sizeof(kIrtMGLOnScreen),
-      nullptr},
-    {NACL_IRT_MGL_SIGNAL_SYNC_POINT_v0_1, &kIrtMGLSignalSyncPoint,
-      sizeof(kIrtMGLSignalSyncPoint), nullptr},
+    // Interface to call Mojo functions
+    { NACL_IRT_MOJO_v0_1,
+      &kIrtMojo,
+      sizeof(kIrtMojo),
+      nullptr },
+    // Interface to call PNaCl translation
+    { NACL_IRT_PRIVATE_PNACL_TRANSLATOR_COMPILE_v0_1,
+      &nacl::nacl_irt_private_pnacl_translator_compile,
+      sizeof(nacl_irt_private_pnacl_translator_compile),
+      NotPNaClFilter },
+    // Interface to call PNaCl linking
+    { NACL_IRT_PRIVATE_PNACL_TRANSLATOR_LINK_v0_1,
+      &nacl::nacl_irt_private_pnacl_translator_link,
+      sizeof(nacl_irt_private_pnacl_translator_link),
+      NotPNaClFilter },
+    // Adds mechanism for opening object files, like crtbegin.o
+    { NACL_IRT_RESOURCE_OPEN_v0_1,
+      &nacl::nacl_irt_resource_open,
+      sizeof(nacl_irt_resource_open),
+      NotPNaClFilter },
+    // GPU functions which give control over MGL context
+    { NACL_IRT_MGL_v0_1,
+      &kIrtMGL,
+      sizeof(kIrtMGL),
+      nullptr },
+    // GPU functions which update framebuffer with respect to the display
+    { NACL_IRT_MGL_ONSCREEN_v0_1,
+      &kIrtMGLOnScreen,
+      sizeof(kIrtMGLOnScreen),
+      nullptr },
+    // GPU functions to synchronize CPU and GPU services
+    { NACL_IRT_MGL_SIGNAL_SYNC_POINT_v0_1,
+      &kIrtMGLSignalSyncPoint,
+      sizeof(kIrtMGLSignalSyncPoint),
+      nullptr },
 };
 
 }  // namespace
 
 namespace nacl {
 
+MojoResult MojoGetInitialHandle(MojoHandle* handle) {
+  *handle = g_mojo_handle;
+  return MOJO_RESULT_OK;
+}
+
 void MojoSetInitialHandle(MojoHandle handle) {
   g_mojo_handle = handle;
 }
 
+void MojoPnaclTranslatorEnable() {
+  g_running_translator = true;
+}
+
+void MojoSetBasePath(std::string base_path) {

[Mark Seaborn, 2015/10/28 18:31:43]

Can be "const std::string&" to avoid one copy.

[Sean Klein, 2015/10/28 21:39:59]

Done, but this function is being removed anyway.

+  g_base_path = base_path;
+}
+
+std::string MojoGetBasePath() {
+  return g_base_path;
+}
+
 size_t MojoIrtNonsfiQuery(const char* interface_ident,
                           void* table,
                           size_t tablesize) {
   size_t result = nacl_irt_query_list(interface_ident, table, tablesize,
                                       kIrtInterfaces, sizeof(kIrtInterfaces));
   if (result != 0)
     return result;
   return nacl_irt_query_core(interface_ident, table, tablesize);
 }
 
 }  // namespace nacl