From 8cab11a9f8e23acc0ca3599a53aea19bf75ec1bf Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Mon, 10 Feb 2014 07:37:04 +0000 Subject: [PATCH] [asan] support for FreeBSD, LLVM part. patch by Viktor Kutuzov git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201067 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Instrumentation/AddressSanitizer.cpp | 9 ++++-- .../AddressSanitizer/freebsd.ll | 29 +++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 test/Instrumentation/AddressSanitizer/freebsd.ll diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp index 377d0d87d16..cf10af61d2d 100644 --- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -60,6 +60,8 @@ static const uint64_t kDefaultShadowOffset64 = 1ULL << 44; static const uint64_t kDefaultShort64bitShadowOffset = 0x7FFF8000; // < 2G. static const uint64_t kPPC64_ShadowOffset64 = 1ULL << 41; static const uint64_t kMIPS32_ShadowOffset32 = 0x0aaa8000; +static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30; +static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46; static const size_t kMinStackMallocSize = 1 << 6; // 64B static const size_t kMaxStackMallocSize = 1 << 16; // 64K @@ -240,6 +242,7 @@ static ShadowMapping getShadowMapping(const Module &M, int LongSize) { llvm::Triple TargetTriple(M.getTargetTriple()); bool IsAndroid = TargetTriple.getEnvironment() == llvm::Triple::Android; bool IsMacOSX = TargetTriple.getOS() == llvm::Triple::MacOSX; + bool IsFreeBSD = TargetTriple.getOS() == llvm::Triple::FreeBSD; bool IsPPC64 = TargetTriple.getArch() == llvm::Triple::ppc64 || TargetTriple.getArch() == llvm::Triple::ppc64le; bool IsX86_64 = TargetTriple.getArch() == llvm::Triple::x86_64; @@ -255,11 +258,13 @@ static ShadowMapping getShadowMapping(const Module &M, int LongSize) { Mapping.Offset = IsAndroid ? 0 : (LongSize == 32 ? - (IsMIPS32 ? kMIPS32_ShadowOffset32 : kDefaultShadowOffset32) : + (IsMIPS32 ? kMIPS32_ShadowOffset32 : + (IsFreeBSD ? kFreeBSD_ShadowOffset32 : kDefaultShadowOffset32)) : IsPPC64 ? kPPC64_ShadowOffset64 : kDefaultShadowOffset64); if (!IsAndroid && ClShort64BitOffset && IsX86_64 && !IsMacOSX) { assert(LongSize == 64); - Mapping.Offset = kDefaultShort64bitShadowOffset; + Mapping.Offset = (IsFreeBSD ? + kFreeBSD_ShadowOffset64 : kDefaultShort64bitShadowOffset); } if (!IsAndroid && ClMappingOffsetLog >= 0) { // Zero offset log is the special case. diff --git a/test/Instrumentation/AddressSanitizer/freebsd.ll b/test/Instrumentation/AddressSanitizer/freebsd.ll new file mode 100644 index 00000000000..26fee787d9a --- /dev/null +++ b/test/Instrumentation/AddressSanitizer/freebsd.ll @@ -0,0 +1,29 @@ +; RUN: opt < %s -asan -S \ +; RUN: -mtriple=i386-unknown-freebsd \ +; RUN: -default-data-layout="e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128" | \ +; RUN: FileCheck --check-prefix=CHECK-32 %s + +; RUN: opt < %s -asan -S \ +; RUN: -mtriple=x86_64-unknown-freebsd \ +; RUN: -default-data-layout="e-m:e-i64:64-f80:128-n8:16:32:64-S128" | \ +; RUN: FileCheck --check-prefix=CHECK-64 %s + +define i32 @read_4_bytes(i32* %a) sanitize_address { +entry: + %tmp1 = load i32* %a, align 4 + ret i32 %tmp1 +} + +; CHECK-32: @read_4_bytes +; CHECK-32-NOT: ret +; Check for ASAN's Offset for 32-bit (2^30 or 0x40000000) +; CHECK-32: lshr {{.*}} 3 +; CHECK-32-NEXT: {{1073741824}} +; CHECK-32: ret + +; CHECK-64: @read_4_bytes +; CHECK-64-NOT: ret +; Check for ASAN's Offset for 64-bit (2^46 or 0x400000000000) +; CHECK-64: lshr {{.*}} 3 +; CHECK-64-NEXT: {{70368744177664}} +; CHECK-64: ret -- 2.34.1