Add the ability to disassemble "n" instructions from the current PC, or the first "n" instructions in a function.

Also added a "-p" flag that disassembles from the current pc.

llvm-svn: 128063

2 files changed, 6 insertions, 3 deletions

diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
index 3b10a343209..ca51db346fc 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
@@ -404,7 +404,8 @@ DisassemblerLLVM::DecodeInstructions
     const Address &base_addr,
     const DataExtractor& data,
     uint32_t data_offset,
-    uint32_t num_instructions
+    uint32_t num_instructions,
+    bool append
 )
 {
     if (m_disassembler == NULL)
@@ -412,7 +413,8 @@ DisassemblerLLVM::DecodeInstructions
 
     size_t total_inst_byte_size = 0;
 
-    m_instruction_list.Clear();
+    if (!append)
+        m_instruction_list.Clear();
 
     while (data.ValidOffset(data_offset) && num_instructions)
     {
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
index 842c03d5dcd..012d4b685e8 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
@@ -78,7 +78,8 @@ public:
     DecodeInstructions (const lldb_private::Address &base_addr,
                         const lldb_private::DataExtractor& data,
                         uint32_t data_offset,
-                        uint32_t num_instructions);
+                        uint32_t num_instructions,
+                        bool append);
     
     //------------------------------------------------------------------
     // PluginInterface protocol