Skip to content

Commit

Permalink
[lldb] Let table gen create command option initializers.
Browse files Browse the repository at this point in the history
Summary:
We currently have man large arrays containing initializers for our command options.
These tables are tricky maintain as we don't have any good place to check them for consistency and
it's also hard to read (`nullptr, {}, 0` is not very descriptive).

This patch fixes this by letting table gen generate those tables. This way we can have a more readable
syntax for this (especially for all the default arguments) and we can let TableCheck check them
for consistency (e.g. an option with an optional argument can't have `eArgTypeNone`, naming of flags', etc.).

Also refactoring the related data structures can now be done without changing the hundred of option initializers.

For example, this line:
```
{LLDB_OPT_SET_ALL, false, "hide-aliases",         'a', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Hide aliases in the command list."},
```
becomes this:
```
  def hide_aliases : Option<"hide-aliases", "a">, Desc<"Hide aliases in the command list.">;
```

For now I just moved a few initializers to the new format to demonstrate the change. I'll slowly migrate the other
option initializers tables  in separate patches.

Reviewers: JDevlieghere, davide, sgraenitz

Reviewed By: JDevlieghere

Subscribers: jingham, xiaobai, labath, mgorny, abidh, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D64365

llvm-svn: 365908
  • Loading branch information
Teemperor committed Jul 12, 2019
1 parent 38cd364 commit 6f4fb4e
Show file tree
Hide file tree
Showing 13 changed files with 436 additions and 29 deletions.
2 changes: 2 additions & 0 deletions lldb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ endif()
if (NOT LLDB_DISABLE_PYTHON)
add_subdirectory(scripts)
endif ()

add_subdirectory(utils/TableGen)
add_subdirectory(source)
add_subdirectory(tools)
add_subdirectory(docs)
Expand Down
35 changes: 34 additions & 1 deletion lldb/cmake/modules/AddLLDB.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,37 @@
function(lldb_tablegen)
# Syntax:
# lldb_tablegen output-file [tablegen-arg ...] SOURCE source-file
# [[TARGET cmake-target-name] [DEPENDS extra-dependency ...]]
#
# Generates a custom command for invoking tblgen as
#
# tblgen source-file -o=output-file tablegen-arg ...
#
# and, if cmake-target-name is provided, creates a custom target for
# executing the custom command depending on output-file. It is
# possible to list more files to depend after DEPENDS.

cmake_parse_arguments(LTG "" "SOURCE;TARGET" "" ${ARGN})

if(NOT LTG_SOURCE)
message(FATAL_ERROR "SOURCE source-file required by lldb_tablegen")
endif()

set(LLVM_TARGET_DEFINITIONS ${LTG_SOURCE})
tablegen(LLDB ${LTG_UNPARSED_ARGUMENTS})

if(LTG_TARGET)
add_public_tablegen_target(${LTG_TARGET})
set_target_properties( ${LTG_TARGET} PROPERTIES FOLDER "LLDB tablegenning")
set_property(GLOBAL APPEND PROPERTY LLDB_TABLEGEN_TARGETS ${LTG_TARGET})
endif()
endfunction(lldb_tablegen)

function(add_lldb_library name)
include_directories(BEFORE
${CMAKE_CURRENT_BINARY_DIR}
)

# only supported parameters to this macro are the optional
# MODULE;SHARED;STATIC library type and source files
cmake_parse_arguments(PARAM
Expand Down Expand Up @@ -241,4 +274,4 @@ function(lldb_setup_rpaths name)
BUILD_RPATH "${LIST_BUILD_RPATH}"
INSTALL_RPATH "${LIST_INSTALL_RPATH}"
)
endfunction()
endfunction()
6 changes: 6 additions & 0 deletions lldb/source/Commands/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
lldb_tablegen(Options.inc -gen-lldb-option-defs
SOURCE Options.td
TARGET LLDBOptionsGen)

