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/processor/microdump.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/processor/microdump.cc') diff --git a/src/processor/microdump.cc b/src/processor/microdump.cc index 2473c35c..b100f765 100644 --- a/src/processor/microdump.cc +++ b/src/processor/microdump.cc @@ -125,8 +125,8 @@ void MicrodumpContext::SetContextARM(MDRawContextARM* arm) { valid_ = true; } -void MicrodumpContext::SetContextARM64(MDRawContextARM64* arm64) { - DumpContext::SetContextFlags(MD_CONTEXT_ARM64); +void MicrodumpContext::SetContextARM64(MDRawContextARM64_Old* arm64) { + DumpContext::SetContextFlags(MD_CONTEXT_ARM64_OLD); DumpContext::SetContextARM64(arm64); valid_ = true; } @@ -311,13 +311,13 @@ Microdump::Microdump(const string& contents) memcpy(arm, &cpu_state_raw[0], cpu_state_raw.size()); context_->SetContextARM(arm); } else if (strcmp(arch.c_str(), kArm64Architecture) == 0) { - if (cpu_state_raw.size() != sizeof(MDRawContextARM64)) { + if (cpu_state_raw.size() != sizeof(MDRawContextARM64_Old)) { std::cerr << "Malformed CPU context. Got " << cpu_state_raw.size() - << " bytes instead of " << sizeof(MDRawContextARM64) + << " bytes instead of " << sizeof(MDRawContextARM64_Old) << std::endl; continue; } - MDRawContextARM64* arm = new MDRawContextARM64(); + MDRawContextARM64_Old* arm = new MDRawContextARM64_Old(); memcpy(arm, &cpu_state_raw[0], cpu_state_raw.size()); context_->SetContextARM64(arm); } else if (strcmp(arch.c_str(), kX86Architecture) == 0) { -- cgit v1.2.1