aprantl updated this revision to Diff 59264.
aprantl added a comment.
I have one last question:
While trying to add a testcase I noticed that DisplaySourceLinesWithLineNumbers
is still exported into Python with the old signature. What is the correct way
to update the Python bindings?
http://reviews.llvm.org/D20835
Files:
include/lldb/API/SBSourceManager.h
include/lldb/Core/Debugger.h
include/lldb/Core/SourceManager.h
packages/Python/lldbsuite/test/settings/TestSettings.py
packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
scripts/interface/SBSourceManager.i
scripts/interface/SBStream.i
source/API/SBSourceManager.cpp
source/Commands/CommandObjectSource.cpp
source/Core/Debugger.cpp
source/Core/Disassembler.cpp
source/Core/SourceManager.cpp
source/Core/StreamAsynchronousIO.cpp
source/Target/StackFrame.cpp
Index: source/Target/StackFrame.cpp
===================================================================
--- source/Target/StackFrame.cpp
+++ source/Target/StackFrame.cpp
@@ -1579,6 +1579,7 @@
{
size_t num_lines = target->GetSourceManager().DisplaySourceLinesWithLineNumbers (m_sc.line_entry.file,
m_sc.line_entry.line,
+ m_sc.line_entry.column,
source_lines_before,
source_lines_after,
"->",
Index: source/Core/StreamAsynchronousIO.cpp
===================================================================
--- source/Core/StreamAsynchronousIO.cpp
+++ source/Core/StreamAsynchronousIO.cpp
@@ -15,12 +15,11 @@
using namespace lldb;
using namespace lldb_private;
-
-StreamAsynchronousIO::StreamAsynchronousIO (Debugger &debugger, bool for_stdout) :
- Stream (0, 4, eByteOrderBig),
- m_debugger (debugger),
- m_data (),
- m_for_stdout (for_stdout)
+StreamAsynchronousIO::StreamAsynchronousIO(Debugger &debugger, bool for_stdout)
+ : Stream(debugger.GetUseColor() ? eANSIColor : 0, 4, eByteOrderBig),
+ m_debugger(debugger),
+ m_data(),
+ m_for_stdout(for_stdout)
{
}
Index: source/Core/SourceManager.cpp
===================================================================
--- source/Core/SourceManager.cpp
+++ source/Core/SourceManager.cpp
@@ -22,6 +22,7 @@
#include "lldb/Symbol/Function.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Target/Target.h"
+#include "lldb/Utility/AnsiTerminal.h"
using namespace lldb;
using namespace lldb_private;
@@ -101,6 +102,7 @@
SourceManager::DisplaySourceLinesWithLineNumbersUsingLastFile (uint32_t start_line,
uint32_t count,
uint32_t curr_line,
+ uint32_t curr_column,
const char* current_line_cstr,
Stream *s,
const SymbolContextList *bp_locs)
@@ -152,7 +154,21 @@
prefix,
line == curr_line ? current_line_cstr : "",
line);
- size_t this_line_size = m_last_file_sp->DisplaySourceLines (line, 0, 0, s);
+ bool DumbTerminal = s->GetFlags().Test(Stream::eANSIColor);
+ size_t this_line_size =
+ m_last_file_sp->DisplaySourceLines(line, line == curr_line ? curr_column : 0, s);
+ if (DumbTerminal && curr_column && line == curr_line)
+ {
+ // Display caret cursor. Unfortunately we don't know the
+ // length of the current token.
+ std::string src_line;
+ m_last_file_sp->GetLine(line, src_line);
+ return_value += s->Printf(" \t");
+ // Insert a space for every non-tab character in the source line.
+ for (int i = 0; i < curr_column - 1 && i < src_line.length(); ++i)
+ return_value += s->PutChar(src_line[i] == '\t' ? '\t' : ' ');
+ return_value += s->Printf("^\n");
+ }
if (this_line_size == 0)
{
m_last_line = UINT32_MAX;
@@ -170,6 +186,7 @@
(
const FileSpec &file_spec,
uint32_t line,
+ uint32_t column,
uint32_t context_before,
uint32_t context_after,
const char* current_line_cstr,
@@ -192,7 +209,7 @@
m_last_line = 0;
m_last_file_sp = file_sp;
}
- return DisplaySourceLinesWithLineNumbersUsingLastFile (start_line, count, line, current_line_cstr, s, bp_locs);
+ return DisplaySourceLinesWithLineNumbersUsingLastFile (start_line, count, line, column, current_line_cstr, s, bp_locs);
}
size_t
@@ -240,7 +257,7 @@
else
m_last_line = 1;
- return DisplaySourceLinesWithLineNumbersUsingLastFile (m_last_line, m_last_count, UINT32_MAX, "", s, bp_locs);
+ return DisplaySourceLinesWithLineNumbersUsingLastFile (m_last_line, m_last_count, UINT32_MAX, UINT32_MAX, "", s, bp_locs);
}
return 0;
}
@@ -548,17 +565,17 @@
}
size_t
-SourceManager::File::DisplaySourceLines (uint32_t line, uint32_t context_before, uint32_t context_after, Stream *s)
+SourceManager::File::DisplaySourceLines (uint32_t line, uint32_t column, Stream *s)
{
// Sanity check m_data_sp before proceeding.
if (!m_data_sp)
return 0;
- const uint32_t start_line = line <= context_before ? 1 : line - context_before;
+ const uint32_t start_line = line <= 0 ? 1 : line;
const uint32_t start_line_offset = GetLineOffset (start_line);
if (start_line_offset != UINT32_MAX)
{
- const uint32_t end_line = line + context_after;
+ const uint32_t end_line = line;
uint32_t end_line_offset = GetLineOffset (end_line + 1);
if (end_line_offset == UINT32_MAX)
end_line_offset = m_data_sp->GetByteSize();
@@ -569,7 +586,20 @@
{
size_t count = end_line_offset - start_line_offset;
const uint8_t *cstr = m_data_sp->GetBytes() + start_line_offset;
- bytes_written = s->Write(cstr, count);
+ bool DumbTerminal = !s->GetFlags().Test(Stream::eANSIColor);
+ if (column && column < count && !DumbTerminal) {
+ // Mark the current column with an underline.
+ std::string ctl;
+ bytes_written = s->Write(cstr, column-1);
+ ctl = lldb_utility::ansi::FormatAnsiTerminalCodes("${ansi.underline}");
+ bytes_written += s->Write(ctl.c_str(), ctl.length());
+ bytes_written += s->Write(cstr+column-1, 1);
+ ctl = lldb_utility::ansi::FormatAnsiTerminalCodes("${ansi.normal}");
+ bytes_written += s->Write(ctl.c_str(), ctl.length());
+ bytes_written += s->Write(cstr+column, count-column);
+ } else
+ bytes_written = s->Write(cstr, count);
+
if (!is_newline_char(cstr[count-1]))
bytes_written += s->EOL();
}
Index: source/Core/Disassembler.cpp
===================================================================
--- source/Core/Disassembler.cpp
+++ source/Core/Disassembler.cpp
@@ -475,6 +475,7 @@
{
source_manager.DisplaySourceLinesWithLineNumbers (sc.line_entry.file,
sc.line_entry.line,
+ sc.line_entry.column,
num_mixed_context_lines,
num_mixed_context_lines,
((inst_is_at_pc && (options & eOptionMarkPCSourceLine)) ? "->" : ""),
Index: source/Core/Debugger.cpp
===================================================================
--- source/Core/Debugger.cpp
+++ source/Core/Debugger.cpp
@@ -214,6 +214,7 @@
{ "stop-disassembly-display", OptionValue::eTypeEnum , true, Debugger::eStopDisassemblyTypeNoDebugInfo, nullptr, g_show_disassembly_enum_values, "Control when to display disassembly when displaying a stopped context." },
{ "stop-line-count-after", OptionValue::eTypeSInt64 , true, 3 , nullptr, nullptr, "The number of sources lines to display that come after the current source line when displaying a stopped context." },
{ "stop-line-count-before", OptionValue::eTypeSInt64 , true, 3 , nullptr, nullptr, "The number of sources lines to display that come before the current source line when displaying a stopped context." },
+{ "stop-show-column", OptionValue::eTypeBoolean , true, true , nullptr, nullptr, "If true, LLDB will use the column information from the debug info to mark the current position when displaying a stopped context." },
{ "term-width", OptionValue::eTypeSInt64 , true, 80 , nullptr, nullptr, "The maximum number of columns to use for displaying text." },
{ "thread-format", OptionValue::eTypeFormatEntity, true, 0 , DEFAULT_THREAD_FORMAT, nullptr, "The default thread format string to use when displaying thread information." },
{ "use-external-editor", OptionValue::eTypeBoolean , true, false, nullptr, nullptr, "Whether to use an external editor or not." },
@@ -238,6 +239,7 @@
ePropertyStopDisassemblyDisplay,
ePropertyStopLineCountAfter,
ePropertyStopLineCountBefore,
+ ePropertyStopShowColumn,
ePropertyTerminalWidth,
ePropertyThreadFormat,
ePropertyUseExternalEditor,
@@ -426,6 +428,13 @@
return ret;
}
+bool
+Debugger::GetStopShowColumn () const
+{
+ const uint32_t idx = ePropertyStopShowColumn;
+ return m_collection_sp->GetPropertyAtIndexAsBoolean(nullptr, idx, g_properties[idx].default_uint_value != 0);
+}
+
uint32_t
Debugger::GetStopSourceLineCount (bool before) const
{
Index: source/Commands/CommandObjectSource.cpp
===================================================================
--- source/Commands/CommandObjectSource.cpp
+++ source/Commands/CommandObjectSource.cpp
@@ -1000,6 +1000,7 @@
return target->GetSourceManager().DisplaySourceLinesWithLineNumbers (start_file,
line_no,
0,
+ 0,
m_options.num_lines,
"",
&result.GetOutputStream(),
@@ -1279,6 +1280,7 @@
target->GetSourceManager().DisplaySourceLinesWithLineNumbers (sc.comp_unit,
sc.line_entry.line,
+ m_interpreter.GetDebugger().GetStopShowColumn () ? sc.line_entry.column : 0,
lines_to_back_up,
m_options.num_lines - lines_to_back_up,
"->",
@@ -1327,6 +1329,7 @@
m_options.start_line, // Line to display
m_options.num_lines, // Lines after line to
UINT32_MAX, // Don't mark "line"
+ 0, // Don't mark "column"
"", // Don't mark "line"
&result.GetOutputStream(),
GetBreakpointLocations ()))
@@ -1478,6 +1481,7 @@
target->GetSourceManager().DisplaySourceLinesWithLineNumbers (sc.line_entry.file ? sc.line_entry.file : sc.comp_unit,
m_options.start_line,
0,
+ 0,
m_options.num_lines,
"",
&result.GetOutputStream(),
Index: source/API/SBSourceManager.cpp
===================================================================
--- source/API/SBSourceManager.cpp
+++ source/API/SBSourceManager.cpp
@@ -48,6 +48,7 @@
size_t
DisplaySourceLinesWithLineNumbers (const lldb_private::FileSpec &file,
uint32_t line,
+ uint32_t column,
uint32_t context_before,
uint32_t context_after,
const char *current_line_cstr,
@@ -61,6 +62,7 @@
{
return target_sp->GetSourceManager().DisplaySourceLinesWithLineNumbers (file,
line,
+ column,
context_before,
context_after,
current_line_cstr,
@@ -73,6 +75,7 @@
{
return debugger_sp->GetSourceManager().DisplaySourceLinesWithLineNumbers (file,
line,
+ column,
context_before,
context_after,
current_line_cstr,
@@ -126,6 +129,7 @@
(
const SBFileSpec &file,
uint32_t line,
+ uint32_t column,
uint32_t context_before,
uint32_t context_after,
const char *current_line_cstr,
@@ -137,6 +141,7 @@
return m_opaque_ap->DisplaySourceLinesWithLineNumbers (file.ref(),
line,
+ column,
context_before,
context_after,
current_line_cstr,
Index: scripts/interface/SBStream.i
===================================================================
--- scripts/interface/SBStream.i
+++ scripts/interface/SBStream.i
@@ -24,6 +24,7 @@
stream = lldb.SBStream()
source_mgr.DisplaySourceLinesWithLineNumbers(filespec,
self.line,
+ self.column,
2, # context before
2, # context after
'=>', # prefix for current line
Index: scripts/interface/SBSourceManager.i
===================================================================
--- scripts/interface/SBSourceManager.i
+++ scripts/interface/SBSourceManager.i
@@ -21,6 +21,7 @@
stream = lldb.SBStream()
source_mgr.DisplaySourceLinesWithLineNumbers(filespec,
self.line,
+ self.column,
2, # context before
2, # context after
'=>', # prefix for current line
@@ -45,6 +46,7 @@
size_t
DisplaySourceLinesWithLineNumbers (const lldb::SBFileSpec &file,
uint32_t line,
+ uint32_t column,
uint32_t context_before,
uint32_t context_after,
const char* current_line_cstr,
Index: packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
===================================================================
--- packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
+++ packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
@@ -52,6 +52,7 @@
stream = lldb.SBStream()
source_mgr.DisplaySourceLinesWithLineNumbers(filespec,
self.line,
+ 1,
2, # context before
2, # context after
"=>", # prefix for current line
@@ -64,7 +65,7 @@
# 6 }
self.expect(stream.GetData(), "Source code displayed correctly",
exe=False,
- patterns = ['=> %d.*Hello world' % self.line])
+ patterns = ['=> %d.*Hello world' % self.line, ' *\^'])
# Boundary condition testings for SBStream(). LLDB should not crash!
stream.Print(None)
Index: packages/Python/lldbsuite/test/settings/TestSettings.py
===================================================================
--- packages/Python/lldbsuite/test/settings/TestSettings.py
+++ packages/Python/lldbsuite/test/settings/TestSettings.py
@@ -464,6 +464,7 @@
"stop-disassembly-display",
"stop-line-count-after",
"stop-line-count-before",
+ "stop-show-column",
"term-width",
"thread-format",
"use-external-editor",
Index: include/lldb/Core/SourceManager.h
===================================================================
--- include/lldb/Core/SourceManager.h
+++ include/lldb/Core/SourceManager.h
@@ -40,8 +40,7 @@
size_t
DisplaySourceLines (uint32_t line,
- uint32_t context_before,
- uint32_t context_after,
+ uint32_t column,
Stream *s);
void
FindLinesMatchingRegex (RegularExpression& regex,
@@ -135,6 +134,7 @@
size_t
DisplaySourceLinesWithLineNumbers(const FileSpec &file,
uint32_t line,
+ uint32_t column,
uint32_t context_before,
uint32_t context_after,
const char* current_line_cstr,
@@ -146,6 +146,7 @@
DisplaySourceLinesWithLineNumbersUsingLastFile(uint32_t start_line,
uint32_t count,
uint32_t curr_line,
+ uint32_t curr_column,
const char* current_line_cstr,
Stream *s,
const SymbolContextList *bp_locs = nullptr);
Index: include/lldb/Core/Debugger.h
===================================================================
--- include/lldb/Core/Debugger.h
+++ include/lldb/Core/Debugger.h
@@ -324,10 +324,13 @@
bool
SetUseColor (bool use_color);
-
+
+ bool
+ GetStopShowColumn () const;
+
uint32_t
GetStopSourceLineCount (bool before) const;
-
+
StopDisassemblyType
GetStopDisassemblyDisplay () const;
Index: include/lldb/API/SBSourceManager.h
===================================================================
--- include/lldb/API/SBSourceManager.h
+++ include/lldb/API/SBSourceManager.h
@@ -31,6 +31,7 @@
size_t
DisplaySourceLinesWithLineNumbers (const lldb::SBFileSpec &file,
uint32_t line,
+ uint32_t column,
uint32_t context_before,
uint32_t context_after,
const char* current_line_cstr,
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