add_lldb_library(lldbCommands
CommandCompletions.cpp
CommandObjectApropos.cpp
Expand Down Expand Up @@ -45,3 +49,5 @@ add_lldb_library(lldbCommands
LINK_COMPONENTS
Support
)

add_dependencies(lldbCommands LLDBOptionsGen)
13 changes: 4 additions & 9 deletions lldb/source/Commands/CommandObjectBreakpoint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1246,15 +1246,10 @@ the second re-enables the first location.");

#pragma mark List::CommandOptions
static constexpr OptionDefinition g_breakpoint_list_options[] = {
// clang-format off
{ LLDB_OPT_SET_ALL, false, "internal", 'i', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Show debugger internal breakpoints" },
{ LLDB_OPT_SET_1, false, "brief", 'b', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Give a brief description of the breakpoint (no location info)." },
// FIXME: We need to add an "internal" command, and then add this sort of thing to it.
// But I need to see it for now, and don't want to wait.
{ LLDB_OPT_SET_2, false, "full", 'f', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Give a full description of the breakpoint and its locations." },
{ LLDB_OPT_SET_3, false, "verbose", 'v', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Explain everything we know about the breakpoint (for debugging debugger bugs)." },
{ LLDB_OPT_SET_ALL, false, "dummy-breakpoints", 'D', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "List Dummy breakpoints - i.e. breakpoints set before a file is provided, which prime new targets." },
// clang-format on
// FIXME: We need to add an "internal" command, and then add this sort of
// thing to it. But I need to see it for now, and don't want to wait.
#define LLDB_OPTIONS_breakpoint_list
#include "Options.inc"
};

#pragma mark List
Expand Down
7 changes: 2 additions & 5 deletions lldb/source/Commands/CommandObjectHelp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,8 @@ CommandObjectHelp::CommandObjectHelp(CommandInterpreter &interpreter)
CommandObjectHelp::~CommandObjectHelp() = default;

static constexpr OptionDefinition g_help_options[] = {
// clang-format off
{LLDB_OPT_SET_ALL, false, "hide-aliases", 'a', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Hide aliases in the command list."},
{LLDB_OPT_SET_ALL, false, "hide-user-commands", 'u', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Hide user-defined commands from the list."},
{LLDB_OPT_SET_ALL, false, "show-hidden-commands", 'h', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Include commands prefixed with an underscore."},
// clang-format on
#define LLDB_OPTIONS_help
#include "Options.inc"
};

llvm::ArrayRef<OptionDefinition>
Expand Down
17 changes: 6 additions & 11 deletions lldb/source/Commands/CommandObjectSettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ using namespace lldb_private;
// CommandObjectSettingsSet

static constexpr OptionDefinition g_settings_set_options[] = {
// clang-format off
{ LLDB_OPT_SET_2, false, "global", 'g', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Apply the new value to the global default value." },
{ LLDB_OPT_SET_2, false, "force", 'f', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Force an empty value to be accepted as the default." }
// clang-format on
#define LLDB_OPTIONS_settings_set
#include "Options.inc"
};

class CommandObjectSettingsSet : public CommandObjectRaw {
Expand Down Expand Up @@ -313,10 +311,8 @@ class CommandObjectSettingsShow : public CommandObjectParsed {
// CommandObjectSettingsWrite -- Write settings to file

static constexpr OptionDefinition g_settings_write_options[] = {
// clang-format off
{ LLDB_OPT_SET_ALL, true, "file", 'f', OptionParser::eRequiredArgument, nullptr, {}, CommandCompletions::eDiskFileCompletion, eArgTypeFilename, "The file into which to write the settings." },
{ LLDB_OPT_SET_ALL, false, "append",'a', OptionParser::eNoArgument, nullptr, {}, 0, eArgTypeNone, "Append to saved settings file if it exists."},
// clang-format on
#define LLDB_OPTIONS_settings_write
#include "Options.inc"
};

class CommandObjectSettingsWrite : public CommandObjectParsed {
Expand Down Expand Up @@ -438,9 +434,8 @@ class CommandObjectSettingsWrite : public CommandObjectParsed {
// CommandObjectSettingsRead -- Read settings from file

static constexpr OptionDefinition g_settings_read_options[] = {
// clang-format off
{LLDB_OPT_SET_ALL, true, "file",'f', OptionParser::eRequiredArgument, nullptr, {}, CommandCompletions::eDiskFileCompletion, eArgTypeFilename, "The file from which to read the breakpoints." },
// clang-format on
#define LLDB_OPTIONS_settings_read
#include "Options.inc"
};

class CommandObjectSettingsRead : public CommandObjectParsed {
Expand Down
5 changes: 2 additions & 3 deletions lldb/source/Commands/CommandObjectTarget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1967,9 +1967,8 @@ static constexpr OptionEnumValueElement g_sort_option_enumeration[] = {
{eSortOrderByName, "name", "Sort output by symbol name."} };

static constexpr OptionDefinition g_target_modules_dump_symtab_options[] = {
// clang-format off
{ LLDB_OPT_SET_1, false, "sort", 's', OptionParser::eRequiredArgument, nullptr, OptionEnumValues(g_sort_option_enumeration), 0, eArgTypeSortOrder, "Supply a sort order when dumping the symbol table." }
// clang-format on
#define LLDB_OPTIONS_target_modules_dump_symtab
#include "Options.inc"
};

class CommandObjectTargetModulesDumpSymtab
Expand Down
53 changes: 53 additions & 0 deletions lldb/source/Commands/Options.td
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
include "OptionsBase.td"

let Command = "target modules dump symtab" in {
def tm_sort : Option<"sort", "s">, Group<1>,
Desc<"Supply a sort order when dumping the symbol table.">,
EnumArg<"SortOrder", "OptionEnumValues(g_sort_option_enumeration)">;
}

let Command = "help" in {
def help_hide_aliases : Option<"hide-aliases", "a">,
Desc<"Hide aliases in the command list.">;
def help_hide_user : Option<"hide-user-commands", "u">,
Desc<"Hide user-defined commands from the list.">;
def help_show_hidden : Option<"show-hidden-commands", "h">,
Desc<"Include commands prefixed with an underscore.">;
}

let Command = "settings set" in {
def setset_global : Option<"global", "g">, Arg<"Filename">,
Completion<"DiskFile">,
Desc<"Apply the new value to the global default value.">;
def setset_force : Option<"force", "f">,
Desc<"Force an empty value to be accepted as the default.">;
}

let Command = "settings write" in {
def setwrite_file : Option<"file", "f">, Required, Arg<"Filename">,
Completion<"DiskFile">,
Desc<"The file into which to write the settings.">;
def setwrite_append : Option<"append", "a">,
Desc<"Append to saved settings file if it exists.">;
}

let Command = "settings read" in {
def setread_file : Option<"file", "f">, Required, Arg<"Filename">,
Completion<"DiskFile">,
Desc<"The file from which to read the settings.">;
}

let Command = "breakpoint list" in {
def blist_internal : Option<"internal", "i">,
Desc<"Show debugger internal breakpoints">;
def blist_brief : Option<"brief", "b">, Group<1>,
Desc<"Give a brief description of the breakpoint (no location info).">;
def blist_full : Option<"full", "f">, Group<2>,
Desc<"Give a full description of the breakpoint and its locations.">;
def blist_verbose : Option<"verbose", "v">, Group<3>,
Desc<"Explain everything we know about the breakpoint (for debugging "
"debugger bugs).">;
def blist_dummy_bp : Option<"dummy-breakpoints", "D">,
Desc<"List Dummy breakpoints - i.e. breakpoints set before a file is "
"provided, which prime new targets.">;
}
62 changes: 62 additions & 0 deletions lldb/source/Commands/OptionsBase.td
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// Base class for all options.
class Option<string fullname, string shortname> {
string FullName = fullname;
string ShortName = shortname;
// The full associated command/subcommand such as "settings set".
string Command;
}

// Moves the option into a list of option groups.
class Groups<list<int> groups> {
list<int> Groups = groups;
}

// Moves the option in all option groups in a range.
// Start and end values are inclusive.
class GroupRange<int start, int end> {
int GroupStart = start;
int GroupEnd = end;
}
// Moves the option in a single option group.
class Group<int group> {
int GroupStart = group;
int GroupEnd = group;
}

// Sets the description for the option that should be
// displayed to the user.
class Desc<string description> {
string Description = description;
}

// Marks the option as required when calling the
// associated command.
class Required {
bit Required = 1;
}

// Gives the option an optional argument.
class OptionalArg<string type> {
string ArgType = type;
bit OptionalArg = 1;
}

// Gives the option an required argument.
class Arg<string type> {
string ArgType = type;
}

// Gives the option an required argument.
class EnumArg<string type, string enum> {
string ArgType = type;
string ArgEnum = enum;
}

// Sets the available completions for the given option.
class Completions<list<string> completions> {
list<string> Completions = completions;
}
// Sets a single completion for the given option.
class Completion<string completion> {
list<string> Completions = [completion];
}
8 changes: 8 additions & 0 deletions lldb/utils/TableGen/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
set(LLVM_LINK_COMPONENTS Support)

add_tablegen(lldb-tblgen LLDB
LLDBOptionDefEmitter.cpp
LLDBTableGen.cpp
)
set_target_properties(lldb-tblgen PROPERTIES FOLDER "LLDB tablegenning")

Loading

0 comments on commit 6f4fb4e

Please sign in to comment.