зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1385667: Use ucontext_t consistently in breakpad-client. r=ted
MozReview-Commit-ID: AJhzJdNXP0f --HG-- extra : rebase_source : 49a8d4c2159869a0a33ab0a84b6692251a2bfd35
This commit is contained in:
Родитель
186fdefda0
Коммит
ec48f33efd
|
@ -40,11 +40,11 @@ namespace google_breakpad {
|
||||||
|
|
||||||
#if defined(__i386__)
|
#if defined(__i386__)
|
||||||
|
|
||||||
uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
|
uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
return uc->uc_mcontext.gregs[REG_ESP];
|
return uc->uc_mcontext.gregs[REG_ESP];
|
||||||
}
|
}
|
||||||
|
|
||||||
uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
|
uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
return uc->uc_mcontext.gregs[REG_EIP];
|
return uc->uc_mcontext.gregs[REG_EIP];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
|
||||||
#elif defined(__x86_64)
|
#elif defined(__x86_64)
|
||||||
|
|
||||||
uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
|
uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
return uc->uc_mcontext.gregs[REG_RSP];
|
return uc->uc_mcontext.gregs[REG_RSP];
|
||||||
}
|
}
|
||||||
|
|
||||||
uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
|
uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
return uc->uc_mcontext.gregs[REG_RIP];
|
return uc->uc_mcontext.gregs[REG_RIP];
|
||||||
}
|
}
|
||||||
|
|
||||||
void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||||
const struct _libc_fpstate* fpregs) {
|
const struct _libc_fpstate* fpregs) {
|
||||||
const greg_t* regs = uc->uc_mcontext.gregs;
|
const greg_t* regs = uc->uc_mcontext.gregs;
|
||||||
|
|
||||||
|
@ -145,11 +145,11 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
|
||||||
#elif defined(__ARM_EABI__)
|
#elif defined(__ARM_EABI__)
|
||||||
|
|
||||||
uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
|
uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
return uc->uc_mcontext.arm_sp;
|
return uc->uc_mcontext.arm_sp;
|
||||||
}
|
}
|
||||||
|
|
||||||
uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
|
uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
return uc->uc_mcontext.arm_pc;
|
return uc->uc_mcontext.arm_pc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -184,11 +184,11 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
|
||||||
|
|
||||||
#elif defined(__aarch64__)
|
#elif defined(__aarch64__)
|
||||||
|
|
||||||
uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
|
uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
return uc->uc_mcontext.sp;
|
return uc->uc_mcontext.sp;
|
||||||
}
|
}
|
||||||
|
|
||||||
uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
|
uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
return uc->uc_mcontext.pc;
|
return uc->uc_mcontext.pc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -210,11 +210,11 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
|
||||||
#elif defined(__mips__)
|
#elif defined(__mips__)
|
||||||
|
|
||||||
uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
|
uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
|
return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
|
||||||
}
|
}
|
||||||
|
|
||||||
uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
|
uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
return uc->uc_mcontext.pc;
|
return uc->uc_mcontext.pc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -41,21 +41,21 @@ namespace google_breakpad {
|
||||||
|
|
||||||
// Wraps platform-dependent implementations of accessors to ucontext structs.
|
// Wraps platform-dependent implementations of accessors to ucontext structs.
|
||||||
struct UContextReader {
|
struct UContextReader {
|
||||||
static uintptr_t GetStackPointer(const struct ucontext* uc);
|
static uintptr_t GetStackPointer(const ucontext_t* uc);
|
||||||
|
|
||||||
static uintptr_t GetInstructionPointer(const struct ucontext* uc);
|
static uintptr_t GetInstructionPointer(const ucontext_t* uc);
|
||||||
|
|
||||||
// Juggle a arch-specific ucontext into a minidump format
|
// Juggle a arch-specific ucontext into a minidump format
|
||||||
// out: the minidump structure
|
// out: the minidump structure
|
||||||
// info: the collection of register structures.
|
// info: the collection of register structures.
|
||||||
#if defined(__i386__) || defined(__x86_64)
|
#if defined(__i386__) || defined(__x86_64)
|
||||||
static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||||
const struct _libc_fpstate* fp);
|
const struct _libc_fpstate* fp);
|
||||||
#elif defined(__aarch64__)
|
#elif defined(__aarch64__)
|
||||||
static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||||
const struct fpsimd_context* fpregs);
|
const struct fpsimd_context* fpregs);
|
||||||
#else
|
#else
|
||||||
static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
|
static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
|
||||||
// Fill in all the holes in the struct to make Valgrind happy.
|
// Fill in all the holes in the struct to make Valgrind happy.
|
||||||
memset(&g_crash_context_, 0, sizeof(g_crash_context_));
|
memset(&g_crash_context_, 0, sizeof(g_crash_context_));
|
||||||
memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
|
memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
|
||||||
memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
|
memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
|
||||||
#if defined(__aarch64__)
|
#if defined(__aarch64__)
|
||||||
struct ucontext* uc_ptr = (struct ucontext*)uc;
|
ucontext_t* uc_ptr = (ucontext_t*)uc;
|
||||||
struct fpsimd_context* fp_ptr =
|
struct fpsimd_context* fp_ptr =
|
||||||
(struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
|
(struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
|
||||||
if (fp_ptr->head.magic == FPSIMD_MAGIC) {
|
if (fp_ptr->head.magic == FPSIMD_MAGIC) {
|
||||||
|
@ -450,9 +450,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
|
||||||
}
|
}
|
||||||
#elif !defined(__ARM_EABI__) && !defined(__mips__)
|
#elif !defined(__ARM_EABI__) && !defined(__mips__)
|
||||||
// FP state is not part of user ABI on ARM Linux.
|
// FP state is not part of user ABI on ARM Linux.
|
||||||
// In case of MIPS Linux FP state is already part of struct ucontext
|
// In case of MIPS Linux FP state is already part of ucontext_t
|
||||||
// and 'float_state' is not a member of CrashContext.
|
// and 'float_state' is not a member of CrashContext.
|
||||||
struct ucontext* uc_ptr = (struct ucontext*)uc;
|
ucontext_t* uc_ptr = (ucontext_t*)uc;
|
||||||
if (uc_ptr->uc_mcontext.fpregs) {
|
if (uc_ptr->uc_mcontext.fpregs) {
|
||||||
memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
|
memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
|
||||||
sizeof(g_crash_context_.float_state));
|
sizeof(g_crash_context_.float_state));
|
||||||
|
@ -476,7 +476,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
|
||||||
// ExceptionHandler::HandleSignal().
|
// ExceptionHandler::HandleSignal().
|
||||||
siginfo.si_code = SI_USER;
|
siginfo.si_code = SI_USER;
|
||||||
siginfo.si_pid = getpid();
|
siginfo.si_pid = getpid();
|
||||||
struct ucontext context;
|
ucontext_t context;
|
||||||
getcontext(&context);
|
getcontext(&context);
|
||||||
return HandleSignal(sig, &siginfo, &context);
|
return HandleSignal(sig, &siginfo, &context);
|
||||||
}
|
}
|
||||||
|
|
|
@ -191,7 +191,7 @@ class ExceptionHandler {
|
||||||
struct CrashContext {
|
struct CrashContext {
|
||||||
siginfo_t siginfo;
|
siginfo_t siginfo;
|
||||||
pid_t tid; // the crashing thread.
|
pid_t tid; // the crashing thread.
|
||||||
struct ucontext context;
|
ucontext_t context;
|
||||||
#if !defined(__ARM_EABI__) && !defined(__mips__)
|
#if !defined(__ARM_EABI__) && !defined(__mips__)
|
||||||
// #ifdef this out because FP state is not part of user ABI for Linux ARM.
|
// #ifdef this out because FP state is not part of user ABI for Linux ARM.
|
||||||
// In case of MIPS Linux FP state is already part of struct
|
// In case of MIPS Linux FP state is already part of struct
|
||||||
|
|
|
@ -571,7 +571,7 @@ class MicrodumpWriter {
|
||||||
|
|
||||||
void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
|
void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
|
||||||
|
|
||||||
const struct ucontext* const ucontext_;
|
const ucontext_t* const ucontext_;
|
||||||
#if !defined(__ARM_EABI__) && !defined(__mips__)
|
#if !defined(__ARM_EABI__) && !defined(__mips__)
|
||||||
const google_breakpad::fpstate_t* const float_state_;
|
const google_breakpad::fpstate_t* const float_state_;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1247,7 +1247,7 @@ class MinidumpWriter {
|
||||||
const int fd_; // File descriptor where the minidum should be written.
|
const int fd_; // File descriptor where the minidum should be written.
|
||||||
const char* path_; // Path to the file where the minidum should be written.
|
const char* path_; // Path to the file where the minidum should be written.
|
||||||
|
|
||||||
const struct ucontext* const ucontext_; // also from the signal handler
|
const ucontext_t* const ucontext_; // also from the signal handler
|
||||||
#if !defined(__ARM_EABI__) && !defined(__mips__)
|
#if !defined(__ARM_EABI__) && !defined(__mips__)
|
||||||
const google_breakpad::fpstate_t* const float_state_; // ditto
|
const google_breakpad::fpstate_t* const float_state_; // ditto
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче