Commit 4c376126 by Jakub Jelinek Committed by Jakub Jelinek

asan_mapping.h (kMidMemEnd): Increase to 0x4fffffffffULL.

	* asan/asan_mapping.h (kMidMemEnd): Increase to 0x4fffffffffULL.
	* asan/asan_rtl.cc (__asan_init): Increase kMidMemEnd to
	0x4fffffffffULL.

From-SVN: r196355
parent ba96cdfb
2013-02-28 Jakub Jelinek <jakub@redhat.com>
* asan/asan_mapping.h (kMidMemEnd): Increase to 0x4fffffffffULL.
* asan/asan_rtl.cc (__asan_init): Increase kMidMemEnd to
0x4fffffffffULL.
2013-02-22 Jakub Jelinek <jakub@redhat.com> 2013-02-22 Jakub Jelinek <jakub@redhat.com>
PR sanitizer/56393 PR sanitizer/56393
......
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
// || `[0x000000040000, 0x01ffffffffff]` || ShadowGap || // || `[0x000000040000, 0x01ffffffffff]` || ShadowGap ||
// //
// Special case when something is already mapped between // Special case when something is already mapped between
// 0x003000000000 and 0x004000000000 (e.g. when prelink is installed): // 0x003000000000 and 0x005000000000 (e.g. when prelink is installed):
// || `[0x10007fff8000, 0x7fffffffffff]` || HighMem || // || `[0x10007fff8000, 0x7fffffffffff]` || HighMem ||
// || `[0x02008fff7000, 0x10007fff7fff]` || HighShadow || // || `[0x02008fff7000, 0x10007fff7fff]` || HighShadow ||
// || `[0x004000000000, 0x02008fff6fff]` || ShadowGap3 || // || `[0x005000000000, 0x02008fff6fff]` || ShadowGap3 ||
// || `[0x003000000000, 0x003fffffffff]` || MidMem || // || `[0x003000000000, 0x004fffffffff]` || MidMem ||
// || `[0x00087fff8000, 0x002fffffffff]` || ShadowGap2 || // || `[0x000a7fff8000, 0x002fffffffff]` || ShadowGap2 ||
// || `[0x00067fff8000, 0x00087fff7fff]` || MidShadow || // || `[0x00067fff8000, 0x000a7fff7fff]` || MidShadow ||
// || `[0x00008fff7000, 0x00067fff7fff]` || ShadowGap || // || `[0x00008fff7000, 0x00067fff7fff]` || ShadowGap ||
// || `[0x00007fff8000, 0x00008fff6fff]` || LowShadow || // || `[0x00007fff8000, 0x00008fff6fff]` || LowShadow ||
// || `[0x000000000000, 0x00007fff7fff]` || LowMem || // || `[0x000000000000, 0x00007fff7fff]` || LowMem ||
...@@ -129,7 +129,7 @@ extern uptr AsanMappingProfile[]; ...@@ -129,7 +129,7 @@ extern uptr AsanMappingProfile[];
// difference between fixed and non-fixed mapping is below the noise level. // difference between fixed and non-fixed mapping is below the noise level.
static uptr kHighMemEnd = 0x7fffffffffffULL; static uptr kHighMemEnd = 0x7fffffffffffULL;
static uptr kMidMemBeg = 0x3000000000ULL; static uptr kMidMemBeg = 0x3000000000ULL;
static uptr kMidMemEnd = 0x3fffffffffULL; static uptr kMidMemEnd = 0x4fffffffffULL;
#else #else
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
extern uptr kHighMemEnd, kMidMemBeg, kMidMemEnd; // Initialized in __asan_init. extern uptr kHighMemEnd, kMidMemBeg, kMidMemEnd; // Initialized in __asan_init.
......
...@@ -455,7 +455,7 @@ void __asan_init() { ...@@ -455,7 +455,7 @@ void __asan_init() {
#if ASAN_LINUX && defined(__x86_64__) && !ASAN_FIXED_MAPPING #if ASAN_LINUX && defined(__x86_64__) && !ASAN_FIXED_MAPPING
if (!full_shadow_is_available) { if (!full_shadow_is_available) {
kMidMemBeg = kLowMemEnd < 0x3000000000ULL ? 0x3000000000ULL : 0; kMidMemBeg = kLowMemEnd < 0x3000000000ULL ? 0x3000000000ULL : 0;
kMidMemEnd = kLowMemEnd < 0x3000000000ULL ? 0x3fffffffffULL : 0; kMidMemEnd = kLowMemEnd < 0x3000000000ULL ? 0x4fffffffffULL : 0;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment