*** 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
diff --git a/lldb/source/API/SBInstructionList.cpp b/lldb/source/API/SBInstructionList.cpp
index 9be38b4..8ab3aca 100644
--- a/lldb/source/API/SBInstructionList.cpp
+++ b/lldb/source/API/SBInstructionList.cpp
@@ -18,130 +18,94 @@
using namespace lldb;
using namespace lldb_private;
+SBInstructionList::SBInstructionList() : m_opaque_sp() {}
-SBInstructionList::SBInstructionList () :
- m_opaque_sp()
-{
+SBInstructionList::SBInstructionList(const SBInstructionList &rhs)
+ : m_opaque_sp(rhs.m_opaque_sp) {}
+
+const SBInstructionList &SBInstructionList::
+operator=(const SBInstructionList &rhs) {
+ if (this != &rhs)
+ m_opaque_sp = rhs.m_opaque_sp;
+ return *this;
}
-SBInstructionList::SBInstructionList(const SBInstructionList &rhs) :
- m_opaque_sp (rhs.m_opaque_sp)
-{
+SBInstructionList::~SBInstructionList() {}
+
+bool SBInstructionList::IsValid() const { return m_opaque_sp.get() != NULL; }
+
+size_t SBInstructionList::GetSize() {
+ if (m_opaque_sp)
+ return m_opaque_sp->GetInstructionList().GetSize();
+ return 0;
}
-const SBInstructionList &
-SBInstructionList::operator = (const SBInstructionList &rhs)
-{
- if (this != &rhs)
- m_opaque_sp = rhs.m_opaque_sp;
- return *this;
+SBInstruction SBInstructionList::GetInstructionAtIndex(uint32_t idx) {
+ SBInstruction inst;
+ if (m_opaque_sp && idx < m_opaque_sp->GetInstructionList().GetSize())
+ inst.SetOpaque(
+ m_opaque_sp,
+ m_opaque_sp->GetInstructionList().GetInstructionAtIndex(idx));
+ return inst;
}
+void SBInstructionList::Clear() { m_opaque_sp.reset(); }
-SBInstructionList::~SBInstructionList ()
-{
+void SBInstructionList::AppendInstruction(SBInstruction insn) {}
+
+void SBInstructionList::SetDisassembler(const lldb::DisassemblerSP &opaque_sp) {
+ m_opaque_sp = opaque_sp;
}
-bool
-SBInstructionList::IsValid () const
-{
- return m_opaque_sp.get() != NULL;
+void SBInstructionList::Print(FILE *out) {
+ if (out == NULL)
+ return;
}
-size_t
-SBInstructionList::GetSize ()
-{
- if (m_opaque_sp)
- return m_opaque_sp->GetInstructionList().GetSize();
- return 0;
-}
+bool SBInstructionList::GetDescription(lldb::SBStream &description) {
+ if (m_opaque_sp) {
+ size_t num_instructions = GetSize();
+ if (num_instructions) {
+ // Call the ref() to make sure a stream is created if one deesn't
+ // exist already inside description...
+ Stream &sref = description.ref();
+ const uint32_t max_opcode_byte_size =
+ m_opaque_sp->GetInstructionList().GetMaxOpcocdeByteSize();
+ FormatEntity::Entry format;
+ FormatEntity::Parse("${addr}: ", format);
+ SymbolContext sc;
+ SymbolContext prev_sc;
+ for (size_t i = 0; i < num_instructions; ++i) {
+ Instruction *inst =
+ m_opaque_sp->GetInstructionList().GetInstructionAtIndex(i).get();
+ if (inst == NULL)
+ break;
-SBInstruction
-SBInstructionList::GetInstructionAtIndex (uint32_t idx)
-{
- SBInstruction inst;
- if (m_opaque_sp && idx < m_opaque_sp->GetInstructionList().GetSize())
- inst.SetOpaque (m_opaque_sp, m_opaque_sp->GetInstructionList().GetInstructionAtIndex (idx));
- return inst;
-}
-
-void
-SBInstructionList::Clear ()
-{
- m_opaque_sp.reset();
-}
-
-void
-SBInstructionList::AppendInstruction (SBInstruction insn)
-{
-}
-
-void
-SBInstructionList::SetDisassembler (const lldb::DisassemblerSP &opaque_sp)
-{
- m_opaque_sp = opaque_sp;
-}
-
-void
-SBInstructionList::Print (FILE *out)
-{
- if (out == NULL)
- return;
-}
-
-
-bool
-SBInstructionList::GetDescription (lldb::SBStream &description)
-{
- if (m_opaque_sp)
- {
- size_t num_instructions = GetSize ();
- if (num_instructions)
- {
- // Call the ref() to make sure a stream is created if one deesn't
- // exist already inside description...
- Stream &sref = description.ref();
- const uint32_t max_opcode_byte_size = m_opaque_sp->GetInstructionList().GetMaxOpcocdeByteSize();
- FormatEntity::Entry format;
- FormatEntity::Parse("${addr}: ", format);
- SymbolContext sc;
- SymbolContext prev_sc;
- for (size_t i=0; i<num_instructions; ++i)
- {
- Instruction *inst = m_opaque_sp->GetInstructionList().GetInstructionAtIndex (i).get();
- if (inst == NULL)
- break;
-
- const Address &addr = inst->GetAddress();
- prev_sc = sc;
- ModuleSP module_sp (addr.GetModule());
- if (module_sp)
- {
- module_sp->ResolveSymbolContextForAddress(addr, eSymbolContextEverything, sc);
- }
-
- inst->Dump (&sref, max_opcode_byte_size, true, false, NULL, &sc, &prev_sc, &format, 0);
- sref.EOL();
- }
- return true;
+ const Address &addr = inst->GetAddress();
+ prev_sc = sc;
+ ModuleSP module_sp(addr.GetModule());
+ if (module_sp) {
+ module_sp->ResolveSymbolContextForAddress(
+ addr, eSymbolContextEverything, sc);
}
+
+ inst->Dump(&sref, max_opcode_byte_size, true, false, NULL, &sc,
+ &prev_sc, &format, 0);
+ sref.EOL();
+ }
+ return true;
}
- return false;
+ }
+ return false;
}
-
-bool
-SBInstructionList::DumpEmulationForAllInstructions (const char *triple)
-{
- if (m_opaque_sp)
- {
- size_t len = GetSize();
- for (size_t i = 0; i < len; ++i)
- {
- if (!GetInstructionAtIndex((uint32_t) i).DumpEmulation (triple))
- return false;
- }
+bool SBInstructionList::DumpEmulationForAllInstructions(const char *triple) {
+ if (m_opaque_sp) {
+ size_t len = GetSize();
+ for (size_t i = 0; i < len; ++i) {
+ if (!GetInstructionAtIndex((uint32_t)i).DumpEmulation(triple))
+ return false;
}
- return true;
+ }
+ return true;
}
-