Import LLDB as of upstream SVN r225923 (git 2b588ecd)

This corresponds with the branchpoint for the 3.6 release.
A number of files not required for the FreeBSD build have been removed.

Sponsored by:	DARPA, AFRL

1 files changed, 49 insertions, 1 deletions

diff --git a/include/lldb/Core/Disassembler.h b/include/lldb/Core/Disassembler.h
index 06a703b..b0b841b 100644
--- a/include/lldb/Core/Disassembler.h
+++ b/include/lldb/Core/Disassembler.h
@@ -77,12 +77,60 @@ public:
         m_address = addr;
     }
 
+    //------------------------------------------------------------------
+    /// Dump the text representation of this Instruction to a Stream
+    ///
+    /// Print the (optional) address, (optional) bytes, opcode, 
+    /// operands, and instruction comments to a stream.
+    ///
+    /// @param[in] s
+    ///     The Stream to add the text to.
+    ///
+    /// @param[in] show_address
+    ///     Whether the address (using disassembly_addr_format_spec formatting)
+    ///     should be printed.
+    ///
+    /// @param[in] show_bytes
+    ///     Whether the bytes of the assembly instruction should be printed.
+    ///
+    /// @param[in] max_opcode_byte_size
+    ///     The size (in bytes) of the largest instruction in the list that
+    ///     we are printing (for text justification/alignment purposes)
+    ///     Only needed if show_bytes is true.
+    ///
+    /// @param[in] exe_ctx
+    ///     The current execution context, if available.  May be used in
+    ///     the assembling of the operands+comments for this instruction.
+    ///     Pass NULL if not applicable.
+    ///
+    /// @param[in] sym_ctx
+    ///     The SymbolContext for this instruction.
+    ///     Pass NULL if not available/computed.
+    ///     Only needed if show_address is true.
+    ///
+    /// @param[in] prev_sym_ctx
+    ///     The SymbolContext for the previous instruction.  Depending on
+    ///     the disassembly address format specification, a change in 
+    ///     Symbol / Function may mean that a line is printed with the new
+    ///     symbol/function name.
+    ///     Pass NULL if unavailable, or if this is the first instruction of
+    ///     the InstructionList.
+    ///     Only needed if show_address is true.
+    ///
+    /// @param[in] disassembly_addr_format_spec
+    ///     The format specification for how addresses are printed.
+    ///     Only needed if show_address is true.
+    //------------------------------------------------------------------
+
     virtual void
     Dump (Stream *s,
           uint32_t max_opcode_byte_size,
           bool show_address,
           bool show_bytes,
-          const ExecutionContext* exe_ctx);
+          const ExecutionContext* exe_ctx,
+          const SymbolContext *sym_ctx,
+          const SymbolContext *prev_sym_ctx,
+          const char *disassembly_addr_format_spec);
     
     virtual bool
     DoesBranch () = 0;