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;
 
 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 not_pnacl_filter(void) {

[Mark Seaborn, 2015/10/27 17:30:20]

Naming nit: NotPNaClFilter().

Also can use "()" instead of "(void)" in C++ (where they're equivalent).

[Sean Klein, 2015/10/28 17:02:41]

Done.

+  if (g_running_translator) {

[Mark Seaborn, 2015/10/27 17:30:20]

Just "return g_running_translator"?

[Sean Klein, 2015/10/28 17:02:40]

Done.

+    return 1;
+  }
+  return 0;
+}
+
 const struct nacl_irt_interface kIrtInterfaces[] = {
-    {NACL_IRT_MOJO_v0_1, &kIrtMojo, sizeof(kIrtMojo), 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),
+      not_pnacl_filter },
+    // 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),
+      not_pnacl_filter },
+    // 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),
+      not_pnacl_filter },
     {NACL_IRT_MGL_v0_1, &kIrtMGL, sizeof(kIrtMGL), nullptr},
     {NACL_IRT_MGL_ONSCREEN_v0_1, &kIrtMGLOnScreen, sizeof(kIrtMGLOnScreen),
       nullptr},

[Petr Hosek, 2015/10/27 15:07:52]

Could you reformat all items to be consistent?

[Sean Klein, 2015/10/28 17:02:40]

Done. Also, added comments for GPU-related IRT interfaces (let me know if
something is inaccurate; I'm trying to avoid making kIrtInterfaces a blob of
undocumented structs)

     {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;
+}
+
 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