ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 771f5146: am 4c0b9e3d: Merge "Fix crash reporting on x86 platform."

Browse source 
* commit '771f5146893aa9bbc451aed78e61b3b18c1bc3b4':
  Fix crash reporting on x86 platform.
This commit is contained in:
Vladimir Chtchetkine 2011-06-07 15:56:33 -07:00 • committed by Android Git Automerger
commit 716104b40d
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
debuggerd/x86/unwind.c
View file

@ -24,7 +24,6 @@ int unwind_backtrace_with_ptrace_x86(int tfd, pid_t pid, mapinfo *map,
//ebp==0, it indicates that the stack is poped to the bottom or there is no stack at all. //ebp==0, it indicates that the stack is poped to the bottom or there is no stack at all.
while (ebp) { while (ebp) {
_LOG(tfd, !at_fault, "#0%d ",stack_level);
mi = pc_to_mapinfo(map, eip, &rel_pc); mi = pc_to_mapinfo(map, eip, &rel_pc);
/* See if we can determine what symbol this stack frame resides in */ /* See if we can determine what symbol this stack frame resides in */
@ -32,9 +31,11 @@ int unwind_backtrace_with_ptrace_x86(int tfd, pid_t pid, mapinfo *map,
sym = symbol_table_lookup(mi->symbols, rel_pc); sym = symbol_table_lookup(mi->symbols, rel_pc);
} }
if (sym) { if (sym) {
_LOG(tfd, !at_fault, " eip: %08x %s (%s)\n", eip, mi ? mi->name : "", sym->name); _LOG(tfd, !at_fault, " #%02d eip: %08x %s (%s)\n",
stack_level, eip, mi ? mi->name : "", sym->name);
} else { } else {
_LOG(tfd, !at_fault, " eip: %08x %s\n", eip, mi ? mi->name : ""); _LOG(tfd, !at_fault, " #%02d eip: %08x %s\n",
stack_level, eip, mi ? mi->name : "");
} }
stack_level++; stack_level++;
@ -49,7 +50,6 @@ int unwind_backtrace_with_ptrace_x86(int tfd, pid_t pid, mapinfo *map,
if (ebp) if (ebp)
_LOG(tfd, !at_fault, "stack: \n"); _LOG(tfd, !at_fault, "stack: \n");
while (ebp) { while (ebp) {
_LOG(tfd, !at_fault, "#0%d \n",stack_level);
stack_ptr = cur_sp; stack_ptr = cur_sp;
while((int)(ebp - stack_ptr) >= 0) { while((int)(ebp - stack_ptr) >= 0) {
stack_content = ptrace(PTRACE_PEEKTEXT, pid, (void*)stack_ptr, NULL); stack_content = ptrace(PTRACE_PEEKTEXT, pid, (void*)stack_ptr, NULL);
@ -60,10 +60,11 @@ int unwind_backtrace_with_ptrace_x86(int tfd, pid_t pid, mapinfo *map,
sym = symbol_table_lookup(mi->symbols, rel_pc); sym = symbol_table_lookup(mi->symbols, rel_pc);
} }
if (sym) { if (sym) {
_LOG(tfd, !at_fault, " %08x %08x %s (%s)\n", _LOG(tfd, !at_fault, " #%02d %08x %08x %s (%s)\n",
stack_ptr, stack_content, mi ? mi->name : "", sym->name); stack_level, stack_ptr, stack_content, mi ? mi->name : "", sym->name);
} else { } else {
_LOG(tfd, !at_fault, " %08x %08x %s\n", stack_ptr, stack_content, mi ? mi->name : ""); _LOG(tfd, !at_fault, " #%02d %08x %08x %s\n",
stack_level, stack_ptr, stack_content, mi ? mi->name : "");
} }
stack_ptr = stack_ptr + 4; stack_ptr = stack_ptr + 4;