MinidumpContext: fix some problems in AMD64 (x86_64) context enums

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 94 matching lines @@
   //! The `extended_registers` field is valid and contains `fxsave` data.
   kMinidumpContextX86Extended = kMinidumpContextX86 | 0x00000020,
 
   //! \brief Indicates the validity of `xsave` data (`CONTEXT_XSTATE`).
   //!
   //! The context contains `xsave` data. This is used with an extended context
   //! structure not currently defined here.
   kMinidumpContextX86Xstate = kMinidumpContextX86 | 0x00000040,
 
   //! \brief Indicates the validity of control, integer, and segment registers.
+  //!     (`CONTEXT_FULL`).
   kMinidumpContextX86Full = kMinidumpContextX86Control |
                             kMinidumpContextX86Integer |
                             kMinidumpContextX86Segment,
 
   //! \brief Indicates the validity of all registers except `xsave` data.
+  //!     (`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. This structure is used instead of `CONTEXT` to make it available
@@ skipping 80 matching lines @@
   //! \brief Indicates the validity of debug registers
   //!     (`CONTEXT_DEBUG_REGISTERS`).
   //!
   //! The `dr0` through `dr3`, `dr6`, and `dr7` fields are valid.
   kMinidumpContextAMD64Debug = kMinidumpContextAMD64 | 0x00000010,
 
   //! \brief Indicates the validity of `xsave` data (`CONTEXT_XSTATE`).
   //!
   //! The context contains `xsave` data. This is used with an extended context
   //! structure not currently defined here.
-  kMinidumpContextX86Xstate = kMinidumpContextAMD64 | 0x00000040,
+  kMinidumpContextAMD64Xstate = kMinidumpContextAMD64 | 0x00000040,
 
-  //! \brief Indicates the validity of control, integer, and segment registers.
+  //! \brief Indicates the validity of control, integer, and floating-point
+  //!     registers (`CONTEXT_FULL`).
   kMinidumpContextAMD64Full = kMinidumpContextAMD64Control |
                               kMinidumpContextAMD64Integer |
-                              kMinidumpContextAMD64Segment,
+                              kMinidumpContextAMD64FloatingPoint,
 
-  //! \brief Indicates the validity of all registers except `xsave` data.
+  //! \brief Indicates the validity of all registers except `xsave` data
+  //!     (`CONTEXT_ALL`).
   kMinidumpContextAMD64All = kMinidumpContextAMD64Full |
-                             kMinidumpContextAMD64FloatingPoint |
+                             kMinidumpContextAMD64Segment |
                              kMinidumpContextAMD64Debug,
 };
 
 //! \brief An x86_64 (AMD64) CPU context (register state) carried in a minidump
 //!     file.
 //!
 //! This is analogous to the `CONTEXT` structure on Windows when targeting
 //! x86_64. This structure is used instead of `CONTEXT` to make it available
 //! when targeting other architectures.
 struct __attribute__((aligned(16))) MinidumpContextAMD64 {
@@ skipping 114 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_