Merge 30867da into 61f4226

facebookarchive · Apr 9, 2016 · 1abf6cd · 1abf6cd
2 parents 61f4226 + 30867da
commit 1abf6cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/Sources/GDBRemote/DebugSessionImpl.cpp b/Sources/GDBRemote/DebugSessionImpl.cpp
@@ -1008,16 +1008,14 @@ ErrorCode DebugSessionImpl::onTerminate(Session &session,
   return queryStopCode(session, _process->pid(), stop);
 }
 
-//
 // For LLDB we need to support breakpoints through the breakpoint manager
-// because LLDB is unable to handle software breakpoints.
-// In GDB mode we let GDB handle the breakpoints.
-//
+// because LLDB is unable to handle software breakpoints. In GDB mode we let
+// GDB handle the breakpoints.
 ErrorCode DebugSessionImpl::onInsertBreakpoint(
     Session &session, BreakpointType type, Address const &address,
-    uint32_t size, StringCollection const &, StringCollection const &, bool) {
-  //    if (session.mode() != kCompatibilityModeLLDB)
-  //        return kErrorUnsupported;
+    uint32_t size, StringCollection const &conditions,
+    StringCollection const &commands, bool persistentCommands) {
+  DS2ASSERT(conditions.empty() && commands.empty() && !persistentCommands);
 
   BreakpointManager *bpm = nullptr;
   BreakpointManager::Mode mode;
@@ -1062,9 +1060,6 @@ ErrorCode DebugSessionImpl::onRemoveBreakpoint(Session &session,
                                                BreakpointType type,
                                                Address const &address,
                                                uint32_t size) {
-  //    if (session.mode() != kCompatibilityModeLLDB)
-  //        return kErrorUnsupported;
-
   if (type != kSoftwareBreakpoint)
     return kErrorUnsupported;
 

diff --git a/Sources/GDBRemote/Session.cpp b/Sources/GDBRemote/Session.cpp
@@ -3410,9 +3410,7 @@ void Session::Handle_Z(ProtocolInterpreter::Handler const &,
   }
   kind = std::strtoul(eptr, &eptr, 16);
 
-  //
-  // TODO cond_list etc
-  //
+  // TODO: cond_list, cmd_list.
   sendError(_delegate->onInsertBreakpoint(*this, type, address, kind,
                                           StringCollection(),
                                           StringCollection(), false));