diff options
| -rw-r--r-- | lldb/include/lldb/API/SBFrame.h | 14 | ||||
| -rw-r--r-- | lldb/scripts/Python/interface/SBFrame.i | 69 | ||||
| -rw-r--r-- | lldb/scripts/Python/interface/SBValue.i | 13 | ||||
| -rw-r--r-- | lldb/scripts/Python/interface/SBValueList.i | 37 | ||||
| -rw-r--r-- | lldb/scripts/Python/python-extensions.swig | 22 | ||||
| -rw-r--r-- | lldb/source/API/SBFrame.cpp | 34 |
6 files changed, 189 insertions, 0 deletions
diff --git a/lldb/include/lldb/API/SBFrame.h b/lldb/include/lldb/API/SBFrame.h index d7d221a1f6f..c78a1f91982 100644 --- a/lldb/include/lldb/API/SBFrame.h +++ b/lldb/include/lldb/API/SBFrame.h @@ -165,6 +165,20 @@ public: lldb::SBValue FindVariable (const char *var_name, lldb::DynamicValueType use_dynamic); + // Find a value for a variable expression path like "rect.origin.x" or + // "pt_ptr->x", "*self", "*this->obj_ptr". The returned value is _not_ + // and expression result and is not a constant object like + // SBFrame::EvaluateExpression(...) returns, but a child object of + // the variable value. + lldb::SBValue + GetValueForVariablePath (const char *var_expr_cstr, + DynamicValueType use_dynamic); + + /// The version that doesn't supply a 'use_dynamic' value will use the + /// target's default. + lldb::SBValue + GetValueForVariablePath (const char *var_path); + /// Find variables, register sets, registers, or persistent variables using /// the frame as the scope. /// diff --git a/lldb/scripts/Python/interface/SBFrame.i b/lldb/scripts/Python/interface/SBFrame.i index 3a6e7999edc..c718073506c 100644 --- a/lldb/scripts/Python/interface/SBFrame.i +++ b/lldb/scripts/Python/interface/SBFrame.i @@ -203,6 +203,34 @@ public: FindVariable (const char *var_name, lldb::DynamicValueType use_dynamic); %feature("docstring", " + /// Get a lldb.SBValue for a variable path. + /// + /// Variable paths can include access to pointer or instance members: + /// rect_ptr->origin.y + /// pt.x + /// Pointer dereferences: + /// *this->foo_ptr + /// **argv + /// Address of: + /// &pt + /// &my_array[3].x + /// Array accesses and treating pointers as arrays: + /// int_array[1] + /// pt_ptr[22].x + /// + /// Unlike EvaluateExpression() which returns lldb.SBValue objects + /// with constant copies of the values at the time of evaluation, + /// the result of this function is a value that will continue to + /// track the current value of the value as execution progresses + /// in the current frame. + ") GetValueForVariablePath; + lldb::SBValue + GetValueForVariablePath (const char *var_path); + + lldb::SBValue + GetValueForVariablePath (const char *var_path, lldb::DynamicValueType use_dynamic); + + %feature("docstring", " /// Find variables, register sets, registers, or persistent variables using /// the frame as the scope. /// @@ -219,6 +247,23 @@ public: GetDescription (lldb::SBStream &description); %pythoncode %{ + def get_all_variables(self): + return self.GetVariables(True,True,True,True) + + def get_arguments(self): + return self.GetVariables(True,False,False,False) + + def get_locals(self): + return self.GetVariables(False,True,False,False) + + def get_statics(self): + return self.GetVariables(False,False,True,False) + + def var(self, var_expr_path): + '''Calls through to lldb.SBFrame.GetValueForVariablePath() and returns + a value that represents the variable expression path''' + return self.GetValueForVariablePath(var_expr_path) + __swig_getmethods__["pc"] = GetPC __swig_setmethods__["pc"] = SetPC if _newclass: x = property(GetPC, SetPC) @@ -265,6 +310,30 @@ public: __swig_getmethods__["idx"] = GetFrameID if _newclass: x = property(GetFrameID, None) + __swig_getmethods__["variables"] = get_all_variables + if _newclass: x = property(get_all_variables, None) + + __swig_getmethods__["vars"] = get_all_variables + if _newclass: x = property(get_all_variables, None) + + __swig_getmethods__["locals"] = get_locals + if _newclass: x = property(get_locals, None) + + __swig_getmethods__["args"] = get_arguments + if _newclass: x = property(get_arguments, None) + + __swig_getmethods__["arguments"] = get_arguments + if _newclass: x = property(get_arguments, None) + + __swig_getmethods__["statics"] = get_statics + if _newclass: x = property(get_statics, None) + + __swig_getmethods__["registers"] = GetRegisters + if _newclass: x = property(GetRegisters, None) + + __swig_getmethods__["regs"] = GetRegisters + if _newclass: x = property(GetRegisters, None) + %} }; diff --git a/lldb/scripts/Python/interface/SBValue.i b/lldb/scripts/Python/interface/SBValue.i index 1f13a37b97d..b1c24055b67 100644 --- a/lldb/scripts/Python/interface/SBValue.i +++ b/lldb/scripts/Python/interface/SBValue.i @@ -436,6 +436,19 @@ public: __swig_getmethods__["num_children"] = GetNumChildren if _newclass: x = property(GetNumChildren, None) + __swig_getmethods__["unsigned"] = GetValueAsUnsigned + if _newclass: x = property(GetValueAsUnsigned, None) + + __swig_getmethods__["signed"] = GetValueAsSigned + if _newclass: x = property(GetValueAsSigned, None) + + def get_expr_path(self): + s = SBStream() + self.GetExpressionPath (s) + return s.GetData() + + __swig_getmethods__["path"] = get_expr_path + if _newclass: x = property(get_expr_path, None) %} }; diff --git a/lldb/scripts/Python/interface/SBValueList.i b/lldb/scripts/Python/interface/SBValueList.i index afd48915e55..1bc904980ef 100644 --- a/lldb/scripts/Python/interface/SBValueList.i +++ b/lldb/scripts/Python/interface/SBValueList.i @@ -96,6 +96,43 @@ public: lldb::SBValue FindValueObjectByUID (lldb::user_id_t uid); + %pythoncode %{ + def __len__(self): + return self.GetSize() + + def __getitem__(self, key): + count = len(self) + #------------------------------------------------------------ + # Access with "int" to get Nth item in the list + #------------------------------------------------------------ + if type(key) is int: + if key < count: + return self.GetValueAtIndex(key) + #------------------------------------------------------------ + # Access with "str" to get values by name + #------------------------------------------------------------ + elif type(key) is str: + matches = [] + for idx in range(count): + value = self.GetValueAtIndex(idx) + if value.name == key: + matches.append(value) + return matches + #------------------------------------------------------------ + # Match with regex + #------------------------------------------------------------ + elif isinstance(key, type(re.compile('.'))): + matches = [] + for idx in range(count): + value = self.GetValueAtIndex(idx) + re_match = key.search(value.name) + if re_match: + matches.append(value) + return matches + + %} + + }; } // namespace lldb diff --git a/lldb/scripts/Python/python-extensions.swig b/lldb/scripts/Python/python-extensions.swig index 1cf6519b390..49172b3cd0b 100644 --- a/lldb/scripts/Python/python-extensions.swig +++ b/lldb/scripts/Python/python-extensions.swig @@ -324,6 +324,28 @@ return Py_None; } } +%extend lldb::SBValueList { + PyObject *lldb::SBValueList::__repr__ (){ + lldb::SBStream description; + const size_t n = $self->GetSize(); + if (n) + { + for (size_t i=0; i<n; ++i) + $self->GetValueAtIndex(i).GetDescription(description); + } + else + { + description.Printf("<empty> lldb.SBValueList()"); + } + const char *desc = description.GetData(); + size_t desc_len = description.GetSize(); + if (desc_len > 0 && (desc[desc_len-1] == '\n' || desc[desc_len-1] == '\r')) + --desc_len; + if (desc_len > 0) + return PyString_FromStringAndSize (desc, desc_len); + return Py_None; + } +} %extend lldb::SBWatchpoint { PyObject *lldb::SBWatchpoint::__repr__ (){ lldb::SBStream description; diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp index a1bb7062ce4..d17e32b1707 100644 --- a/lldb/source/API/SBFrame.cpp +++ b/lldb/source/API/SBFrame.cpp @@ -455,6 +455,39 @@ SBFrame::Clear() m_opaque_sp.reset(); } +lldb::SBValue +SBFrame::GetValueForVariablePath (const char *var_path) +{ + SBValue sb_value; + StackFrameSP frame_sp(GetFrameSP()); + if (frame_sp) + { + lldb::DynamicValueType use_dynamic = frame_sp->CalculateTarget()->GetPreferDynamicValue(); + sb_value = GetValueForVariablePath (var_path, use_dynamic); + } + return sb_value; +} + +lldb::SBValue +SBFrame::GetValueForVariablePath (const char *var_path, DynamicValueType use_dynamic) +{ + SBValue sb_value; + StackFrameSP frame_sp(GetFrameSP()); + if (frame_sp && var_path && var_path[0]) + { + Mutex::Locker api_locker (frame_sp->GetThread().GetProcess().GetTarget().GetAPIMutex()); + VariableSP var_sp; + Error error; + ValueObjectSP value_sp (frame_sp->GetValueForVariableExpressionPath (var_path, + use_dynamic, + StackFrame::eExpressionPathOptionCheckPtrVsMember, + var_sp, + error)); + *sb_value = value_sp; + } + return sb_value; +} + SBValue SBFrame::FindVariable (const char *name) { @@ -467,6 +500,7 @@ SBFrame::FindVariable (const char *name) } return value; } + SBValue SBFrame::FindVariable (const char *name, lldb::DynamicValueType use_dynamic) |
