hg/stx-libtool: comparison DebugView.st

equal deleted inserted replaced

-:dab2fdc4a811
+:26d452e40e52
 		steppedContextAddress canAbort abortButton terminateButton
 		continueButton stepButton nextButton sendButton returnButton
 		restartButton exclusive inspecting nChainShown inspectedProcess
 		updateProcess stopButton updateButton monitorToggle stepping
 		steppedContextLineno stepForReturn actualContext inWrap
-		stackInspector steppedContext'
+		stackInspector steppedContext wrapperContext'
 	classVariableNames:'CachedDebugger CachedExclusive OpenDebuggers MoreDebuggingDetail
 		DebuggingDebugger'
 	poolDictionaries:''
 	category:'Interface-Debugger'
 !
 catchBlock := [
 catchBlock := nil.
 contextArray := nil.
 selectedContext := actualContext := nil.
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 (exitAction == #terminate) ifTrue:[
 aProcess terminate.
 ].
 (exitAction == #quickTerminate) ifTrue:[
 super destroy
 ].
 ].
 self open
-"Modified: 21.10.1996 / 13:43:05 / cg"
+"Modified: 22.10.1996 / 11:58:53 / cg"
 ! !
 !DebugView methodsFor:'help'!
 helpTextFor:aComponent
 "Modified: 14.10.1996 / 13:30:56 / cg"
 !
 stepOrNext
 |where here s isWrap method lastWrappedConAddr wrappedMethod
-inBlock left ignore contextBelow lastWrappedContext|
+inBlock left ignore contextBelow lastWrappedContext
+leftWrap enteredWrap|
 skipLineNr == #return ifTrue:[
 name := Processor activeProcess nameOrId.
 self label:('context returned ' , ' (process: ' , name , ')').
 here := thisContext sender sender.
 "
 kludge to hide breakpoint wrappers in the context list:
 check if we are in a wrapper methods hidden setup-sequence
 if so, ignore the interrupt and continue single sending
 "
-where := here.
 isWrap := false.
 left := false.
+leftWrap := enteredWrap := false.
+where := here.
 inWrap ifTrue:[
 wrappedMethod := nil.
 5 timesRepeat:[
-"/ where selector printNL.
 (where notNil and:[where isBlockContext not]) ifTrue:[
 method := where method.
 (method notNil and:[method isWrapped]) ifTrue:[
 "
 in a wrapper method
 where sender receiver == method originalMethod ifFalse:[
 isWrap := true.
 ]
 ] ifFalse:[
 where == steppedContext ifTrue:[
-"/DebuggingDebugger ifTrue:[
-"/ 'change stepCon from: ' print.
+DebuggingDebugger ifTrue:[
-"/ steppedContext print.
+'change stepCon from: ' print.
-"/ ' to: ' print.
+steppedContext print.
-"/ lastWrappedContext printNL.
+' to lastWrapped: ' print.
-"/].
+lastWrappedContext printNL.
+].
 inWrap := false.
+leftWrap := true.
+wrapperContext := steppedContext.
 steppedContext := lastWrappedContext
 ]
 ]
 ].
 where := where sender
 "/
 where := nil. here := nil.
 ObjectMemory flushInlineCaches.
 skipLineNr == #return ifTrue:[
-'skipRet in wrap' printCR.
+DebuggingDebugger ifTrue:[
+'skipRet in wrap' printCR.
+]
 ].
 StepInterruptPending := 1.
 InterruptPending := 1.
 InStepInterrupt := nil.
 ] ifFalse:[
 "/ ' send' printNL.
 "
 a send
 "
+DebuggingDebugger ifTrue:[
+'clear steppedContext' printCR.
+].
 steppedContext := nil.
 s := 'after send'
 ].
