1 files changed, 115 insertions, 144 deletions

diff --git a/lldb/source/Core/AddressRange.cpp b/lldb/source/Core/AddressRange.cpp
index 072c2450836..e03d721b566 100644
--- a/lldb/source/Core/AddressRange.cpp
+++ b/lldb/source/Core/AddressRange.cpp
@@ -16,194 +16,165 @@
 using namespace lldb;
 using namespace lldb_private;
 
-AddressRange::AddressRange () :
-    m_base_addr(),
-    m_byte_size(0)
-{
-}
+AddressRange::AddressRange() : m_base_addr(), m_byte_size(0) {}
 
-AddressRange::AddressRange (addr_t file_addr, addr_t byte_size, const SectionList *section_list) :
-    m_base_addr(file_addr, section_list),
-    m_byte_size(byte_size)
-{
-}
+AddressRange::AddressRange(addr_t file_addr, addr_t byte_size,
+                           const SectionList *section_list)
+    : m_base_addr(file_addr, section_list), m_byte_size(byte_size) {}
 
-AddressRange::AddressRange (const lldb::SectionSP &section, addr_t offset, addr_t byte_size) :
-    m_base_addr(section, offset),
-    m_byte_size(byte_size)
-{
-}
+AddressRange::AddressRange(const lldb::SectionSP &section, addr_t offset,
+                           addr_t byte_size)
+    : m_base_addr(section, offset), m_byte_size(byte_size) {}
 
-AddressRange::AddressRange (const Address& so_addr, addr_t byte_size) :
-    m_base_addr(so_addr),
-    m_byte_size(byte_size)
-{
-}
+AddressRange::AddressRange(const Address &so_addr, addr_t byte_size)
+    : m_base_addr(so_addr), m_byte_size(byte_size) {}
 
-AddressRange::~AddressRange ()
-{
-}
+AddressRange::~AddressRange() {}
 
-//bool
-//AddressRange::Contains (const Address &addr) const
+// bool
+// AddressRange::Contains (const Address &addr) const
 //{
 //    const addr_t byte_size = GetByteSize();
 //    if (byte_size)
-//        return addr.GetSection() == m_base_addr.GetSection() && (addr.GetOffset() - m_base_addr.GetOffset()) < byte_size;
+//        return addr.GetSection() == m_base_addr.GetSection() &&
+//        (addr.GetOffset() - m_base_addr.GetOffset()) < byte_size;
 //}
 //
-//bool
-//AddressRange::Contains (const Address *addr) const
+// bool
+// AddressRange::Contains (const Address *addr) const
 //{
 //    if (addr)
 //        return Contains (*addr);
 //    return false;
 //}
 
