[Lldb-commits] [lldb] r138907 - in /lldb/trunk/tools/debugserver/source/MacOSX: i386/DNBArchImplI386.cpp i386/DNBArchImplI386.h x86_64/DNBArchImplX86_64.cpp x86_64/DNBArchImplX86_64.h

[Johnny Chen]

Author: johnny
Date: Wed Aug 31 16:44:56 2011
New Revision: 138907

URL: http://llvm.org/viewvc/llvm-project?rev=138907&view=rev
Log:
Renaming: from IsVacantWatchpoint() to IsWatchpointVacant().

Modified:
    lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
    lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h
    lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
    lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h

Modified: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp?rev=138907&r1=138906&r2=138907&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp Wed Aug 31 16:44:56 2011
@@ -720,7 +720,7 @@
 }
 
 bool
-DNBArchImplI386::IsVacantWatchpoint(const DBG &debug_state, uint32_t hw_index)
+DNBArchImplI386::IsWatchpointVacant(const DBG &debug_state, uint32_t hw_index)
 {
     // Check dr7 (debug control register) for local/global enable bits:
     //  global enable --. .-- local enable
@@ -782,7 +782,7 @@
         DBG debug_state = m_state.context.dbg;
         for (i = 0; i < num_hw_watchpoints; ++i)
         {
-            if (IsVacantWatchpoint(debug_state, i))
+            if (IsWatchpointVacant(debug_state, i))
                 break;
         }
 
@@ -815,7 +815,7 @@
     if (kret == KERN_SUCCESS)
     {
         DBG debug_state = m_state.context.dbg;
-        if (hw_index < num_hw_points && !IsVacantWatchpoint(debug_state, hw_index))
+        if (hw_index < num_hw_points && !IsWatchpointVacant(debug_state, hw_index))
         {
             // Modify our local copy of the debug state, first.
             ClearWatchpoint(debug_state, hw_index);

Modified: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h?rev=138907&r1=138906&r2=138907&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h Wed Aug 31 16:44:56 2011
@@ -229,7 +229,7 @@
     // Helper functions for watchpoint manipulations.
     static void SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write);
     static void ClearWatchpoint(DBG &debug_state, uint32_t hw_index);
-    static bool IsVacantWatchpoint(const DBG &debug_state, uint32_t hw_index);
+    static bool IsWatchpointVacant(const DBG &debug_state, uint32_t hw_index);
     static void ClearWatchpointHits(DBG &debug_state);
     static bool IsWatchpointHit(const DBG &debug_state, uint32_t hw_index);
 

Modified: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp?rev=138907&r1=138906&r2=138907&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Wed Aug 31 16:44:56 2011
@@ -648,7 +648,7 @@
 }
 
 bool
-DNBArchImplX86_64::IsVacantWatchpoint(const DBG &debug_state, uint32_t hw_index)
+DNBArchImplX86_64::IsWatchpointVacant(const DBG &debug_state, uint32_t hw_index)
 {
     // Check dr7 (debug control register) for local/global enable bits:
     //  global enable --. .-- local enable
@@ -710,7 +710,7 @@
         DBG debug_state = m_state.context.dbg;
         for (i = 0; i < num_hw_watchpoints; ++i)
         {
-            if (IsVacantWatchpoint(debug_state, i))
+            if (IsWatchpointVacant(debug_state, i))
                 break;
         }
 
@@ -743,7 +743,7 @@
     if (kret == KERN_SUCCESS)
     {
         DBG debug_state = m_state.context.dbg;
-        if (hw_index < num_hw_points && !IsVacantWatchpoint(debug_state, hw_index))
+        if (hw_index < num_hw_points && !IsWatchpointVacant(debug_state, hw_index))
         {
             // Modify our local copy of the debug state, first.
             ClearWatchpoint(debug_state, hw_index);

Modified: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h?rev=138907&r1=138906&r2=138907&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h Wed Aug 31 16:44:56 2011
@@ -236,7 +236,7 @@
     // Helper functions for watchpoint manipulations.
     static void SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write);
     static void ClearWatchpoint(DBG &debug_state, uint32_t hw_index);
-    static bool IsVacantWatchpoint(const DBG &debug_state, uint32_t hw_index);
+    static bool IsWatchpointVacant(const DBG &debug_state, uint32_t hw_index);
     static void ClearWatchpointHits(DBG &debug_state);
     static bool IsWatchpointHit(const DBG &debug_state, uint32_t hw_index);