JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / debugger / Debugger.h

diff --git a/debugger/Debugger.h b/debugger/Debugger.h
index 2e8524aaf54cd16eef29f326b308a040258c4320..d70f3b76f376a22a8d08a64893bfe46d2e3af4dc 100644 (file)
--- a/debugger/Debugger.h
+++ b/debugger/Debugger.h
@@ -33,6 +33,8 @@
 
 namespace JSC {
 
 
 namespace JSC {
 

+class CodeBlock;
+class Exception;

 class ExecState;
 class JSGlobalObject;
 class SourceProvider;
 class ExecState;
 class JSGlobalObject;
 class SourceProvider;


@@ -59,12 +61,13 @@ public:
 
     bool needsExceptionCallbacks() const { return m_pauseOnExceptionsState != DontPauseOnExceptions; }
 
 
     bool needsExceptionCallbacks() const { return m_pauseOnExceptionsState != DontPauseOnExceptions; }
 

-    void attach(JSGlobalObject*);

     enum ReasonForDetach {
         TerminatingDebuggingSession,
         GlobalObjectIsDestructing
     };
     enum ReasonForDetach {
         TerminatingDebuggingSession,
         GlobalObjectIsDestructing
     };

-    virtual void detach(JSGlobalObject*, ReasonForDetach);
+    void attach(JSGlobalObject*);
+    void detach(JSGlobalObject*, ReasonForDetach);
+    bool isAttached(JSGlobalObject*);

 
     BreakpointID setBreakpoint(Breakpoint, unsigned& actualLine, unsigned& actualColumn);
     void removeBreakpoint(BreakpointID);
 
     BreakpointID setBreakpoint(Breakpoint, unsigned& actualLine, unsigned& actualColumn);
     void removeBreakpoint(BreakpointID);


@@ -81,6 +84,20 @@ public:
     PauseOnExceptionsState pauseOnExceptionsState() const { return m_pauseOnExceptionsState; }
     void setPauseOnExceptionsState(PauseOnExceptionsState);
 
     PauseOnExceptionsState pauseOnExceptionsState() const { return m_pauseOnExceptionsState; }
     void setPauseOnExceptionsState(PauseOnExceptionsState);
 

+    enum ReasonForPause {
+        NotPaused,
+        PausedForException,
+        PausedAtStatement,
+        PausedAfterCall,
+        PausedBeforeReturn,
+        PausedAtStartOfProgram,
+        PausedAtEndOfProgram,
+        PausedForBreakpoint,
+        PausedForDebuggerStatement,
+    };
+    ReasonForPause reasonForPause() const { return m_reasonForPause; }
+    BreakpointID pausingBreakpointID() const { return m_pausingBreakpointID; }
+

     void setPauseOnNextStatement(bool);
     void breakProgram();
     void continueProgram();
     void setPauseOnNextStatement(bool);
     void breakProgram();
     void continueProgram();


@@ -88,12 +105,12 @@ public:
     void stepOverStatement();
     void stepOutOfFunction();
 
     void stepOverStatement();
     void stepOutOfFunction();
 

-    bool isPaused() { return m_isPaused; }
+    bool isPaused() const { return m_isPaused; }

     bool isStepping() const { return m_steppingMode == SteppingModeEnabled; }
 
     virtual void sourceParsed(ExecState*, SourceProvider*, int errorLineNumber, const WTF::String& errorMessage) = 0;
 
     bool isStepping() const { return m_steppingMode == SteppingModeEnabled; }
 
     virtual void sourceParsed(ExecState*, SourceProvider*, int errorLineNumber, const WTF::String& errorMessage) = 0;
 

-    void exception(CallFrame*, JSValue exceptionValue, bool hasHandler);
+    void exception(CallFrame*, JSValue exceptionValue, bool hasCatchHandler);

     void atStatement(CallFrame*);
     void callEvent(CallFrame*);
     void returnEvent(CallFrame*);
     void atStatement(CallFrame*);
     void callEvent(CallFrame*);
     void returnEvent(CallFrame*);


@@ -107,21 +124,9 @@ public:
 
 protected:
     virtual bool needPauseHandling(JSGlobalObject*) { return false; }
 
 protected:
     virtual bool needPauseHandling(JSGlobalObject*) { return false; }

-    virtual void handleBreakpointHit(const Breakpoint&) { }
-    virtual void handleExceptionInBreakpointCondition(ExecState*, JSValue exception) const { UNUSED_PARAM(exception); }
-
-    enum ReasonForPause {
-        NotPaused,
-        PausedForException,
-        PausedAtStatement,
-        PausedAfterCall,
-        PausedBeforeReturn,
-        PausedAtStartOfProgram,
-        PausedAtEndOfProgram,
-        PausedForBreakpoint
-    };
-
-    virtual void handlePause(ReasonForPause, JSGlobalObject*) { }
+    virtual void handleBreakpointHit(JSGlobalObject*, const Breakpoint&) { }
+    virtual void handleExceptionInBreakpointCondition(ExecState*, Exception*) const { }
+    virtual void handlePause(JSGlobalObject*, ReasonForPause) { }

     virtual void notifyDoneProcessingDebuggerEvents() { }
 
 private:
     virtual void notifyDoneProcessingDebuggerEvents() { }
 
 private:


@@ -191,7 +196,7 @@ private:
     bool m_breakpointsActivated : 1;
     bool m_hasHandlerForExceptionCallback : 1;
     bool m_isInWorkerThread : 1;
     bool m_breakpointsActivated : 1;
     bool m_hasHandlerForExceptionCallback : 1;
     bool m_isInWorkerThread : 1;

-    SteppingMode m_steppingMode : 1;
+    unsigned m_steppingMode : 1; // SteppingMode

 
     ReasonForPause m_reasonForPause;
     JSValue m_currentException;
 
     ReasonForPause m_reasonForPause;
     JSValue m_currentException;


@@ -201,12 +206,13 @@ private:
     SourceID m_lastExecutedSourceID;
 
     BreakpointID m_topBreakpointID;
     SourceID m_lastExecutedSourceID;
 
     BreakpointID m_topBreakpointID;

+    BreakpointID m_pausingBreakpointID;

     BreakpointIDToBreakpointMap m_breakpointIDToBreakpoint;
     SourceIDToBreakpointsMap m_sourceIDToBreakpoints;
 
     RefPtr<JSC::DebuggerCallFrame> m_currentDebuggerCallFrame;
 
     BreakpointIDToBreakpointMap m_breakpointIDToBreakpoint;
     SourceIDToBreakpointsMap m_sourceIDToBreakpoints;
 
     RefPtr<JSC::DebuggerCallFrame> m_currentDebuggerCallFrame;
 

-    friend class DebuggerCallFrameScope;
+    friend class DebuggerPausedScope;

     friend class TemporaryPausedState;
     friend class LLIntOffsetsExtractor;
 };
     friend class TemporaryPausedState;
     friend class LLIntOffsetsExtractor;
 };