Skip to content

Commit

Permalink
[lldb/Debugger] Remove macros formerly used by property definitions
Browse files Browse the repository at this point in the history
The DEFAULT_ were used in property definitions which have since been
moved to CoreProperties.td.
  • Loading branch information
JDevlieghere committed Feb 24, 2020
1 parent c2e272f commit 77a2744
Showing 1 changed file with 0 additions and 78 deletions.
78 changes: 0 additions & 78 deletions lldb/source/Core/Debugger.cpp
Expand Up @@ -135,84 +135,6 @@ static constexpr OptionEnumValueElement g_language_enumerators[] = {
},
};

#define MODULE_WITH_FUNC \
"{ " \
"${module.file.basename}{`${function.name-with-args}" \
"{${frame.no-debug}${function.pc-offset}}}}"

#define MODULE_WITH_FUNC_NO_ARGS \
"{ " \
"${module.file.basename}{`${function.name-without-args}" \
"{${frame.no-debug}${function.pc-offset}}}}"

#define FILE_AND_LINE \
"{ at ${ansi.fg.cyan}${line.file.basename}${ansi.normal}" \
":${ansi.fg.yellow}${line.number}${ansi.normal}" \
"{:${ansi.fg.yellow}${line.column}${ansi.normal}}}"

#define IS_OPTIMIZED "{${function.is-optimized} [opt]}"

#define IS_ARTIFICIAL "{${frame.is-artificial} [artificial]}"

#define DEFAULT_THREAD_FORMAT \
"thread #${thread.index}: tid = ${thread.id%tid}" \
"{, ${frame.pc}}" MODULE_WITH_FUNC FILE_AND_LINE \
"{, name = ${ansi.fg.green}'${thread.name}'${ansi.normal}}" \
"{, queue = ${ansi.fg.green}'${thread.queue}'${ansi.normal}}" \
"{, activity = " \
"${ansi.fg.green}'${thread.info.activity.name}'${ansi.normal}}" \
"{, ${thread.info.trace_messages} messages}" \
"{, stop reason = ${ansi.fg.red}${thread.stop-reason}${ansi.normal}}" \
"{\\nReturn value: ${thread.return-value}}" \
"{\\nCompleted expression: ${thread.completed-expression}}" \
"\\n"

#define DEFAULT_THREAD_STOP_FORMAT \
"thread #${thread.index}{, name = '${thread.name}'}" \
"{, queue = ${ansi.fg.green}'${thread.queue}'${ansi.normal}}" \
"{, activity = " \
"${ansi.fg.green}'${thread.info.activity.name}'${ansi.normal}}" \
"{, ${thread.info.trace_messages} messages}" \
"{, stop reason = ${ansi.fg.red}${thread.stop-reason}${ansi.normal}}" \
"{\\nReturn value: ${thread.return-value}}" \
"{\\nCompleted expression: ${thread.completed-expression}}" \
"\\n"

#define DEFAULT_FRAME_FORMAT \
"frame #${frame.index}: " \
"${ansi.fg.yellow}${frame.pc}${ansi.normal}" MODULE_WITH_FUNC FILE_AND_LINE \
IS_OPTIMIZED IS_ARTIFICIAL "\\n"

#define DEFAULT_FRAME_FORMAT_NO_ARGS \
"frame #${frame.index}: " \
"${ansi.fg.yellow}${frame.pc}${ansi.normal}" MODULE_WITH_FUNC_NO_ARGS \
FILE_AND_LINE IS_OPTIMIZED IS_ARTIFICIAL "\\n"

// Three parts to this disassembly format specification:
// 1. If this is a new function/symbol (no previous symbol/function), print
// dylib`funcname:\n
// 2. If this is a symbol context change (different from previous
// symbol/function), print
// dylib`funcname:\n
// 3. print
// address <+offset>:
#define DEFAULT_DISASSEMBLY_FORMAT \
"{${function.initial-function}{${module.file.basename}`}{${function.name-" \
"without-args}}:\\n}{${function.changed}\\n{${module.file.basename}`}{${" \
"function.name-without-args}}:\\n}{${current-pc-arrow} " \
"}${addr-file-or-load}{ " \
"<${function.concrete-only-addr-offset-no-padding}>}: "

// gdb's disassembly format can be emulated with ${current-pc-arrow}${addr-
// file-or-load}{ <${function.name-without-args}${function.concrete-only-addr-
// offset-no-padding}>}:

// lldb's original format for disassembly would look like this format string -
// {${function.initial-function}{${module.file.basename}`}{${function.name-
// without-
// args}}:\n}{${function.changed}\n{${module.file.basename}`}{${function.name-
// without-args}}:\n}{${current-pc-arrow} }{${addr-file-or-load}}:

static constexpr OptionEnumValueElement s_stop_show_column_values[] = {
{
eStopShowColumnAnsiOrCaret,
Expand Down

0 comments on commit 77a2744

Please sign in to comment.