OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

[ASan] Missed some SHADOW_XYZ uses on non-Linux platforms. 

Reviewed By: kstoimenov

Differential Revision: https://reviews.llvm.org/D115307
This commit is contained in:
Kirill Stoimenov 2021-12-08 00:36:09 +00:00
parent ad56941a57
commit 572d1ecccc
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/lib/asan/asan_mac.cpp
View File

@ -55,7 +55,7 @@ void *AsanDoesNotSupportStaticLinkage() {
} }
uptr FindDynamicShadowStart() { uptr FindDynamicShadowStart() {
return MapDynamicShadow(MemToShadowSize(kHighMemEnd), SHADOW_SCALE, return MapDynamicShadow(MemToShadowSize(kHighMemEnd), ASAN_SHADOW_SCALE,
/*min_shadow_base_alignment*/ 0, kHighMemEnd); /*min_shadow_base_alignment*/ 0, kHighMemEnd);
} }

9
compiler-rt/lib/asan/asan_mapping_sparc64.h
View File

@ -25,13 +25,14 @@
// The idea is to chop the high bits before doing the scaling, so the two // The idea is to chop the high bits before doing the scaling, so the two
// parts become contiguous again and the usual scheme can be applied. // parts become contiguous again and the usual scheme can be applied.
#define MEM_TO_SHADOW(mem) \ #define MEM_TO_SHADOW(mem) \
((((mem) << HIGH_BITS) >> (HIGH_BITS + (SHADOW_SCALE))) + (SHADOW_OFFSET)) ((((mem) << HIGH_BITS) >> (HIGH_BITS + (ASAN_SHADOW_SCALE))) + \
(ASAN_SHADOW_OFFSET))
#define kLowMemBeg 0 #define kLowMemBeg 0
#define kLowMemEnd (SHADOW_OFFSET - 1) #define kLowMemEnd (ASAN_SHADOW_OFFSET - 1)
#define kLowShadowBeg SHADOW_OFFSET #define kLowShadowBeg ASAN_SHADOW_OFFSET
#define kLowShadowEnd MEM_TO_SHADOW(kLowMemEnd) #define kLowShadowEnd MEM_TO_SHADOW(kLowMemEnd)
// But of course there is the huge hole between the high shadow memory, // But of course there is the huge hole between the high shadow memory,

2
compiler-rt/lib/asan/asan_premap_shadow.cpp
View File

@ -26,7 +26,7 @@ namespace __asan {
// Conservative upper limit. // Conservative upper limit.
uptr PremapShadowSize() { uptr PremapShadowSize() {
uptr granularity = GetMmapGranularity(); uptr granularity = GetMmapGranularity();
return RoundUpTo(GetMaxVirtualAddress() >> SHADOW_SCALE, granularity); return RoundUpTo(GetMaxVirtualAddress() >> ASAN_SHADOW_SCALE, granularity);
} }
// Returns an address aligned to 8 pages, such that one page on the left and // Returns an address aligned to 8 pages, such that one page on the left and

2
compiler-rt/lib/asan/asan_win.cpp
View File

@ -253,7 +253,7 @@ void *AsanDoesNotSupportStaticLinkage() {
} }
uptr FindDynamicShadowStart() { uptr FindDynamicShadowStart() {
return MapDynamicShadow(MemToShadowSize(kHighMemEnd), SHADOW_SCALE, return MapDynamicShadow(MemToShadowSize(kHighMemEnd), ASAN_SHADOW_SCALE,
/*min_shadow_base_alignment*/ 0, kHighMemEnd); /*min_shadow_base_alignment*/ 0, kHighMemEnd);
} }