[PATCH] D18896: [sanitizer] [SystemZ] Add virtual space size.

[Marcin Kościelnicki via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL266296: [sanitizer] [SystemZ] Add virtual space size. (authored by koriakin).

Changed prior to commit:
  http://reviews.llvm.org/D18896?vs=53012&id=53698#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D18896

Files:
  compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix.cc
  compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_allocator_test.cc

Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix.cc
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix.cc
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix.cc
@@ -104,15 +104,21 @@
   return (1ULL << (MostSignificantSetBitIndex(GET_CURRENT_FRAME()) + 1)) - 1;
 # elif defined(__mips64)
   return (1ULL << 40) - 1;  // 0x000000ffffffffffUL;
+# elif defined(__s390x__)
+  return (1ULL << 53) - 1;  // 0x001fffffffffffffUL;
 # else
   return (1ULL << 47) - 1;  // 0x00007fffffffffffUL;
 # endif
 #else  // SANITIZER_WORDSIZE == 32
+# if defined(__s390__)
+  return (1ULL << 31) - 1;  // 0x7fffffff;
+# else
   uptr res = (1ULL << 32) - 1;  // 0xffffffff;
   if (!common_flags()->full_address_space)
     res -= GetKernelAreaSize();
   CHECK_LT(reinterpret_cast<uptr>(&res), res);
   return res;
+# endif
 #endif  // SANITIZER_WORDSIZE
 }
 
Index: compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
+++ compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
@@ -42,6 +42,10 @@
 static const u64 kAddressSpaceSize = 1ULL << 40;
 #elif defined(__aarch64__)
 static const u64 kAddressSpaceSize = 1ULL << 39;
+#elif defined(__s390x__)
+static const u64 kAddressSpaceSize = 1ULL << 53;
+#elif defined(__s390__)
+static const u64 kAddressSpaceSize = 1ULL << 31;
 #else
 static const u64 kAddressSpaceSize = 1ULL << 32;
 #endif


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D18896.53698.patch
Type: text/x-patch
Size: 1600 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160414/00a6ac73/attachment.bin>