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

[Sanitizer] Expose StackTrace::GetPreviousInstructionPc() to get PC of call instruction from return address 

llvm-svn: 170424
This commit is contained in:
Alexey Samsonov 2012-12-18 09:57:34 +00:00
parent 7e45562ad0
commit f37c45c20d
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,10 +25,7 @@ static const char *StripPathPrefix(const char *filepath,
}
// ----------------------- StackTrace ----------------------------- {{{1
// PCs in stack traces are actually the return addresses, that is,
// addresses of the next instructions after the call. That's why we
// decrement them.
static uptr patch_pc(uptr pc) {
uptr StackTrace::GetPreviousInstructionPc(uptr pc) {
#ifdef __arm__
// Cancel Thumb bit.
pc = pc & (~1);
@ -71,7 +68,9 @@ void StackTrace::PrintStack(const uptr *addr, uptr size,
InternalScopedBuffer<AddressInfo> addr_frames(64);
uptr frame_num = 0;
for (uptr i = 0; i < size && addr[i]; i++) {
uptr pc = patch_pc(addr[i]);
// PCs in stack traces are actually the return addresses, that is,
// addresses of the next instructions after the call.
uptr pc = GetPreviousInstructionPc(addr[i]);
uptr addr_frames_num = 0; // The number of stack frames for current
// instruction address.
if (symbolize_callback) {

1
compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h
View File

@ -49,6 +49,7 @@ struct StackTrace {
void PopStackFrames(uptr count);
static uptr GetCurrentPc();
static uptr GetPreviousInstructionPc(uptr pc);
static uptr CompressStack(StackTrace *stack,
u32 *compressed, uptr size);

4
compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
View File

@ -177,8 +177,8 @@ ScopedInterceptor::~ScopedInterceptor() {
StatInc(thr, StatInt_##func); \
const uptr caller_pc = GET_CALLER_PC(); \
ScopedInterceptor si(thr, #func, caller_pc); \
/* Subtract one from pc as we need current instruction address */ \
const uptr pc = __sanitizer::StackTrace::GetCurrentPc() - 1; \
const uptr pc = __sanitizer::StackTrace::GetPreviousInstructionPc( \
__sanitizer::StackTrace::GetCurrentPc()); \
(void)pc; \
/**/

8
compiler-rt/lib/ubsan/ubsan_diag.cc
View File

@ -24,13 +24,11 @@ Location __ubsan::getCallerLocation(uptr CallerLoc) {
if (!CallerLoc)
return Location();
// Adjust to find the call instruction.
// FIXME: This is not portable.
--CallerLoc;
uptr Loc = StackTrace::GetPreviousInstructionPc(CallerLoc);
AddressInfo Info;
if (!SymbolizeCode(CallerLoc, &Info, 1) || !Info.module || !*Info.module)
return Location(CallerLoc);
if (!SymbolizeCode(Loc, &Info, 1) || !Info.module || !*Info.module)
return Location(Loc);
if (!Info.function)
return ModuleLocation(Info.module, Info.module_offset);