+ignore := false.
+"
+kludge to hide breakpoint wrappers in the context list:
+check if we are in a wrapper methods hidden exit-sequence
+if so, ignore the interrupt and continue single sending
+"
+(where isNil
+and:[wrapperContext notNil])
+ifTrue:[
+"/ did not find our steppedContext along the chain;
+"/ could be in a wrappedMethods exitBlock ...
+leftWrap ifFalse:[
+where := here.
+wrappedMethod := nil.
+5 timesRepeat:[
+where notNil ifTrue:[
+where isBlockContext ifFalse:[
+method := where method.
+(method notNil and:[method isWrapped]) ifTrue:[
+where == wrapperContext ifTrue:[
+DebuggingDebugger ifTrue:[
+'change stepCon fromWrapped: ' print.
+steppedContext print.
+' to: ' print.
+wrapperContext printNL.
+].
+inWrap := true.
+enteredWrap := true.
+steppedContext := wrapperContext.
+wrapperContext := nil.
+]
+].
+].
+where := where sender
+]
+].
+].
+enteredWrap ifTrue:[
+ignore := true
+]
+].
+"/
 left ifTrue:[
 "/ special care for stepInterrupt in send,
 "/ when created a dummy context (lineNr == 1)
 where print.
 '[' print. where lineNumber print. ']' printNL.
 ].
 ].
-ignore := false.
+ignore ifFalse:[
 (bigStep
 and:[steppedContextLineno notNil
 and:[where notNil
 and:[where lineNumber == steppedContextLineno]]]) ifTrue:[
 DebuggingDebugger == true ifTrue:[
 'same line - ignored' printNL.
 ].
 ignore := true
 ].
 (left not
 and:[skipLineNr notNil
 and:[where notNil
 and:[where lineNumber < skipLineNr]]]) ifTrue:[
 DebuggingDebugger == true ifTrue:[
 'skip (' print. skipLineNr print. ' unreached - ignored' printNL.
 ].
 ignore := true
 ].
 (steppedContextLineno isNil
 and:[skipLineNr isNil
 and:[thisContext sender selector == #contextInterrupt]]) ifTrue:[
 DebuggingDebugger == true ifTrue:[
 'same line2 (after conIRQ) - ignored' printNL.
 ].
 ignore := true
+].
 ].
 ignore ifTrue:[
 "/' ' printNL.
 where := nil. here := nil.
 bigStep := false.
 "release refs to context"
 where := nil. here := nil.
 "/'enter' printCR.
 self enter:thisContext sender sender
 "Created: 14.10.1996 / 12:53:39 / cg"
-"Modified: 22.10.1996 / 11:31:44 / cg"
+"Modified: 22.10.1996 / 12:54:33 / cg"
 ! !
 !DebugView methodsFor:'menu / button actions'!
 autoUpdateOff
 self interruptProcessWith:[Object abortSignal raise].
 ].
 ^ self
 ].
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 haveControl := false.
 exitAction := #abort.
 "exit private event-loop"
 catchBlock notNil ifTrue:[
 'DEBUGGER: oops, abort failed' errorPrintNL.
 ].
 ^ self.
-"Modified: 21.10.1996 / 13:47:28 / cg"
+"Modified: 22.10.1996 / 11:59:21 / cg"
 !
 doContinue
 "continue from menu"
 self processPerform:#resume.
 ^ self
 ].
 canContinue ifTrue:[
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 tracing := false.
 haveControl := false.
 exitAction := #continue.
 "exit private event-loop"
 self showSelection:1.
 self doReturn
 ]
 ]
-"Modified: 21.10.1996 / 13:47:31 / cg"
+"Modified: 22.10.1996 / 11:59:24 / cg"
 !
 doNext
 "skip for next source-code line"
 ].
 self interruptProcessWith:[selectedContext unwindAndRestart].
 ^ self
 ].
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 haveControl := false.
 exitAction := #restart.
 "exit private event-loop"
 catchBlock notNil ifTrue:[catchBlock value].
 "/ not reached
 'DEBUGGER: oops, restart failed' errorPrintNL.
 restartButton turnOff.
-"Modified: 21.10.1996 / 13:47:35 / cg"
+"Modified: 22.10.1996 / 11:59:28 / cg"
 !
 doReturn
 "return - the selected context will do a ^nil"
 ].
 self interruptProcessWith:[selectedContext unwind].
 ^ self
 ].
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 haveControl := false.
 exitAction := #return.
 "exit private event-loop"
 catchBlock notNil ifTrue:[catchBlock value].
 "/ not reached
 'DEBUGGER: oops, return failed' errorPrintNL.
 returnButton turnOff.
