diff options
author | Alexey Samsonov <samsonov@google.com> | 2012-06-06 09:26:25 +0000 |
---|---|---|
committer | Alexey Samsonov <samsonov@google.com> | 2012-06-06 09:26:25 +0000 |
commit | 230c3be6cdd094a187f48e27ba0961dbeee70344 (patch) | |
tree | 86fc65e18451956359223a7e45261e2a0e146de0 /lib/asan | |
parent | 8e820fcf7aafeb8101322182d742fcf99255d972 (diff) | |
download | compiler-rt-230c3be6cdd094a187f48e27ba0961dbeee70344.tar.gz |
[Sanitizer] Move more functions/constants to sanitizer_common.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@158056 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan')
-rw-r--r-- | lib/asan/asan_interceptors.cc | 6 | ||||
-rw-r--r-- | lib/asan/asan_interceptors.h | 1 | ||||
-rw-r--r-- | lib/asan/asan_internal.h | 16 | ||||
-rw-r--r-- | lib/asan/asan_posix.cc | 4 | ||||
-rw-r--r-- | lib/asan/asan_win.cc | 4 |
5 files changed, 0 insertions, 31 deletions
diff --git a/lib/asan/asan_interceptors.cc b/lib/asan/asan_interceptors.cc index 7797f99ae..37a0c0651 100644 --- a/lib/asan/asan_interceptors.cc +++ b/lib/asan/asan_interceptors.cc @@ -220,12 +220,6 @@ s64 internal_atoll(const char *nptr) { return internal_simple_strtoll(nptr, (char**)0, 10); } -uptr internal_strlen(const char *s) { - uptr i = 0; - while (s[i]) i++; - return i; -} - uptr internal_strnlen(const char *s, uptr maxlen) { #if ASAN_INTERCEPT_STRNLEN if (REAL(strnlen) != 0) { diff --git a/lib/asan/asan_interceptors.h b/lib/asan/asan_interceptors.h index 975187f53..e0dab6a07 100644 --- a/lib/asan/asan_interceptors.h +++ b/lib/asan/asan_interceptors.h @@ -32,7 +32,6 @@ namespace __asan { // __asan::internal_X() is the implementation of X() for use in RTL. s64 internal_atoll(const char *nptr); -uptr internal_strlen(const char *s); uptr internal_strnlen(const char *s, uptr maxlen); char* internal_strchr(const char *s, int c); void* internal_memset(void *s, int c, uptr n); diff --git a/lib/asan/asan_internal.h b/lib/asan/asan_internal.h index 0d1d208bf..d234a7875 100644 --- a/lib/asan/asan_internal.h +++ b/lib/asan/asan_internal.h @@ -141,7 +141,6 @@ bool AsanInterceptsSignal(int signum); void SetAlternateSignalStack(); void UnsetAlternateSignalStack(); void InstallSignalHandlers(); -int GetPid(); uptr GetThreadSelf(); int AtomicInc(int *a); u16 AtomicExchange(u16 *a, u16 new_val); @@ -242,11 +241,6 @@ int Atexit(void (*function)(void)); #define ASAN_ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) -const uptr kWordSize = __WORDSIZE / 8; -const uptr kWordSizeInBits = 8 * kWordSize; -const uptr kPageSizeBits = 12; -const uptr kPageSize = 1UL << kPageSizeBits; - #if !defined(_WIN32) || defined(__clang__) # define GET_CALLER_PC() (uptr)__builtin_return_address(0) # define GET_CURRENT_FRAME() (uptr)__builtin_frame_address(0) @@ -291,16 +285,6 @@ const int kAsanInternalHeapMagic = 0xfe; static const uptr kCurrentStackFrameMagic = 0x41B58AB3; static const uptr kRetiredStackFrameMagic = 0x45E0360E; -// --------------------------- Bit twiddling ------- {{{1 -inline bool IsPowerOfTwo(uptr x) { - return (x & (x - 1)) == 0; -} - -inline uptr RoundUpTo(uptr size, uptr boundary) { - CHECK(IsPowerOfTwo(boundary)); - return (size + boundary - 1) & ~(boundary - 1); -} - // -------------------------- LowLevelAllocator ----- {{{1 // A simple low-level memory allocator for internal use. class LowLevelAllocator { diff --git a/lib/asan/asan_posix.cc b/lib/asan/asan_posix.cc index 762c340e6..48de79395 100644 --- a/lib/asan/asan_posix.cc +++ b/lib/asan/asan_posix.cc @@ -154,10 +154,6 @@ void AsanDumpProcessMap() { Report("End of process memory map.\n"); } -int GetPid() { - return getpid(); -} - uptr GetThreadSelf() { return (uptr)pthread_self(); } diff --git a/lib/asan/asan_win.cc b/lib/asan/asan_win.cc index 001f4719d..609f3d432 100644 --- a/lib/asan/asan_win.cc +++ b/lib/asan/asan_win.cc @@ -239,10 +239,6 @@ void AsanDumpProcessMap() { UNIMPLEMENTED(); } -int GetPid() { - return GetProcessId(GetCurrentProcess()); -} - uptr GetThreadSelf() { return GetCurrentThreadId(); } |