Mostly-boilerplate to add MemoryMapSnapshot

compat/non_win/dbghelp.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 818 matching lines @@
   //! This string is UTF-16-encoded and terminated by a UTF-16 `NUL` code unit.
   //!
   //! On Windows 8.1 (NT 6.3), this may be “dbghelp.i386,6.3.9600.16520” or
   //! “dbghelp.amd64,6.3.9600.16520” depending on CPU architecture.
   base::char16 DbgBldStr[40];
 };
 
 //! \brief The latest known version of the MINIDUMP_MISC_INFO structure.
 typedef MINIDUMP_MISC_INFO_4 MINIDUMP_MISC_INFO_N;
 
+//! \brief Describes a region of memory.
+struct __attribute__((packed, aligned(4))) MINIDUMP_MEMORY_INFO {
+  //! \brief The base address of the region of pages.
+  uint64_t BaseAddress;
+
+  //! \brief The base address of a range of pages in this region. The page is
+  //!     contained within this memory region.
+  uint64_t AllocationBase;
+
+  //! \brief The memory protection when the region was initially allocated. This
+  //!     member can be one of the memory protection options (such as
+  //!     `PAGE_EXECUTE`, `PAGE_NOACCESS`, etc.), along with `PAGE_GUARD` or
+  //!     `PAGE_NOCACHE`, as needed.
+  uint32_t AllocationProtect;
+
+  //! \brief To align the next field.
+  uint32_t __alignment1;

[Mark Mentovai, 2015/10/12 13:47:52]

No comment necessary for __alignment fields. There’s precedent elsewhere in this
file.

[scottmg, 2015/10/13 19:33:31]

Done.

+
+  //! \brief The size of the region beginning at the base address in which all
+  //!     pages have identical attributes, in bytes.
+  uint64_t RegionSize;
+
+  //! \brief The state of the pages in the region. This can be one of
+  //! `MEM_COMMIT`, `MEM_FREE`, or `MEM_RESERVE`.

[Mark Mentovai, 2015/10/12 13:47:52]

Indent.

[scottmg, 2015/10/13 19:33:31]

Done.

+  uint32_t State;
+
+  //! \brief The access protection of the pages in the region. This member is
+  //!     one of the values listed for the #AllocationProtect member.
+  uint32_t Protect;
+
+  //! \brief The type of pages in the region. This can be one of `MEM_IMAGE`,
+  //!     `MEM_MAPPED`, or `MEM_PRIVATE`.
+  uint32_t Type;
+
+  //! \brief To align the next MINIDUMP_MEMORY_INFO in an array.
+  uint32_t __alignment2;
+};
+
 //! \brief Minidump file type values for MINIDUMP_HEADER::Flags. These bits
 //!     describe the types of data carried within a minidump file.
 enum MINIDUMP_TYPE {
   //! \brief A minidump file without any additional data.
   //!
   //! This type of minidump file contains:
   //!  - A MINIDUMP_SYSTEM_INFO stream.
   //!  - A MINIDUMP_MISC_INFO, MINIDUMP_MISC_INFO_2, MINIDUMP_MISC_INFO_3, or
   //!    MINIDUMP_MISC_INFO_4 stream, depending on which fields are present.
   //!  - A MINIDUMP_THREAD_LIST stream. All threads are present, along with a
   //!    snapshot of each thread’s stack memory sufficient to obtain backtraces.
   //!  - If the minidump file was generated as a result of an exception, a
   //!    MINIDUMP_EXCEPTION_STREAM describing the exception.
   //!  - A MINIDUMP_MODULE_LIST stream. All loaded modules are present.
   //!  - Typically, a MINIDUMP_MEMORY_LIST stream containing duplicate pointers
   //!    to the stack memory regions also referenced by the MINIDUMP_THREAD_LIST
   //!    stream. This type of minidump file also includes a
   //!    MINIDUMP_MEMORY_DESCRIPTOR containing the 256 bytes centered around
   //!    the exception address or the instruction pointer.
   MiniDumpNormal = 0x00000000,
 };
 
 #endif  // CRASHPAD_COMPAT_NON_WIN_DBGHELP_H_