Revert of Update Crashpad to 6da9708e7cc93e2e1772439d51646e47583cb225

third_party/crashpad/crashpad/minidump/minidump_context.h

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 74 matching lines @@
 
   //! \brief Indicates the validity of non-control segment registers
   //!     (`CONTEXT_SEGMENTS`).
   //!
   //! The `gs`, `fs`, `es`, and `ds` fields are valid.
   kMinidumpContextX86Segment = kMinidumpContextX86 | 0x00000004,
 
   //! \brief Indicates the validity of floating-point state
   //!     (`CONTEXT_FLOATING_POINT`).
   //!
-  //! The `fsave` field is valid. The `float_save` field is included in this
-  //! definition, but its members have no practical use asdie from `fsave`.
+  //! The `float_save` field is valid.
   kMinidumpContextX86FloatingPoint = kMinidumpContextX86 | 0x00000008,
 
   //! \brief Indicates the validity of debug registers
   //!     (`CONTEXT_DEBUG_REGISTERS`).
   //!
   //! The `dr0` through `dr3`, `dr6`, and `dr7` fields are valid.
   kMinidumpContextX86Debug = kMinidumpContextX86 | 0x00000010,
 
   //! \brief Indicates the validity of extended registers in `fxsave` format
   //!     (`CONTEXT_EXTENDED_REGISTERS`).
@@ skipping 17 matching lines @@
   //!     (`CONTEXT_ALL`).
   kMinidumpContextX86All = kMinidumpContextX86Full |
                            kMinidumpContextX86FloatingPoint |
                            kMinidumpContextX86Debug |
                            kMinidumpContextX86Extended,
 };
 
 //! \brief A 32-bit x86 CPU context (register state) carried in a minidump file.
 //!
 //! This is analogous to the `CONTEXT` structure on Windows when targeting
-//! 32-bit x86, and the `WOW64_CONTEXT` structure when targeting an x86-family
-//! CPU, either 32- or 64-bit. This structure is used instead of `CONTEXT` or
-//! `WOW64_CONTEXT` to make it available when targeting other architectures.
+//! 32-bit x86. This structure is used instead of `CONTEXT` to make it available
+//! when targeting other architectures.
 //!
 //! \note This structure doesn’t carry `dr4` or `dr5`, which are obsolete and
 //!     normally alias `dr6` and `dr7`, respectively. See Intel Software
 //!     Developer’s Manual, Volume 3B: System Programming, Part 2 (253669-052),
 //!     17.2.2 “Debug Registers DR4 and DR5”.
 struct MinidumpContextX86 {
   //! \brief A bitfield composed of values of #MinidumpContextFlags and
   //!     #MinidumpContextX86Flags.
   //!
   //! This field identifies the context structure as a 32-bit x86 CPU context,
   //! and indicates which other fields in the structure are valid.
   uint32_t context_flags;
 
   uint32_t dr0;
   uint32_t dr1;
   uint32_t dr2;
   uint32_t dr3;
   uint32_t dr6;
   uint32_t dr7;
 
-  // CPUContextX86::Fsave has identical layout to what the x86 CONTEXT
-  // structure places here.
-  CPUContextX86::Fsave fsave;
-  union {
-    uint32_t spare_0;  // As in the native x86 CONTEXT structure since Windows 8
-    uint32_t cr0_npx_state;  // As in WOW64_CONTEXT and older SDKs’ x86 CONTEXT
+  struct {
+    uint32_t control_word;
+    uint32_t status_word;
+    uint32_t tag_word;
+    uint32_t error_offset;
+    uint32_t error_selector;
+    uint32_t data_offset;
+    uint32_t data_selector;
+    uint8_t register_area[80];
+    uint32_t spare_0;
   } float_save;
 
   uint32_t gs;
   uint32_t fs;
   uint32_t es;
   uint32_t ds;
 
   uint32_t edi;
   uint32_t esi;
   uint32_t ebx;
@@ skipping 160 matching lines @@
   uint64_t last_branch_to_rip;
   uint64_t last_branch_from_rip;
   uint64_t last_exception_to_rip;
   uint64_t last_exception_from_rip;
   //! \}
 };
 
 }  // namespace crashpad
 
 #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_