Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/validator_arm/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('env')
 
 if env.Bit('linux'):
 
   env.Append(
     # TODO(cbiffle): give everyone else these warnings too.
     CXXFLAGS='-Weffc++ -Woverloaded-virtual -fno-rtti -fomit-frame-pointer',
   )
 
   # NOTE: we cannot use TARGET_ROOT here because we want to share this file
   #       between different scons invocations
   gen_dec=('${DESTINATION_ROOT}/gen/native_client/src/trusted/validator_arm/'
            'decode.cc')
 
   env.Command(target=gen_dec,
               source=['armv7-opt.table',
+                      'armv7-thumb.table',
                       'generate_decoder.py',
                       'dgen_core.py',
                       'dgen_input.py',
                       'dgen_opt.py',
                       'dgen_output.py'],
-             action=['${SOURCES[1].abspath} ${SOURCES[0].abspath} '
-                         '${TARGET.abspath}'])
+             action=['${SOURCES[2].abspath} ${SOURCES[0].abspath} '
+                         '${SOURCES[1].abspath} ${TARGET.abspath}'])
 
   env.ComponentLibrary('arm_validator_core',
                        ['address_set.cc',
                         'inst_classes.cc',
                         'validator.cc',
                         gen_dec])
 
   env.ComponentLibrary('ncvalidate_arm_v2',
                        ['ncvalidate.cc'],
                        LIBS=['arm_validator_core',
@@ skipping 24 matching lines @@
 
   validator_tests = {
     'test_external_jumps': 1,
     'test_forbidden_instructions': 1,
     'test_internal_jumps': 1,
     'test_sp_updates': 1,
     'test_stores': 1,
     'test_vector_stores': 1,
   }
 
+  validator_tests_thumb = {

[Karl, 2011/09/19 19:56:05]

NIT: Should this be named thumb2 instead of thunb?

[jasonwkim, 2011/09/26 21:35:52]

not really.
we are teting thumb MODE
thumb MODE
thumb2 ISA

+    'local_allowed' : 0,
+    'local_disallowed' : 1,
+    'test_forbidden_instructions' : 1,
+    'masking_instructions' : 0,
+    'mem_test' : 1,
+    'branch_test' : 1,
+    'bundle_test' : 1,
+    'it_test'     : 1,
+    'test_external_jumps' : 1,
+    'test_internal_jumps' : 1,
+    'test_sp_updates' : 1,
+    'test_stores' : 1,
+    'lit_pool_test' : 0
+  }
+
   for test, exit_status in validator_tests.iteritems():
     node = env.CommandTest(
         test + '_actual.out',
         [ncval, env.File('testdata/' + test + '.nexe')],
         exit_status = str(exit_status),
         filter_regex = "'^ncval'",
         # NOTE: all stdout_golden are currently empty
         stdout_golden = env.File('testdata/' + test + '.out'),
         stderr_golden = env.File('testdata/' + test + '.err'))
 
     env.AddNodeToTestSuite(node, ['small_tests', 'validator_tests'],
                            "run_arm_" + test)
 
+  for test, exit_status in validator_tests_thumb.iteritems():
+    node = env.CommandTest(
+        test + '_thumb_actual.out',
+        [ncval, env.File('testdata-thumb/' + test + '.nexe')],

[Karl, 2011/09/19 19:56:05]

NIT: Again, isn't this thumb2, not thumb?

[jasonwkim, 2011/09/26 21:35:52]

no this is for thumb MODE, this is not the ISA

+        exit_status = str(exit_status),
+        filter_regex = "'^ncval'",
+        # NOTE: all stdout_golden are currently empty
+        stdout_golden = env.File('testdata-thumb/' + test + '.out'),
+        stderr_golden = env.File('testdata-thumb/' + test + '.err'))
+
+    env.AddNodeToTestSuite(node, ['small_tests', 'validator_tests'],
+                           "run_arm_" + test)
+
   gtest_env = env.Clone()
   # gtest does not compile with our stringent settings.
   gtest_env.FilterOut(
       CCFLAGS=['-pedantic'],
       CXXFLAGS=['-fno-rtti', '-Weffc++'])
   gtest_env.Prepend(CPPPATH=['${SOURCE_ROOT}/testing/gtest/include'])
 
   # Do NOT name this program 'validator_tests' because this is the same name as
   # a test suite, and scons will run that test suite if it ever builds
   # a program of the same name.
   validator_tests_exe = gtest_env.ComponentProgram('arm_validator_tests',
                                  ['validator_tests.cc'],
                                  EXTRA_LIBS=['gtest', 'arm_validator_core'])
 
   test_node = gtest_env.CommandTest(
       'validator_tests.out',
       command=[validator_tests_exe])
   gtest_env.AddNodeToTestSuite(test_node, ['small_tests'],
       'run_arm_validator_tests')