aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Callanan <scallanan@apple.com>2013-07-25 23:12:53 +0000
committerSean Callanan <scallanan@apple.com>2013-07-25 23:12:53 +0000
commitca4c37b4874dfcbc2001852624644fa2a2c30f2c (patch)
treeecaca482cf1ab56cfb58f624a2c5bae85de4f076
parent7b30525922628ac36632374a2d73b7412073e849 (diff)
downloadlldb-ca4c37b4874dfcbc2001852624644fa2a2c30f2c.tar.gz
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. <rdar://problem/12658775> git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@187169 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--source/Commands/CommandObjectWatchpoint.cpp2
-rw-r--r--source/Interpreter/OptionGroupWatchpoint.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/source/Commands/CommandObjectWatchpoint.cpp b/source/Commands/CommandObjectWatchpoint.cpp
index c1f0c41e3..6f70f39c1 100644
--- a/source/Commands/CommandObjectWatchpoint.cpp
+++ b/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/source/Interpreter/OptionGroupWatchpoint.cpp b/source/Interpreter/OptionGroupWatchpoint.cpp
index 7018f1471..9eef37a3a 100644
--- a/source/Interpreter/OptionGroupWatchpoint.cpp
+++ b/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: