*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

Firstly, merging this particular commit into a downstream fork may be a huge
effort.  Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit.  The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):

    find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
    find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;

The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.

Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit.  There are alternatives available that will attempt
to look through this change and find the appropriate prior commit.  YMMV.

llvm-svn: 280751

1 files changed, 42 insertions, 46 deletions

diff --git a/lldb/tools/debugserver/source/MacOSX/MachVMRegion.h b/lldb/tools/debugserver/source/MacOSX/MachVMRegion.h
index bcac60b..758112d 100644
--- a/lldb/tools/debugserver/source/MacOSX/MachVMRegion.h
+++ b/lldb/tools/debugserver/source/MacOSX/MachVMRegion.h
@@ -18,60 +18,56 @@
 #include "DNBError.h"
 #include <mach/mach.h>
 
-class MachVMRegion
-{
+class MachVMRegion {
 public:
-    MachVMRegion(task_t task);
-    ~MachVMRegion();
+  MachVMRegion(task_t task);
+  ~MachVMRegion();
 
-    void Clear();
-    mach_vm_address_t StartAddress() const { return m_start; }
-    mach_vm_address_t EndAddress() const { return m_start + m_size; }
-    mach_vm_size_t GetByteSize () const { return m_size; }
-    mach_vm_address_t BytesRemaining(mach_vm_address_t addr) const
-    {
-        if (ContainsAddress(addr))
-            return m_size - (addr - m_start);
-        else
-            return 0;
-    }
-    bool ContainsAddress(mach_vm_address_t addr) const
-    {
-        return addr >= StartAddress() && addr < EndAddress();
-    }
+  void Clear();
+  mach_vm_address_t StartAddress() const { return m_start; }
+  mach_vm_address_t EndAddress() const { return m_start + m_size; }
+  mach_vm_size_t GetByteSize() const { return m_size; }
+  mach_vm_address_t BytesRemaining(mach_vm_address_t addr) const {
+    if (ContainsAddress(addr))
+      return m_size - (addr - m_start);
+    else
+      return 0;
+  }
+  bool ContainsAddress(mach_vm_address_t addr) const {
+    return addr >= StartAddress() && addr < EndAddress();
+  }
 
-    bool SetProtections(mach_vm_address_t addr, mach_vm_size_t size, vm_prot_t prot);
-    bool RestoreProtections();
-    bool GetRegionForAddress(nub_addr_t addr);
+  bool SetProtections(mach_vm_address_t addr, mach_vm_size_t size,
+                      vm_prot_t prot);
+  bool RestoreProtections();
+  bool GetRegionForAddress(nub_addr_t addr);
 
-    uint32_t
-    GetDNBPermissions () const;
+  uint32_t GetDNBPermissions() const;
+
+  const DNBError &GetError() { return m_err; }
 
-    const DNBError &
-    GetError ()
-    {
-        return m_err;
-    }
 protected:
-#if defined (VM_REGION_SUBMAP_SHORT_INFO_COUNT_64)
-    typedef vm_region_submap_short_info_data_64_t RegionInfo;
-    enum { kRegionInfoSize = VM_REGION_SUBMAP_SHORT_INFO_COUNT_64 };
+#if defined(VM_REGION_SUBMAP_SHORT_INFO_COUNT_64)
+  typedef vm_region_submap_short_info_data_64_t RegionInfo;
+  enum { kRegionInfoSize = VM_REGION_SUBMAP_SHORT_INFO_COUNT_64 };
 #else
-    typedef vm_region_submap_info_data_64_t RegionInfo;
-    enum { kRegionInfoSize = VM_REGION_SUBMAP_INFO_COUNT_64 };
+  typedef vm_region_submap_info_data_64_t RegionInfo;
+  enum { kRegionInfoSize = VM_REGION_SUBMAP_INFO_COUNT_64 };
 #endif
 
-    task_t              m_task;
-    mach_vm_address_t   m_addr;
-    DNBError            m_err;
-    mach_vm_address_t   m_start;
-    mach_vm_size_t      m_size;
-    natural_t           m_depth;
-    RegionInfo          m_data;
-    vm_prot_t           m_curr_protection;    // The current, possibly modified protections. Original value is saved in m_data.protections.
-    mach_vm_address_t   m_protection_addr;    // The start address at which protections were changed
-    mach_vm_size_t      m_protection_size;    // The size of memory that had its protections changed
-
+  task_t m_task;
+  mach_vm_address_t m_addr;
+  DNBError m_err;
+  mach_vm_address_t m_start;
+  mach_vm_size_t m_size;
+  natural_t m_depth;
+  RegionInfo m_data;
+  vm_prot_t m_curr_protection; // The current, possibly modified protections.
+                               // Original value is saved in m_data.protections.
+  mach_vm_address_t
+      m_protection_addr; // The start address at which protections were changed
+  mach_vm_size_t
+      m_protection_size; // The size of memory that had its protections changed
 };
 
-#endif    // #ifndef __MachVMRegion_h__
+#endif // #ifndef __MachVMRegion_h__