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

am 1f64d7e1: am b4866128: Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."

Browse source 
* commit '1f64d7e14c0e6c8f5b142d6eb942608f2951f4a7':
  Fix mips debuggerd <corkscrew/ptrace.h> build breakage.
This commit is contained in:
Elliott Hughes 2014-05-07 22:53:33 +00:00 • committed by Android Git Automerger
commit 4776e2e432
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debuggerd/mips/machine.cpp
View file

@ -22,8 +22,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/ptrace.h> #include <sys/ptrace.h>
#include <corkscrew/ptrace.h>
#include <sys/user.h> #include <sys/user.h>
#include "../utility.h" #include "../utility.h"
@ -37,7 +35,7 @@
// If configured to do so, dump memory around *all* registers // If configured to do so, dump memory around *all* registers
// for the crashing thread. // for the crashing thread.
void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) { void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) {
pt_regs_mips_t r; pt_regs r;
if (ptrace(PTRACE_GETREGS, tid, 0, &r)) { if (ptrace(PTRACE_GETREGS, tid, 0, &r)) {
return; return;
} }
@ -80,7 +78,7 @@ void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) {
} }
void dump_registers(log_t* log, pid_t tid, int scope_flags) { void dump_registers(log_t* log, pid_t tid, int scope_flags) {
pt_regs_mips_t r; pt_regs r;
if(ptrace(PTRACE_GETREGS, tid, 0, &r)) { if(ptrace(PTRACE_GETREGS, tid, 0, &r)) {
_LOG(log, scope_flags, "cannot get registers: %s\n", strerror(errno)); _LOG(log, scope_flags, "cannot get registers: %s\n", strerror(errno));
return; return;