-"Modified: 21.10.1996 / 13:47:38 / cg"
+"Modified: 22.10.1996 / 11:59:31 / cg"
 !
 doSend
 "single send; reenter with next message send"
 inspecting ifTrue:[^ self].
 canContinue ifTrue:[
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 haveControl := false.
 exitAction := #step.
 "exit private event-loop"
 catchBlock notNil ifTrue:[catchBlock value].
 "/ not reached
 'DEBUGGER: oops, send failed' errorPrintNL.
 sendButton turnOff.
 ]
-"Modified: 21.10.1996 / 13:47:41 / cg"
+"Modified: 22.10.1996 / 11:59:33 / cg"
 !
 doStep
 "skip for next send in selected method"
 lineNr == -1 ifTrue:[
 steppedContextLineno := skipLineNr := nil.
 ].
 steppedContext := con.
+wrapperContext := nil.
 "
 if we step in a wrapped method,
 prepare to skip the prolog ...
 "
 stepButton turnOff.
 nextButton turnOff.
 sendButton turnOff.
 ]
-"Modified: 21.10.1996 / 13:47:49 / cg"
+"Modified: 22.10.1996 / 11:59:42 / cg"
 !
 doStop
 "stop the process (if its running, otherwise this is a no-op)"
 inspecting ifTrue:[
 self processPerform:#terminate.
 ^ self
 ].
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 haveControl := false.
 exitAction := #terminate.
 "exit private event-loop"
 catchBlock notNil ifTrue:[catchBlock value].
 'DEBUGGER: oops, terminate failed' errorPrintNL.
 self warn:'terminate failed'.
 ].
 terminateButton turnOff.
-"Modified: 21.10.1996 / 13:48:00 / cg"
+"Modified: 22.10.1996 / 11:59:45 / cg"
 !
 doTrace
 "tracing - not really implemented ..."
 inspecting ifTrue:[
 self processPerform:#terminateNoSignal.
 ^ self
 ].
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 haveControl := false.
 exitAction := #quickTerminate.
 "exit private event-loop"
 catchBlock notNil ifTrue:[catchBlock value].
 'DEBUGGER: oops, terminate failed' errorPrintNL.
 self warn:'terminate failed'.
 ].
 terminateButton turnOff.
-"Modified: 21.10.1996 / 13:48:05 / cg"
+"Modified: 22.10.1996 / 11:59:49 / cg"
 !
 removeAllBreakpoints
 "remove all trace & breakpoints - if any"
 contextInspector release.
 inspectedProcess := nil.
 exitAction := nil.
 contextArray := nil.
 selectedContext := actualContext := nil.
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 catchBlock := nil.
 grabber := nil.
 self autoUpdateOff.
 exclusive ifTrue:[CachedExclusive := self] ifFalse:[CachedDebugger := self].
-"Modified: 21.10.1996 / 13:42:45 / cg"
+"Modified: 22.10.1996 / 11:59:53 / cg"
 !
 exclusive:aBoolean
 exclusive := aBoolean
 !
 !
 unstep
 stepping := false.
 bigStep := false.
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 exitAction := nil
-"Modified: 21.10.1996 / 13:47:53 / cg"
+"Modified: 22.10.1996 / 11:59:57 / cg"
 !
 updateContext
 |oldContext idx|
 contextInspector release.
 inspectedProcess := nil.
 exitAction := nil.
 contextArray := nil.
 selectedContext := actualContext := nil.
-steppedContext := nil.
+steppedContext := wrapperContext := nil.
 grabber := nil.
 self autoUpdateOff.
 super destroy    "/ 1.12.94
-"Modified: 21.10.1996 / 13:43:40 / cg"
+"Modified: 22.10.1996 / 12:00:00 / cg"
 !
 showSelection:lineNr
 "user clicked on a header line - show selected code in textView.
 Also sent to autoselect an interesting context on entry."
 ! !
 !DebugView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.108 1996-10-22 10:41:16 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.109 1996-10-22 11:57:13 cg Exp $'
 ! !

changeset 788	26d452e40e52
parent 787	dab2fdc4a811
child 789	a9595b71a8fa