This is an archive of the discontinued LLVM Phabricator instance.

Differential D21525

[asan] Use 32T as offset on asan Windows64
ClosedPublic

Authored by wang0109 on Jun 20 2016, 11:52 AM.

Details

Reviewers
rnk
Commits
rG3d6a88c3896f: Change the shadow memory address for win64.
rCRT273270: Change the shadow memory address for win64.
rL273270: Change the shadow memory address for win64.
Summary

Change the shadow memory address for win64.

This is part of the effort for asan to support Windows 64 bit.
Depends on LLVM patch http://reviews.llvm.org/D21523

Diff Detail

Repository
rL LLVM

Event Timeline

wang0109 updated this revision to Diff 61281.Jun 20 2016, 11:52 AM
wang0109 retitled this revision from to [asan] Use 32T as offset on asan Windows64.
wang0109 updated this object.
wang0109 added reviewers: rnk, etienneb, • chrisha.
Herald added a subscriber: kubamracek. · View Herald TranscriptJun 20 2016, 11:52 AM
etienneb removed reviewers: • chrisha, etienneb.Jun 20 2016, 11:53 AM
etienneb added subscribers: etienneb, • chrisha.
rnk accepted this revision.Jun 21 2016, 7:24 AM
rnk edited edge metadata.

lgtm

This revision is now accepted and ready to land.Jun 21 2016, 7:24 AM
etienneb updated this object.Jun 21 2016, 8:17 AM
etienneb edited edge metadata.
Closed by commit rL273270: Change the shadow memory address for win64. (authored by etienneb). · Explain WhyJun 21 2016, 8:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
trunk/
lib/
asan/
3 lines

Diff 61377

compiler-rt/trunk/lib/asan/asan_mapping.h

Show First 20 Lines • Show All 134 Lines • ▼ Show 20 Lines
static const u64 kAArch64_ShadowOffset64 = 1ULL << 36; static const u64 kAArch64_ShadowOffset64 = 1ULL << 36;
static const u64 kMIPS32_ShadowOffset32 = 0x0aaa0000; static const u64 kMIPS32_ShadowOffset32 = 0x0aaa0000;
static const u64 kMIPS64_ShadowOffset64 = 1ULL << 37; static const u64 kMIPS64_ShadowOffset64 = 1ULL << 37;
static const u64 kPPC64_ShadowOffset64 = 1ULL << 41; static const u64 kPPC64_ShadowOffset64 = 1ULL << 41;
static const u64 kSystemZ_ShadowOffset64 = 1ULL << 52; static const u64 kSystemZ_ShadowOffset64 = 1ULL << 52;
static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000 static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000
static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000 static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000
static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000 static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000
static const u64 kWindowsShadowOffset64 = 1ULL << 45; // 32TB
#define SHADOW_SCALE kDefaultShadowScale #define SHADOW_SCALE kDefaultShadowScale
#if SANITIZER_WORDSIZE == 32 #if SANITIZER_WORDSIZE == 32
# if SANITIZER_ANDROID # if SANITIZER_ANDROID
# define SHADOW_OFFSET (0) # define SHADOW_OFFSET (0)
# elif defined(__mips__) # elif defined(__mips__)
Show All 25 Lines
# elif defined(__s390x__) # elif defined(__s390x__)
# define SHADOW_OFFSET kSystemZ_ShadowOffset64 # define SHADOW_OFFSET kSystemZ_ShadowOffset64
# elif SANITIZER_FREEBSD # elif SANITIZER_FREEBSD
# define SHADOW_OFFSET kFreeBSD_ShadowOffset64 # define SHADOW_OFFSET kFreeBSD_ShadowOffset64
# elif SANITIZER_MAC # elif SANITIZER_MAC
# define SHADOW_OFFSET kDefaultShadowOffset64 # define SHADOW_OFFSET kDefaultShadowOffset64
# elif defined(__mips64) # elif defined(__mips64)
# define SHADOW_OFFSET kMIPS64_ShadowOffset64 # define SHADOW_OFFSET kMIPS64_ShadowOffset64
# elif SANITIZER_WINDOWS64
# define SHADOW_OFFSET kWindowsShadowOffset64
# else # else
# define SHADOW_OFFSET kDefaultShort64bitShadowOffset # define SHADOW_OFFSET kDefaultShort64bitShadowOffset
# endif # endif
#endif #endif
#define SHADOW_GRANULARITY (1ULL << SHADOW_SCALE) #define SHADOW_GRANULARITY (1ULL << SHADOW_SCALE)
#define MEM_TO_SHADOW(mem) (((mem) >> SHADOW_SCALE) + (SHADOW_OFFSET)) #define MEM_TO_SHADOW(mem) (((mem) >> SHADOW_SCALE) + (SHADOW_OFFSET))
#define SHADOW_TO_MEM(shadow) (((shadow) - SHADOW_OFFSET) << SHADOW_SCALE) #define SHADOW_TO_MEM(shadow) (((shadow) - SHADOW_OFFSET) << SHADOW_SCALE)
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines