maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

<rdar://problem/13404189> 

Made the "--reverse" option to "source list" also be able to use the "--count". This helps us implement support for regexp source list command:

(lldb) l -10

Which gets turned into:

(lldb) source list --reverse --count 10

Also simplified the code that is used to track showing more source from the last file and line.

llvm-svn: 176961
This commit is contained in:
Greg Clayton 2013-03-13 18:25:49 +00:00
parent 682b60e4b4
commit e4ca515ae1
4 changed files with 101 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lldb/include/lldb/Core/SourceManager.h
View File

@ -129,17 +129,18 @@ public:
// This variant uses the last file we visited.
size_t
DisplaySourceLinesWithLineNumbersUsingLastFile (uint32_t line,
uint32_t context_before,
uint32_t context_after,
DisplaySourceLinesWithLineNumbersUsingLastFile (uint32_t start_line,
uint32_t count,
uint32_t curr_line,
const char* current_line_cstr,
Stream *s,
const SymbolContextList *bp_locs = NULL);
size_t
DisplayMoreWithLineNumbers (Stream *s,
const SymbolContextList *bp_locs = NULL,
bool reverse = false);
uint32_t count,
bool reverse,
const SymbolContextList *bp_locs = NULL);
bool
SetDefaultFileAndLine (const FileSpec &file_spec, uint32_t line);
@ -169,11 +170,9 @@ protected:
// Classes that inherit from SourceManager can see and modify these
//------------------------------------------------------------------
FileSP m_last_file_sp;
uint32_t m_last_file_line;
uint32_t m_last_file_context_before;
uint32_t m_last_file_context_after;
uint32_t m_last_line;
uint32_t m_last_count;
bool m_default_set;
bool m_first_reverse;
Target *m_target;
Debugger *m_debugger;

38
lldb/source/Commands/CommandObjectSource.cpp
View File

