From 627ef0cb9c705444da6ca7515bc5ca6b3169e1aa Mon Sep 17 00:00:00 2001 From: Joshua Peraza Date: Tue, 31 Jul 2018 13:30:11 -0700 Subject: Rename MDRawContextARM64 and its context flags This makes way for the addition of a struct matching Microsoft's layout for ARM64. Change-Id: I115f25290863e7438852691d1ec3c9324a42f7a5 Reviewed-on: https://chromium-review.googlesource.com/1152158 Reviewed-by: Mark Mentovai Reviewed-by: Mike Frysinger --- src/client/ios/handler/ios_exception_minidump_generator.mm | 6 +++--- src/client/linux/dump_writer_common/raw_context_cpu.h | 2 +- src/client/linux/dump_writer_common/thread_info.cc | 2 +- src/client/linux/dump_writer_common/ucontext_reader.cc | 2 +- src/client/linux/minidump_writer/minidump_writer.cc | 2 +- src/client/mac/handler/minidump_generator.cc | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/client') diff --git a/src/client/ios/handler/ios_exception_minidump_generator.mm b/src/client/ios/handler/ios_exception_minidump_generator.mm index 82ea5bb5..f57bdf21 100644 --- a/src/client/ios/handler/ios_exception_minidump_generator.mm +++ b/src/client/ios/handler/ios_exception_minidump_generator.mm @@ -108,13 +108,13 @@ bool IosExceptionMinidumpGenerator::WriteCrashingContextARM( #ifdef HAS_ARM64_SUPPORT bool IosExceptionMinidumpGenerator::WriteCrashingContextARM64( MDLocationDescriptor *register_location) { - TypedMDRVA context(&writer_); + TypedMDRVA context(&writer_); if (!context.Allocate()) return false; *register_location = context.location(); - MDRawContextARM64 *context_ptr = context.get(); + MDRawContextARM64_Old *context_ptr = context.get(); memset(context_ptr, 0, sizeof(*context_ptr)); - context_ptr->context_flags = MD_CONTEXT_ARM64_FULL; + context_ptr->context_flags = MD_CONTEXT_ARM64_FULL_OLD; context_ptr->iregs[MD_CONTEXT_ARM64_REG_FP] = kExpectedFinalFp; // FP context_ptr->iregs[MD_CONTEXT_ARM64_REG_SP] = kExpectedFinalSp; // SP context_ptr->iregs[MD_CONTEXT_ARM64_REG_LR] = GetLRFromException(); // LR diff --git a/src/client/linux/dump_writer_common/raw_context_cpu.h b/src/client/linux/dump_writer_common/raw_context_cpu.h index e2ef45df..07d9171a 100644 --- a/src/client/linux/dump_writer_common/raw_context_cpu.h +++ b/src/client/linux/dump_writer_common/raw_context_cpu.h @@ -41,7 +41,7 @@ typedef MDRawContextAMD64 RawContextCPU; #elif defined(__ARM_EABI__) typedef MDRawContextARM RawContextCPU; #elif defined(__aarch64__) -typedef MDRawContextARM64 RawContextCPU; +typedef MDRawContextARM64_Old RawContextCPU; #elif defined(__mips__) typedef MDRawContextMIPS RawContextCPU; #else diff --git a/src/client/linux/dump_writer_common/thread_info.cc b/src/client/linux/dump_writer_common/thread_info.cc index 0a1041d6..aae1dc13 100644 --- a/src/client/linux/dump_writer_common/thread_info.cc +++ b/src/client/linux/dump_writer_common/thread_info.cc @@ -214,7 +214,7 @@ uintptr_t ThreadInfo::GetInstructionPointer() const { } void ThreadInfo::FillCPUContext(RawContextCPU* out) const { - out->context_flags = MD_CONTEXT_ARM64_FULL; + out->context_flags = MD_CONTEXT_ARM64_FULL_OLD; out->cpsr = static_cast(regs.pstate); for (int i = 0; i < MD_CONTEXT_ARM64_REG_SP; ++i) diff --git a/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/client/linux/dump_writer_common/ucontext_reader.cc index 052ce37c..6ee6cc1e 100644 --- a/src/client/linux/dump_writer_common/ucontext_reader.cc +++ b/src/client/linux/dump_writer_common/ucontext_reader.cc @@ -194,7 +194,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; + out->context_flags = MD_CONTEXT_ARM64_FULL_OLD; out->cpsr = static_cast(uc->uc_mcontext.pstate); for (int i = 0; i < MD_CONTEXT_ARM64_REG_SP; ++i) diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc index cdf4bf65..31e7bd62 100644 --- a/src/client/linux/minidump_writer/minidump_writer.cc +++ b/src/client/linux/minidump_writer/minidump_writer.cc @@ -1042,7 +1042,7 @@ class MinidumpWriter { // processor_architecture should always be set, do this first sys_info->processor_architecture = #if defined(__aarch64__) - MD_CPU_ARCHITECTURE_ARM64; + MD_CPU_ARCHITECTURE_ARM64_OLD; #else MD_CPU_ARCHITECTURE_ARM; #endif diff --git a/src/client/mac/handler/minidump_generator.cc b/src/client/mac/handler/minidump_generator.cc index 48cd2e99..8c796243 100644 --- a/src/client/mac/handler/minidump_generator.cc +++ b/src/client/mac/handler/minidump_generator.cc @@ -545,7 +545,7 @@ bool MinidumpGenerator::WriteContextARM64(breakpad_thread_state_data_t state, MDLocationDescriptor *register_location) { - TypedMDRVA context(&writer_); + TypedMDRVA context(&writer_); arm_thread_state64_t *machine_state = reinterpret_cast(state); @@ -553,8 +553,8 @@ MinidumpGenerator::WriteContextARM64(breakpad_thread_state_data_t state, return false; *register_location = context.location(); - MDRawContextARM64 *context_ptr = context.get(); - context_ptr->context_flags = MD_CONTEXT_ARM64_FULL; + MDRawContextARM64_Old *context_ptr = context.get(); + context_ptr->context_flags = MD_CONTEXT_ARM64_FULL_OLD; #define AddGPR(a) context_ptr->iregs[a] = \ REGISTER_FROM_THREADSTATE(machine_state, x[a]) @@ -1191,7 +1191,7 @@ bool MinidumpGenerator::WriteSystemInfoStream( #endif #ifdef HAS_ARM64_SUPPORT case CPU_TYPE_ARM64: - info_ptr->processor_architecture = MD_CPU_ARCHITECTURE_ARM64; + info_ptr->processor_architecture = MD_CPU_ARCHITECTURE_ARM64_OLD; break; #endif #ifdef HAS_PPC_SUPPORT -- cgit v1.2.1