<div dir="ltr">I'd prefer if you could move this and similar pieces of code into separate <span style="font-size:12.8px">SystemZ-specific file(s). </span><div><span style="font-size:12.8px">The sanitizer run-time is already a hairy ball of #ifdefs, let's try not to make it worse. </span></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Apr 14, 2016 at 5:51 AM, Marcin Koscielnicki via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: koriakin<br>
Date: Thu Apr 14 07:51:45 2016<br>
New Revision: 266295<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=266295&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=266295&view=rev</a><br>
Log:<br>
[sanitizer] [SystemZ] Implement internal_mmap.<br>
<br>
mmap on s390 is quite a special snowflake: since it has too many<br>
parameters to pass them in registers, it passes a pointer to a struct<br>
with all the parameters instead.<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D18889" rel="noreferrer" target="_blank">http://reviews.llvm.org/D18889</a><br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=266295&r1=266294&r2=266295&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=266295&r1=266294&r2=266295&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc Thu Apr 14 07:51:45 2016<br>
@@ -112,7 +112,32 @@ namespace __sanitizer {<br>
 // --------------- sanitizer_libc.h<br>
 uptr internal_mmap(void *addr, uptr length, int prot, int flags, int fd,<br>
                    OFF_T offset) {<br>
-#if SANITIZER_FREEBSD || SANITIZER_LINUX_USES_64BIT_SYSCALLS<br>
+#ifdef __s390__<br>
+  struct s390_mmap_params {<br>
+    unsigned long addr;<br>
+    unsigned long length;<br>
+    unsigned long prot;<br>
+    unsigned long flags;<br>
+    unsigned long fd;<br>
+    unsigned long offset;<br>
+  } params = {<br>
+    (unsigned long)addr,<br>
+    (unsigned long)length,<br>
+    (unsigned long)prot,<br>
+    (unsigned long)flags,<br>
+    (unsigned long)fd,<br>
+# ifdef __s390x__<br>
+    (unsigned long)offset,<br>
+# else<br>
+    (unsigned long)(offset / 4096),<br>
+# endif<br>
+  };<br>
+# ifdef __s390x__<br>
+  return internal_syscall(SYSCALL(mmap), &params);<br>
+# else<br>
+  return internal_syscall(SYSCALL(mmap2), &params);<br>
+# endif<br>
+#elif SANITIZER_FREEBSD || SANITIZER_LINUX_USES_64BIT_SYSCALLS<br>
   return internal_syscall(SYSCALL(mmap), (uptr)addr, length, prot, flags, fd,<br>
                           offset);<br>
 #else<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>