mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
fix frame-pointer stackwalking
This commit is contained in:
parent
aaf2c5ad64
commit
dcccceff24
1 changed files with 12 additions and 1 deletions
|
@ -96,7 +96,9 @@ unsafe fn frame_pointer_stack_walk(regs: Registers) -> NativeStack {
|
||||||
// --dev,
|
// --dev,
|
||||||
// or --with-frame-pointer.
|
// or --with-frame-pointer.
|
||||||
|
|
||||||
let stackaddr = libc::pthread_get_stackaddr_np(libc::pthread_self());
|
let pthread_t = libc::pthread_self();
|
||||||
|
let stackaddr = libc::pthread_get_stackaddr_np(pthread_t);
|
||||||
|
let stacksize = libc::pthread_get_stacksize_np(pthread_t);
|
||||||
let mut native_stack = NativeStack::new();
|
let mut native_stack = NativeStack::new();
|
||||||
let pc = regs.instruction_ptr as *mut std::ffi::c_void;
|
let pc = regs.instruction_ptr as *mut std::ffi::c_void;
|
||||||
let stack = regs.stack_ptr as *mut std::ffi::c_void;
|
let stack = regs.stack_ptr as *mut std::ffi::c_void;
|
||||||
|
@ -104,6 +106,12 @@ unsafe fn frame_pointer_stack_walk(regs: Registers) -> NativeStack {
|
||||||
let mut current = regs.frame_ptr as *mut *mut std::ffi::c_void;
|
let mut current = regs.frame_ptr as *mut *mut std::ffi::c_void;
|
||||||
while !current.is_null() {
|
while !current.is_null() {
|
||||||
if (current as usize) < stackaddr as usize {
|
if (current as usize) < stackaddr as usize {
|
||||||
|
// Reached the end of the stack.
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if current as usize >= stackaddr.add(stacksize * 8) as usize {
|
||||||
|
// Reached the beginning of the stack.
|
||||||
|
// Assumining 64 bit mac(see the stacksize * 8).
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
let next = *current as *mut *mut std::ffi::c_void;
|
let next = *current as *mut *mut std::ffi::c_void;
|
||||||
|
@ -112,6 +120,9 @@ unsafe fn frame_pointer_stack_walk(regs: Registers) -> NativeStack {
|
||||||
if let Err(()) = native_stack.process_register(*pc, *stack) {
|
if let Err(()) = native_stack.process_register(*pc, *stack) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
if (next <= current) || (next as usize & 3 != 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
current = next;
|
current = next;
|
||||||
}
|
}
|
||||||
native_stack
|
native_stack
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue