Non-SFI Mode: Add nonsfi_loader and plumbing to test it

SConstruct

 #! -*- 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 atexit
 import json
 import os
 import platform
 import re
@@ skipping 309 matching lines @@
 
   BitFromArgument(env, 'pnacl_generate_pexe', default=env.Bit('bitcode'),
     desc='use pnacl to generate pexes and translate in a separate step')
 
   BitFromArgument(env, 'translate_in_build_step', default=True,
     desc='Run translation during build phase (e.g. if do_not_run_tests=1)')
 
   BitFromArgument(env, 'pnacl_unsandboxed', default=False,
     desc='Translate pexe to an unsandboxed, host executable')
 
+  BitFromArgument(env, 'nonsfi_nacl', default=False,
+    desc='Use Non-SFI Mode instead of the original SFI Mode.  This uses '
+      'nonsfi_loader instead of sel_ldr, and it tells the PNaCl toolchain '
+      'to translate pexes to Non-SFI nexes.')
+
   BitFromArgument(env, 'browser_headless', default=False,
     desc='Where possible, set up a dummy display to run the browser on '
       'when running browser tests.  On Linux, this runs the browser through '
       'xvfb-run.  This Scons does not need to be run with an X11 display '
       'and we do not open a browser window on the user\'s desktop.  '
       'Unfortunately there is no equivalent on Mac OS X.')
 
   BitFromArgument(env, 'disable_crash_dialog', default=True,
     desc='Disable Windows\' crash dialog box, which Windows pops up when a '
       'process exits with an unhandled fault.  Windows enables this by '
@@ skipping 946 matching lines @@
 def AddBootstrap(env, executable, args):
   bootstrap, bootstrap_args = env.GetBootstrap()
   if bootstrap is None:
     return [executable] + args
   else:
     return [bootstrap, executable] + bootstrap_args + args
 
 pre_base_env.AddMethod(AddBootstrap)
 
 
+def GetNonSfiLoader(env):
+  if 'TRUSTED_ENV' not in env:
+    return None
+  return env['TRUSTED_ENV'].File(
+      '${STAGING_DIR}/${PROGPREFIX}nonsfi_loader${PROGSUFFIX}')
+
+pre_base_env.AddMethod(GetNonSfiLoader)
+
+
 def GetIrtNexe(env, chrome_irt=False):
   image = ARGUMENTS.get('force_irt')
   if image:
     return env.SConstructAbsPath(image)
 
   if chrome_irt:
     return nacl_irt_env.File('${STAGING_DIR}/irt.nexe')
   else:
     return nacl_irt_env.File('${STAGING_DIR}/irt_core.nexe')
 
@@ skipping 300 matching lines @@
 
   command = [nexe]
   if args is not None:
     command += args
 
   if env.Bit('pnacl_unsandboxed'):
     # Run unsandboxed executable directly, without sel_ldr.
     return env.CommandTest(name, command, size, **extra)
 
   if loader is None:
-    loader = env.GetSelLdr()
+    if env.Bit('nonsfi_nacl'):
+      loader = env.GetNonSfiLoader()
+    else:
+      loader = env.GetSelLdr()
     if loader is None:
       print 'WARNING: no sel_ldr found. Skipping test %s' % name
       return []
 
   # Avoid problems with [] as default arguments
   if sel_ldr_flags is None:
     sel_ldr_flags = []
   else:
     # Avoid modifying original list
     sel_ldr_flags = list(sel_ldr_flags)
@@ skipping 39 matching lines @@
     sel_ldr_flags += ['-a']
 
   if env.Bit('tests_use_irt'):
     sel_ldr_flags += ['-B', nacl_env.GetIrtNexe()]
 
   if skip_bootstrap:
     loader_cmd = [loader]
   else:
     loader_cmd = env.AddBootstrap(loader, [])
 
-  command = loader_cmd + sel_ldr_flags + ['--'] + command
+  if env.Bit('nonsfi_nacl'):
+    # nonsfi_loader does not accept the same flags as sel_ldr yet, so
+    # we ignore sel_ldr_flags here.
+    command = [loader] + command
+  else:
+    command = loader_cmd + sel_ldr_flags + ['--'] + command
 
   if env.Bit('host_linux'):
     extra['using_nacl_signal_handler'] = True
 
   if env.ShouldUseVerboseOptions(extra):
     env.MakeVerboseExtraOptions(name, log_verbosity, extra)
 
   node = env.CommandTest(name, command, size, posix_path=True,
                          wrapper_program_prefix=wrapper_program_prefix, **extra)
   if env.Bit('tests_use_irt'):
@@ skipping 433 matching lines @@
     CFLAGS = ['${EXTRA_CFLAGS}'],
     CXXFLAGS = ['${EXTRA_CXXFLAGS}'],
   )
   if base_env.Bit('ncval_testing'):
     base_env.Append(CPPDEFINES = ['NCVAL_TESTING'])
 
   base_env.Append(BUILD_SCONSCRIPTS = [
       # KEEP THIS SORTED PLEASE
       'build/package_version/build.scons',
       'pynacl/build.scons',
+      'src/nonsfi/irt/build.scons',
+      'src/nonsfi/loader/build.scons',
       'src/shared/gio/build.scons',
       'src/shared/imc/build.scons',
       'src/shared/ldr/build.scons',
       'src/shared/platform/build.scons',
       'src/shared/serialization/build.scons',
       'src/shared/srpc/build.scons',
       'src/shared/utils/build.scons',
       'src/third_party_mod/gtest/build.scons',
       'src/tools/validator_tools/build.scons',
       'src/trusted/cpu_features/build.scons',
@@ skipping 893 matching lines @@
 
 # Map certain flag bits to suffices on the build output.  This needs to
 # happen pretty early, because it affects any concretized directory names.
 target_variant_map = [
     ('bitcode', 'pnacl'),
     ('translate_fast', 'fast'),
     ('nacl_pic', 'pic'),
     ('use_sandboxed_translator', 'sbtc'),
     ('nacl_glibc', 'glibc'),
     ('pnacl_generate_pexe', 'pexe'),
+    ('nonsfi_nacl', 'nonsfi'),
     ]
 for variant_bit, variant_suffix in target_variant_map:
   if nacl_env.Bit(variant_bit):
     nacl_env['TARGET_VARIANT'] += '-' + variant_suffix
 
 if nacl_env.Bit('bitcode'):
   nacl_env['TARGET_VARIANT'] += '-clang'
 
 nacl_env.Replace(TESTRUNNER_LIBS=['testrunner'])
 # TODO(mseaborn): Drop this once chrome side has inlined this.
@@ skipping 783 matching lines @@
   nacl_env.ValidateSdk()
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')