*** 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, 85 insertions, 123 deletions

diff --git a/lldb/source/Utility/RegisterNumber.cpp b/lldb/source/Utility/RegisterNumber.cpp
index 8116cda10fe..07dd223f630 100644
--- a/lldb/source/Utility/RegisterNumber.cpp
+++ b/lldb/source/Utility/RegisterNumber.cpp
@@ -8,150 +8,112 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Utility/RegisterNumber.h"
-#include "lldb/Target/Thread.h"
 #include "lldb/Target/RegisterContext.h"
+#include "lldb/Target/Thread.h"
 
 using namespace lldb_private;
 
-
-RegisterNumber::RegisterNumber (lldb_private::Thread &thread, lldb::RegisterKind kind, uint32_t num) :
-    m_reg_ctx_sp (thread.GetRegisterContext()),
-    m_regnum (num),
-    m_kind (kind),
-    m_kind_regnum_map (),
-    m_name ("")
-{
-    if (m_reg_ctx_sp.get())
-    {
-        const lldb_private::RegisterInfo *reginfo = m_reg_ctx_sp->GetRegisterInfoAtIndex (GetAsKind (lldb::eRegisterKindLLDB));
-        if (reginfo && reginfo->name)
-        {
-            m_name = reginfo->name;
-        }
+RegisterNumber::RegisterNumber(lldb_private::Thread &thread,
+                               lldb::RegisterKind kind, uint32_t num)
+    : m_reg_ctx_sp(thread.GetRegisterContext()), m_regnum(num), m_kind(kind),
+      m_kind_regnum_map(), m_name("") {
+  if (m_reg_ctx_sp.get()) {
+    const lldb_private::RegisterInfo *reginfo =
+        m_reg_ctx_sp->GetRegisterInfoAtIndex(
+            GetAsKind(lldb::eRegisterKindLLDB));
+    if (reginfo && reginfo->name) {
+      m_name = reginfo->name;
     }
+  }
 }
 
-RegisterNumber::RegisterNumber () :
-    m_reg_ctx_sp(),
-    m_regnum (LLDB_INVALID_REGNUM),
-    m_kind (lldb::kNumRegisterKinds),
-    m_kind_regnum_map (),
-    m_name (nullptr)
-{
-}
-
-void
-RegisterNumber::init (lldb_private::Thread &thread, lldb::RegisterKind kind, uint32_t num)
-{
-    m_reg_ctx_sp = thread.GetRegisterContext();
-    m_regnum = num;
-    m_kind = kind;
-    if (m_reg_ctx_sp.get())
-    {
-        const lldb_private::RegisterInfo *reginfo = m_reg_ctx_sp->GetRegisterInfoAtIndex (GetAsKind (lldb::eRegisterKindLLDB));
-        if (reginfo && reginfo->name)
-        {
-            m_name = reginfo->name;
-        }
+RegisterNumber::RegisterNumber()
+    : m_reg_ctx_sp(), m_regnum(LLDB_INVALID_REGNUM),
+      m_kind(lldb::kNumRegisterKinds), m_kind_regnum_map(), m_name(nullptr) {}
+
+void RegisterNumber::init(lldb_private::Thread &thread, lldb::RegisterKind kind,
+                          uint32_t num) {
+  m_reg_ctx_sp = thread.GetRegisterContext();
+  m_regnum = num;
+  m_kind = kind;
+  if (m_reg_ctx_sp.get()) {
+    const lldb_private::RegisterInfo *reginfo =
+        m_reg_ctx_sp->GetRegisterInfoAtIndex(
+            GetAsKind(lldb::eRegisterKindLLDB));
+    if (reginfo && reginfo->name) {
+      m_name = reginfo->name;
     }
+  }
 }
 
-const RegisterNumber &
-RegisterNumber::operator = (const RegisterNumber &rhs)
-{
-    m_reg_ctx_sp = rhs.m_reg_ctx_sp;
-    m_regnum = rhs.m_regnum;
-    m_kind = rhs.m_kind;
-    for (auto it : rhs.m_kind_regnum_map)
-        m_kind_regnum_map[it.first] = it.second;
-    m_name = rhs.m_name;
-    return *this;
+const RegisterNumber &RegisterNumber::operator=(const RegisterNumber &rhs) {
+  m_reg_ctx_sp = rhs.m_reg_ctx_sp;
+  m_regnum = rhs.m_regnum;
+  m_kind = rhs.m_kind;
+  for (auto it : rhs.m_kind_regnum_map)
+    m_kind_regnum_map[it.first] = it.second;
+  m_name = rhs.m_name;
+  return *this;
 }
 
-bool
-RegisterNumber::operator == (RegisterNumber &rhs)
-{
-    if (IsValid() != rhs.IsValid())
-        return false;
-
-    if (m_kind == rhs.m_kind)
-    {
-        if (m_regnum == rhs.m_regnum)
-            return true;
-        else
-            return false;
-    }
-
-    uint32_t rhs_regnum = rhs.GetAsKind (m_kind);
-    if (rhs_regnum != LLDB_INVALID_REGNUM)
-    {
-        if (m_regnum == rhs_regnum)
-            return true;
-        else
-            return false;
-    }
-    uint32_t lhs_regnum = GetAsKind (rhs.m_kind);
-    {
-        if (lhs_regnum == rhs.m_regnum)
-            return true;
-        else 
-            return false;
-    }
+bool RegisterNumber::operator==(RegisterNumber &rhs) {
+  if (IsValid() != rhs.IsValid())
     return false;
-}
 
-bool
-RegisterNumber::operator != (RegisterNumber &rhs)
-{
-    return !(*this == rhs);
+  if (m_kind == rhs.m_kind) {
+    if (m_regnum == rhs.m_regnum)
+      return true;
+    else
+      return false;
+  }
+
+  uint32_t rhs_regnum = rhs.GetAsKind(m_kind);
+  if (rhs_regnum != LLDB_INVALID_REGNUM) {
+    if (m_regnum == rhs_regnum)
+      return true;
+    else
+      return false;
+  }
+  uint32_t lhs_regnum = GetAsKind(rhs.m_kind);
+  {
+    if (lhs_regnum == rhs.m_regnum)
+      return true;
+    else
+      return false;
+  }
+  return false;
 }
 
-bool
-RegisterNumber::IsValid () const
-{
-    return m_reg_ctx_sp.get()
-        && m_kind != lldb::kNumRegisterKinds 
-        && m_regnum != LLDB_INVALID_REGNUM;
+bool RegisterNumber::operator!=(RegisterNumber &rhs) { return !(*this == rhs); }
+
+bool RegisterNumber::IsValid() const {
+  return m_reg_ctx_sp.get() && m_kind != lldb::kNumRegisterKinds &&
+         m_regnum != LLDB_INVALID_REGNUM;
 }
 
-uint32_t
-RegisterNumber::GetAsKind (lldb::RegisterKind kind)
-{
-    if (m_regnum == LLDB_INVALID_REGNUM)
-        return LLDB_INVALID_REGNUM;
+uint32_t RegisterNumber::GetAsKind(lldb::RegisterKind kind) {
+  if (m_regnum == LLDB_INVALID_REGNUM)
+    return LLDB_INVALID_REGNUM;
 
-    if (kind == m_kind)
-        return m_regnum;
+  if (kind == m_kind)
+    return m_regnum;
 
-    Collection::iterator iter = m_kind_regnum_map.find (kind);
-    if (iter != m_kind_regnum_map.end())
-    {
-        return iter->second;
-    }
-    uint32_t output_regnum = LLDB_INVALID_REGNUM;
-    if (m_reg_ctx_sp 
-        && m_reg_ctx_sp->ConvertBetweenRegisterKinds (m_kind, m_regnum, kind, output_regnum)
-        && output_regnum != LLDB_INVALID_REGNUM)
-    {
-        m_kind_regnum_map[kind] = output_regnum;
-    }
-    return output_regnum;
+  Collection::iterator iter = m_kind_regnum_map.find(kind);
+  if (iter != m_kind_regnum_map.end()) {
+    return iter->second;
+  }
+  uint32_t output_regnum = LLDB_INVALID_REGNUM;
+  if (m_reg_ctx_sp &&
+      m_reg_ctx_sp->ConvertBetweenRegisterKinds(m_kind, m_regnum, kind,
+                                                output_regnum) &&
+      output_regnum != LLDB_INVALID_REGNUM) {
+    m_kind_regnum_map[kind] = output_regnum;
+  }
+  return output_regnum;
 }
 
-uint32_t
-RegisterNumber::GetRegisterNumber () const
-{
-    return m_regnum;
-}
+uint32_t RegisterNumber::GetRegisterNumber() const { return m_regnum; }
 
-lldb::RegisterKind
-RegisterNumber::GetRegisterKind () const
-{
-    return m_kind;
-}
+lldb::RegisterKind RegisterNumber::GetRegisterKind() const { return m_kind; }
 
-const char *
-RegisterNumber::GetName ()
-{
-    return m_name;
-}
+const char *RegisterNumber::GetName() { return m_name; }