replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[asan] support x32 mode in the fast stack unwinder. Patch by H.J. Lu 

llvm-svn: 168306
This commit is contained in:
Kostya Serebryany 2012-11-19 10:31:00 +00:00
parent 06b22c1513
commit 386e2d853b
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler-rt/include/sanitizer/common_interface_defs.h
View File

@ -48,6 +48,13 @@ typedef signed long long sptr; // NOLINT
typedef unsigned long uptr; // NOLINT
typedef signed long sptr; // NOLINT
#endif // defined(_WIN64)
#if defined(__x86_64__)
// Since x32 uses ILP32 data model in 64-bit hardware mode, we must use
// 64-bit pointer to unwind stack frame.
typedef unsigned long long uhwptr; // NOLINT
#else
typedef uptr uhwptr; // NOLINT
#endif
typedef unsigned char u8;
typedef unsigned short u16; // NOLINT
typedef unsigned int u32;

14
compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc
View File

@ -123,18 +123,18 @@ void StackTrace::FastUnwindStack(uptr pc, uptr bp,
uptr stack_top, uptr stack_bottom) {
CHECK(size == 0 && trace[0] == pc);
size = 1;
uptr *frame = (uptr*)bp;
uptr *prev_frame = frame;
uhwptr *frame = (uhwptr *)bp;
uhwptr *prev_frame = frame;
while (frame >= prev_frame &&
frame < (uptr*)stack_top - 2 &&
frame > (uptr*)stack_bottom &&
frame < (uhwptr *)stack_top - 2 &&
frame > (uhwptr *)stack_bottom &&
size < max_size) {
uptr pc1 = frame[1];
uhwptr pc1 = frame[1];
if (pc1 != pc) {
trace[size++] = pc1;
trace[size++] = (uptr) pc1;
}
prev_frame = frame;
frame = (uptr*)frame[0];
frame = (uhwptr *)frame[0];
}
}