-bool
-AddressRange::ContainsFileAddress (const Address &addr) const
-{
-    if (addr.GetSection() == m_base_addr.GetSection())
-        return (addr.GetOffset() - m_base_addr.GetOffset()) < GetByteSize();
-    addr_t file_base_addr = GetBaseAddress().GetFileAddress();
-    if (file_base_addr == LLDB_INVALID_ADDRESS)
-        return false;
+bool AddressRange::ContainsFileAddress(const Address &addr) const {
+  if (addr.GetSection() == m_base_addr.GetSection())
+    return (addr.GetOffset() - m_base_addr.GetOffset()) < GetByteSize();
+  addr_t file_base_addr = GetBaseAddress().GetFileAddress();
+  if (file_base_addr == LLDB_INVALID_ADDRESS)
+    return false;
 
-    addr_t file_addr = addr.GetFileAddress();
-    if (file_addr == LLDB_INVALID_ADDRESS)
-        return false;
+  addr_t file_addr = addr.GetFileAddress();
+  if (file_addr == LLDB_INVALID_ADDRESS)
+    return false;
 
-    if (file_base_addr <= file_addr)
-        return (file_addr - file_base_addr) < GetByteSize();
+  if (file_base_addr <= file_addr)
+    return (file_addr - file_base_addr) < GetByteSize();
 
-    return false;
+  return false;
 }
 
-bool
-AddressRange::ContainsFileAddress (addr_t file_addr) const
-{
-    if (file_addr == LLDB_INVALID_ADDRESS)
-        return false;
+bool AddressRange::ContainsFileAddress(addr_t file_addr) const {
+  if (file_addr == LLDB_INVALID_ADDRESS)
+    return false;
 
-    addr_t file_base_addr = GetBaseAddress().GetFileAddress();
-    if (file_base_addr == LLDB_INVALID_ADDRESS)
-        return false;
+  addr_t file_base_addr = GetBaseAddress().GetFileAddress();
+  if (file_base_addr == LLDB_INVALID_ADDRESS)
+    return false;
 
-    if (file_base_addr <= file_addr)
-        return (file_addr - file_base_addr) < GetByteSize();
+  if (file_base_addr <= file_addr)
+    return (file_addr - file_base_addr) < GetByteSize();
 
-    return false;
+  return false;
 }
 
+bool AddressRange::ContainsLoadAddress(const Address &addr,
+                                       Target *target) const {
+  if (addr.GetSection() == m_base_addr.GetSection())
+    return (addr.GetOffset() - m_base_addr.GetOffset()) < GetByteSize();
+  addr_t load_base_addr = GetBaseAddress().GetLoadAddress(target);
+  if (load_base_addr == LLDB_INVALID_ADDRESS)
+    return false;
 
-bool
-AddressRange::ContainsLoadAddress (const Address &addr, Target *target) const
-{
-    if (addr.GetSection() == m_base_addr.GetSection())
-        return (addr.GetOffset() - m_base_addr.GetOffset()) < GetByteSize();
-    addr_t load_base_addr = GetBaseAddress().GetLoadAddress(target);
-    if (load_base_addr == LLDB_INVALID_ADDRESS)
-        return false;
-
-    addr_t load_addr = addr.GetLoadAddress(target);
-    if (load_addr == LLDB_INVALID_ADDRESS)
-        return false;
+  addr_t load_addr = addr.GetLoadAddress(target);
+  if (load_addr == LLDB_INVALID_ADDRESS)
+    return false;
 
-    if (load_base_addr <= load_addr)
-        return (load_addr - load_base_addr) < GetByteSize();
+  if (load_base_addr <= load_addr)
+    return (load_addr - load_base_addr) < GetByteSize();
 
-    return false;
+  return false;
 }
 
-bool
-AddressRange::ContainsLoadAddress (addr_t load_addr, Target *target) const
-{
-    if (load_addr == LLDB_INVALID_ADDRESS)
-        return false;
+bool AddressRange::ContainsLoadAddress(addr_t load_addr, Target *target) const {
+  if (load_addr == LLDB_INVALID_ADDRESS)
+    return false;
 
-    addr_t load_base_addr = GetBaseAddress().GetLoadAddress(target);
-    if (load_base_addr == LLDB_INVALID_ADDRESS)
-        return false;
+  addr_t load_base_addr = GetBaseAddress().GetLoadAddress(target);
+  if (load_base_addr == LLDB_INVALID_ADDRESS)
+    return false;
 
-    if (load_base_addr <= load_addr)
-        return (load_addr - load_base_addr) < GetByteSize();
+  if (load_base_addr <= load_addr)
+    return (load_addr - load_base_addr) < GetByteSize();
 
-    return false;
+  return false;
 }
 
-void
-AddressRange::Clear()
-{
-    m_base_addr.Clear();
-    m_byte_size = 0;
+void AddressRange::Clear() {
+  m_base_addr.Clear();
+  m_byte_size = 0;
 }
 
-bool
-AddressRange::Dump(Stream *s, Target *target, Address::DumpStyle style, Address::DumpStyle fallback_style) const
-{
-    addr_t vmaddr = LLDB_INVALID_ADDRESS;
-    int addr_size = sizeof (addr_t);
-    if (target)
-        addr_size = target->GetArchitecture().GetAddressByteSize ();
-
-    bool show_module = false;
-    switch (style)
-    {
-    default:
-        break;
-    case Address::DumpStyleSectionNameOffset:
-    case Address::DumpStyleSectionPointerOffset:
-        s->PutChar ('[');
-        m_base_addr.Dump(s, target, style, fallback_style);
-        s->PutChar ('-');
-        s->Address (m_base_addr.GetOffset() + GetByteSize(), addr_size);
-        s->PutChar (')');
-        return true;
-        break;
-
-    case Address::DumpStyleModuleWithFileAddress:
-        show_module = true;
-        LLVM_FALLTHROUGH;
-    case Address::DumpStyleFileAddress:
-        vmaddr = m_base_addr.GetFileAddress();
-        break;
-
-    case Address::DumpStyleLoadAddress:
-        vmaddr = m_base_addr.GetLoadAddress(target);
-        break;
+bool AddressRange::Dump(Stream *s, Target *target, Address::DumpStyle style,
+                        Address::DumpStyle fallback_style) const {
+  addr_t vmaddr = LLDB_INVALID_ADDRESS;
+  int addr_size = sizeof(addr_t);
+  if (target)
+    addr_size = target->GetArchitecture().GetAddressByteSize();
+
+  bool show_module = false;
+  switch (style) {
+  default:
+    break;
+  case Address::DumpStyleSectionNameOffset:
+  case Address::DumpStyleSectionPointerOffset:
+    s->PutChar('[');
+    m_base_addr.Dump(s, target, style, fallback_style);
+    s->PutChar('-');
+    s->Address(m_base_addr.GetOffset() + GetByteSize(), addr_size);
+    s->PutChar(')');
+    return true;
+    break;
+
+  case Address::DumpStyleModuleWithFileAddress:
+    show_module = true;
+    LLVM_FALLTHROUGH;
+  case Address::DumpStyleFileAddress:
+    vmaddr = m_base_addr.GetFileAddress();
+    break;
+
+  case Address::DumpStyleLoadAddress:
+    vmaddr = m_base_addr.GetLoadAddress(target);
+    break;
+  }
+
+  if (vmaddr != LLDB_INVALID_ADDRESS) {
+    if (show_module) {
+      ModuleSP module_sp(GetBaseAddress().GetModule());
+      if (module_sp)
+        s->Printf("%s", module_sp->GetFileSpec().GetFilename().AsCString(
+                            "<Unknown>"));
     }
+    s->AddressRange(vmaddr, vmaddr + GetByteSize(), addr_size);
+    return true;
+  } else if (fallback_style != Address::DumpStyleInvalid) {
+    return Dump(s, target, fallback_style, Address::DumpStyleInvalid);
+  }
 
-    if (vmaddr != LLDB_INVALID_ADDRESS)
-    {
-        if (show_module)
-        {
-            ModuleSP module_sp (GetBaseAddress().GetModule());
-            if (module_sp)
-                s->Printf("%s", module_sp->GetFileSpec().GetFilename().AsCString("<Unknown>"));
-        }
-        s->AddressRange(vmaddr, vmaddr + GetByteSize(), addr_size);
-        return true;
-    }
-    else if (fallback_style != Address::DumpStyleInvalid)
-    {
-        return Dump(s, target, fallback_style, Address::DumpStyleInvalid);
-    }
-
-    return false;
+  return false;
 }
 
-
-void
-AddressRange::DumpDebug (Stream *s) const
-{
-    s->Printf("%p: AddressRange section = %p, offset = 0x%16.16" PRIx64 ", byte_size = 0x%16.16" PRIx64 "\n",
-              static_cast<const void*>(this),
-              static_cast<void*>(m_base_addr.GetSection().get()),
-              m_base_addr.GetOffset(), GetByteSize());
+void AddressRange::DumpDebug(Stream *s) const {
+  s->Printf("%p: AddressRange section = %p, offset = 0x%16.16" PRIx64
+            ", byte_size = 0x%16.16" PRIx64 "\n",
+            static_cast<const void *>(this),
+            static_cast<void *>(m_base_addr.GetSection().get()),
+            m_base_addr.GetOffset(), GetByteSize());
 }
 //
-//bool
-//lldb::operator==    (const AddressRange& lhs, const AddressRange& rhs)
+// bool
+// lldb::operator==    (const AddressRange& lhs, const AddressRange& rhs)
 //{
 //    if (lhs.GetBaseAddress() == rhs.GetBaseAddress())
 //        return lhs.GetByteSize() == rhs.GetByteSize();