diff options
| author | Kostya Serebryany <kcc@google.com> | 2012-11-19 10:31:00 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2012-11-19 10:31:00 +0000 |
| commit | 386e2d853b9f37d16f1b11c725e9eb30f0b924fa (patch) | |
| tree | 62fe7b5de7c35b5f95b8615f24f461566d0c98ea | |
| parent | 06b22c15130b9c9429ad832763ebb552dd54ca5a (diff) | |
| download | bcm5719-llvm-386e2d853b9f37d16f1b11c725e9eb30f0b924fa.tar.gz bcm5719-llvm-386e2d853b9f37d16f1b11c725e9eb30f0b924fa.zip | |
[asan] support x32 mode in the fast stack unwinder. Patch by H.J. Lu
llvm-svn: 168306
| -rw-r--r-- | compiler-rt/include/sanitizer/common_interface_defs.h | 7 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc | 14 |
2 files changed, 14 insertions, 7 deletions
diff --git a/compiler-rt/include/sanitizer/common_interface_defs.h b/compiler-rt/include/sanitizer/common_interface_defs.h index 466631802a1..e4ba2cb326d 100644 --- a/compiler-rt/include/sanitizer/common_interface_defs.h +++ b/compiler-rt/include/sanitizer/common_interface_defs.h @@ -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; diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc index 0a54e7c9867..28ee9600d0a 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc @@ -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]; } } |
