Incorporate shimming into the irt

src/untrusted/irt/irt_interfaces.c

 /*
  * Copyright (c) 2012 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 <string.h>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/untrusted/irt/irt.h"
+#include "native_client/src/untrusted/irt/irt_shim.h"
 #include "native_client/src/untrusted/irt/irt_interfaces.h"
 
 struct nacl_interface_table {
   const char *name;
   const void *table;
   size_t size;
 };
 
 static const struct nacl_interface_table irt_interfaces[] = {
   { NACL_IRT_BASIC_v0_1, &nacl_irt_basic, sizeof(nacl_irt_basic) },
   { NACL_IRT_FDIO_v0_1, &nacl_irt_fdio, sizeof(nacl_irt_fdio) },
   { NACL_IRT_FILENAME_v0_1, &nacl_irt_filename, sizeof(nacl_irt_filename) },
   { NACL_IRT_MEMORY_v0_1, &nacl_irt_memory, sizeof(nacl_irt_memory) },
   { NACL_IRT_DYNCODE_v0_1, &nacl_irt_dyncode, sizeof(nacl_irt_dyncode) },
   { NACL_IRT_THREAD_v0_1, &nacl_irt_thread, sizeof(nacl_irt_thread) },
   { NACL_IRT_MUTEX_v0_1, &nacl_irt_mutex, sizeof(nacl_irt_mutex) },
   { NACL_IRT_COND_v0_1, &nacl_irt_cond, sizeof(nacl_irt_cond) },
   { NACL_IRT_SEM_v0_1, &nacl_irt_sem, sizeof(nacl_irt_sem) },
   { NACL_IRT_TLS_v0_1, &nacl_irt_tls, sizeof(nacl_irt_tls) },
   { NACL_IRT_BLOCKHOOK_v0_1, &nacl_irt_blockhook, sizeof(nacl_irt_blockhook) },
   { NACL_IRT_RESOURCE_OPEN_v0_1, &nacl_irt_resource_open,
       sizeof(nacl_irt_resource_open) },
+/* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */

[Mark Seaborn, 2012/08/28 20:41:00]

Please indent by 2 spaces to match the surrounding code

[Mark Seaborn, 2012/08/28 21:32:00]

Ping?

Please do this for the comment below too.

 #ifdef IRT_PPAPI
   { NACL_IRT_PPAPIHOOK_v0_1, &nacl_irt_ppapihook, sizeof(nacl_irt_ppapihook) },
+/* This ifdef should be removed once the IRT build has migrated to the Chrome tree. */

[Mark Seaborn, 2012/08/28 20:41:00]

Please add a TODO(robertm) in this comment.  Also, this line is >80 chars long. 
Also, the comment would be more accurate if it said "once Chromium's Gyp build
has been extended to build the shims".

+/* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */
+#ifdef ENABLE_NACL_IRT_PPAPIHOOK_SHIMMED
+  { NACL_IRT_PPAPIHOOK_SHIMMED_v0_1, &nacl_irt_ppapihook_shimmed,
+    sizeof(nacl_irt_ppapihook) },
+#endif
 #endif
   { NACL_IRT_RANDOM_v0_1, &nacl_irt_random, sizeof(nacl_irt_random) },
   { NACL_IRT_CLOCK_v0_1, &nacl_irt_clock, sizeof(nacl_irt_clock) },
   { NACL_IRT_DEV_EXCEPTION_HANDLING_v0_1, &nacl_irt_dev_exception_handling,
     sizeof(nacl_irt_dev_exception_handling) },
 };
 
 size_t nacl_irt_interface(const char *interface_ident,
                           void *table, size_t tablesize) {
   int i;
   for (i = 0; i < NACL_ARRAY_SIZE(irt_interfaces); ++i) {
     if (0 == strcmp(interface_ident, irt_interfaces[i].name)) {
       const size_t size = irt_interfaces[i].size;
       if (size <= tablesize) {
         memcpy(table, irt_interfaces[i].table, size);
         return size;
       }
       break;
     }
   }
   return 0;
 }