[Lldb-commits] [lldb] r146812 - in /lldb/trunk: include/lldb/API/SBThread.h scripts/Python/interface/SBThread.i source/API/SBThread.cpp

[Johnny Chen]

Author: johnny
Date: Fri Dec 16 20:07:52 2011
New Revision: 146812

URL: http://llvm.org/viewvc/llvm-project?rev=146812&view=rev
Log:
Fixed code rot pointed out by Jim.
SBThread::GetStopReasonDataCount/GetStopReasonDataAtIndex() need to handle eStopReasonWatchpoint.

Modified:
    lldb/trunk/include/lldb/API/SBThread.h
    lldb/trunk/scripts/Python/interface/SBThread.i
    lldb/trunk/source/API/SBThread.cpp

Modified: lldb/trunk/include/lldb/API/SBThread.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBThread.h?rev=146812&r1=146811&r2=146812&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBThread.h (original)
+++ lldb/trunk/include/lldb/API/SBThread.h Fri Dec 16 20:07:52 2011
@@ -53,7 +53,7 @@
     /// eStopReasonNone          0
     /// eStopReasonTrace         0
     /// eStopReasonBreakpoint    N     duple: {breakpoint id, location id}
-    /// eStopReasonWatchpoint    N     duple: {watchpoint id, location id}
+    /// eStopReasonWatchpoint    1     watchpoint id
     /// eStopReasonSignal        1     unix signal number
     /// eStopReasonException     N     exception data
     /// eStopReasonPlanComplete  0

Modified: lldb/trunk/scripts/Python/interface/SBThread.i
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/interface/SBThread.i?rev=146812&r1=146811&r2=146812&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/interface/SBThread.i (original)
+++ lldb/trunk/scripts/Python/interface/SBThread.i Fri Dec 16 20:07:52 2011
@@ -70,7 +70,7 @@
     /// eStopReasonNone          0
     /// eStopReasonTrace         0
     /// eStopReasonBreakpoint    N     duple: {breakpoint id, location id}
-    /// eStopReasonWatchpoint    N     duple: {watchpoint id, location id}
+    /// eStopReasonWatchpoint    1     watchpoint id
     /// eStopReasonSignal        1     unix signal number
     /// eStopReasonException     N     exception data
     /// eStopReasonPlanComplete  0

Modified: lldb/trunk/source/API/SBThread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBThread.cpp?rev=146812&r1=146811&r2=146812&view=diff
==============================================================================
--- lldb/trunk/source/API/SBThread.cpp (original)
+++ lldb/trunk/source/API/SBThread.cpp Fri Dec 16 20:07:52 2011
@@ -141,8 +141,7 @@
                 break;
 
             case eStopReasonWatchpoint:
-                assert (!"implement watchpoint support in SBThread::GetStopReasonDataCount ()");
-                return 0; // We don't have watchpoint support yet...
+                return 1;
 
             case eStopReasonSignal:
                 return 1;
@@ -201,8 +200,7 @@
                 break;
 
             case eStopReasonWatchpoint:
-                assert (!"implement watchpoint support in SBThread::GetStopReasonDataCount ()");
-                return 0; // We don't have watchpoint support yet...
+                return stop_info_sp->GetValue();
 
             case eStopReasonSignal:
                 return stop_info_sp->GetValue();