diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2012-11-16 12:02:29 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2012-11-16 04:02:29 -0800 |
| commit | d1caed1484bef4846406d7c42f9e5bbfb7c58710 (patch) | |
| tree | c820b9a2e4796f64daf0e40ac9e60c9dc6588120 | |
| parent | 8108af84a5783a1c7e328a8be2eef8330517c224 (diff) | |
| download | gcc-d1caed1484bef4846406d7c42f9e5bbfb7c58710.zip gcc-d1caed1484bef4846406d7c42f9e5bbfb7c58710.tar.gz gcc-d1caed1484bef4846406d7c42f9e5bbfb7c58710.tar.bz2 | |
Define/use hardware pointer type for stack unwind
PR other/55333
* include/sanitizer/common_interface_defs.h (uhwptr): New type
for hardware pointer.
* sanitizer_common/sanitizer_stacktrace.cc (StackTrace::FastUnwindStack):
Replace uptr with uhwptr for stack unwind.
From-SVN: r193557
| -rw-r--r-- | libsanitizer/ChangeLog | 8 | ||||
| -rw-r--r-- | libsanitizer/include/sanitizer/common_interface_defs.h | 7 | ||||
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_stacktrace.cc | 14 |
3 files changed, 22 insertions, 7 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 156aaeb..267aa42 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,11 @@ +2012-11-16 H.J. Lu <hongjiu.lu@intel.com> + + PR other/55333 + * include/sanitizer/common_interface_defs.h (uhwptr): New type + for hardware pointer. + * sanitizer_common/sanitizer_stacktrace.cc (StackTrace::FastUnwindStack): + Replace uptr with uhwptr for stack unwind. + 2012-11-16 Dodji Seketeli <dodji@redhat.com> * configure.tgt: Enable build on sparc linux. diff --git a/libsanitizer/include/sanitizer/common_interface_defs.h b/libsanitizer/include/sanitizer/common_interface_defs.h index 4ac7609..d78d280 100644 --- a/libsanitizer/include/sanitizer/common_interface_defs.h +++ b/libsanitizer/include/sanitizer/common_interface_defs.h @@ -46,6 +46,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/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc b/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc index f6d7a09..915c4b8 100644 --- a/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc +++ b/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc @@ -120,18 +120,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]; } } |