Separate the (partial) decoder of the x86_32 validator into a separate library.

site_scons/site_tools/library_deps.py

 # 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.
 
 """Simple harness for defining library dependencies for scons files."""
 
 # The following is a map from a library, to the corresponding
 # list of dependent libraries that must be included after that library, in
 # the list of libraries.
 # Note: These are default rules that are used if platform specific rules are
@@ skipping 20 matching lines @@
 # libraries that must be included after that library, in the list
 # of libraries.
 PLATFORM_LIBRARY_DEPENDENCIES = {
     'x86-32': _AddDefaultLibraryDependencies({
         'nc_decoder_x86_32': [
             'ncval_base_x86_32',
             'nc_opcode_modeling_x86_32',
             ],
         'ncdis_util_x86_32': [
             'ncval_reg_sfi_verbose_x86_32',
+            'ncdis_seg_sfi_verbose_x86_32',
+            ],
+        'ncdis_seg_sfi_verbose_x86_32': [
+            'ncdis_seg_sfi_x86_32',
             'ncval_base_verbose_x86_32',
             ],
         'ncvalidate_verbose_x86_32': [
             'ncvalidate_x86_32',
-            'ncval_seg_sfi_verbose_x86_32',
+            'ncdis_seg_sfi_verbose_x86_32',
             ],
         'ncvalidate_x86_32': [
             'ncval_seg_sfi_x86_32',
             ],
         'ncval_base_verbose_x86_32': [
             'ncval_base_x86_32',
             ],
         'ncval_base_x86_32': [
             'platform',
             ],
         'nc_opcode_modeling_verbose_x86_32': [
             'nc_opcode_modeling_x86_32',
             'ncval_base_verbose_x86_32',
             ],
         'nc_opcode_modeling_x86_32': [
             'ncval_base_x86_32',
             ],
         'ncval_reg_sfi_verbose_x86_32': [
             'ncval_reg_sfi_x86_32',
             'nc_opcode_modeling_verbose_x86_32',
             ],
         'ncval_reg_sfi_x86_32': [
             'nccopy_x86_32',
             'ncval_base_x86_32',
             'nc_decoder_x86_32',
             ],
-        'ncval_seg_sfi_verbose_x86_32': [
-            'ncval_seg_sfi_x86_32',
-            'ncval_base_verbose_x86_32',
-            ],
         'ncval_seg_sfi_x86_32': [
             'nccopy_x86_32',
+            'ncdis_seg_sfi_x86_32',
             'ncval_base_x86_32',
             ],
         }),
     'x86-64': _AddDefaultLibraryDependencies({
         'nc_decoder_x86_64': [
             'ncval_base_x86_64',
             'nc_opcode_modeling_x86_64',
             ],
         'ncdis_util_x86_64': [
             'ncval_reg_sfi_verbose_x86_64',
+            'ncdis_seg_sfi_verbose_x86_64',
+            ],
+        'ncdis_seg_sfi_verbose_x86_64': [
+            'ncdis_seg_sfi_x86_64',
             'ncval_base_verbose_x86_64',
             ],
         'ncvalidate_verbose_x86_64': [
             'ncvalidate_x86_64',
             'ncval_reg_sfi_verbose_x86_64',
             ],
         'ncvalidate_x86_64': [
             'ncval_reg_sfi_x86_64',
             ],
         'ncval_base_verbose_x86_64': [
@@ skipping 11 matching lines @@
             ],
         'ncval_reg_sfi_verbose_x86_64': [
             'ncval_reg_sfi_x86_64',
             'nc_opcode_modeling_verbose_x86_64',
             ],
         'ncval_reg_sfi_x86_64': [
             'nccopy_x86_64',
             'ncval_base_x86_64',
             'nc_decoder_x86_64',
             ],
-        'ncval_seg_sfi_verbose_x86_64': [
-            'ncval_seg_sfi_x86_64',
-            'ncval_base_verbose_x86_64',
-            ],
         'ncval_seg_sfi_x86_64': [
             'nccopy_x86_64',
+            'ncdis_seg_sfi_x86_64',
             'ncval_base_x86_64',
             ],
         }),
     'arm': _AddDefaultLibraryDependencies({
         'ncvalidate_arm_v2': [
             'arm_validator_core',
             ],
         }),
     }
 
@@ skipping 46 matching lines @@
           # dependencies have been added.
           to_visit.append(lib)
           for dep in dependencies[lib]:
             to_visit.append(dep)
           expanding.append(lib)
         else:
           # No dependent library, just add.
           closure.append(lib)
   closure.reverse()
   return closure