Switch the nop pnacl x86-64 IRT shim to the real one generated from IDL.

src/untrusted/pnacl_irt_shim/shim_ppapi.c

 /*
  * Copyright (c) 2011 The Native Client 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 "native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h"
 
 #include <string.h>
 #include "native_client/src/shared/ppapi_proxy/ppruntime.h"
 #include "native_client/src/untrusted/irt/irt.h"
 #include "native_client/src/untrusted/irt/irt_ppapi.h"
+#include "ppapi/generators/pnacl_shim.h"
 
 TYPE_nacl_irt_query __pnacl_real_irt_interface;
 
 /*
  * These remember the interface pointers the user registers by calling the
  * IRT entry point.
  */
 static struct PP_StartFunctions user_start_functions;
 
-/*
- * This remembers the interface pointer the IRT passes through
- * PPP_InitializeModule.
- */
-static const void *(*user_PPBGetInterface)(const char *interface_name);
-
-
+static int32_t wrap_PPPInitializeModule(PP_Module module_id,
+                                        PPB_GetInterface get_browser_intf) {
+  __set_real_Pnacl_PPBGetInterface(get_browser_intf);
+  return (*user_start_functions.PPP_InitializeModule)(module_id,
 /*
  * Calls from user code to the PPB interfaces pass through here and may require
  * shims to convert the ABI.
  */

[robertm, 2011/12/01 22:55:43]

moving the comment before the arg is uncommon

[jvoung - send to chromium..., 2011/12/01 23:35:34]

Done.

-static const void *wrap_PPBGetInterface(const char *interface_name) {
-  /* TODO(sehr): call PPB shims here. */
-  return (*user_PPBGetInterface)(interface_name);
-}
-
-static int32_t wrap_PPPInitializeModule(PP_Module module_id,
-                                        PPB_GetInterface get_browser_intf) {
-  user_PPBGetInterface = get_browser_intf;
-  return (*user_start_functions.PPP_InitializeModule)(module_id,
-                                                      wrap_PPBGetInterface);
+                                                      &__Pnacl_PPBGetInterface);
 }
 
 static void wrap_PPPShutdownModule() {
   (*user_start_functions.PPP_ShutdownModule)();
 }
 
-/*
- * Calls from the IRT to the user plugin pass through here and may require
- * shims to convert the ABI.
- */
-static const void *wrap_PPPGetInterface(const char *interface_name) {
-  /* TODO(sehr): call PPP shims here. */
-  return (*user_start_functions.PPP_GetInterface)(interface_name);
-}
-
 static const struct PP_StartFunctions wrapped_ppapi_methods = {
   wrap_PPPInitializeModule,
   wrap_PPPShutdownModule,
-  wrap_PPPGetInterface
+  /*
+   * Calls from the IRT to the user plugin pass through here and may require
+   * shims to convert the ABI.
+   */
+  __Pnacl_PPPGetInterface
 };
 
 static struct nacl_irt_ppapihook real_irt_ppapi_hook;
 
 static int wrap_ppapi_start(const struct PP_StartFunctions *funcs) {
   /*
    * Save the user's real bindings for the start functions.
    */
   user_start_functions = *funcs;
+  __set_real_Pnacl_PPPGetInterface(user_start_functions.PPP_GetInterface);
+
   /*
    * Invoke the IRT's ppapi_start interface with the wrapped interface.
    */
   return (*real_irt_ppapi_hook.ppapi_start)(&wrapped_ppapi_methods);
 }
 
 static struct nacl_irt_ppapihook ppapi_hook = {
   wrap_ppapi_start,
   NULL
 };
@@ skipping 26 matching lines @@
       real_irt_ppapi_hook.ppapi_register_thread_creator;
   /*
    * Copy the interface structure into the client.
    */
   if (sizeof ppapi_hook <= tablesize) {
     memcpy(table, &ppapi_hook, sizeof ppapi_hook);
     return sizeof ppapi_hook;
   }
   return 0;
 }