[compiler-rt] r273270 - Change the shadow memory address for win64.

Etienne Bergeron via llvm-commits llvm-commits at lists.llvm.org
Tue Jun 21 08:11:24 PDT 2016


Author: etienneb
Date: Tue Jun 21 10:11:24 2016
New Revision: 273270

URL: http://llvm.org/viewvc/llvm-project?rev=273270&view=rev
Log:
Change the shadow memory address for win64.

This is part of the effort for asan to support Windows 64 bit.

Patch by Wei Wang
Differential Revision: http://reviews.llvm.org/D21525

Modified:
    compiler-rt/trunk/lib/asan/asan_mapping.h

Modified: compiler-rt/trunk/lib/asan/asan_mapping.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mapping.h?rev=273270&r1=273269&r2=273270&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_mapping.h (original)
+++ compiler-rt/trunk/lib/asan/asan_mapping.h Tue Jun 21 10:11:24 2016
@@ -140,6 +140,7 @@ static const u64 kSystemZ_ShadowOffset64
 static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30;  // 0x40000000
 static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46;  // 0x400000000000
 static const u64 kWindowsShadowOffset32 = 3ULL << 28;  // 0x30000000
+static const u64 kWindowsShadowOffset64 = 1ULL << 45;  // 32TB
 
 #define SHADOW_SCALE kDefaultShadowScale
 
@@ -181,6 +182,8 @@ static const u64 kWindowsShadowOffset32
 #   define SHADOW_OFFSET kDefaultShadowOffset64
 #  elif defined(__mips64)
 #   define SHADOW_OFFSET kMIPS64_ShadowOffset64
+#  elif SANITIZER_WINDOWS64
+#   define SHADOW_OFFSET kWindowsShadowOffset64
 #  else
 #   define SHADOW_OFFSET kDefaultShort64bitShadowOffset
 #  endif




More information about the llvm-commits mailing list