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/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;
-}
-
 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_interface kIrtInterfaces[] = {
-    {NACL_IRT_MOJO_v0_1, &kIrtMojo, sizeof(kIrtMojo), nullptr}};
+static const struct nacl_irt_interface kIrtInterfaces[] = {

[Mark Seaborn, 2015/10/20 21:32:40]

Nit: 'static' not needed: this is in an anon namespace.

[Sean Klein, 2015/10/22 21:50:00]

Done.

+    /* Interface to call Mojo functions */

[Mark Seaborn, 2015/10/20 21:32:40]

Nit: Use C++-style comments

[Sean Klein, 2015/10/22 21:50:00]

Done.

+    { NACL_IRT_MOJO_v0_1,
+      &kIrtMojo,
+      sizeof(kIrtMojo),
+      nullptr },
+    /* Interface to call PNaCl translation */
+    { NACL_IRT_PRIVATE_PNACL_TRANSLATOR_COMPILE_v0_1,
+      &nacl_irt_private_pnacl_translator_compile,
+      sizeof(nacl_irt_private_pnacl_translator_compile),
+      nullptr },

[Mark Seaborn, 2015/10/20 22:28:58]

Can you conditionalise the 3 new interfaces so that they are only made visible
to the PNaCl translator nexes, please?  (This 4th field in 'struct
nacl_irt_interface' is for conditionalising interfaces.)

[Sean Klein, 2015/10/22 21:50:00]

Done.

+    /* Interface to call PNaCl linking */
+    { NACL_IRT_PRIVATE_PNACL_TRANSLATOR_LINK_v0_1,
+      &nacl_irt_private_pnacl_translator_link,
+      sizeof(nacl_irt_private_pnacl_translator_link),
+      nullptr },
+    /* Adds mechanism for opening object files, like crtbegin.o */
+    { NACL_IRT_RESOURCE_OPEN_v0_1,
+      &nacl_irt_resource_open,
+      sizeof(nacl_irt_resource_open),
+      nullptr },
+};
 
 }  // namespace
 
 namespace nacl {
 
+MojoResult _MojoGetInitialHandle(MojoHandle* handle) {
+  *handle = g_mojo_handle;
+  return MOJO_RESULT_OK;
+}
+
 void MojoSetInitialHandle(MojoHandle handle) {
   g_mojo_handle = handle;
 }
 
 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