Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc0261f9 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 030ba83c: Merge "Updated non-ARM archs to reflect logging changes." 

* commit '030ba83c':
  Updated non-ARM archs to reflect logging changes.
parents a0619be0 030ba83c

debuggerd/arm64/machine.cpp

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void dump_memory_and_code(log_t* log, pid_t tid) { 
    io.iov_len = sizeof(regs);



    if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, &io) == -1) {

        LOG_ERROR("%s: ptrace failed to get registers: %s\n",

        _LOG(log, logtype::ERROR, "%s: ptrace failed to get registers: %s\n",

             __func__, strerror(errno));

        return;

    }
@@ -80,7 +80,7 @@ void dump_registers(log_t* log, pid_t tid) { 
  io.iov_len = sizeof(r);



  if (ptrace(PTRACE_GETREGSET, tid, (void*) NT_PRSTATUS, (void*) &io) == -1) {

    LOG_ERROR("ptrace error: %s\n", strerror(errno));

    _LOG(log, logtype::ERROR, "ptrace error: %s\n", strerror(errno));

    return;

  }
@@ -105,7 +105,7 @@ void dump_registers(log_t* log, pid_t tid) { 
  io.iov_len = sizeof(f);



  if (ptrace(PTRACE_GETREGSET, tid, (void*) NT_PRFPREG, (void*) &io) == -1) {

    LOG_ERROR("ptrace error: %s\n", strerror(errno));

    _LOG(log, logtype::ERROR, "ptrace error: %s\n", strerror(errno));

    return;

  }

debuggerd/mips/machine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void dump_memory_and_code(log_t* log, pid_t tid) { 
void dump_registers(log_t* log, pid_t tid) {

  pt_regs_mips_t r;

  if(ptrace(PTRACE_GETREGS, tid, 0, &r)) {

    LOG_ERROR("cannot get registers: %s\n", strerror(errno));

    _LOG(log, logtype::ERROR, "cannot get registers: %s\n", strerror(errno));

    return;

  }

debuggerd/x86/machine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ void dump_memory_and_code(log_t*, pid_t) { 
void dump_registers(log_t* log, pid_t tid) {

  struct pt_regs r;

  if (ptrace(PTRACE_GETREGS, tid, 0, &r) == -1) {

    LOG_ERROR("cannot get registers: %s\n", strerror(errno));

    _LOG(log, logtype::ERROR, "cannot get registers: %s\n", strerror(errno));

    return;

  }

  _LOG(log, logtype::REGISTERS, "    eax %08lx  ebx %08lx  ecx %08lx  edx %08lx\n",

debuggerd/x86_64/machine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ void dump_memory_and_code(log_t*, pid_t) { 
void dump_registers(log_t* log, pid_t tid) {

    struct user_regs_struct r;

    if (ptrace(PTRACE_GETREGS, tid, 0, &r) == -1) {

        LOG_ERROR("cannot get registers: %s\n", strerror(errno));

        _LOG(log, logtype::ERROR, "cannot get registers: %s\n", strerror(errno));

        return;

    }

    _LOG(log, logtype::REGISTERS, "    rax %016lx  rbx %016lx  rcx %016lx  rdx %016lx\n",