Implement deletion of breakpoints

runtime/vm/debugger.h

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_DEBUGGER_H_
 #define VM_DEBUGGER_H_
 
 #include "vm/object.h"
 
 namespace dart {
 
 class Breakpoint;
 class Isolate;
 class ObjectPointerVisitor;
 class ActiveVariables;
 
 
 // Breakpoint represents a location in Dart source and the corresponding
 // address in compiled code.
 class Breakpoint {
  public:
   Breakpoint(const Function& func, intptr_t pc_desc_index);
 
   RawFunction* function() const { return function_; }
   uword pc() const { return pc_; }
+  intptr_t token_index() const { return token_index_; }
 
   RawScript* SourceCode();
   RawString* SourceUrl();
   intptr_t LineNumber();
 
  private:
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
   void set_next(Breakpoint* value) { next_ = value; }
   Breakpoint* next() const { return this->next_; }
+  intptr_t pc_desc_index() const { return pc_desc_index_; }
 
   RawFunction* function_;
   intptr_t pc_desc_index_;
   intptr_t token_index_;
   uword pc_;
+  uword saved_bytes_;
   intptr_t line_number_;
   Breakpoint* next_;
 
   friend class Debugger;
   DISALLOW_COPY_AND_ASSIGN(Breakpoint);
 };
 
 
 // ActivationFrame represents one dart function activation frame
 // on the call stack.
@@ skipping 56 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(StackTrace);
 };
 
 
 typedef void BreakpointHandler(Breakpoint* bpt, StackTrace* stack);
 
 
 class Debugger {
  public:
   Debugger();
+  ~Debugger();
 
   void Initialize(Isolate* isolate);
+  void Shutdown();
   bool IsActive();
 
   void SetBreakpointHandler(BreakpointHandler* handler);
 
   RawFunction* ResolveFunction(const Library& library,
                                const String& class_name,
                                const String& function_name);
 
   // Set breakpoint at closest location to function entry.
   Breakpoint* SetBreakpointAtEntry(const Function& target_function);
   Breakpoint* SetBreakpointAtLine(const String& script_url,
                                   intptr_t line_number);
 
+  void RemoveBreakpoint(Breakpoint* bpt);
+
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
   // Returns NULL if no breakpoint exists for the given address.
   Breakpoint* GetBreakpoint(uword breakpoint_address);
 
   // Called from Runtime when a breakpoint in Dart code is reached.
   void BreakpointCallback();
 
   // Utility functions.
   static const char* QualifiedFunctionName(const Function& func);
 
  private:
   Breakpoint* SetBreakpoint(const Function& target_function,
                             intptr_t token_index);
-  void AddBreakpoint(Breakpoint* bpt);
+  void UnsetBreakpoint(Breakpoint* bpt);
+  Breakpoint* NewBreakpoint(const Function& func, intptr_t pc_desc_index);
+  void RegisterBreakpoint(Breakpoint* bpt);
+  Breakpoint* GetBreakpointByFunction(const Function& func,
+                                      intptr_t token_index);
 
   bool initialized_;
   BreakpointHandler* bp_handler_;
   Breakpoint* breakpoints_;
   DISALLOW_COPY_AND_ASSIGN(Debugger);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DEBUGGER_H_