Incorporate shimming into the irt

src/untrusted/irt/nacl.scons

 # -*- python -*-
 # 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.
 
+import os
 
 Import('env')
 
 # This module shouldn't be built in an environment that uses glibc.
 if env.Bit('nacl_glibc'):
   raise UserError('src/untrusted/irt/nacl.scons in the wrong environment?')
 
 blob_env = env.Clone()
-blob_env.Append(LINKFLAGS='-Wl,--section-start,.rodata=${IRT_BLOB_DATA_START}')
+blob_env.Append(LINKFLAGS='-Wl,--section-start,.rodata=${IRT_BLOB_DATA_START}',
+                # This ifdef should be removed once

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

Please add a TODO(robertm) in this comment.  Also, "This ifdef" -> "This
#define"?  (Since there's no #ifdef in this file.)

+                # the IRT build has migrated to the Chrome tree.
+                CPPDEFINES = ['ENABLE_NACL_IRT_PPAPIHOOK_SHIMMED']

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

Nit: Python style is no spaces around '=' for keyword arguments.

+                )

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

Normal Python style is that the closing bracket can go on the previous line.

 # The PNaCl linker (gold) does not implement the "-Ttext-segment"
 # option.  However, with the linker for x86, the "-Ttext" option does
 # not affect the executable's base address.
 if blob_env.Bit('bitcode'):
   blob_env.Append(LINKFLAGS='-Wl,-Ttext=${IRT_BLOB_CODE_START}')
 else:
   blob_env.Append(LINKFLAGS='-Wl,-Ttext-segment=${IRT_BLOB_CODE_START}')
 
 irt_support_sources = [
     'irt_malloc.c',
@@ skipping 74 matching lines @@
                'irt_manifest.c',
                ]
 
 irt_libs = ['srpc',
             'imc_syscalls',
             'platform',
             'gio',
             'm',
             ]
 
+# We may want to move this into ppruntime in the future to limit
+# visibility to ppapi/generators
+def GetPNaClShimSource(env):
+  if not env.Bit('target_x86_64'):
+    return 'shim_dummy.c'
+
+  # Generate a 'pnacl_shim.c'
+  # API code
+  api_glob = env.Glob('${SOURCE_ROOT}/ppapi/api/*.idl')
+  api_dev_glob = env.Glob('${SOURCE_ROOT}/ppapi/api/dev/*.idl')
+  all_api = [f.abspath for f in api_glob + api_dev_glob]
+  # Python code
+  generators_glob = env.Glob('${SOURCE_ROOT}/ppapi/generators/*.py')
+  return env.Command(
+      'pnacl_irt_shim.c',
+      (api_glob + api_dev_glob + generators_glob),
+      ('${PYTHON} ' +
+       '${SOURCE_ROOT}/ppapi/generators/generator.py ' +
+       '--srcroot=' + os.path.join('${SOURCE_ROOT}', 'ppapi', 'api') + ' ' +
+       '--wnone --pnacl --pnaclshim=${TARGETS} ' + ' '.join(all_api)))
+
+irt_shim_obj = blob_env.ComponentObject(GetPNaClShimSource(blob_env))
+
+
 def LinkIrt(output, files, libs):
   return blob_env.ComponentProgram(output,
-                                   [irt_entry_obj] + irt_support_objs + files,
+                                   [irt_entry_obj, irt_shim_obj] +
+                                   irt_support_objs + files,
                                    EXTRA_LIBS=libs + irt_libs)
 
 irt_core_library = LinkIrt('irt_core', irt_nonbrowser, [])
 irt_library = LinkIrt('irt', irt_browser, ['ppruntime'])
 
 env.SDKInstallBin('irt_core.nexe', irt_core_library)
 env.SDKInstallBin('irt.nexe', irt_library)
 
 # TODO(mcgrathr): these should be installed, but scons is a mystery
 #env.AddHeaderToSdk(['irt.h'])
@@ skipping 24 matching lines @@
                          # Holy cow it takes over 30 seconds to disassemble
                          # the ARM irt.nexe. Set test size to 'large'.
                          size='large')
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_tls_test')
   node = env.CommandTest('irt_core_tls_test.out',
                          ['${PYTHON}', env.File('check_tls.py'),
                           check_tls_arch, '${OBJDUMP}', irt_core_library],
                          # don't run ${PYTHON} under the emulator.
                          direct_emulation=False)
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_core_tls_test')