Incorporate shimming into the irt

src/untrusted/irt/nacl.scons

 # -*- python -*-
-# Copyright (c) 2012 The Native Client Authors. All rights reserved.
+# Copyright 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}')
 # 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}')
 
+# We may want to move this into ppruntime in the future to limit
+# visibility to ppapi/generators
+def GetPNaClShimSource(env):

[Mark Seaborn, 2012/08/28 15:51:20]

Please put this lower in the file, just before LinkIrt(), because it's only an
ancillary part of the IRT.

[Robert Muth (chromium), 2012/08/28 18:13:30]

Done.

+  if not env.Bit('target_x86_64'):
+    return 'shim_dummy.c'
+
+  # Generate a 'pnacl_shim.c'
+  # api code

[Mark Seaborn, 2012/08/28 15:51:20]

Capitalise: "API code"

[Robert Muth (chromium), 2012/08/28 18:13:30]

Done.

+  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

[Mark Seaborn, 2012/08/28 15:51:20]

Capitalise as "Python", please

[Robert Muth (chromium), 2012/08/28 18:13:30]

Done.

+  generators_glob = env.Glob('${SOURCE_ROOT}/ppapi/generators/*.py')
+  return env.Command(
+    'pnacl_irt_shim.c',

[Mark Seaborn, 2012/08/28 15:51:20]

Nit: our Python style is that arguments are indented by 4 spaces, not 2

[Robert Muth (chromium), 2012/08/28 18:13:30]

Done.

+    (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))

[Mark Seaborn, 2012/08/28 15:51:20]

I don't think you need ComponentObject() here, do you?  I think you can just
pass the .c file to ComponentProgram().

[Robert Muth (chromium), 2012/08/28 18:13:30]

IIRC there was some strange python issue where auto-generated code was not
picked up correctly unless
we used ComponentObject. So I'd rather leave it this
way to be on the safe side.

On 2012/08/28 15:51:20, Mark Seaborn wrote:

+
 irt_support_sources = [
     'irt_malloc.c',
     'irt_private_pthread.c',
     'irt_private_tls.c',
     ]
 
 irt_entry_obj = blob_env.ComponentObject('irt_entry.c')
 
 # NACL_GC_WRAP_SYSCALL uses ({...}) syntax.
 blob_env.FilterOut(CCFLAGS=['-pedantic'])
@@ skipping 68 matching lines @@
 
 irt_libs = ['srpc',
             'imc_syscalls',
             'platform',
             'gio',
             'm',
             ]
 
 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')