34ddc8db22
the '-e' option (for watching of an address) to be present. Update some existing test cases with the required option and add some more test cases. Since the '-v' option takes <variable-name> and the '-e' option takes <expr> as the command arg, the existing infrastructure for generating the option usage can produce confusing help message, like: watchpoint set -e [-w <watch-type>] [-x <byte-size>] <variable-name | expr> watchpoint set -v [-w <watch-type>] [-x <byte-size>] <variable-name | expr> The solution adopted is to provide an extra member field to the struct CommandArgumentData called (uint32_t)arg_opt_set_association, whose purpose is to link this particular argument data with some option set(s). Also modify the signature of CommandObject::GetFormattedCommandArguments() to: GetFormattedCommandArguments (Stream &str, uint32_t opt_set_mask = LLDB_OPT_SET_ALL) it now takes an additional opt_set_mask which can be used to generate a filtered formatted command args for help message. Options::GenerateOptionUsage() impl is modified to call the GetFormattedCommandArguments() appropriately. So that the help message now looks like: watchpoint set -e [-w <watch-type>] [-x <byte-size>] <expr> watchpoint set -v [-w <watch-type>] [-x <byte-size>] <variable-name> rdar://problem/10703256 llvm-svn: 150032
104 lines
2.8 KiB
C++
104 lines
2.8 KiB
C++
//===-- OptionGroupWatchpoint.cpp -------------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "lldb/Interpreter/OptionGroupWatchpoint.h"
|
|
|
|
// C Includes
|
|
// C++ Includes
|
|
// Other libraries and framework includes
|
|
// Project includes
|
|
#include "lldb/lldb-enumerations.h"
|
|
#include "lldb/Interpreter/Args.h"
|
|
#include "lldb/Utility/Utils.h"
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
static OptionEnumValueElement g_watch_type[] =
|
|
{
|
|
{ OptionGroupWatchpoint::eWatchRead, "read", "Watch for read"},
|
|
{ OptionGroupWatchpoint::eWatchWrite, "write", "Watch for write"},
|
|
{ OptionGroupWatchpoint::eWatchReadWrite, "read_write", "Watch for read/write"},
|
|
{ 0, NULL, NULL }
|
|
};
|
|
|
|
static OptionEnumValueElement g_watch_size[] =
|
|
{
|
|
{ 1, "1", "Watch for byte size of 1"},
|
|
{ 2, "2", "Watch for byte size of 2"},
|
|
{ 4, "4", "Watch for byte size of 4"},
|
|
{ 8, "8", "Watch for byte size of 8"},
|
|
{ 0, NULL, NULL }
|
|
};
|
|
|
|
static OptionDefinition
|
|
g_option_table[] =
|
|
{
|
|
{ LLDB_OPT_SET_1, false, "watch", 'w', required_argument, g_watch_type, 0, eArgTypeWatchType, "Specify the type of watching to perform."},
|
|
{ LLDB_OPT_SET_1, false, "xsize", 'x', required_argument, g_watch_size, 0, eArgTypeByteSize, "Number of bytes to use to watch a region."}
|
|
};
|
|
|
|
|
|
OptionGroupWatchpoint::OptionGroupWatchpoint () :
|
|
OptionGroup()
|
|
{
|
|
}
|
|
|
|
OptionGroupWatchpoint::~OptionGroupWatchpoint ()
|
|
{
|
|
}
|
|
|
|
Error
|
|
OptionGroupWatchpoint::SetOptionValue (CommandInterpreter &interpreter,
|
|
uint32_t option_idx,
|
|
const char *option_arg)
|
|
{
|
|
Error error;
|
|
char short_option = (char) g_option_table[option_idx].short_option;
|
|
switch (short_option)
|
|
{
|
|
case 'w':
|
|
watch_type = (WatchType) Args::StringToOptionEnum(option_arg, g_option_table[option_idx].enum_values, 0, error);
|
|
if (error.Success())
|
|
watch_variable = true;
|
|
break;
|
|
|
|
case 'x':
|
|
watch_size = (WatchType) Args::StringToOptionEnum(option_arg, g_option_table[option_idx].enum_values, 0, error);
|
|
break;
|
|
|
|
default:
|
|
error.SetErrorStringWithFormat("unrecognized short option '%c'", short_option);
|
|
break;
|
|
}
|
|
|
|
return error;
|
|
}
|
|
|
|
void
|
|
OptionGroupWatchpoint::OptionParsingStarting (CommandInterpreter &interpreter)
|
|
{
|
|
watch_variable = false;
|
|
watch_type = eWatchInvalid;
|
|
watch_size = 0;
|
|
}
|
|
|
|
|
|
const OptionDefinition*
|
|
OptionGroupWatchpoint::GetDefinitions ()
|
|
{
|
|
return g_option_table;
|
|
}
|
|
|
|
uint32_t
|
|
OptionGroupWatchpoint::GetNumDefinitions ()
|
|
{
|
|
return arraysize(g_option_table);
|
|
}
|