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/google_breakpad/processor/dump_context.h | 6 +++--- src/google_breakpad/processor/microdump.h | 2 +- src/google_breakpad/processor/stack_frame_cpu.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/google_breakpad/processor') diff --git a/src/google_breakpad/processor/dump_context.h b/src/google_breakpad/processor/dump_context.h index df80bf7e..455115e5 100644 --- a/src/google_breakpad/processor/dump_context.h +++ b/src/google_breakpad/processor/dump_context.h @@ -56,7 +56,7 @@ class DumpContext : public DumpObject { // context data does not match the CPU type or does not exist, returns NULL. const MDRawContextAMD64* GetContextAMD64() const; const MDRawContextARM* GetContextARM() const; - const MDRawContextARM64* GetContextARM64() const; + const MDRawContextARM64_Old* GetContextARM64() const; const MDRawContextMIPS* GetContextMIPS() const; const MDRawContextPPC* GetContextPPC() const; const MDRawContextPPC64* GetContextPPC64() const; @@ -85,7 +85,7 @@ class DumpContext : public DumpObject { void SetContextAMD64(MDRawContextAMD64* amd64); void SetContextSPARC(MDRawContextSPARC* ctx_sparc); void SetContextARM(MDRawContextARM* arm); - void SetContextARM64(MDRawContextARM64* arm64); + void SetContextARM64(MDRawContextARM64_Old* arm64); void SetContextMIPS(MDRawContextMIPS* ctx_mips); // Free the CPU-specific context structure. @@ -103,7 +103,7 @@ class DumpContext : public DumpObject { // so variables can NOT be named as sparc MDRawContextSPARC* ctx_sparc; MDRawContextARM* arm; - MDRawContextARM64* arm64; + MDRawContextARM64_Old* arm64_old; MDRawContextMIPS* ctx_mips; } context_; diff --git a/src/google_breakpad/processor/microdump.h b/src/google_breakpad/processor/microdump.h index 02ebdcd7..496f83ce 100644 --- a/src/google_breakpad/processor/microdump.h +++ b/src/google_breakpad/processor/microdump.h @@ -68,7 +68,7 @@ class MicrodumpModules : public BasicCodeModules { class MicrodumpContext : public DumpContext { public: virtual void SetContextARM(MDRawContextARM* arm); - virtual void SetContextARM64(MDRawContextARM64* arm64); + virtual void SetContextARM64(MDRawContextARM64_Old* arm64); virtual void SetContextX86(MDRawContextX86* x86); virtual void SetContextMIPS(MDRawContextMIPS* mips32); virtual void SetContextMIPS64(MDRawContextMIPS* mips64); diff --git a/src/google_breakpad/processor/stack_frame_cpu.h b/src/google_breakpad/processor/stack_frame_cpu.h index dc5d8ae6..3b2551b5 100644 --- a/src/google_breakpad/processor/stack_frame_cpu.h +++ b/src/google_breakpad/processor/stack_frame_cpu.h @@ -327,7 +327,7 @@ struct StackFrameARM64 : public StackFrame { // stack. In other frames, the values of nonvolatile registers may be // present, given sufficient debugging information. Refer to // context_validity. - MDRawContextARM64 context; + MDRawContextARM64_Old context; // For each register in context whose value has been recovered, we set // the corresponding CONTEXT_VALID_ bit in context_validity. -- cgit v1.2.1