Add probes for x64.

syzygy/agent/asan/asan.gyp

Index: syzygy/agent/asan/asan.gyp
diff --git a/syzygy/agent/asan/asan.gyp b/syzygy/agent/asan/asan.gyp
index 35e6454ba1f4ac5cf93709f0beeee874c673da8e..55d3406fa8de6cfe5bde0fc32f27cfe5f6214098 100644
--- a/syzygy/agent/asan/asan.gyp
+++ b/syzygy/agent/asan/asan.gyp
@@ -116,13 +116,14 @@
         '<(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',
@@ -131,8 +132,12 @@
           ],
           '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': [
@@ -210,10 +215,35 @@
         '<(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': [
@@ -326,11 +356,7 @@
         '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',
       ],
@@ -349,6 +375,18 @@
         },
       },
       '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': {