1 files changed, 53 insertions, 4 deletions

diff --git a/contrib/llvm/tools/lldb/source/API/SBBreakpointLocation.cpp b/contrib/llvm/tools/lldb/source/API/SBBreakpointLocation.cpp
index 6fdf59f..4390e9a 100644
--- a/contrib/llvm/tools/lldb/source/API/SBBreakpointLocation.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBBreakpointLocation.cpp
@@ -17,10 +17,13 @@
 #include "lldb/lldb-defines.h"
 #include "lldb/Breakpoint/Breakpoint.h"
 #include "lldb/Breakpoint/BreakpointLocation.h"
-#include "lldb/Target/ThreadSpec.h"
+#include "lldb/Core/Debugger.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Stream.h"
 #include "lldb/Core/StreamFile.h"
+#include "lldb/Interpreter/CommandInterpreter.h"
+#include "lldb/Interpreter/ScriptInterpreter.h"
+#include "lldb/Target/ThreadSpec.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/ThreadSpec.h"
 
@@ -43,7 +46,9 @@ SBBreakpointLocation::SBBreakpointLocation (const lldb::BreakpointLocationSP &br
         SBStream sstr;
         GetDescription (sstr, lldb::eDescriptionLevelBrief);
         log->Printf ("SBBreakpointLocation::SBBreakpointLocaiton (const lldb::BreakpointLocationsSP &break_loc_sp"
-                     "=%p)  => this.sp = %p (%s)", break_loc_sp.get(), m_opaque_sp.get(), sstr.GetData());
+                     "=%p)  => this.sp = %p (%s)",
+                     static_cast<void*>(break_loc_sp.get()),
+                     static_cast<void*>(m_opaque_sp.get()), sstr.GetData());
     }
 }
 
@@ -160,6 +165,49 @@ SBBreakpointLocation::GetCondition ()
 }
 
 void
+SBBreakpointLocation::SetScriptCallbackFunction (const char *callback_function_name)
+{
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+
+    if (log)
+        log->Printf ("SBBreakpointLocation(%p)::SetScriptCallbackFunction (callback=%s)",
+                     static_cast<void*>(m_opaque_sp.get()),
+                     callback_function_name);
+
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetBreakpoint().GetTarget().GetAPIMutex());
+        BreakpointOptions *bp_options = m_opaque_sp->GetLocationOptions();
+        m_opaque_sp->GetBreakpoint().GetTarget().GetDebugger().GetCommandInterpreter().GetScriptInterpreter()->SetBreakpointCommandCallbackFunction (bp_options,
+                                                                                                                                     callback_function_name);
+    }
+}
+
+SBError
+SBBreakpointLocation::SetScriptCallbackBody (const char *callback_body_text)
+{
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+
+    if (log)
+        log->Printf ("SBBreakpoint(%p)::SetScriptCallbackBody: callback body:\n%s)",
+                     static_cast<void*>(m_opaque_sp.get()), callback_body_text);
+
+    SBError sb_error;
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetBreakpoint().GetTarget().GetAPIMutex());
+        BreakpointOptions *bp_options = m_opaque_sp->GetLocationOptions();
+        Error error = m_opaque_sp->GetBreakpoint().GetTarget().GetDebugger().GetCommandInterpreter().GetScriptInterpreter()->SetBreakpointCommandCallback (bp_options,
+                                                                                                                                                           callback_body_text);
+        sb_error.SetError(error);
+    }
+    else
+        sb_error.SetErrorString("invalid breakpoint");
+
+    return sb_error;
+}
+
+void
 SBBreakpointLocation::SetThreadID (tid_t thread_id)
 {
     if (m_opaque_sp)
@@ -312,8 +360,9 @@ SBBreakpointLocation::GetBreakpoint ()
     {
         SBStream sstr;
         sb_bp.GetDescription (sstr);
-        log->Printf ("SBBreakpointLocation(%p)::GetBreakpoint () => SBBreakpoint(%p) %s", 
-                     m_opaque_sp.get(), sb_bp.get(), sstr.GetData());
+        log->Printf ("SBBreakpointLocation(%p)::GetBreakpoint () => SBBreakpoint(%p) %s",
+                     static_cast<void*>(m_opaque_sp.get()),
+                     static_cast<void*>(sb_bp.get()), sstr.GetData());
     }
     return sb_bp;
 }