maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use 64-bit pointer to unwind stack for x86-64 

X32 uses ILP32 data model in 64-bit hardware mode.  This patch always
uses 64-bit pointer to unwind stack for x86-64.
Patch by H.J. Lu

llvm-svn: 209277
This commit is contained in:
Kostya Serebryany 2014-05-21 07:34:03 +00:00
parent b05e0b53b9
commit 6c9eacb384
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/lib/sanitizer_common/sanitizer_internal_defs.h
View File

@ -57,6 +57,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

@ -39,21 +39,21 @@ void StackTrace::FastUnwindStack(uptr pc, uptr bp,
CHECK_GE(max_depth, 2);
trace[0] = pc;
size = 1;
uptr *frame = (uptr *)bp;
uptr *prev_frame = frame - 1;
uhwptr *frame = (uhwptr *)bp;
uhwptr *prev_frame = frame - 1;
if (stack_top < 4096) return; // Sanity check for stack top.
// Avoid infinite loop when frame == frame[0] by using frame > prev_frame.
while (frame > prev_frame &&
frame < (uptr *)stack_top - 2 &&
frame > (uptr *)stack_bottom &&
frame < (uhwptr *)stack_top - 2 &&
frame > (uhwptr *)stack_bottom &&
IsAligned((uptr)frame, sizeof(*frame)) &&
size < max_depth) {
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];
}
}