@ -220,7 +220,7 @@ class CommandObjectSourceList : public CommandObjectParsed
symbol_name.clear();
address = LLDB_INVALID_ADDRESS;
start_line = 0;
num_lines = 10;
num_lines = 0;
show_bp_locs = false;
reverse = false;
modules.clear();
@ -320,6 +320,9 @@ protected:
bool append = true;
size_t num_matches = 0;
if (m_options.num_lines == 0)
m_options.num_lines = 10;
const size_t num_modules = m_options.modules.size();
if (num_modules > 0)
{
@ -420,23 +423,26 @@ protected:
}
}
// This is a little hacky, but the first line table entry for a function points to the "{" that
// starts the function block. It would be nice to actually get the function
// declaration in there too. So back up a bit, but not further than what you're going to display.
uint32_t lines_to_back_up = m_options.num_lines >= 10 ? 5 : m_options.num_lines/2;
uint32_t extra_lines;
if (m_options.num_lines >= 10)
extra_lines = 5;
else
extra_lines = m_options.num_lines/2;
uint32_t line_no;
if (start_line <= lines_to_back_up)
if (start_line <= extra_lines)
line_no = 1;
else
line_no = start_line - lines_to_back_up;
line_no = start_line - extra_lines;
// For fun, if the function is shorter than the number of lines we're supposed to display,
// only display the function...
if (end_line != 0)
{
if (m_options.num_lines > end_line - line_no)
m_options.num_lines = end_line - line_no;
m_options.num_lines = end_line - line_no + extra_lines;
}
char path_buf[PATH_MAX];
@ -452,7 +458,7 @@ protected:
else
m_breakpoint_locations.Clear();
result.AppendMessageWithFormat("File: %s.\n", path_buf);
result.AppendMessageWithFormat("File: %s\n", path_buf);
target->GetSourceManager().DisplaySourceLinesWithLineNumbers (start_file,
line_no,
0,
@ -553,6 +559,9 @@ protected:
show_module,
show_inlined_frames);
result.GetOutputStream().EOL();
if (m_options.num_lines == 0)
m_options.num_lines = 10;
size_t lines_to_back_up = m_options.num_lines >= 10 ? 5 : m_options.num_lines/2;
@ -576,14 +585,18 @@ protected:
if (m_options.start_line == 0)
{
if (target->GetSourceManager().DisplayMoreWithLineNumbers (&result.GetOutputStream(),
GetBreakpointLocations (),
m_options.reverse))
m_options.num_lines,
m_options.reverse,
GetBreakpointLocations ()))
{
result.SetStatus (eReturnStatusSuccessFinishResult);
}
}
else
{
if (m_options.num_lines == 0)
m_options.num_lines = 10;
if (m_options.show_bp_locs)
{
SourceManager::FileSP last_file_sp (target->GetSourceManager().GetLastFile ());
@ -600,8 +613,8 @@ protected:
if (target->GetSourceManager().DisplaySourceLinesWithLineNumbersUsingLastFile(
m_options.start_line, // Line to display
0, // Lines before line to display
m_options.num_lines, // Lines after line to display
m_options.num_lines, // Lines after line to
UINT32_MAX, // Don't mark "line"
"", // Don't mark "line"
&result.GetOutputStream(),
GetBreakpointLocations ()))
@ -700,6 +713,9 @@ protected:
else
m_breakpoint_locations.Clear();
if (m_options.num_lines == 0)
m_options.num_lines = 10;
target->GetSourceManager().DisplaySourceLinesWithLineNumbers (sc.comp_unit,
m_options.start_line,
0,

148
lldb/source/Core/SourceManager.cpp
View File

@ -38,11 +38,9 @@ static inline bool is_newline_char(char ch)
//----------------------------------------------------------------------
SourceManager::SourceManager(Target &target) :
m_last_file_sp (),
m_last_file_line (0),
m_last_file_context_before (0),
m_last_file_context_after (10),
m_last_line (0),
m_last_count (0),
m_default_set(false),
m_first_reverse(true),
m_target (&target),
m_debugger(NULL)
{
@ -51,11 +49,9 @@ SourceManager::SourceManager(Target &target) :
SourceManager::SourceManager(Debugger &debugger) :
m_last_file_sp (),
m_last_file_line (0),
m_last_file_context_before (0),
m_last_file_context_after (10),
m_last_line (0),
m_last_count (0),
m_default_set(false),
m_first_reverse (true),
m_target (NULL),
m_debugger (&debugger)
{
@ -84,53 +80,49 @@ SourceManager::GetFile (const FileSpec &file_spec)
}
size_t
SourceManager::DisplaySourceLinesWithLineNumbersUsingLastFile
(
uint32_t line,
uint32_t context_before,
uint32_t context_after,
const char* current_line_cstr,
Stream *s,
const SymbolContextList *bp_locs
)
SourceManager::DisplaySourceLinesWithLineNumbersUsingLastFile (uint32_t start_line,
uint32_t count,
uint32_t curr_line,
const char* current_line_cstr,
Stream *s,
const SymbolContextList *bp_locs)
{
m_first_reverse = true;
if (count == 0)
return 0;
size_t return_value = 0;
if (line == 0)
if (start_line == 0)
{
if (m_last_file_line != 0
&& m_last_file_line != UINT32_MAX)
line = m_last_file_line + context_before;
if (m_last_line != 0 && m_last_line != UINT32_MAX)
start_line = m_last_line + m_last_count;
else
line = 1;
start_line = 1;
}
m_last_file_line = line + context_after + 1;
m_last_file_context_before = context_before;
m_last_file_context_after = context_after;
if (!m_default_set)
{
FileSpec tmp_spec;
uint32_t tmp_line;
GetDefaultFileAndLine(tmp_spec, tmp_line);
}
if (context_before == UINT32_MAX)
context_before = 0;
if (context_after == UINT32_MAX)
context_after = 10;
m_last_line = start_line;
m_last_count = count;
if (m_last_file_sp.get())
{
const uint32_t start_line = line <= context_before ? 1 : line - context_before;
const uint32_t end_line = line + context_after;
uint32_t curr_line;
for (curr_line = start_line; curr_line <= end_line; ++curr_line)
const uint32_t end_line = start_line + count - 1;
for (uint32_t line = start_line; line <= end_line; ++line)
{
if (!m_last_file_sp->LineIsValid (curr_line))
if (!m_last_file_sp->LineIsValid (line))
{
m_last_file_line = UINT32_MAX;
m_last_line = UINT32_MAX;
break;
}
char prefix[32] = "";
if (bp_locs)
{
uint32_t bp_count = bp_locs->NumLineEntriesWithLine (curr_line);
uint32_t bp_count = bp_locs->NumLineEntriesWithLine (line);
if (bp_count > 0)
::snprintf (prefix, sizeof (prefix), "[%u] ", bp_count);
@ -139,13 +131,13 @@ SourceManager::DisplaySourceLinesWithLineNumbersUsingLastFile
}
return_value += s->Printf("%s%2.2s %-4u\t",
prefix,
curr_line == line ? current_line_cstr : "",
curr_line);
size_t this_line_size = m_last_file_sp->DisplaySourceLines (curr_line, 0, 0, s);
prefix,
line == curr_line ? current_line_cstr : "",
line);
size_t this_line_size = m_last_file_sp->DisplaySourceLines (line, 0, 0, s);
if (this_line_size == 0)
{
m_last_file_line = UINT32_MAX;
m_last_line = UINT32_MAX;
break;
}
else
@ -172,17 +164,27 @@ SourceManager::DisplaySourceLinesWithLineNumbers
if (!same_as_previous)
m_last_file_sp = GetFile (file_spec);
uint32_t start_line;
uint32_t count = context_before + context_after + 1;
if (line > context_before)
start_line = line - context_before;
else
start_line = 1;
if (line == 0)
{
if (!same_as_previous)
m_last_file_line = 0;
m_last_line = 0;
}
return DisplaySourceLinesWithLineNumbersUsingLastFile (line, context_before, context_after, current_line_cstr, s, bp_locs);
return DisplaySourceLinesWithLineNumbersUsingLastFile (start_line, count, line, current_line_cstr, s, bp_locs);
}
size_t
SourceManager::DisplayMoreWithLineNumbers (Stream *s, const SymbolContextList *bp_locs, bool reverse)
SourceManager::DisplayMoreWithLineNumbers (Stream *s,
uint32_t count,
bool reverse,
const SymbolContextList *bp_locs)
{
// If we get called before anybody has set a default file and line, then try to figure it out here.
if (!m_default_set)
@ -194,55 +196,35 @@ SourceManager::DisplayMoreWithLineNumbers (Stream *s, const SymbolContextList *b
if (m_last_file_sp)
{
if (m_last_file_line == UINT32_MAX)
if (m_last_line == UINT32_MAX)
return 0;
if (reverse && m_last_file_line == 1)
if (reverse && m_last_line == 1)
return 0;
uint32_t line;
uint32_t new_last_file_line = 0;
if (m_last_file_line != 0
&& m_last_file_line != UINT32_MAX)
if (count > 0)
m_last_count = count;
else if (m_last_count == 0)
m_last_count = 10;
if (m_last_line > 0)
{
if (reverse)
{
// If this is the first time we've done a reverse, then back up one more time so we end
// up showing the chunk before the last one we've shown:
if (m_first_reverse)
{
if (m_last_file_line > m_last_file_context_after)
m_last_file_line -= m_last_file_context_after + 1;
}
if (m_last_file_line > m_last_file_context_after)
{
line = m_last_file_line - m_last_file_context_after;
if (line > m_last_file_context_before)
new_last_file_line = line - m_last_file_context_before - 1;
else
new_last_file_line = 1;
}
if (m_last_line > m_last_count)
m_last_line -= m_last_count;
else
{
line = 1;
new_last_file_line = 1;
}
m_last_line = 1;
}
else
line = m_last_file_line + m_last_file_context_before;
m_last_line += m_last_count;
}
else
line = 1;
m_last_line = 1;
size_t num_chars_shown = DisplaySourceLinesWithLineNumbersUsingLastFile (line, m_last_file_context_before, m_last_file_context_after, "", s, bp_locs);
if (new_last_file_line != 0)
m_last_file_line = new_last_file_line;
if (reverse)
m_first_reverse = false;
return num_chars_shown;
return DisplaySourceLinesWithLineNumbersUsingLastFile (m_last_line, m_last_count, UINT32_MAX, "", s, bp_locs);
}
return 0;
}
@ -256,7 +238,7 @@ SourceManager::SetDefaultFileAndLine (const FileSpec &file_spec, uint32_t line)
m_default_set = true;
if (m_last_file_sp)
{
m_last_file_line = line;
m_last_line = line;
return true;
}
else
@ -272,7 +254,7 @@ SourceManager::GetDefaultFileAndLine (FileSpec &file_spec, uint32_t &line)
if (m_last_file_sp)
{
file_spec = m_last_file_sp->GetFileSpec();
line = m_last_file_line;
line = m_last_line;
return true;
}
else if (!m_default_set)
@ -307,7 +289,7 @@ SourceManager::GetDefaultFileAndLine (FileSpec &file_spec, uint32_t &line)
SetDefaultFileAndLine (line_entry.file,
line_entry.line);
file_spec = m_last_file_sp->GetFileSpec();
line = m_last_file_line;
line = m_last_line;
return true;
}
}

1
lldb/source/Interpreter/CommandInterpreter.cpp
View File

@ -579,6 +579,7 @@ CommandInterpreter::LoadCommandDictionary ()
list_regex_cmd_ap->AddRegexCommand("^(.*[^[:space:]])[[:space:]]*:[[:space:]]*([[:digit:]]+)[[:space:]]*$", "source list --file '%1' --line %2") &&
list_regex_cmd_ap->AddRegexCommand("^\\*?(0x[[:xdigit:]]+)[[:space:]]*$", "source list --address %1") &&
list_regex_cmd_ap->AddRegexCommand("^-[[:space:]]*$", "source list --reverse") &&
list_regex_cmd_ap->AddRegexCommand("^-([[:digit:]]+)[[:space:]]*$", "source list --reverse --count %1") &&
list_regex_cmd_ap->AddRegexCommand("^(.+)$", "source list --name \"%1\"") &&
list_regex_cmd_ap->AddRegexCommand("^$", "source list"))
{