Support processing microdumps for x86 architecture.

src/processor/microdump.cc

 // Copyright (c) 2014 Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 42 matching lines @@
 static const char kMicrodumpBegin[] = "-----BEGIN BREAKPAD MICRODUMP-----";
 static const char kMicrodumpEnd[] = "-----END BREAKPAD MICRODUMP-----";
 static const char kOsKey[] = ": O ";
 static const char kCpuKey[] = ": C ";
 static const char kGpuKey[] = ": G ";
 static const char kMmapKey[] = ": M ";
 static const char kStackKey[] = ": S ";
 static const char kStackFirstLineKey[] = ": S 0 ";
 static const char kArmArchitecture[] = "arm";
 static const char kArm64Architecture[] = "arm64";
+static const char kX86Architecture[] = "x86";
 static const char kGpuUnknown[] = "UNKNOWN";
 
 template<typename T>
 T HexStrToL(const string& str) {
   uint64_t res = 0;
   std::istringstream ss(str);
   ss >> std::hex >> res;
   return static_cast<T>(res);
 }
 
@@ skipping 44 matching lines @@
   DumpContext::SetContextARM(arm);
   valid_ = true;
 }
 
 void MicrodumpContext::SetContextARM64(MDRawContextARM64* arm64) {
   DumpContext::SetContextFlags(MD_CONTEXT_ARM64);
   DumpContext::SetContextARM64(arm64);
   valid_ = true;
 }
 
+void MicrodumpContext::SetContextX86(MDRawContextX86* x86) {
+  DumpContext::SetContextFlags(MD_CONTEXT_X86);
+  DumpContext::SetContextX86(x86);
+  valid_ = true;
+}
+
 
 //
 // MicrodumpMemoryRegion
 //
 
 MicrodumpMemoryRegion::MicrodumpMemoryRegion() : base_address_(0) { }
 
 void MicrodumpMemoryRegion::Init(uint64_t base_address,
                                  const std::vector<uint8_t>& contents) {
   base_address_ = base_address;
@@ skipping 147 matching lines @@
         context_->SetContextARM(arm);
       } else if (strcmp(arch.c_str(), kArm64Architecture) == 0) {
         if (cpu_state_raw.size() != sizeof(MDRawContextARM64)) {
           std::cerr << "Malformed CPU context. Got " << cpu_state_raw.size() <<
               " bytes instead of " << sizeof(MDRawContextARM64) << std::endl;
           continue;
         }
         MDRawContextARM64* arm = new MDRawContextARM64();
         memcpy(arm, &cpu_state_raw[0], cpu_state_raw.size());
         context_->SetContextARM64(arm);
+      } else if (strcmp(arch.c_str(), kX86Architecture) == 0) {
+        if (cpu_state_raw.size() != sizeof(MDRawContextX86)) {
+          std::cerr << "Malformed CPU context. Got " << cpu_state_raw.size() <<
+              " bytes instead of " << sizeof(MDRawContextX86) << std::endl;
+          continue;
+        }
+        MDRawContextX86* x86 = new MDRawContextX86();
+        memcpy(x86, &cpu_state_raw[0], cpu_state_raw.size());
+        context_->SetContextX86(x86);
       } else {
         std::cerr << "Unsupported architecture: " << arch << std::endl;
       }
     } else if ((pos = line.find(kGpuKey)) != string::npos) {
       string gpu_str(line, pos + strlen(kGpuKey));
       if (strcmp(gpu_str.c_str(), kGpuUnknown) != 0) {
         std::istringstream gpu_tokens(gpu_str);
         std::getline(gpu_tokens, system_info_->gl_version, '|');
         std::getline(gpu_tokens, system_info_->gl_vendor, '|');
         std::getline(gpu_tokens, system_info_->gl_renderer, '|');
@@ skipping 16 matching lines @@
           filename,                   // debug_file
           identifier,                 // debug_identifier
           ""));                       // version
     }
   }
   stack_region_->Init(stack_start, stack_content);
 }
 
 }  // namespace google_breakpad