Update NaCl's generator to support new wait APIs.

mojo/nacl/mojo_syscall_internal.h

 // 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.
 
 #ifndef MOJO_NACL_MOJO_SYSCALL_INTERNAL_H_
 #define MOJO_NACL_MOJO_SYSCALL_INTERNAL_H_
 
 #include "native_client/src/trusted/service_runtime/nacl_copy.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 
@@ skipping 14 matching lines @@
 static inline uintptr_t NaClUserToSysAddrArray(
     struct NaClApp* nap,
     uint32_t uaddr,
     size_t count,
     size_t size) {
   // TODO(ncbray): overflow checking
   size_t range = count * size;
   return NaClUserToSysAddrRange(nap, uaddr, range);
 }
 
+void memcpy_volatile_out(void volatile* dst, const void* src, size_t n) {

[Mark Seaborn, 2014/12/08 22:24:12]

Shouldn't this be static and/or inline, since it's in a header?

Also, this could do with a comment to explain why you don't use memcpy.

[Nick Bray (chromium), 2014/12/09 22:14:31]

Done.

+  char volatile* c_dst = reinterpret_cast<char volatile*>(dst);
+  const char* c_src = reinterpret_cast<const char*>(src);
+  for (size_t i = 0; i < n; i++) {
+    c_dst[i] = c_src[i];
+  }
+}
+
 template <typename T> bool ConvertScalarInput(
     struct NaClApp* nap,
     uint32_t user_ptr,
     T* value) {
   if (user_ptr) {
     uintptr_t temp = NaClUserToSysAddrRange(nap, user_ptr, sizeof(T));
     if (temp != kNaClBadAddress) {
       *value = *reinterpret_cast<T volatile*>(temp);
       return true;
     }
   }
   return false;
 }
 
 template <typename T> bool ConvertScalarOutput(
     struct NaClApp* nap,
     uint32_t user_ptr,
+    bool optional,
     T volatile** sys_ptr) {
   if (user_ptr) {
     uintptr_t temp = NaClUserToSysAddrRange(nap, user_ptr, sizeof(T));
     if (temp != kNaClBadAddress) {
       *sys_ptr = reinterpret_cast<T volatile*>(temp);
       return true;
+    } else if (optional) {
+      *sys_ptr = 0;
+      return true;
     }
   }
   *sys_ptr = 0; // Paranoia.
   return false;
 }
 
 template <typename T> bool ConvertScalarInOut(
     struct NaClApp* nap,
     uint32_t user_ptr,
     bool optional,
@@ skipping 52 matching lines @@
     }
   } else if (optional) {
     *sys_ptr = 0;
     return true;
   }
   return false;
 }
 
 // TODO(ncbray): size validation and complete copy.
 // TODO(ncbray): ensure non-null / missized structs are covered by a test case.
-template <typename T> bool ConvertStruct(
+template <typename T> bool ConvertExtensibleStructInput(
     struct NaClApp* nap,
     uint32_t user_ptr,
     bool optional,
     T** sys_ptr) {
   if (user_ptr) {
     uintptr_t temp = NaClUserToSysAddrRange(nap, user_ptr, sizeof(T));
     if (temp != kNaClBadAddress) {
       *sys_ptr = reinterpret_cast<T*>(temp);
       return true;
     }
   } else if (optional) {
     *sys_ptr = 0;
     return true;
   }
   return false;
 }
 
 } // namespace
 
 #endif // MOJO_NACL_MOJO_SYSCALL_INTERNAL_H_