Add ragel machine generators to SCONS

src/trusted/validator_ragel/build.scons

+# -*- python -*-
+# 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.
+
+import os
+import sys
+Import('env')
+
+#
+#
+# Build on x86 only.
+#
+#
+if not env.Bit('target_x86'): Return()

[Mark Seaborn, 2012/04/03 17:13:37]

Our Python style is to use multiple lines:

if X:
  Y

[khim, 2012/04/03 17:48:04]

Hmm... All validator files use this style, but Ok. Done.

+
+# ------------------------------------------------------

[Mark Seaborn, 2012/04/03 17:13:37]

Please don't put spacers like this in comments.

[khim, 2012/04/03 17:48:04]

Again: our validator's build.scons files use them. Done.

+# General adjustments to the environment for builds.
+
+# Make a copy of debug CRT for now.

[Mark Seaborn, 2012/04/03 17:13:37]

This appears to be cargo-culted.  Please remove this CRT stuff from here; we
don't need it.

[khim, 2012/04/03 17:48:04]

I'm not sure if we need it or not, but it's included in most files which build
binaries. Do you know what breaks if I remove that? Or if nothing breaks then
why we have that?

+# TODO(bradnelson): there should be a better way to generalize this requirement.
+# NOTE: debug builds on windows break without this
+crt = []
+if env.AllBits('windows', 'debug'):
+  for i in ['.', '$STAGING_DIR']:
+    crt += env.Replicate(i, '$VC80_DIR/vc/redist/Debug_NonRedist/'
+                         'x86/Microsoft.VC80.DebugCRT')
+    crt += env.Replicate(i, '$VC80_DIR/vc/redist/x86/Microsoft.VC80.CRT')
+
+# TODO(bradchen): eliminate need for the following line

[Mark Seaborn, 2012/04/03 17:13:37]

TODOs are supposed to contain the name of the person who added them, so this
should be "TODO(khim)".

+env.FilterOut(CCFLAGS=['-Wextra', '-Wswitch-enum', '-Wsign-compare'])

[Mark Seaborn, 2012/04/03 17:13:37]

Do you really need this?  Can you fix your code to not need these?

[khim, 2012/04/03 17:48:04]

I'll check: I think only generator needs these and it has it's own set of
options.

+
+# Defines the source directory where validator generated files should be added.
+val_src_dir = '$MAIN_DIR/src/trusted/validator_ragel/generated'
+# ------------------------------------------------------
+# Source generation:
+#
+#   valgen : Regenerate any autogenerated source files.
+
+gen_env = env.Clone();
+gen_env.Append(CCFLAGS=['-DNACL_TRUSTED_BUT_NOT_TCB'])
+
+generate = False
+if 'valgen' in COMMAND_LINE_TARGETS: generate = True
+if 'valclean' in COMMAND_LINE_TARGETS: generate = True
+
+# Set of generated (source) decoder tables.
+tables = []
+
+# ------------------------------------------------------
+# Ragel generator:
+#
+# We have generator which reads .def files and produced automata definition.
+
+env_gen_dfa = env.Clone()
+env_gen_dfa.FilterOut(CCFLAGS=['-pedantic', '-Wsign-compare'])
+env_gen_dfa.Append(CCFLAGS=['-std=c++0x', '-Wno-sign-compare',

[Mark Seaborn, 2012/04/03 17:13:37]

I thought you guys were going to eliminate the use of C++0x...?

[khim, 2012/04/03 17:48:04]

No. We've removed C++11 features not implemented in GCC 4.4.x

+                                '-DNACL_TRUSTED_BUT_NOT_TCB'])

[Mark Seaborn, 2012/04/03 17:13:37]

Fix indentation to line up with '['

[khim, 2012/04/03 17:48:04]

Done.

+
+gen_dfa = env_gen_dfa.ComponentProgram(
+    'gen-dfa',
+    ['unreviewed/gen-dfa.cc'])
+
+env.Requires(gen_dfa, crt)
+
+# ------------------------------------------------------
+#  Source generation step 2: Generate decoder tables.
+#
+# Now we are back to conditionally defining the large tables generated
+# by ncdecode_tablegen.
+#
+
+if generate:
+  #
+  # Generate 32 and 64 bit versions of decoders and validators.
+  #
+  for bits in ['32', '64']:
+    for automata in ['decoder', 'validator']:
+      rl_file = '%s/%s-x86_%s-instruction.rl' % (val_src_dir, automata, bits)
+      exe_path = '${STAGING_DIR}/${PROGPREFIX}gen-dfa${PROGSUFFIX}'
+      gen_env.Command(
+          rl_file,
+          [exe_path,
+            'unreviewed/general-purpose-instructions.def',
+            'unreviewed/system-instructions.def',
+            'unreviewed/x87-instructions.def',
+            'unreviewed/mmx-instructions.def',
+            'unreviewed/xmm-instructions.def',
+            'unreviewed/nops.def'],
+          [('${SOURCES[0]} -o ${TARGET} -m %s -d %s ${SOURCES[1]} '
+            '${SOURCES[2]} ${SOURCES[3]} ${SOURCES[4]} ${SOURCES[5]} '
+            '${SOURCES[6]}') % (
+            {'32': 'ia32', '64': 'amd64'}[bits],
+            {'decoder32':
+              'check_access,opcode,parse_operands_states,mark_data_fields',
+             'decoder64':
+              'check_access,opcode,parse_operands_states,mark_data_fields',
+             'validator32':
+              ('check_access,opcode,parse_operands,parse_operands_states,'
+                'instruction_name,mark_data_fields,nacl-forbidden,'
+                'imm_operand_action,rel_operand_action'),
+            'validator64':
+              'opcode,instruction_name,mark_data_fields,rel_operand_action,' +
+              'nacl-forbidden'}[automata+bits])]
+      )
+      tables.append(rl_file)
+      c_file = '%s/%s-x86_%s.c' % (val_src_dir, automata, bits)
+      gen_env.Command(
+          c_file,
+          ['unreviewed/%s-x86_%s.rl' % (automata, bits), rl_file],
+          ['ragel -G2 -I%s ${SOURCES[0]} -o ${TARGET}' % (val_src_dir)]
+      )
+      tables.append(c_file)
+
+  # Generate 32 and 64 bit versions of decoders and validators
+  gen_env.AlwaysBuild(
+      gen_env.Alias('valgen', tables))
+  gen_env.AlwaysBuild(
+      gen_env.Alias('valclean', action=[Delete(x) for x in tables]))