CbC/CbC_llvm: lldb/source/Commands/CommandObjectSource.cpp comparison

comparison lldb/source/Commands/CommandObjectSource.cpp @ 236:c4bab56944e8 llvm-original

LLVM 16

author	kono
date	Wed, 09 Nov 2022 17:45:10 +0900
parents	5f17cb93ff66
children	1f2b6ac9f198

comparison

equal deleted inserted replaced

-:70dce7da266c
+:c4bab56944e8
 #include "lldb/Core/FileLineResolver.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/SourceManager.h"
 #include "lldb/Host/OptionParser.h"
+#include "lldb/Interpreter/CommandOptionArgumentTable.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Interpreter/OptionArgParser.h"
 #include "lldb/Interpreter/OptionValueFileColonLine.h"
 #include "lldb/Interpreter/Options.h"
 #include "lldb/Symbol/CompileUnit.h"
 #include "CommandOptions.inc"
 class CommandObjectSourceInfo : public CommandObjectParsed {
 class CommandOptions : public Options {
 public:
-CommandOptions() : Options() {}
+CommandOptions() = default;
 ~CommandOptions() override = default;
 Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg,
 ExecutionContext *execution_context) override {
 : CommandObjectParsed(
 interpreter, "source info",
 "Display source line information for the current target "
 "process.  Defaults to instruction pointer in current stack "
 "frame.",
-nullptr, eCommandRequiresTarget),
+nullptr, eCommandRequiresTarget) {}
-m_options() {}
 ~CommandObjectSourceInfo() override = default;
 Options *GetOptions() override { return &m_options; }
 ConstString name(m_options.symbol_name.c_str());
 SymbolContextList sc_list_lines;
 Target *target = m_exe_ctx.GetTargetPtr();
 uint32_t addr_byte_size = target->GetArchitecture().GetAddressByteSize();
+ModuleFunctionSearchOptions function_options;
+function_options.include_symbols = false;
+function_options.include_inlines = true;
 // Note: module_list can't be const& because FindFunctionSymbols isn't
 // const.
 ModuleList module_list =
 (m_module_list.GetSize() > 0) ? m_module_list : target->GetImages();
-module_list.FindFunctions(name, eFunctionNameTypeAuto,
+module_list.FindFunctions(name, eFunctionNameTypeAuto, function_options,
-/*include_symbols=*/false,
+sc_list_funcs);
-/*include_inlines=*/true, sc_list_funcs);
 size_t num_matches = sc_list_funcs.GetSize();
 if (!num_matches) {
 // If we didn't find any functions with that name, try searching for
 // symbols that line up exactly with function addresses.
 }
 return true;
 }
 bool DoExecute(Args &command, CommandReturnObject &result) override {
-const size_t argc = command.GetArgumentCount();
-if (argc != 0) {
-result.AppendErrorWithFormat("'%s' takes no arguments, only flags.\n",
-GetCommandName().str().c_str());
-return false;
-}
 Target *target = m_exe_ctx.GetTargetPtr();
 if (target == nullptr) {
 target = GetDebugger().GetSelectedTarget().get();
 if (target == nullptr) {
 result.AppendError("invalid target, create a debug target using the "
 #include "CommandOptions.inc"
 class CommandObjectSourceList : public CommandObjectParsed {
 class CommandOptions : public Options {
 public:
-CommandOptions() : Options() {}
+CommandOptions() = default;
 ~CommandOptions() override = default;
 Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg,
 ExecutionContext *execution_context) override {
 public:
 CommandObjectSourceList(CommandInterpreter &interpreter)
 : CommandObjectParsed(interpreter, "source list",
 "Display source code for the current target "
 "process as specified by options.",
-nullptr, eCommandRequiresTarget),
+nullptr, eCommandRequiresTarget) {}
-m_options() {}
 ~CommandObjectSourceList() override = default;
 Options *GetOptions() override { return &m_options; }
-const char *GetRepeatCommand(Args &current_command_args,
+llvm::Optional<std::string> GetRepeatCommand(Args &current_command_args,
 uint32_t index) override {
 // This is kind of gross, but the command hasn't been parsed yet so we
 // can't look at the option values for this invocation...  I have to scan
 // the arguments directly.
 auto iter =
 llvm::find_if(current_command_args, [](const Args::ArgEntry &e) {
 return e.ref() == "-r" || e.ref() == "--reverse";
 });
 if (iter == current_command_args.end())
-return m_cmd_name.c_str();
+return m_cmd_name;
 if (m_reverse_name.empty()) {
 m_reverse_name = m_cmd_name;
 m_reverse_name.append(" -r");
 }
-return m_reverse_name.c_str();
+return m_reverse_name;
 }
 protected:
 struct SourceInfo {
 ConstString function;
 LineEntry line_entry;
 SourceInfo(ConstString name, const LineEntry &line_entry)
 : function(name), line_entry(line_entry) {}
-SourceInfo() : function(), line_entry() {}
+SourceInfo() = default;
 bool IsValid() const { return (bool)function && line_entry.IsValid(); }
 bool operator==(const SourceInfo &rhs) const {
 return function == rhs.function &&
 // passed to the various ModuleList::Find* calls, which would either be a
 // vector of string names or a ModuleSpecList.
 void FindMatchingFunctions(Target *target, ConstString name,
 SymbolContextList &sc_list) {
 // Displaying the source for a symbol:
-bool include_inlines = true;
-bool include_symbols = false;
 if (m_options.num_lines == 0)
 m_options.num_lines = 10;
+ModuleFunctionSearchOptions function_options;
+function_options.include_symbols = true;
+function_options.include_inlines = false;
 const size_t num_modules = m_options.modules.size();
 if (num_modules > 0) {
 ModuleList matching_modules;
 for (size_t i = 0; i < num_modules; ++i) {
 FileSpec module_file_spec(m_options.modules[i]);
 if (module_file_spec) {
 ModuleSpec module_spec(module_file_spec);
 matching_modules.Clear();
 target->GetImages().FindModules(module_spec, matching_modules);
 matching_modules.FindFunctions(name, eFunctionNameTypeAuto,
-include_symbols, include_inlines,
+function_options, sc_list);
-sc_list);
 }
 }
 } else {
 target->GetImages().FindFunctions(name, eFunctionNameTypeAuto,
-include_symbols, include_inlines,
+function_options, sc_list);
-sc_list);
 }
 }
 void FindMatchingFunctionSymbols(Target *target, ConstString name,
 SymbolContextList &sc_list) {
 sc_list);
 }
 }
 bool DoExecute(Args &command, CommandReturnObject &result) override {
-const size_t argc = command.GetArgumentCount();
-if (argc != 0) {
-result.AppendErrorWithFormat("'%s' takes no arguments, only flags.\n",
-GetCommandName().str().c_str());
-return false;
-}
 Target *target = m_exe_ctx.GetTargetPtr();
 if (!m_options.symbol_name.empty()) {
 SymbolContextList sc_list;
 ConstString name(m_options.symbol_name.c_str());

Mercurial > hg > CbC > CbC_llvm

comparison lldb/source/Commands/CommandObjectSource.cpp @ 236:c4bab56944e8 llvm-original