Merge the latest changes to master in the vs2015 branch.

syzygy/agent/asan/memory_interceptors.h

 // Copyright 2014 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 80 matching lines @@
     F(16, read_access, AsanReadAccess) \
     F(32, read_access, AsanReadAccess) \
     F(1, write_access, AsanWriteAccess) \
     F(2, write_access, AsanWriteAccess) \
     F(4, write_access, AsanWriteAccess) \
     F(8, write_access, AsanWriteAccess) \
     F(10, write_access, AsanWriteAccess) \
     F(16, write_access, AsanWriteAccess) \
     F(32, write_access, AsanWriteAccess)
 
-#define ASAN_STRING_INTERCEPT_FUNCTIONS(F) \
-    F(cmps, _repz_, ecx, AsanReadAccess, AsanReadAccess, 4, 1) \
-    F(cmps, _repz_, ecx, AsanReadAccess, AsanReadAccess, 2, 1) \
-    F(cmps, _repz_, ecx, AsanReadAccess, AsanReadAccess, 1, 1) \
-    F(cmps, _, 1, AsanReadAccess, AsanReadAccess, 4, 1) \
-    F(cmps, _, 1, AsanReadAccess, AsanReadAccess, 2, 1) \
-    F(cmps, _, 1, AsanReadAccess, AsanReadAccess, 1, 1) \
-    F(movs, _repz_, ecx, AsanWriteAccess, AsanReadAccess, 4, 0) \
-    F(movs, _repz_, ecx, AsanWriteAccess, AsanReadAccess, 2, 0) \
-    F(movs, _repz_, ecx, AsanWriteAccess, AsanReadAccess, 1, 0) \
-    F(movs, _, 1, AsanWriteAccess, AsanReadAccess, 4, 0) \
-    F(movs, _, 1, AsanWriteAccess, AsanReadAccess, 2, 0) \
-    F(movs, _, 1, AsanWriteAccess, AsanReadAccess, 1, 0) \
-    F(stos, _repz_, ecx, AsanWriteAccess, AsanUnknownAccess, 4, 0) \
-    F(stos, _repz_, ecx, AsanWriteAccess, AsanUnknownAccess, 2, 0) \
-    F(stos, _repz_, ecx, AsanWriteAccess, AsanUnknownAccess, 1, 0) \
-    F(stos, _, 1, AsanWriteAccess, AsanUnknownAccess, 4, 0) \
-    F(stos, _, 1, AsanWriteAccess, AsanUnknownAccess, 2, 0) \
-    F(stos, _, 1, AsanWriteAccess, AsanUnknownAccess, 1, 0)
+#define ASAN_STRING_INTERCEPT_FUNCTIONS(F)                       \
+  F(cmps, _repz_, ecx, AsanReadAccess, AsanReadAccess, 4, 1)     \
+  F(cmps, _repz_, ecx, AsanReadAccess, AsanReadAccess, 2, 1)     \
+  F(cmps, _repz_, ecx, AsanReadAccess, AsanReadAccess, 1, 1)     \
+  F(cmps, _, 1, AsanReadAccess, AsanReadAccess, 4, 1)            \
+  F(cmps, _, 1, AsanReadAccess, AsanReadAccess, 2, 1)            \
+  F(cmps, _, 1, AsanReadAccess, AsanReadAccess, 1, 1)            \
+  F(lods, _repz_, ecx, AsanWriteAccess, AsanReadAccess, 4, 0)    \
+  F(lods, _repz_, ecx, AsanWriteAccess, AsanReadAccess, 2, 0)    \
+  F(lods, _repz_, ecx, AsanWriteAccess, AsanReadAccess, 1, 0)    \
+  F(lods, _, 1, AsanWriteAccess, AsanReadAccess, 4, 0)           \
+  F(lods, _, 1, AsanWriteAccess, AsanReadAccess, 2, 0)           \
+  F(lods, _, 1, AsanWriteAccess, AsanReadAccess, 1, 0)           \
+  F(movs, _repz_, ecx, AsanWriteAccess, AsanReadAccess, 4, 0)    \
+  F(movs, _repz_, ecx, AsanWriteAccess, AsanReadAccess, 2, 0)    \
+  F(movs, _repz_, ecx, AsanWriteAccess, AsanReadAccess, 1, 0)    \
+  F(movs, _, 1, AsanWriteAccess, AsanReadAccess, 4, 0)           \
+  F(movs, _, 1, AsanWriteAccess, AsanReadAccess, 2, 0)           \
+  F(movs, _, 1, AsanWriteAccess, AsanReadAccess, 1, 0)           \
+  F(stos, _repz_, ecx, AsanWriteAccess, AsanUnknownAccess, 4, 0) \
+  F(stos, _repz_, ecx, AsanWriteAccess, AsanUnknownAccess, 2, 0) \
+  F(stos, _repz_, ecx, AsanWriteAccess, AsanUnknownAccess, 1, 0) \
+  F(stos, _, 1, AsanWriteAccess, AsanUnknownAccess, 4, 0)        \
+  F(stos, _, 1, AsanWriteAccess, AsanUnknownAccess, 2, 0)        \
+  F(stos, _, 1, AsanWriteAccess, AsanUnknownAccess, 1, 0)
 
 }  // namespace asan
 }  // namespace agent
 
 extern "C" {
 
 // The no-op memory access checker.
 void asan_no_check();
 
 // The no-op string instruction memory access checker.
@@ skipping 26 matching lines @@
 
 // Declare all the string instruction interceptor functions. Note that these
 // functions have a custom calling convention, and can't be invoked directly.
 ASAN_STRING_INTERCEPT_FUNCTIONS(DECLARE_STRING_INTERCEPT_FUNCTIONS)
 
 #undef DECLARE_STRING_INTERCEPT_FUNCTIONS
 
 }  // extern "C"
 
 #endif  // SYZYGY_AGENT_ASAN_MEMORY_INTERCEPTORS_H_