Mojo + NaCl prototype.

mojo/monacl/generator/mojo_syscall.cc.template

Index: mojo/monacl/generator/mojo_syscall.cc.template
diff --git a/mojo/monacl/generator/mojo_syscall.cc.template b/mojo/monacl/generator/mojo_syscall.cc.template
new file mode 100644
index 0000000000000000000000000000000000000000..2ef1d5de98e8a6418db76ab884504d8cb12988fc
--- /dev/null
+++ b/mojo/monacl/generator/mojo_syscall.cc.template
@@ -0,0 +1,63 @@
+// Copyright 2014 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.
+
+$generator_warning
+
+#include "mojo/monacl/mojo_syscall.h"
+
+#include <stdio.h>
+
+#include "mojo/monacl/mojo_syscall_internal.h"
+#include "mojo/public/c/system/core.h"
+#include "native_client/src/public/chrome_main.h"
+#include "native_client/src/public/nacl_app.h"
+#include "native_client/src/trusted/desc/nacl_desc_custom.h"
+
+namespace {
+
+void MojoDescDestroy(void* handle) {
+}
+
+ssize_t MojoDescSendMsg(void* handle,
+                        const struct NaClImcTypedMsgHdr* msg,
+                        int flags) {
+  struct NaClApp* nap = static_cast<struct NaClApp*>(handle);
+
+  if (msg->iov_length != 1 || msg->iov[0].length < 8 ||

[Mark Seaborn, 2014/09/10 23:19:21]

Minimum should be 4, not 8, surely?  This could move to after num_params is
calculated...

[Nick Bray (chromium), 2014/09/11 00:56:40]

Technically correct, (always a return parameter), but simplified for
understandability.

+      msg->ndesc_length != 0) {
+    return -1;
+  }
+
+  uint32_t* params = static_cast<uint32_t*>(msg->iov[0].base);

[Mark Seaborn, 2014/09/10 23:19:21]

This pointer should be volatile too, since it is reading from untrusted address
space.

[Nick Bray (chromium), 2014/09/11 00:56:40]

Unclear from the API.

Done.

+  size_t num_params = msg->iov[0].length / sizeof(*params);

[Mark Seaborn, 2014/09/10 23:19:20]

After:
if (num_params < 1)
  return -1;

[Nick Bray (chromium), 2014/09/11 00:56:40]

Done.

+
+  uint32_t msg_type = params[0];
+  switch (msg_type) {
+$body
+  }
+
+  return -1;
+}
+
+ssize_t MojoDescRecvMsg(void* handle,
+                        struct NaClImcTypedMsgHdr* msg,
+                        int flags) {
+  return -1;
+}
+
+struct NaClDesc* MakeMojoDesc(struct NaClApp* nap) {
+  struct NaClDescCustomFuncs funcs = NACL_DESC_CUSTOM_FUNCS_INITIALIZER;
+  funcs.Destroy = MojoDescDestroy;
+  funcs.SendMsg = MojoDescSendMsg;
+  funcs.RecvMsg = MojoDescRecvMsg;
+  return NaClDescMakeCustomDesc(nap, &funcs);
+}
+
+} // namespace
+
+#define NACL_MOJO_DESC (NACL_CHROME_DESC_BASE + 2)
+
+void InjectMojo(struct NaClApp* nap) {
+  NaClAppSetDesc(nap, NACL_MOJO_DESC, MakeMojoDesc(nap));
+}