Add probes for x64.

syzygy/agent/asan/asan.gyp

 # Copyright 2012 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 98 matching lines @@
         'timed_try_impl.h',
         'windows_heap_adapter.cc',
         'windows_heap_adapter.h',
       ],
       'dependencies': [
         '<(src)/syzygy/crashdata/crashdata.gyp:crashdata_lib',
         '<(src)/syzygy/common/common.gyp:common_lib',
         '<(src)/syzygy/trace/client/client.gyp:rpc_client_lib',
         '<(src)/syzygy/trace/common/common.gyp:trace_common_lib',
         '<(src)/syzygy/trace/protocol/protocol.gyp:protocol_lib',
+        '<(src)/syzygy/trace/rpc/rpc.gyp:logger_rpc_lib',
         '<(src)/third_party/crashpad/files/client/client.gyp:crashpad_client',
       ],
       'conditions': [
         # By default, target_arch is set to ia32 on Windows.
         # To get a 64-bit build, one needs to explicitly set
         # `target_arch` and `host_arch` to `x64`.
-        ['target_arch=="ia32"', {
+        ['target_arch == "ia32"', {
           'sources': [
             'gen/memory_interceptors_impl.asm',
             'gen/memory_redirectors.asm',
             'reporters/kasko_reporter.cc',
             'reporters/kasko_reporter.h',
           ],
           'dependencies': [
             '<(src)/syzygy/kasko/kasko.gyp:kasko',
-            '<(src)/syzygy/trace/rpc/rpc.gyp:logger_rpc_lib',
           ],
+        }, {
+          'sources': [
+            'memory_interceptors_impl_x64.cc',
+            'memory_interceptors_impl_x64.h',
+          ]
         }],
       ],
       'export_dependent_settings': [
         # We depend on crashdata_lib, which means we can see the include
         # directories it exports via 'all_dependent_settings' or
         # 'direct_dependent_settings'. However, our dependents will have
         # this same dependency, so we forward these settings to them.
         '<(src)/syzygy/crashdata/crashdata.gyp:crashdata_lib',
       ],
     },
@@ skipping 57 matching lines @@
         'heap_managers/deferred_free_thread_unittest.cc',
         'memory_notifiers/shadow_memory_notifier_unittest.cc',
         'quarantines/sharded_quarantine_unittest.cc',
         'quarantines/size_limited_quarantine_unittest.cc',
         'reporters/breakpad_reporter_unittest.cc',
         'reporters/crashpad_reporter_unittest.cc',
         'reporters/exported_function_unittest.cc',
         '<(src)/syzygy/testing/run_all_unittests.cc',
       ],
       'conditions': [
-        ['target_arch == "ia32"', {
-          'sources': [
-            'reporters/kasko_reporter_unittest.cc',
+        ['target_arch == "x64"', {

[Sébastien Marchand, 2016/09/13 18:23:05]

Can you try to keep the same logic across the different files ? i.e. Sometime
you to:
if (target_arch == x64) {
...
} else {
...
}

but sometime you check for 'target_arch == ia32' first. I'd prefer to be
consistent and to always do
if (target_arch == ia32) {
...
} else {
...
}

+          'sources!': [
+            # Static shadow doesn't work for large address spaces.
+            'static_shadow.cc',
+
+            'reporters/kasko_reporter_unittest.cc',  # kasko is to be removed

[Sébastien Marchand, 2016/09/13 18:23:04]

Move the comment on the previous line, for consistency.

+            # Redirectors are not currently implemented for win64.
+            'memory_interceptors_patcher_unittest.cc',
+
+            'memory_interceptors_unittest.cc',  # relies on full set of probes

[Sébastien Marchand, 2016/09/13 18:23:05]

Ditto , here and below

+
+            # Win64 binaries currently don't have the version info.
+            'registry_cache_unittest.cc',
+            'logger_unittest.cc',
+
+            # PE lib for win64 is sort of stub, so there's nothing to test there
+            'iat_patcher_unittest.cc',
+
+            'heap_checker_unittest.cc',  # IsHeapCorrupt fails
+            'heap_managers/block_heap_manager_unittest.cc',  # uses 32bit asm
           ],
+          'sources': ['dummy_shadow.cc']
+        }, {
+          'msvs_settings': {
+            'VCLinkerTool': {
+              # Disable support for large address spaces.
+              'LargeAddressAware': 1,
+            },
+          },
         }],
       ],
       'dependencies': [
         'syzyasan_rtl_lib',
         'syzyasan_rtl',
         'syzyasan_rtl_unittest_utils',
         '<(src)/base/base.gyp:base',
         '<(src)/base/base.gyp:test_support_base',
         '<(src)/syzygy/agent/common/common.gyp:agent_common_lib',
         '<(src)/syzygy/assm/assm.gyp:assm_lib',
@@ skipping 92 matching lines @@
       },
     },
     {
       'target_name': 'syzyasan_rtl',
       'type': 'loadable_module',
       'includes': [
         '../agent.gypi',
         'agent_link_settings.gypi',
       ],
       'sources': [
-        # This file must have a .def extension in order for GYP to
-        # automatically configure it as the ModuleDefinitionFile
-        # (we usually suffix generated files with .gen).
         'dummy_shadow.cc',
-        'gen/system_interceptors.def',
         'syzyasan_rtl.cc',
         'syzyasan_rtl.rc',
       ],
       'dependencies': [
         'syzyasan_rtl_lib',
         '<(src)/syzygy/agent/common/common.gyp:agent_common_lib',
         '<(src)/syzygy/common/common.gyp:common_lib',
         '<(src)/syzygy/core/core.gyp:core_lib',
         '<(src)/syzygy/version/version.gyp:syzygy_version',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
           # This module should delay load nothing.
           'DelayLoadDLLs=': [
           ],
         },
       },
       'conditions': [
+        ['target_arch == "ia32"', {
+          'sources': [
+            # This file must have a .def extension in order for GYP to
+            # automatically configure it as the ModuleDefinitionFile
+            # (we usually suffix generated files with .gen).
+            'gen/system_interceptors.def',
+          ]
+        }, {
+          'sources': [
+            'system_interceptors_x64.def'
+          ]
+        }],
         ['pgo_phase==1', {
           'msvs_settings': {
             'VCLinkerTool': {
               # 2 corresponds to LTCG:PGINSTRUMENT.
               'LinkTimeCodeGeneration': '2',
             },
           },
         }],
         ['pgo_phase==2', {
           'msvs_settings': {
             'VCLinkerTool': {
               # 3 corresponds to LTCG:PGOPTIMIZE.
               'LinkTimeCodeGeneration': '3',
             },
           },
         }],
       ],
     },
   ],
 }