mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-24 03:33:20 +01:00
Add msan custom mapping options.
Similarly to https://reviews.llvm.org/D18865 this adds options to provide custom mapping for msan. As discussed in http://lists.llvm.org/pipermail/llvm-dev/2018-February/121339.html Patch by vit9696(at)avp.su. Differential Revision: https://reviews.llvm.org/D44926 llvm-svn: 328830
This commit is contained in:
Evgeniy Stepanov
parent
1192f331d7
commit
2494a3ee96
@ -234,6 +234,24 @@ static cl::opt<bool> ClWithComdat("msan-with-comdat",
|
|||||||
cl::desc("Place MSan constructors in comdat sections"),
|
cl::desc("Place MSan constructors in comdat sections"),
|
||||||
cl::Hidden, cl::init(false));
|
cl::Hidden, cl::init(false));
|
||||||
|
|
||||||
|
// These options allow to specify custom memory map parameters
|
||||||
|
// See MemoryMapParams for details.
|
||||||
|
static cl::opt<unsigned long long> ClAndMask("msan-and-mask",
|
||||||
|
cl::desc("Define custom MSan AndMask"),
|
||||||
|
cl::Hidden, cl::init(0));
|
||||||
|
|
||||||
|
static cl::opt<unsigned long long> ClXorMask("msan-xor-mask",
|
||||||
|
cl::desc("Define custom MSan XorMask"),
|
||||||
|
cl::Hidden, cl::init(0));
|
||||||
|
|
||||||
|
static cl::opt<unsigned long long> ClShadowBase("msan-shadow-base",
|
||||||
|
cl::desc("Define custom MSan ShadowBase"),
|
||||||
|
cl::Hidden, cl::init(0));
|
||||||
|
|
||||||
|
static cl::opt<unsigned long long> ClOriginBase("msan-origin-base",
|
||||||
|
cl::desc("Define custom MSan OriginBase"),
|
||||||
|
cl::Hidden, cl::init(0));
|
||||||
|
|
||||||
static const char *const kMsanModuleCtorName = "msan.module_ctor";
|
static const char *const kMsanModuleCtorName = "msan.module_ctor";
|
||||||
static const char *const kMsanInitName = "__msan_init";
|
static const char *const kMsanInitName = "__msan_init";
|
||||||
|
|
||||||
@ -449,6 +467,10 @@ private:
|
|||||||
/// \brief Memory map parameters used in application-to-shadow calculation.
|
/// \brief Memory map parameters used in application-to-shadow calculation.
|
||||||
const MemoryMapParams *MapParams;
|
const MemoryMapParams *MapParams;
|
||||||
|
|
||||||
|
/// \brief Custom memory map parameters used when -msan-shadow-base or
|
||||||
|
// -msan-origin-base is provided.
|
||||||
|
MemoryMapParams CustomMapParams;
|
||||||
|
|
||||||
MDNode *ColdCallWeights;
|
MDNode *ColdCallWeights;
|
||||||
|
|
||||||
/// \brief Branch weights for origin store.
|
/// \brief Branch weights for origin store.
|
||||||
@ -576,55 +598,66 @@ void MemorySanitizer::initializeCallbacks(Module &M) {
|
|||||||
bool MemorySanitizer::doInitialization(Module &M) {
|
bool MemorySanitizer::doInitialization(Module &M) {
|
||||||
auto &DL = M.getDataLayout();
|
auto &DL = M.getDataLayout();
|
||||||
|
|
||||||
Triple TargetTriple(M.getTargetTriple());
|
bool ShadowPassed = ClShadowBase.getNumOccurrences() > 0;
|
||||||
switch (TargetTriple.getOS()) {
|
bool OriginPassed = ClOriginBase.getNumOccurrences() > 0;
|
||||||
case Triple::FreeBSD:
|
// Check the overrides first
|
||||||
switch (TargetTriple.getArch()) {
|
if (ShadowPassed || OriginPassed) {
|
||||||
case Triple::x86_64:
|
CustomMapParams.AndMask = ClAndMask;
|
||||||
MapParams = FreeBSD_X86_MemoryMapParams.bits64;
|
CustomMapParams.XorMask = ClXorMask;
|
||||||
break;
|
CustomMapParams.ShadowBase = ClShadowBase;
|
||||||
case Triple::x86:
|
CustomMapParams.OriginBase = ClOriginBase;
|
||||||
MapParams = FreeBSD_X86_MemoryMapParams.bits32;
|
MapParams = &CustomMapParams;
|
||||||
break;
|
} else {
|
||||||
default:
|
Triple TargetTriple(M.getTargetTriple());
|
||||||
report_fatal_error("unsupported architecture");
|
switch (TargetTriple.getOS()) {
|
||||||
}
|
case Triple::FreeBSD:
|
||||||
break;
|
switch (TargetTriple.getArch()) {
|
||||||
case Triple::NetBSD:
|
case Triple::x86_64:
|
||||||
switch (TargetTriple.getArch()) {
|
MapParams = FreeBSD_X86_MemoryMapParams.bits64;
|
||||||
case Triple::x86_64:
|
break;
|
||||||
MapParams = NetBSD_X86_MemoryMapParams.bits64;
|
case Triple::x86:
|
||||||
break;
|
MapParams = FreeBSD_X86_MemoryMapParams.bits32;
|
||||||
default:
|
break;
|
||||||
report_fatal_error("unsupported architecture");
|
default:
|
||||||
}
|
report_fatal_error("unsupported architecture");
|
||||||
break;
|
}
|
||||||
case Triple::Linux:
|
break;
|
||||||
switch (TargetTriple.getArch()) {
|
case Triple::NetBSD:
|
||||||
case Triple::x86_64:
|
switch (TargetTriple.getArch()) {
|
||||||
MapParams = Linux_X86_MemoryMapParams.bits64;
|
case Triple::x86_64:
|
||||||
break;
|
MapParams = NetBSD_X86_MemoryMapParams.bits64;
|
||||||
case Triple::x86:
|
break;
|
||||||
MapParams = Linux_X86_MemoryMapParams.bits32;
|
default:
|
||||||
break;
|
report_fatal_error("unsupported architecture");
|
||||||
case Triple::mips64:
|
}
|
||||||
case Triple::mips64el:
|
break;
|
||||||
MapParams = Linux_MIPS_MemoryMapParams.bits64;
|
case Triple::Linux:
|
||||||
break;
|
switch (TargetTriple.getArch()) {
|
||||||
case Triple::ppc64:
|
case Triple::x86_64:
|
||||||
case Triple::ppc64le:
|
MapParams = Linux_X86_MemoryMapParams.bits64;
|
||||||
MapParams = Linux_PowerPC_MemoryMapParams.bits64;
|
break;
|
||||||
break;
|
case Triple::x86:
|
||||||
case Triple::aarch64:
|
MapParams = Linux_X86_MemoryMapParams.bits32;
|
||||||
case Triple::aarch64_be:
|
break;
|
||||||
MapParams = Linux_ARM_MemoryMapParams.bits64;
|
case Triple::mips64:
|
||||||
break;
|
case Triple::mips64el:
|
||||||
default:
|
MapParams = Linux_MIPS_MemoryMapParams.bits64;
|
||||||
report_fatal_error("unsupported architecture");
|
break;
|
||||||
}
|
case Triple::ppc64:
|
||||||
break;
|
case Triple::ppc64le:
|
||||||
default:
|
MapParams = Linux_PowerPC_MemoryMapParams.bits64;
|
||||||
report_fatal_error("unsupported operating system");
|
break;
|
||||||
|
case Triple::aarch64:
|
||||||
|
case Triple::aarch64_be:
|
||||||
|
MapParams = Linux_ARM_MemoryMapParams.bits64;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
report_fatal_error("unsupported architecture");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
report_fatal_error("unsupported operating system");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
C = &(M.getContext());
|
C = &(M.getContext());
|
||||||
|
|||||||
43
test/Instrumentation/MemorySanitizer/manual-shadow.ll
Normal file
43
test/Instrumentation/MemorySanitizer/manual-shadow.ll
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
; Test that the msan layout customization options work as expected
|
||||||
|
;
|
||||||
|
; RUN: opt < %s -msan -msan-shadow-base 3735928559 -S | FileCheck --check-prefix=CHECK-BASE %s
|
||||||
|
; RUN: opt < %s -msan -msan-shadow-base 3735928559 -msan-and-mask 4294901760 -S | FileCheck --check-prefix=CHECK-AND %s
|
||||||
|
; RUN: opt < %s -msan -msan-shadow-base 3735928559 -msan-xor-mask 48879 -S | FileCheck --check-prefix=CHECK-XOR %s
|
||||||
|
; RUN: opt < %s -msan -msan-shadow-base 3735928559 -msan-xor-mask 48879 -msan-and-mask 4294901760 -S | FileCheck --check-prefix=CHECK-XOR-AND %s
|
||||||
|
; RUN: opt < %s -msan -msan-track-origins 1 -msan-origin-base 1777777 -S | FileCheck --check-prefix=CHECK-ORIGIN-BASE %s
|
||||||
|
|
||||||
|
target triple = "x86_64-unknown-linux-gnu"
|
||||||
|
|
||||||
|
define i32 @read_value(i32* %a) sanitize_memory {
|
||||||
|
entry:
|
||||||
|
%tmp1 = load i32, i32* %a, align 4
|
||||||
|
ret i32 %tmp1
|
||||||
|
}
|
||||||
|
; CHECK-BASE-LABEL: @read_value
|
||||||
|
; CHECK-BASE-NOT: ret i32
|
||||||
|
; CHECK-BASE: add{{.*}}3735928559
|
||||||
|
; CHECK-BASE: ret i32
|
||||||
|
|
||||||
|
; CHECK-AND-LABEL: @read_value
|
||||||
|
; CHECK-AND-NOT: ret i32
|
||||||
|
; CHECK-AND: and{{.*}}-4294901761
|
||||||
|
; CHECK-AND-NEXT: add{{.*}}3735928559
|
||||||
|
; CHECK-AND: ret i32
|
||||||
|
|
||||||
|
; CHECK-XOR-LABEL: @read_value
|
||||||
|
; CHECK-XOR-NOT: ret i32
|
||||||
|
; CHECK-XOR: xor{{.*}}48879
|
||||||
|
; CHECK-XOR-NEXT: add{{.*}}3735928559
|
||||||
|
; CHECK-XOR: ret i32
|
||||||
|
|
||||||
|
; CHECK-XOR-AND-LABEL: @read_value
|
||||||
|
; CHECK-XOR-AND-NOT: ret i32
|
||||||
|
; CHECK-XOR-AND: and{{.*}}-4294901761
|
||||||
|
; CHECK-XOR-AND-NEXT: xor{{.*}}48879
|
||||||
|
; CHECK-XOR-AND-NEXT: add{{.*}}3735928559
|
||||||
|
; CHECK-XOR-AND: ret i32
|
||||||
|
|
||||||
|
; CHECK-ORIGIN-BASE-LABEL: @read_value
|
||||||
|
; CHECK-ORIGIN-BASE-NOT: ret i32
|
||||||
|
; CHECK-ORIGIN-BASE: add{{.*}}1777777
|
||||||
|
; CHECK-ORIGIN-BASE: ret i32
|
||||||
Loading…
Reference in New Issue
Block a user