diff options
| author | Hans Wennborg <hans@hanshq.net> | 2015-02-03 18:56:42 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2015-02-03 18:56:42 +0000 |
| commit | c66aa3ede3f205a86c7a976a043dc7d0f4fa2175 (patch) | |
| tree | a13818b4adbf191526941b7859f42f7ab6f4b0fb | |
| parent | 2e73858298df14641deef87318146554d3e48beb (diff) | |
| download | compiler-rt-c66aa3ede3f205a86c7a976a043dc7d0f4fa2175.tar.gz | |
Merging r226809:
------------------------------------------------------------------------
r226809 | timurrrr | 2015-01-22 04:24:21 -0800 (Thu, 22 Jan 2015) | 1 line
[ASan/Win] Move the shadow to 0x30000000
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_36@228007 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/asan/asan_mapping.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/asan/asan_mapping.h b/lib/asan/asan_mapping.h index 94a1f834a..8008474a7 100644 --- a/lib/asan/asan_mapping.h +++ b/lib/asan/asan_mapping.h @@ -81,11 +81,13 @@ // || `[0x00000000, 0x3fffffff]` || LowMem || // // Default Windows/i386 mapping: -// || `[0x60000000, 0xffffffff]` || HighMem || -// || `[0x4c000000, 0x5fffffff]` || HighShadow || -// || `[0x48000000, 0x4bffffff]` || ShadowGap || -// || `[0x40000000, 0x47ffffff]` || LowShadow || -// || `[0x00000000, 0x3fffffff]` || LowMem || +// (the exact location of HighShadow/HighMem may vary depending +// on WoW64, /LARGEADDRESSAWARE, etc). +// || `[0x50000000, 0xffffffff]` || HighMem || +// || `[0x3a000000, 0x4fffffff]` || HighShadow || +// || `[0x36000000, 0x39ffffff]` || ShadowGap || +// || `[0x30000000, 0x35ffffff]` || LowShadow || +// || `[0x00000000, 0x2fffffff]` || LowMem || static const u64 kDefaultShadowScale = 3; static const u64 kDefaultShadowOffset32 = 1ULL << 29; // 0x20000000 @@ -98,7 +100,7 @@ static const u64 kMIPS64_ShadowOffset64 = 1ULL << 36; static const u64 kPPC64_ShadowOffset64 = 1ULL << 41; static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000 static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000 -static const u64 kWindowsShadowOffset32 = 1ULL << 30; // 0x40000000 +static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000 #define SHADOW_SCALE kDefaultShadowScale #if SANITIZER_ANDROID |