[Lldb-commits] [lldb] 77a2744 - [lldb/Debugger] Remove macros formerly used by property definitions

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2020-02-24T12:48:31-08:00
New Revision: 77a2744fa50b80c73d68356af010a002cc2a3d7f

URL: https://github.com/llvm/llvm-project/commit/77a2744fa50b80c73d68356af010a002cc2a3d7f
DIFF: https://github.com/llvm/llvm-project/commit/77a2744fa50b80c73d68356af010a002cc2a3d7f.diff

LOG: [lldb/Debugger] Remove macros formerly used by property definitions

The DEFAULT_ were used in property definitions which have since been
moved to CoreProperties.td.

Added: 
    

Modified: 
    lldb/source/Core/Debugger.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 4f988d3a2941..47bd1c5637ff 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -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 (
diff erent 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,