From 4d682d25fb99985534eb52a3e17307117bfe8d77 Mon Sep 17 00:00:00 2001 From: Sean Callanan Date: Thu, 25 Jul 2013 23:12:53 +0000 Subject: [PATCH] Fixed several problems with watchpoint expressions. - First, the watchpoint size was being cast to the wrong type. This is primarily cosmetic, but annoying. - Second, the options for the watchpoint command were not being initialized correctly, which led to the watchpoint size sometimes having absurdly large values. This caused watchpoints to fail to be set in some cases. llvm-svn: 187169 --- lldb/source/Commands/CommandObjectWatchpoint.cpp | 2 ++ lldb/source/Interpreter/OptionGroupWatchpoint.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lldb/source/Commands/CommandObjectWatchpoint.cpp b/lldb/source/Commands/CommandObjectWatchpoint.cpp index c1f0c41..6f70f39 100644 --- a/lldb/source/Commands/CommandObjectWatchpoint.cpp +++ b/lldb/source/Commands/CommandObjectWatchpoint.cpp @@ -1185,6 +1185,8 @@ protected: virtual bool DoExecute (const char *raw_command, CommandReturnObject &result) { + m_option_group.NotifyOptionParsingStarting(); // This is a raw command, so notify the option group + Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); StackFrame *frame = m_exe_ctx.GetFramePtr(); diff --git a/lldb/source/Interpreter/OptionGroupWatchpoint.cpp b/lldb/source/Interpreter/OptionGroupWatchpoint.cpp index 7018f14..9eef37a 100644 --- a/lldb/source/Interpreter/OptionGroupWatchpoint.cpp +++ b/lldb/source/Interpreter/OptionGroupWatchpoint.cpp @@ -88,7 +88,7 @@ OptionGroupWatchpoint::SetOptionValue (CommandInterpreter &interpreter, break; } case 'x': - watch_size = (WatchType) Args::StringToOptionEnum(option_arg, g_option_table[option_idx].enum_values, 0, error); + watch_size = (uint32_t) Args::StringToOptionEnum(option_arg, g_option_table[option_idx].enum_values, 0, error); break; default: -- 2.7.4