openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Emit the frame for DEX PC before the frame for native PC." 

am: 4a2178836e

Change-Id: I651a1be0ea4fbe66d4b88288cc08876b6946355f
This commit is contained in:
David Srbecky 2018-01-25 22:47:14 +00:00 committed by android-build-merger
parent 83720310f0 4a2178836e
commit 9ba37712e5
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libbacktrace/UnwindStack.cpp
View File

@ -128,9 +128,28 @@ bool Backtrace::Unwind(unwindstack::Regs* regs, BacktraceMap* back_map,
}
frames->resize(total_frames);
size_t cur_frame = 0;
for (size_t i = num_ignore_frames; i < unwinder.NumFrames(); i++, cur_frame++) {
for (size_t i = num_ignore_frames; i < unwinder.NumFrames(); i++) {
auto frame = &unwinder_frames[i];
backtrace_frame_data_t* back_frame = &frames->at(cur_frame);
// Inject extra 'virtual' frame that represents the dex pc data.
// The dex pc is magic register defined in the Mterp interpreter,
// and thus it will be restored/observed in the frame after it.
// Adding the dex frame first here will create something like:
// #7 pc 006b1ba1 libartd.so ExecuteMterpImpl+14625
// #8 pc 0015fa20 core.vdex java.util.Arrays.binarySearch+8
// #9 pc 0039a1ef libartd.so art::interpreter::Execute+719
if (frame->dex_pc != 0) {
backtrace_frame_data_t* dex_frame = &frames->at(cur_frame++);
dex_frame->num = cur_frame;
dex_frame->pc = frame->dex_pc;
dex_frame->rel_pc = frame->dex_pc;
dex_frame->sp = frame->sp;
dex_frame->stack_size = 0;
dex_frame->func_offset = 0;
FillInDexFrame(stack_map, frame->dex_pc, dex_frame);
}
backtrace_frame_data_t* back_frame = &frames->at(cur_frame++);
back_frame->num = cur_frame;
@ -147,19 +166,6 @@ bool Backtrace::Unwind(unwindstack::Regs* regs, BacktraceMap* back_map,
back_frame->map.offset = frame->map_offset;
back_frame->map.load_bias = frame->map_load_bias;
back_frame->map.flags = frame->map_flags;
// Inject a frame that represents the dex pc data.
if (frame->dex_pc != 0) {
cur_frame++;
backtrace_frame_data_t* dex_frame = &frames->at(cur_frame);
dex_frame->num = cur_frame;
dex_frame->pc = frame->dex_pc;
dex_frame->rel_pc = frame->dex_pc;
dex_frame->sp = back_frame->sp;
dex_frame->stack_size = 0;
dex_frame->func_offset = 0;
FillInDexFrame(stack_map, frame->dex_pc, dex_frame);
}
}
return true;