Chnage VerifyWatchpointIDs() from a static function to a class function to be called from other source files.

llvm-svn: 158751
This commit is contained in:
Johnny Chen 2012-06-19 22:12:58 +00:00
parent 478faed4b0
commit 1773a89ff4
2 changed files with 12 additions and 8 deletions

View File

@ -101,8 +101,8 @@ WithRSAIndex(llvm::StringRef &Arg)
// Return true if wp_ids is successfully populated with the watch ids.
// False otherwise.
static bool
VerifyWatchpointIDs(Args &args, std::vector<uint32_t> &wp_ids)
bool
CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(Args &args, std::vector<uint32_t> &wp_ids)
{
// Pre-condition: args.GetArgumentCount() > 0.
assert(args.GetArgumentCount() > 0);
@ -306,7 +306,7 @@ protected:
{
// Particular watchpoints selected; enable them.
std::vector<uint32_t> wp_ids;
if (!VerifyWatchpointIDs(command, wp_ids))
if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
@ -406,7 +406,7 @@ protected:
{
// Particular watchpoints selected; enable them.
std::vector<uint32_t> wp_ids;
if (!VerifyWatchpointIDs(command, wp_ids))
if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
@ -491,7 +491,7 @@ protected:
{
// Particular watchpoints selected; disable them.
std::vector<uint32_t> wp_ids;
if (!VerifyWatchpointIDs(command, wp_ids))
if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
@ -574,7 +574,7 @@ protected:
{
// Particular watchpoints selected; delete them.
std::vector<uint32_t> wp_ids;
if (!VerifyWatchpointIDs(command, wp_ids))
if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
@ -715,7 +715,7 @@ protected:
{
// Particular watchpoints selected; ignore them.
std::vector<uint32_t> wp_ids;
if (!VerifyWatchpointIDs(command, wp_ids))
if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
@ -872,7 +872,7 @@ protected:
{
// Particular watchpoints selected; set condition on them.
std::vector<uint32_t> wp_ids;
if (!VerifyWatchpointIDs(command, wp_ids))
if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);

View File

@ -32,6 +32,10 @@ public:
virtual
~CommandObjectMultiwordWatchpoint ();
static bool
VerifyWatchpointIDs(Args &args, std::vector<uint32_t> &wp_ids);
};
} // namespace lldb_private