maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ASan] Add shadow offset for SystemZ. 

This is the compiler-rt counterpart to D19650.

Differential Revision: http://reviews.llvm.org/D19652

llvm-svn: 268162
This commit is contained in:
Marcin Koscielnicki 2016-04-30 10:02:12 +00:00
parent 57290f934a
commit ee587cba0e
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler-rt/lib/asan/asan_mapping.h
View File

@ -87,6 +87,20 @@
// || `[0x08000000000, 0x08fffffffff]` || lowshadow || // || `[0x08000000000, 0x08fffffffff]` || lowshadow ||
// || `[0x00000000000, 0x07fffffffff]` || lowmem || // || `[0x00000000000, 0x07fffffffff]` || lowmem ||
// //
// Default Linux/S390 mapping:
// || `[0x30000000, 0x7fffffff]` || HighMem ||
// || `[0x26000000, 0x2fffffff]` || HighShadow ||
// || `[0x24000000, 0x25ffffff]` || ShadowGap ||
// || `[0x20000000, 0x23ffffff]` || LowShadow ||
// || `[0x00000000, 0x1fffffff]` || LowMem ||
//
// Default Linux/SystemZ mapping:
// || `[0x14000000000000, 0x1fffffffffffff]` || HighMem ||
// || `[0x12800000000000, 0x13ffffffffffff]` || HighShadow ||
// || `[0x12000000000000, 0x127fffffffffff]` || ShadowGap ||
// || `[0x10000000000000, 0x11ffffffffffff]` || LowShadow ||
// || `[0x00000000000000, 0x0fffffffffffff]` || LowMem ||
//
// Shadow mapping on FreeBSD/x86-64 with SHADOW_OFFSET == 0x400000000000: // Shadow mapping on FreeBSD/x86-64 with SHADOW_OFFSET == 0x400000000000:
// || `[0x500000000000, 0x7fffffffffff]` || HighMem || // || `[0x500000000000, 0x7fffffffffff]` || HighMem ||
// || `[0x4a0000000000, 0x4fffffffffff]` || HighShadow || // || `[0x4a0000000000, 0x4fffffffffff]` || HighShadow ||
@ -122,6 +136,7 @@ static const u64 kAArch64_ShadowOffset64 = 1ULL << 36;
static const u64 kMIPS32_ShadowOffset32 = 0x0aaa0000; static const u64 kMIPS32_ShadowOffset32 = 0x0aaa0000;
static const u64 kMIPS64_ShadowOffset64 = 1ULL << 37; static const u64 kMIPS64_ShadowOffset64 = 1ULL << 37;
static const u64 kPPC64_ShadowOffset64 = 1ULL << 41; static const u64 kPPC64_ShadowOffset64 = 1ULL << 41;
static const u64 kSystemZ_ShadowOffset64 = 1ULL << 52;
static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000 static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000
static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000 static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000
static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000 static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000
@ -158,6 +173,8 @@ static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000
# define SHADOW_OFFSET kAArch64_ShadowOffset64 # define SHADOW_OFFSET kAArch64_ShadowOffset64
# elif defined(__powerpc64__) # elif defined(__powerpc64__)
# define SHADOW_OFFSET kPPC64_ShadowOffset64 # define SHADOW_OFFSET kPPC64_ShadowOffset64
# elif defined(__s390x__)
# define SHADOW_OFFSET kSystemZ_ShadowOffset64
# elif SANITIZER_FREEBSD # elif SANITIZER_FREEBSD
# define SHADOW_OFFSET kFreeBSD_ShadowOffset64 # define SHADOW_OFFSET kFreeBSD_ShadowOffset64
# elif SANITIZER_MAC # elif SANITIZER_MAC

2
compiler-rt/lib/asan/tests/asan_test.cc
View File

@ -937,6 +937,8 @@ TEST(AddressSanitizer, ShadowGapTest) {
#else #else
# if defined(__powerpc64__) # if defined(__powerpc64__)
char *addr = (char*)0x024000800000; char *addr = (char*)0x024000800000;
# elif defined(__s390x__)
char *addr = (char*)0x11000000000000;
# else # else
char *addr = (char*)0x0000100000080000; char *addr = (char*)0x0000100000080000;
# endif # endif

2
compiler-rt/test/asan/CMakeLists.txt
View File

@ -6,7 +6,7 @@ set(ASAN_DYNAMIC_TESTSUITES)
macro(get_bits_for_arch arch bits) macro(get_bits_for_arch arch bits)
if (${arch} MATCHES "i386|i686|arm|mips|mipsel") if (${arch} MATCHES "i386|i686|arm|mips|mipsel")
set(${bits} 32) set(${bits} 32)
elseif (${arch} MATCHES "x86_64|powerpc64|powerpc64le|aarch64|mips64|mips64el") elseif (${arch} MATCHES "x86_64|powerpc64|powerpc64le|aarch64|mips64|mips64el|s390x")
set(${bits} 64) set(${bits} 64)
else() else()
message(FATAL_ERROR "Unknown target architecture: ${arch}") message(FATAL_ERROR "Unknown target architecture: ${arch}")