This is an archive of the discontinued LLVM Phabricator instance.

Differential D37234

Define NetBSD/amd64 ASAN Shadow Offset
ClosedPublic

Authored by krytarowski on Aug 28 2017, 2:53 PM.

Details

Reviewers
kcc
joerg
filcab
vitalybuka
eugenis
Commits
rGa9f404f813ad: Define NetBSD/amd64 ASAN Shadow Offset
rL311941: Define NetBSD/amd64 ASAN Shadow Offset
Summary

Catch up after compiler-rt changes and define kNetBSD_ShadowOffset64
as (1ULL << 46).

Sponsored by <The NetBSD Foundation>

Diff Detail

Repository
rL LLVM

Event Timeline

krytarowski created this revision.Aug 28 2017, 2:53 PM
eugenis accepted this revision.Aug 28 2017, 2:54 PM
This revision is now accepted and ready to land.Aug 28 2017, 2:54 PM
krytarowski added a comment.Aug 28 2017, 3:11 PM

I'm going to commit it as is, the offset can be optimized in future if needed.

krytarowski closed this revision.Aug 28 2017, 3:14 PM

Revision Contents

PathSize
lib/
Transforms/
Instrumentation/
4 lines

Diff 112974

lib/Transforms/Instrumentation/AddressSanitizer.cpp

Show First 20 Lines • Show All 77 Lines • ▼ Show 20 Lines
static const uint64_t kLinuxKasan_ShadowOffset64 = 0xdffffc0000000000; static const uint64_t kLinuxKasan_ShadowOffset64 = 0xdffffc0000000000;
static const uint64_t kPPC64_ShadowOffset64 = 1ULL << 41; static const uint64_t kPPC64_ShadowOffset64 = 1ULL << 41;
static const uint64_t kSystemZ_ShadowOffset64 = 1ULL << 52; static const uint64_t kSystemZ_ShadowOffset64 = 1ULL << 52;
static const uint64_t kMIPS32_ShadowOffset32 = 0x0aaa0000; static const uint64_t kMIPS32_ShadowOffset32 = 0x0aaa0000;
static const uint64_t kMIPS64_ShadowOffset64 = 1ULL << 37; static const uint64_t kMIPS64_ShadowOffset64 = 1ULL << 37;
static const uint64_t kAArch64_ShadowOffset64 = 1ULL << 36; static const uint64_t kAArch64_ShadowOffset64 = 1ULL << 36;
static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30; static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30;
static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46; static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;
static const uint64_t kNetBSD_ShadowOffset64 = 1ULL << 46;
static const uint64_t kPS4CPU_ShadowOffset64 = 1ULL << 40; static const uint64_t kPS4CPU_ShadowOffset64 = 1ULL << 40;
static const uint64_t kWindowsShadowOffset32 = 3ULL << 28; static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
// The shadow memory space is dynamically allocated. // The shadow memory space is dynamically allocated.
static const uint64_t kWindowsShadowOffset64 = kDynamicShadowSentinel; static const uint64_t kWindowsShadowOffset64 = kDynamicShadowSentinel;
static const size_t kMinStackMallocSize = 1 << 6; // 64B static const size_t kMinStackMallocSize = 1 << 6; // 64B
static const size_t kMaxStackMallocSize = 1 << 16; // 64K static const size_t kMaxStackMallocSize = 1 << 16; // 64K
static const uintptr_t kCurrentStackFrameMagic = 0x41B58AB3; static const uintptr_t kCurrentStackFrameMagic = 0x41B58AB3;
▲ Show 20 Lines • Show All 303 Lines • ▼ Show 20 Linesstruct ShadowMapping {
bool OrShadowOffset; bool OrShadowOffset;
}; };
static ShadowMapping getShadowMapping(Triple &TargetTriple, int LongSize, static ShadowMapping getShadowMapping(Triple &TargetTriple, int LongSize,
bool IsKasan) { bool IsKasan) {
bool IsAndroid = TargetTriple.isAndroid(); bool IsAndroid = TargetTriple.isAndroid();
bool IsIOS = TargetTriple.isiOS() || TargetTriple.isWatchOS(); bool IsIOS = TargetTriple.isiOS() || TargetTriple.isWatchOS();
bool IsFreeBSD = TargetTriple.isOSFreeBSD(); bool IsFreeBSD = TargetTriple.isOSFreeBSD();
bool IsNetBSD = TargetTriple.isOSNetBSD();
bool IsPS4CPU = TargetTriple.isPS4CPU(); bool IsPS4CPU = TargetTriple.isPS4CPU();
bool IsLinux = TargetTriple.isOSLinux(); bool IsLinux = TargetTriple.isOSLinux();
bool IsPPC64 = TargetTriple.getArch() == llvm::Triple::ppc64 || bool IsPPC64 = TargetTriple.getArch() == llvm::Triple::ppc64 ||
TargetTriple.getArch() == llvm::Triple::ppc64le; TargetTriple.getArch() == llvm::Triple::ppc64le;
bool IsSystemZ = TargetTriple.getArch() == llvm::Triple::systemz; bool IsSystemZ = TargetTriple.getArch() == llvm::Triple::systemz;
bool IsX86 = TargetTriple.getArch() == llvm::Triple::x86; bool IsX86 = TargetTriple.getArch() == llvm::Triple::x86;
bool IsX86_64 = TargetTriple.getArch() == llvm::Triple::x86_64; bool IsX86_64 = TargetTriple.getArch() == llvm::Triple::x86_64;
bool IsMIPS32 = TargetTriple.getArch() == llvm::Triple::mips || bool IsMIPS32 = TargetTriple.getArch() == llvm::Triple::mips ||
Show All 28 Lines if (LongSize == 32) {
if (IsFuchsia) if (IsFuchsia)
Mapping.Offset = 0; Mapping.Offset = 0;
else if (IsPPC64) else if (IsPPC64)
Mapping.Offset = kPPC64_ShadowOffset64; Mapping.Offset = kPPC64_ShadowOffset64;
else if (IsSystemZ) else if (IsSystemZ)
Mapping.Offset = kSystemZ_ShadowOffset64; Mapping.Offset = kSystemZ_ShadowOffset64;
else if (IsFreeBSD) else if (IsFreeBSD)
Mapping.Offset = kFreeBSD_ShadowOffset64; Mapping.Offset = kFreeBSD_ShadowOffset64;
else if (IsNetBSD)
Mapping.Offset = kNetBSD_ShadowOffset64;
else if (IsPS4CPU) else if (IsPS4CPU)
Mapping.Offset = kPS4CPU_ShadowOffset64; Mapping.Offset = kPS4CPU_ShadowOffset64;
else if (IsLinux && IsX86_64) { else if (IsLinux && IsX86_64) {
if (IsKasan) if (IsKasan)
Mapping.Offset = kLinuxKasan_ShadowOffset64; Mapping.Offset = kLinuxKasan_ShadowOffset64;
else else
Mapping.Offset = kSmallX86_64ShadowOffset; Mapping.Offset = kSmallX86_64ShadowOffset;
} else if (IsWindows && IsX86_64) { } else if (IsWindows && IsX86_64) {
▲ Show 20 Lines • Show All 991 Lines • Show Last 20 Lines