diff options
Diffstat (limited to 'lldb/scripts/Python')
| -rwxr-xr-x | lldb/scripts/Python/build-swig-Python.sh | 4 | ||||
| -rw-r--r-- | lldb/scripts/Python/interface/SBTarget.i | 40 | ||||
| -rw-r--r-- | lldb/scripts/Python/interface/SBValue.i | 6 | ||||
| -rw-r--r-- | lldb/scripts/Python/interface/SBWatchpoint.i (renamed from lldb/scripts/Python/interface/SBWatchpointLocation.i) | 24 | ||||
| -rw-r--r-- | lldb/scripts/Python/modify-python-lldb.py | 2 | ||||
| -rw-r--r-- | lldb/scripts/Python/python-extensions.swig | 4 |
6 files changed, 45 insertions, 35 deletions
diff --git a/lldb/scripts/Python/build-swig-Python.sh b/lldb/scripts/Python/build-swig-Python.sh index 69da019a0b5..d7191221a77 100755 --- a/lldb/scripts/Python/build-swig-Python.sh +++ b/lldb/scripts/Python/build-swig-Python.sh @@ -72,7 +72,7 @@ HEADER_FILES="${SRC_ROOT}/include/lldb/lldb.h"\ " ${SRC_ROOT}/include/lldb/API/SBType.h"\ " ${SRC_ROOT}/include/lldb/API/SBValue.h"\ " ${SRC_ROOT}/include/lldb/API/SBValueList.h"\ -" ${SRC_ROOT}/include/lldb/API/SBWatchpointLocation.h"\ +" ${SRC_ROOT}/include/lldb/API/SBWatchpoint.h"\ INTERFACE_FILES="${SRC_ROOT}/scripts/Python/interface/SBAddress.i"\ " ${SRC_ROOT}/scripts/Python/interface/SBBlock.i"\ @@ -108,7 +108,7 @@ INTERFACE_FILES="${SRC_ROOT}/scripts/Python/interface/SBAddress.i"\ " ${SRC_ROOT}/scripts/Python/interface/SBType.i"\ " ${SRC_ROOT}/scripts/Python/interface/SBValue.i"\ " ${SRC_ROOT}/scripts/Python/interface/SBValueList.i"\ -" ${SRC_ROOT}/scripts/Python/interface/SBWatchpointLocation.i" +" ${SRC_ROOT}/scripts/Python/interface/SBWatchpoint.i" if [ $Debug == 1 ] then diff --git a/lldb/scripts/Python/interface/SBTarget.i b/lldb/scripts/Python/interface/SBTarget.i index f93128d2e19..9c628a621ff 100644 --- a/lldb/scripts/Python/interface/SBTarget.i +++ b/lldb/scripts/Python/interface/SBTarget.i @@ -442,28 +442,32 @@ public: DeleteAllBreakpoints (); uint32_t - GetNumWatchpointLocations () const; - - lldb::SBWatchpointLocation - GetLastCreatedWatchpointLocation (); - - lldb::SBWatchpointLocation - GetWatchpointLocationAtIndex (uint32_t idx) const; - + GetNumWatchpoints () const; + + lldb::SBWatchpoint + GetWatchpointAtIndex (uint32_t idx) const; + bool - WatchpointLocationDelete (watch_id_t watch_id); - - lldb::SBWatchpointLocation - FindWatchpointLocationByID (watch_id_t watch_id); - + DeleteWatchpoint (lldb::watch_id_t watch_id); + + lldb::SBWatchpoint + FindWatchpointByID (lldb::watch_id_t watch_id); + bool - EnableAllWatchpointLocations (); - + EnableAllWatchpoints (); + bool - DisableAllWatchpointLocations (); - + DisableAllWatchpoints (); + bool - DeleteAllWatchpointLocations (); + DeleteAllWatchpoints (); + + lldb::SBWatchpoint + WatchAddress (lldb::addr_t addr, + size_t size, + bool read, + bool write); + lldb::SBBroadcaster GetBroadcaster () const; diff --git a/lldb/scripts/Python/interface/SBValue.i b/lldb/scripts/Python/interface/SBValue.i index 8792464b245..439e0abb7f7 100644 --- a/lldb/scripts/Python/interface/SBValue.i +++ b/lldb/scripts/Python/interface/SBValue.i @@ -278,6 +278,12 @@ public: lldb::SBFrame GetFrame(); + lldb::SBWatchpoint + Watch (bool resolve_location, bool read, bool write); + + lldb::SBWatchpoint + WatchPointee (bool resolve_location, bool read, bool write); + bool GetDescription (lldb::SBStream &description); diff --git a/lldb/scripts/Python/interface/SBWatchpointLocation.i b/lldb/scripts/Python/interface/SBWatchpoint.i index a5e21ddb894..5ddba459aaa 100644 --- a/lldb/scripts/Python/interface/SBWatchpointLocation.i +++ b/lldb/scripts/Python/interface/SBWatchpoint.i @@ -1,4 +1,4 @@ -//===-- SWIG Interface for SBWatchpointLocation -----------------*- C++ -*-===// +//===-- SWIG Interface for SBWatchpoint -----------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -18,22 +18,22 @@ settable options. See also SBTarget.watchpoint_location_iter() for for example usage of iterating through the watchpoint locations of the target." -) SBWatchpointLocation; -class SBWatchpointLocation +) SBWatchpoint; +class SBWatchpoint { public: - SBWatchpointLocation (); + SBWatchpoint (); - SBWatchpointLocation (const lldb::SBWatchpointLocation &rhs); + SBWatchpoint (const lldb::SBWatchpoint &rhs); - ~SBWatchpointLocation (); + ~SBWatchpoint (); watch_id_t - GetID () const; + GetID (); bool - IsValid() const; + IsValid(); %feature("docstring", " //------------------------------------------------------------------ @@ -41,13 +41,13 @@ public: //------------------------------------------------------------------ ") GetHardwareIndex; int32_t - GetHardwareIndex () const; + GetHardwareIndex (); lldb::addr_t - GetWatchAddress () const; + GetWatchAddress (); size_t - GetWatchSize() const; + GetWatchSize(); void SetEnabled(bool enabled); @@ -56,7 +56,7 @@ public: IsEnabled (); uint32_t - GetHitCount () const; + GetHitCount (); uint32_t GetIgnoreCount (); diff --git a/lldb/scripts/Python/modify-python-lldb.py b/lldb/scripts/Python/modify-python-lldb.py index 645d7de0d6b..15f42a46009 100644 --- a/lldb/scripts/Python/modify-python-lldb.py +++ b/lldb/scripts/Python/modify-python-lldb.py @@ -236,7 +236,7 @@ d = { 'SBBreakpoint': ('GetNumLocations', 'GetLocationAtIndex'), # e = { 'SBAddress': ['GetFileAddress', 'GetModule'], 'SBBreakpoint': ['GetID'], - 'SBWatchpointLocation': ['GetID'], + 'SBWatchpoint': ['GetID'], 'SBFileSpec': ['GetFilename', 'GetDirectory'], 'SBModule': ['GetFileSpec', 'GetUUIDString'], 'SBType': ['GetByteSize', 'GetName'] diff --git a/lldb/scripts/Python/python-extensions.swig b/lldb/scripts/Python/python-extensions.swig index 5c302ba6f86..52ec68e46f1 100644 --- a/lldb/scripts/Python/python-extensions.swig +++ b/lldb/scripts/Python/python-extensions.swig @@ -160,8 +160,8 @@ return PyString_FromString (description.GetData()); } } -%extend lldb::SBWatchpointLocation { - PyObject *lldb::SBWatchpointLocation::__repr__ (){ +%extend lldb::SBWatchpoint { + PyObject *lldb::SBWatchpoint::__repr__ (){ lldb::SBStream description; $self->GetDescription (description, lldb::eDescriptionLevelVerbose); return PyString_FromString (description.GetData()); |
