From bddcc58860f522a0d4cbaa7e9d04058caee0db9d Mon Sep 17 00:00:00 2001 From: Mark Mentovai Date: Tue, 19 Sep 2017 22:48:30 -0400 Subject: Replace remaining references to 'struct ucontext' with 'ucontext_t' This relands https://chromium.googlesource.com/breakpad/breakpad/src/+/e3035bc406cee8a4d765e59ad46eb828705f17f4, which was accidentally committed to breakpad/breakpad/src, the read-only mirror of src in breakpad/breakpad. (Well, it should have been read-only.) See https://crbug.com/766164. This fixes issues with glibc-2.26. See https://bugs.gentoo.org/show_bug.cgi?id=628782 , https://sourceware.org/git/?p=glibc.git;h=251287734e89a52da3db682a8241eb6bccc050c9 , and https://sourceware.org/ml/libc-alpha/2017-08/msg00010.html for context. Change-Id: Id66f474d636dd2afa450bab925c5514a800fdd6f Reviewed-on: https://chromium-review.googlesource.com/674304 Reviewed-by: Mark Mentovai --- .../linux/dump_writer_common/ucontext_reader.cc | 32 +++++++++++----------- .../linux/dump_writer_common/ucontext_reader.h | 14 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/client/linux/dump_writer_common') diff --git a/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/client/linux/dump_writer_common/ucontext_reader.cc index c80724dd..052ce37c 100644 --- a/src/client/linux/dump_writer_common/ucontext_reader.cc +++ b/src/client/linux/dump_writer_common/ucontext_reader.cc @@ -36,19 +36,19 @@ namespace google_breakpad { // Minidump defines register structures which are different from the raw // structures which we get from the kernel. These are platform specific -// functions to juggle the ucontext and user structures into minidump format. +// functions to juggle the ucontext_t and user structures into minidump format. #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]; } -uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { +uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { return uc->uc_mcontext.gregs[REG_EIP]; } -void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, +void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct _libc_fpstate* fp) { const greg_t* regs = uc->uc_mcontext.gregs; @@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, #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]; } -uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { +uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { 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 greg_t* regs = uc->uc_mcontext.gregs; @@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, #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; } -uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { +uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { return uc->uc_mcontext.arm_pc; } -void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { +void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { out->context_flags = MD_CONTEXT_ARM_FULL; out->iregs[0] = uc->uc_mcontext.arm_r0; @@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { #elif defined(__aarch64__) -uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { +uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { 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; } -void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, +void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct fpsimd_context* fpregs) { out->context_flags = MD_CONTEXT_ARM64_FULL; @@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, #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]; } -uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { +uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { return uc->uc_mcontext.pc; } -void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { +void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { #if _MIPS_SIM == _ABI64 out->context_flags = MD_CONTEXT_MIPS64_FULL; #elif _MIPS_SIM == _ABIO32 diff --git a/src/client/linux/dump_writer_common/ucontext_reader.h b/src/client/linux/dump_writer_common/ucontext_reader.h index b6e77b4b..2de80b70 100644 --- a/src/client/linux/dump_writer_common/ucontext_reader.h +++ b/src/client/linux/dump_writer_common/ucontext_reader.h @@ -39,23 +39,23 @@ namespace google_breakpad { -// Wraps platform-dependent implementations of accessors to ucontext structs. +// Wraps platform-dependent implementations of accessors to ucontext_t structs. 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_t into a minidump format // out: the minidump structure // info: the collection of register structures. #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); #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); #else - static void FillCPUContext(RawContextCPU *out, const ucontext *uc); + static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); #endif }; -- cgit v1.2.1