[Lldb-commits] [lldb] r127433 - in /lldb/trunk: include/lldb/Core/Disassembler.h source/Commands/CommandObjectDisassemble.cpp source/Core/Disassembler.cpp source/Target/StackFrame.cpp

[Sean Callanan]

Author: spyffe
Date: Thu Mar 10 17:35:12 2011
New Revision: 127433

URL: http://llvm.org/viewvc/llvm-project?rev=127433&view=rev
Log:
Fixed the -r parameter to the disassemble command
so that it actually triggers raw output.

Modified:
    lldb/trunk/include/lldb/Core/Disassembler.h
    lldb/trunk/source/Commands/CommandObjectDisassemble.cpp
    lldb/trunk/source/Core/Disassembler.cpp
    lldb/trunk/source/Target/StackFrame.cpp

Modified: lldb/trunk/include/lldb/Core/Disassembler.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Disassembler.h?rev=127433&r1=127432&r2=127433&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Disassembler.h (original)
+++ lldb/trunk/include/lldb/Core/Disassembler.h Thu Mar 10 17:35:12 2011
@@ -113,6 +113,7 @@
                  const AddressRange &range,
                  uint32_t num_mixed_context_lines,
                  bool show_bytes,
+                 bool raw,
                  Stream &strm);
 
     static size_t
@@ -122,6 +123,7 @@
                  SymbolContextList &sc_list,
                  uint32_t num_mixed_context_lines,
                  bool show_bytes,
+                 bool raw,
                  Stream &strm);
     
     static bool
@@ -132,6 +134,7 @@
                  Module *module,
                  uint32_t num_mixed_context_lines,
                  bool show_bytes,
+                 bool raw,
                  Stream &strm);
 
     static bool
@@ -140,6 +143,7 @@
                  const ExecutionContext &exe_ctx,
                  uint32_t num_mixed_context_lines,
                  bool show_bytes,
+                 bool raw,
                  Stream &strm);
 
     //------------------------------------------------------------------

Modified: lldb/trunk/source/Commands/CommandObjectDisassemble.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectDisassemble.cpp?rev=127433&r1=127432&r2=127433&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectDisassemble.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectDisassemble.cpp Thu Mar 10 17:35:12 2011
@@ -218,6 +218,7 @@
                                        NULL,    // Module *
                                        m_options.show_mixed ? m_options.num_lines_context : 0,
                                        m_options.show_bytes,
+                                       m_options.raw,
                                        result.GetOutputStream()))
         {
             result.SetStatus (eReturnStatusSuccessFinishResult);
@@ -276,6 +277,7 @@
                                        range,
                                        m_options.show_mixed ? m_options.num_lines_context : 0,
                                        m_options.show_bytes,
+                                       m_options.raw,
                                        result.GetOutputStream()))
         {
             result.SetStatus (eReturnStatusSuccessFinishResult);

Modified: lldb/trunk/source/Core/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Disassembler.cpp?rev=127433&r1=127432&r2=127433&view=diff
==============================================================================
--- lldb/trunk/source/Core/Disassembler.cpp (original)
+++ lldb/trunk/source/Core/Disassembler.cpp Thu Mar 10 17:35:12 2011
@@ -63,6 +63,7 @@
     SymbolContextList &sc_list,
     uint32_t num_mixed_context_lines,
     bool show_bytes,
+    bool raw,
     Stream &strm
 )
 {
@@ -76,7 +77,7 @@
             break;
         if (sc.GetAddressRange(eSymbolContextFunction | eSymbolContextSymbol, range))
         {
-            if (Disassemble (debugger, arch, exe_ctx, range, num_mixed_context_lines, show_bytes, strm))
+            if (Disassemble (debugger, arch, exe_ctx, range, num_mixed_context_lines, show_bytes, raw, strm))
             {
                 ++success_count;
                 strm.EOL();
@@ -96,6 +97,7 @@
     Module *module,
     uint32_t num_mixed_context_lines,
     bool show_bytes,
+    bool raw,
     Stream &strm
 )
 {
@@ -134,7 +136,8 @@
                             exe_ctx, 
                             sc_list, 
                             num_mixed_context_lines, 
-                            show_bytes, 
+                            show_bytes,
+                            raw,
                             strm);
     }
     return false;
@@ -175,6 +178,7 @@
     const AddressRange &disasm_range,
     uint32_t num_mixed_context_lines,
     bool show_bytes,
+    bool raw,
     Stream &strm
 )
 {
@@ -301,7 +305,7 @@
                             strm.IndentMore ();
                         strm.Indent();
                         size_t inst_byte_size = inst->GetByteSize();
-                        inst->Dump(&strm, true, show_bytes ? &data : NULL, offset, &exe_ctx, show_bytes);
+                        inst->Dump(&strm, true, show_bytes ? &data : NULL, offset, &exe_ctx, raw);
                         strm.EOL();
                         offset += inst_byte_size;
                         
@@ -334,6 +338,7 @@
     const ExecutionContext &exe_ctx,
     uint32_t num_mixed_context_lines,
     bool show_bytes,
+    bool raw,
     Stream &strm
 )
 {
@@ -358,7 +363,7 @@
             range.SetByteSize (DEFAULT_DISASM_BYTE_SIZE);
     }
 
-    return Disassemble(debugger, arch, exe_ctx, range, num_mixed_context_lines, show_bytes, strm);
+    return Disassemble(debugger, arch, exe_ctx, range, num_mixed_context_lines, show_bytes, raw, strm);
 }
 
 Instruction::Instruction(const Address &addr) :

Modified: lldb/trunk/source/Target/StackFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StackFrame.cpp?rev=127433&r1=127432&r2=127433&view=diff
==============================================================================
--- lldb/trunk/source/Target/StackFrame.cpp (original)
+++ lldb/trunk/source/Target/StackFrame.cpp Thu Mar 10 17:35:12 2011
@@ -261,6 +261,7 @@
                                    exe_ctx,
                                    0,
                                    false,
+                                   false,
                                    m_disassembly);
         if (m_disassembly.GetSize() == 0)
             return NULL;