mohit.bhakkad updated this revision to Diff 38799.
mohit.bhakkad added a comment.
Changes in this revision:
- changed no-source to no-debuginfo and made it default
- now no-source means display assembly if source file is missing, even if
debug-info is present.
Repository:
rL LLVM
http://reviews.llvm.org/D12877
Files:
source/Core/Debugger.cpp
source/Target/StackFrame.cpp
Index: source/Target/StackFrame.cpp
===================================================================
--- source/Target/StackFrame.cpp
+++ source/Target/StackFrame.cpp
@@ -1487,7 +1487,7 @@
if (show_source)
{
ExecutionContext exe_ctx (shared_from_this());
- bool have_source = false;
+ bool have_source = false, have_debuginfo = false;
Debugger::StopDisassemblyType disasm_display =
Debugger::eStopDisassemblyTypeNever;
Target *target = exe_ctx.GetTargetPtr();
if (target)
@@ -1500,26 +1500,35 @@
GetSymbolContext(eSymbolContextCompUnit | eSymbolContextLineEntry);
if (m_sc.comp_unit && m_sc.line_entry.IsValid())
{
- have_source = true;
+ have_debuginfo = true;
if (source_lines_before > 0 || source_lines_after > 0)
{
-
target->GetSourceManager().DisplaySourceLinesWithLineNumbers
(m_sc.line_entry.file,
+ size_t num_lines =
target->GetSourceManager().DisplaySourceLinesWithLineNumbers
(m_sc.line_entry.file,
m_sc.line_entry.line,
source_lines_before,
source_lines_after,
"->",
&strm);
+ if (num_lines != 0)
+ have_source = true;
+ // TODO: Give here a one time warning if source file is
missing.
}
}
switch (disasm_display)
{
case Debugger::eStopDisassemblyTypeNever:
break;
-
+
+ case Debugger::eStopDisassemblyTypeNoDebugInfo:
+ if (have_debuginfo)
+ break;
+ // Fall through to next case
+
case Debugger::eStopDisassemblyTypeNoSource:
if (have_source)
break;
// Fall through to next case
+
case Debugger::eStopDisassemblyTypeAlways:
if (target)
{
Index: source/Core/Debugger.cpp
===================================================================
--- source/Core/Debugger.cpp
+++ source/Core/Debugger.cpp
@@ -86,9 +86,10 @@
OptionEnumValueElement
g_show_disassembly_enum_values[] =
{
- { Debugger::eStopDisassemblyTypeNever, "never", "Never show
disassembly when displaying a stop context."},
- { Debugger::eStopDisassemblyTypeNoSource, "no-source", "Show disassembly
when there is no source information, or the source file is missing when
displaying a stop context."},
- { Debugger::eStopDisassemblyTypeAlways, "always", "Always show
disassembly when displaying a stop context."},
+ { Debugger::eStopDisassemblyTypeNever, "never", "Never
show disassembly when displaying a stop context."},
+ { Debugger::eStopDisassemblyTypeNoDebugInfo, "no-debuginfo", "Show
disassembly when there is no debug information."},
+ { Debugger::eStopDisassemblyTypeNoSource, "no-source", "Show
disassembly when there is no source information, or the source file is missing
when displaying a stop context."},
+ { Debugger::eStopDisassemblyTypeAlways, "always",
"Always show disassembly when displaying a stop context."},
{ 0, NULL, NULL }
};
@@ -150,7 +151,7 @@
{ "prompt", OptionValue::eTypeString , true,
OptionValueString::eOptionEncodeCharacterEscapeSequences, "(lldb) ", NULL, "The
debugger command line prompt displayed for the user." },
{ "script-lang", OptionValue::eTypeEnum , true,
eScriptLanguagePython, NULL, g_language_enumerators, "The script language to be
used for evaluating user-written scripts." },
{ "stop-disassembly-count", OptionValue::eTypeSInt64 , true, 4 ,
NULL, NULL, "The number of disassembly lines to show when displaying a stopped
context." },
-{ "stop-disassembly-display", OptionValue::eTypeEnum , true,
Debugger::eStopDisassemblyTypeNoSource, NULL, g_show_disassembly_enum_values,
"Control when to display disassembly when displaying a stopped context." },
+{ "stop-disassembly-display", OptionValue::eTypeEnum , true,
Debugger::eStopDisassemblyTypeNoDebugInfo, NULL,
g_show_disassembly_enum_values, "Control when to display disassembly when
displaying a stopped context." },
{ "stop-line-count-after", OptionValue::eTypeSInt64 , true, 3 ,
NULL, NULL, "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 ,
NULL, NULL, "The number of sources lines to display that come before the
current source line when displaying a stopped context." },
{ "term-width", OptionValue::eTypeSInt64 , true, 80 ,
NULL, NULL, "The maximum number of columns to use for displaying text." },
Index: source/Target/StackFrame.cpp
===================================================================
--- source/Target/StackFrame.cpp
+++ source/Target/StackFrame.cpp
@@ -1487,7 +1487,7 @@
if (show_source)
{
ExecutionContext exe_ctx (shared_from_this());
- bool have_source = false;
+ bool have_source = false, have_debuginfo = false;
Debugger::StopDisassemblyType disasm_display = Debugger::eStopDisassemblyTypeNever;
Target *target = exe_ctx.GetTargetPtr();
if (target)
@@ -1500,26 +1500,35 @@
GetSymbolContext(eSymbolContextCompUnit | eSymbolContextLineEntry);
if (m_sc.comp_unit && m_sc.line_entry.IsValid())
{
- have_source = true;
+ have_debuginfo = true;
if (source_lines_before > 0 || source_lines_after > 0)
{
- target->GetSourceManager().DisplaySourceLinesWithLineNumbers (m_sc.line_entry.file,
+ size_t num_lines = target->GetSourceManager().DisplaySourceLinesWithLineNumbers (m_sc.line_entry.file,
m_sc.line_entry.line,
source_lines_before,
source_lines_after,
"->",
&strm);
+ if (num_lines != 0)
+ have_source = true;
+ // TODO: Give here a one time warning if source file is missing.
}
}
switch (disasm_display)
{
case Debugger::eStopDisassemblyTypeNever:
break;
-
+
+ case Debugger::eStopDisassemblyTypeNoDebugInfo:
+ if (have_debuginfo)
+ break;
+ // Fall through to next case
+
case Debugger::eStopDisassemblyTypeNoSource:
if (have_source)
break;
// Fall through to next case
+
case Debugger::eStopDisassemblyTypeAlways:
if (target)
{
Index: source/Core/Debugger.cpp
===================================================================
--- source/Core/Debugger.cpp
+++ source/Core/Debugger.cpp
@@ -86,9 +86,10 @@
OptionEnumValueElement
g_show_disassembly_enum_values[] =
{
- { Debugger::eStopDisassemblyTypeNever, "never", "Never show disassembly when displaying a stop context."},
- { Debugger::eStopDisassemblyTypeNoSource, "no-source", "Show disassembly when there is no source information, or the source file is missing when displaying a stop context."},
- { Debugger::eStopDisassemblyTypeAlways, "always", "Always show disassembly when displaying a stop context."},
+ { Debugger::eStopDisassemblyTypeNever, "never", "Never show disassembly when displaying a stop context."},
+ { Debugger::eStopDisassemblyTypeNoDebugInfo, "no-debuginfo", "Show disassembly when there is no debug information."},
+ { Debugger::eStopDisassemblyTypeNoSource, "no-source", "Show disassembly when there is no source information, or the source file is missing when displaying a stop context."},
+ { Debugger::eStopDisassemblyTypeAlways, "always", "Always show disassembly when displaying a stop context."},
{ 0, NULL, NULL }
};
@@ -150,7 +151,7 @@
{ "prompt", OptionValue::eTypeString , true, OptionValueString::eOptionEncodeCharacterEscapeSequences, "(lldb) ", NULL, "The debugger command line prompt displayed for the user." },
{ "script-lang", OptionValue::eTypeEnum , true, eScriptLanguagePython, NULL, g_language_enumerators, "The script language to be used for evaluating user-written scripts." },
{ "stop-disassembly-count", OptionValue::eTypeSInt64 , true, 4 , NULL, NULL, "The number of disassembly lines to show when displaying a stopped context." },
-{ "stop-disassembly-display", OptionValue::eTypeEnum , true, Debugger::eStopDisassemblyTypeNoSource, NULL, g_show_disassembly_enum_values, "Control when to display disassembly when displaying a stopped context." },
+{ "stop-disassembly-display", OptionValue::eTypeEnum , true, Debugger::eStopDisassemblyTypeNoDebugInfo, NULL, g_show_disassembly_enum_values, "Control when to display disassembly when displaying a stopped context." },
{ "stop-line-count-after", OptionValue::eTypeSInt64 , true, 3 , NULL, NULL, "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 , NULL, NULL, "The number of sources lines to display that come before the current source line when displaying a stopped context." },
{ "term-width", OptionValue::eTypeSInt64 , true, 80 , NULL, NULL, "The maximum number of columns to use for displaying text." },
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
