commit ecd4feb5111432d2878e95461220c720cb2d24c8
author Johnny Chen <johnny.chen@apple.com> Fri Oct 14 00:42:25 2011 +0000
committer Johnny Chen <johnny.chen@apple.com> Fri Oct 14 00:42:25 2011 +0000
tree 3a759210d02a38555748c1202a1a6140db5b2079
parent 03fd0d013cbd82ddcb3053a5add8f1f9891eeec5

SBValue::Watch() and SBValue::WatchPointee() are now the official API for creating
a watchpoint for either the variable encapsulated by SBValue (Watch) or the pointee
encapsulated by SBValue (WatchPointee).

Removed SBFrame::WatchValue() and SBFrame::WatchLocation() API as a result of that.

Modified the watchpoint related test suite to reflect the change.

Plus replacing WatchpointLocation with Watchpoint throughout the code base.

There are still cleanups to be dome.  This patch passes the whole test suite.
Check it in so that we aggressively catch regressions.


git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@141925 91177308-0d34-0410-b5e6-96231b3b80d8

source/API/SBTarget.cpp

diff --git a/source/API/SBTarget.cpp b/source/API/SBTarget.cpp
index 3cdfe1d..652d470 100644
--- a/source/API/SBTarget.cpp
+++ b/source/API/SBTarget.cpp
@@ -887,8 +887,8 @@
 {
     if (m_opaque_sp)
     {
-        // The watchpoint location list is thread safe, no need to lock
-        return m_opaque_sp->GetWatchpointLocationList().GetSize();
+        // The watchpoint list is thread safe, no need to lock
+        return m_opaque_sp->GetWatchpointList().GetSize();
     }
     return 0;
 }
@@ -896,13 +896,13 @@
 SBWatchpoint
 SBTarget::GetWatchpointAtIndex (uint32_t idx) const
 {
-    SBWatchpoint sb_watchpoint_location;
+    SBWatchpoint sb_watchpoint;
     if (m_opaque_sp)
     {
-        // The watchpoint location list is thread safe, no need to lock
-        *sb_watchpoint_location = m_opaque_sp->GetWatchpointLocationList().GetByIndex(idx);
+        // The watchpoint list is thread safe, no need to lock
+        *sb_watchpoint = m_opaque_sp->GetWatchpointList().GetByIndex(idx);
     }
-    return sb_watchpoint_location;
+    return sb_watchpoint;
 }
 
 bool
@@ -914,12 +914,12 @@
     if (m_opaque_sp)
     {
         Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
-        result = m_opaque_sp->RemoveWatchpointLocationByID (wp_id);
+        result = m_opaque_sp->RemoveWatchpointByID (wp_id);
     }
 
     if (log)
     {
-        log->Printf ("SBTarget(%p)::WatchpointLocationDelete (wp_id=%d) => %i", m_opaque_sp.get(), (uint32_t) wp_id, result);
+        log->Printf ("SBTarget(%p)::WatchpointDelete (wp_id=%d) => %i", m_opaque_sp.get(), (uint32_t) wp_id, result);
     }
 
     return result;
@@ -934,12 +934,12 @@
     if (m_opaque_sp && wp_id != LLDB_INVALID_WATCH_ID)
     {
         Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
-        *sb_watchpoint = m_opaque_sp->GetWatchpointLocationList().FindByID(wp_id);
+        *sb_watchpoint = m_opaque_sp->GetWatchpointList().FindByID(wp_id);
     }
 
     if (log)
     {
-        log->Printf ("SBTarget(%p)::FindWatchpointLocationByID (bp_id=%d) => SBWatchpoint(%p)", 
+        log->Printf ("SBTarget(%p)::FindWatchpointByID (bp_id=%d) => SBWatchpoint(%p)", 
                      m_opaque_sp.get(), (uint32_t) wp_id, sb_watchpoint.get());
     }
 
@@ -955,8 +955,9 @@
     if (m_opaque_sp)
     {
         Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
-        // TODO: Johnny fill this in
-        //*sb_watchpoint = m_opaque_sp->GetWatchpointLocationList().FindByID(wp_id);
+        uint32_t watch_type = (read ? LLDB_WATCH_TYPE_READ : 0) |
+            (write ? LLDB_WATCH_TYPE_WRITE : 0);
+        WatchpointSP wp_sp = m_opaque_sp->CreateWatchpoint(addr, size, watch_type);
     }
     
     if (log)
@@ -974,7 +975,7 @@
     if (m_opaque_sp)
     {
         Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
-        m_opaque_sp->EnableAllWatchpointLocations ();
+        m_opaque_sp->EnableAllWatchpoints ();
         return true;
     }
     return false;
@@ -986,7 +987,7 @@
     if (m_opaque_sp)
     {
         Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
-        m_opaque_sp->DisableAllWatchpointLocations ();
+        m_opaque_sp->DisableAllWatchpoints ();
         return true;
     }
     return false;
@@ -998,7 +999,7 @@
     if (m_opaque_sp)
     {
         Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
-        m_opaque_sp->RemoveAllWatchpointLocations ();
+        m_opaque_sp->RemoveAllWatchpoints ();
         return true;
     }
     return false;