commit ae4d9caa4f47fa6abcd641719e9f520622940c17
author Alexey Samsonov <samsonov@google.com> Mon Jun 04 14:27:50 2012 +0000
committer Alexey Samsonov <samsonov@google.com> Mon Jun 04 14:27:50 2012 +0000
tree 368d66ef80ca8ac49164d85b7e1eacbfd1a553c4
parent 603c4be006d8c53905d736bf1f19a49f5ce98276

Created files sanitizer_linux.cc and sanitizer_mac.cc for platform-specific implementations of common functions. Turned asan_mmap into __sanitizer::internal_mmap.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157930 91177308-0d34-0410-b5e6-96231b3b80d8

lib/asan/asan_linux.cc

diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
index 040b8b7..1577d2f 100644
--- a/lib/asan/asan_linux.cc
+++ b/lib/asan/asan_linux.cc
@@ -18,6 +18,7 @@
 #include "asan_lock.h"
 #include "asan_procmaps.h"
 #include "asan_thread.h"
+#include "sanitizer_common/sanitizer_libc.h"
 
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -35,6 +36,8 @@
 #include <sys/ucontext.h>
 #endif
 
+using namespace __sanitizer;  // NOLINT
+
 extern "C" void* _DYNAMIC;
 
 namespace __asan {
@@ -73,20 +76,11 @@
   return signum == SIGSEGV && FLAG_handle_segv;
 }
 
-static void *asan_mmap(void *addr, uptr length, int prot, int flags,
-                int fd, u64 offset) {
-# if __WORDSIZE == 64
-  return (void *)syscall(__NR_mmap, addr, length, prot, flags, fd, offset);
-# else
-  return (void *)syscall(__NR_mmap2, addr, length, prot, flags, fd, offset);
-# endif
-}
-
 void *AsanMmapSomewhereOrDie(uptr size, const char *mem_type) {
   size = RoundUpTo(size, kPageSize);
-  void *res = asan_mmap(0, size,
-                        PROT_READ | PROT_WRITE,
-                        MAP_PRIVATE | MAP_ANON, -1, 0);
+  void *res = internal_mmap(0, size,
+                            PROT_READ | PROT_WRITE,
+                            MAP_PRIVATE | MAP_ANON, -1, 0);
   if (res == (void*)-1) {
     OutOfMemoryMessageAndDie(mem_type, size);
   }
@@ -94,17 +88,17 @@
 }
 
 void *AsanMmapFixedNoReserve(uptr fixed_addr, uptr size) {
-  return asan_mmap((void*)fixed_addr, size,
-                   PROT_READ | PROT_WRITE,
-                   MAP_PRIVATE | MAP_ANON | MAP_FIXED | MAP_NORESERVE,
-                   0, 0);
+  return internal_mmap((void*)fixed_addr, size,
+                      PROT_READ | PROT_WRITE,
+                      MAP_PRIVATE | MAP_ANON | MAP_FIXED | MAP_NORESERVE,
+                      0, 0);
 }
 
 void *AsanMprotect(uptr fixed_addr, uptr size) {
-  return asan_mmap((void*)fixed_addr, size,
-                   PROT_NONE,
-                   MAP_PRIVATE | MAP_ANON | MAP_FIXED | MAP_NORESERVE,
-                   0, 0);
+  return internal_mmap((void*)fixed_addr, size,
+                       PROT_NONE,
+                       MAP_PRIVATE | MAP_ANON | MAP_FIXED | MAP_NORESERVE,
+                       0, 0);
 }
 
 void AsanUnmapOrDie(void *addr, uptr size) {