Vm-dev July 2015

vm-dev@lists.squeakfoundation.org

19 participants
87 discussions

VM Maker: Cog-eem.272.mcz
by commits＠source.squeak.org 15 Jul '15

15 Jul '15

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.272.mcz ==================== Summary ==================== Name: Cog-eem.272 Author: eem Time: 14 July 2015, 11:50:38.16 pm UUID: a4782a2a-cf79-4cdf-84fe-24c70abb7fa0 Ancestors: Cog-tpr.271 Keep it simple. The indirection to a method that answers an array just obfuscates. =============== Diff against Cog-tpr.271 =============== Item was removed: - ----- Method: GdbARMAlien>>callerABISavedSmashRegisterAccessors (in category 'accessing-abstract') ----- - callerABISavedSmashRegisterAccessors - "limited list of registers to clear out when simulating a naBI call; we need R1 sometimes since many abi calls return 2 results or maybe a 64bit dual-reg value, and LR has to be left alone becasue a leaf call doesn't push it" - ^#( r2: r3: )! Item was removed: - ----- Method: GdbARMAlien>>callerSavedSmashRegisterAccessors (in category 'accessing-abstract') ----- - callerSavedSmashRegisterAccessors - ^#(r0: r1: r2: r3: lr:)! Item was changed: ----- Method: GdbARMAlien>>smashABICallerSavedRegistersWithValuesFrom:by: (in category 'accessing-abstract') ----- smashABICallerSavedRegistersWithValuesFrom: base by: step + "limited list of registers to clear out when simulating an ABI call. + Smash neither R0 nor R1 since many abi calls return 2 results or a 64-bit dual-reg value. + LR has to be left alone becasue a leaf call doesn't push it." + + #(r2: r3:) withIndexDo: - self callerABISavedSmashRegisterAccessors - withIndexDo: [:accessor :index| self perform: accessor with: index - 1 * step + base]! Item was changed: ----- Method: GdbARMAlien>>smashCallerSavedRegistersWithValuesFrom:by: (in category 'accessing-abstract') ----- smashCallerSavedRegistersWithValuesFrom: base by: step + #(r0: r1: r2: r3: lr:) withIndexDo: - self callerSavedSmashRegisterAccessors - withIndexDo: [:accessor :index| self perform: accessor with: index - 1 * step + base]!

1 0

VM Maker: VMMaker.oscog-eem.1418.mcz
by commits＠source.squeak.org 15 Jul '15

15 Jul '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1418.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1418 Author: eem Time: 14 July 2015, 9:26:06.427 pm UUID: ec9f7a35-a5c8-4eb2-ad7d-c3f0cb2e2e84 Ancestors: VMMaker.oscog-eem.1417 Simulator: Rename Timothy's StackInterpreterSimulatorFoo classes tosomething a little less of a mouthful. Plumb his (now) SimulatorEventTransformer into the existing simple simulator UI. (thnks Tmothy! Sorry I've been so long getting to this) Copy the event queue code from StackInterpreterSimulator to CogVMSimulator. Fix Spur64BitMemoryManager>>newInputEventAccessorOfSize: and allow CPluggableAccessor to hard-code the size. =============== Diff against VMMaker.oscog-eem.1417 =============== Item was changed: CArrayAccessor subclass: #CPluggableAccessor + instanceVariableNames: 'readBlock writeBlock objectSize' - instanceVariableNames: 'readBlock writeBlock' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-InterpreterSimulation'! !CPluggableAccessor commentStamp: 'tpr 5/5/2003 11:49' prior: 0! This class adds generalized block parameter access to C objects for vm simulation! Item was added: + ----- Method: CPluggableAccessor>>objectSize: (in category 'initialize') ----- + objectSize: n + objectSize := n! Item was added: + ----- Method: CPluggableAccessor>>size (in category 'accessing') ----- + size + ^objectSize ifNil: [super size]! Item was changed: CoInterpreterMT subclass: #CogVMSimulator + instanceVariableNames: 'parent enableCog byteCount lastPollCount lastExtPC sendCount lookupCount printSends traceOn myBitBlt displayForm fakeForm imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes uniqueIndices uniqueIndex breakCount atEachStepBlock startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize debugStackDepthDictionary performFilters eventQueue' - instanceVariableNames: 'parent enableCog byteCount lastPollCount lastExtPC sendCount lookupCount printSends traceOn myBitBlt displayForm fakeForm imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes uniqueIndices uniqueIndex breakCount atEachStepBlock startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize debugStackDepthDictionary performFilters' classVariableNames: 'ByteCountsPerMicrosecond' poolDictionaries: '' category: 'VMMaker-JITSimulation'! !CogVMSimulator commentStamp: 'eem 9/3/2013 11:16' prior: 0! This class defines basic memory access and primitive simulation so that the CoInterpreter can run simulated in the Squeak environment. It also defines a number of handy object viewing methods to facilitate pawing around in the object memory. Remember that you can test the Cogit using its class-side in-image compilation facilities. To see the thing actually run, you could (after backing up this image and changes), execute (CogVMSimulator new openOn: Smalltalk imageName) test and be patient both to wait for things to happen, and to accept various things that may go wrong depending on how large or unusual your image may be. We usually do this with a small and simple benchmark image. Here's an example to launch the simulator in a window. The bottom-right window has a menu packed with useful stuff: (CogVMSimulator newWithOptions: #(Cogit StackToRegisterMappingCogit)) desiredNumStackPages: 8; openOn: '/Users/eliot/Cog/startreader.image'; openAsMorph; run Here's a hairier example that I (Eliot) actually use in daily development with some of the breakpoint facilities commented out. | cos proc opts | CoInterpreter initializeWithOptions: (opts := Dictionary newFromPairs: #(Cogit StackToRegisterMappingCogit)). CogVMSimulator chooseAndInitCogitClassWithOpts: opts. cos := CogVMSimulator new. "cos initializeThreadSupport." "to test the multi-threaded VM" cos desiredNumStackPages: 8. "to set the size of the stack zone" "cos desiredCogCodeSize: 8 * 1024 * 1024." "to set the size of the Cogit's code zone" cos openOn: '/Users/eliot/Squeak/Squeak4.4/trunk44.image'. "choose your favourite image" "cos setBreakSelector: 'r:degrees:'." "set a breakpoint at a specific selector" proc := cos cogit processor. "cos cogit sendTrace: 7." "turn on tracing" "set a complex breakpoint at a specific point in machine code" "cos cogit singleStep: true; breakPC: 16r56af; breakBlock: [:cg| cos framePointer > 16r101F3C and: [(cos longAt: cos framePointer - 4) = 16r2479A and: [(cos longAt: 16r101F30) = (cos longAt: 16r101F3C) or: [(cos longAt: 16r101F2C) = (cos longAt: 16r101F3C)]]]]; sendTrace: 1". "[cos cogit compilationTrace: -1] on: MessageNotUnderstood do: [:ex|]." "turn on compilation tracing in the StackToRegisterMappingCogit" "cos cogit setBreakMethod: 16rB38880." cos openAsMorph; "toggleTranscript;" "toggleTranscript will send output to the Transcript instead of the morph's rather small window" halt; run! Item was changed: ----- Method: CogVMSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the CogVMSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." super initialize. transcript := Transcript. objectMemory ifNil: [objectMemory := self class objectMemoryClass simulatorClass new]. cogit ifNil: [cogit := self class cogitClass new setInterpreter: self]. objectMemory coInterpreter: self cogit: cogit. cogit numRegArgs > 0 ifTrue: [debugStackDepthDictionary := Dictionary new]. cogThreadManager ifNotNil: [super initialize]. "Note: we must initialize ConstMinusOne & HasBeenReturnedFromMCPC differently for simulation, due to the fact that the simulator works only with +ve 32-bit values" ConstMinusOne := objectMemory integerObjectOf: -1. HasBeenReturnedFromMCPC := objectMemory integerObjectOf: -1. cogMethodZone := cogit methodZone. "Because Slang can't remove intermediate implicit receivers (cogit methodZone foo doesn't reduce to foo())" enableCog := true. methodCache := Array new: MethodCacheSize. nsMethodCache := Array new: NSMethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. cogCompiledCodeCompactionCalledFor := false. gcSemaphoreIndex := 0. externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #(). externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). externalPrimitiveTableFirstFreeIndex := 0. primitiveTable := self class primitiveTable copy. mappedPluginEntries := OrderedCollection new. objectMemory hasSpurMemoryManagerAPI ifTrue: [primitiveAccessorDepthTable := Array new: primitiveTable size. pluginList := {}. self loadNewPlugin: ''] ifFalse: [pluginList := {'' -> self }]. desiredNumStackPages := desiredEdenBytes := desiredCogCodeSize := 0. "This is initialized on loading the image, but convenient for testing stack page values..." numStackPages := self defaultNumStackPages. startMicroseconds := Time totalSeconds * 1000000. maxLiteralCountForCompile := MaxLiteralCountForCompile. minBackwardJumpCountForCompile := MinBackwardJumpCountForCompile. flagInterpretedMethods := false. "initialize InterpreterSimulator variables used for debugging" byteCount := lastPollCount := sendCount := lookupCount := 0. quitBlock := [^ self]. traceOn := true. printSends := printFrameAtEachStep := printBytecodeAtEachStep := false. myBitBlt := BitBltSimulator new setInterpreter: self. displayForm := fakeForm := 'Display has not yet been installed' asDisplayText form. + eventQueue := SharedQueue new. suppressHeartbeatFlag := deferSmash := deferredSmash := false. systemAttributes := Dictionary new. primTraceLog := CArrayAccessor on: (Array new: 256 withAll: 0). primTraceLogIndex := 0. traceLog := CArrayAccessor on: (Array new: TraceBufferSize withAll: 0). traceLogIndex := 0. traceSources := TraceSources. statCodeCompactionCount := 0. statCodeCompactionUsecs := 0. extSemTabSize := 256! Item was changed: ----- Method: CogVMSimulator>>ioGetNextEvent: (in category 'I/O primitives') ----- ioGetNextEvent: evtBuf + | evt | + "SimulatorMorphicModel browse" + eventQueue ifNil: + [^self primitiveFail]. + eventQueue isEmpty ifFalse: + [evt := eventQueue next. + 1 to: evt size do: + [:i| (evt at: i) ifNotNil: [:val| evtBuf at: (i - 1) put: val]]]! - - self primitiveFail. - ! Item was changed: ----- Method: CogVMSimulator>>openAsMorph (in category 'UI') ----- openAsMorph "Open a morphic view on this simulation." | localImageName borderWidth window | localImageName := imageName ifNotNil: [FileDirectory default localNameFor: imageName] ifNil: [' synthetic image']. window := (SystemWindow labelled: 'Simulation of ', localImageName) model: self. window addMorph: (displayView := ImageMorph new image: displayForm) + frame: (0@0 corner: 1(a)0.8). + displayView activeHand addEventListener: self. - frame: (0@0 corner: 1(a)0.8). transcript := TranscriptStream on: (String new: 10000). window addMorph: (PluggableTextMorph on: transcript text: nil accept: nil readSelection: nil menu: #codePaneMenu:shifted:) frame: (0(a)0.8 corner: 0.7@1). window addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil readSelection: nil menu: #utilitiesMenu:) hideScrollBarsIndefinitely frame: (0.7(a)0.8 corner: 1@1). borderWidth := [SystemWindow borderWidth] "Squeak 4.1" on: MessageNotUnderstood do: [:ex| 0]. "3.8" borderWidth := borderWidth + window borderWidth. window openInWorldExtent: (self desiredDisplayExtent + (2 * borderWidth) + (0@window labelHeight) * (1(a)(1/0.8))) rounded. ^window! Item was changed: ----- Method: CogVMSimulator>>openAsMorphNoTranscript (in category 'UI') ----- openAsMorphNoTranscript "Open a morphic view on this simulation." | localImageName borderWidth window | localImageName := FileDirectory default localNameFor: imageName. window := (SystemWindow labelled: 'Simulation of ' , localImageName) model: self. window addMorph: (displayView := ImageMorph new image: displayForm) + frame: (0@0 corner: 1(a)0.95). + displayView activeHand addEventListener: self. - frame: (0@0 corner: 1(a)0.95). window addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil readSelection: nil menu: #utilitiesMenu:) hideScrollBarsIndefinitely frame: (0(a)0.95 corner: 1@1). borderWidth := [SystemWindow borderWidth] "Squeak 4.1" on: MessageNotUnderstood do: [:ex| 0]. "3.8" borderWidth := borderWidth + window borderWidth. window openInWorldExtent: (self desiredDisplayExtent + (2 * borderWidth) + (0@window labelHeight) * (1(a)(1/0.95))) rounded! Item was added: + Object subclass: #SimulatorEventTransformer + instanceVariableNames: '' + classVariableNames: 'Default' + poolDictionaries: 'EventSensorConstants' + category: 'VMMaker-InterpreterSimulation-Morphic'! + + !SimulatorEventTransformer commentStamp: 'eem 7/14/2015 17:05' prior: 0! + A SimulatorEventTransformer takes events as wrapped by HandMorph and converts them to a form a StackInterpreterSimulator can deal with. + + See HandMorph >> handleEvent to see what the wrapping entails. + See HandMorph >> ProcessEvents or EventSensor >> fetchMoreEvents for examples of what an unwrapped event looks like when given to the system for pre-wrapping. + + Instance Variables + ! Item was added: + ----- Method: SimulatorEventTransformer class>>default (in category 'initialize-release') ----- + default + ^Default ifNil:[Default := self new]! Item was added: + ----- Method: SimulatorEventTransformer class>>eventTypeMouse (in category 'accessing') ----- + eventTypeMouse + ^EventTypeMouse! Item was added: + ----- Method: SimulatorEventTransformer>>degenerateEvent: (in category 'event transformation') ----- + degenerateEvent: aMorphicEvent + "tty. Bert had mentioned a distinction between events and polling events and that Morphic could handle both. + I don't know what he is talking about." + | evt type | + self flag:'tty'. + + evt := nil. + type := aMorphicEvent type. + " Transcript show:type;cr." + (('mouse' charactersExactlyMatching: type asString) > 4) "mous" + ifTrue: [^self degenerateMouseEvent: aMorphicEvent]. + (('key' charactersExactlyMatching: type asString) > 2) "key" + ifTrue: [^self degenerateKeyboardEvent: aMorphicEvent]. + " type = EventTypeDragDropFiles ifTrue: [evt := self generateDropFilesEvent: evtBuf]. + type = EventTypeWindow ifTrue:[evt := self generateWindowEvent: evtBuf]." + + ^ #(0 0 0 0 0 0 0 0).! Item was added: + ----- Method: SimulatorEventTransformer>>degenerateKeyboardEvent: (in category 'event transformation') ----- + degenerateKeyboardEvent: aMorphicEvent + | evt | + "see HandMorph>>generateKeyboardEvent and EventSensor class comment" + evt := {2 . 0 . 0 . 0 . 0. 0 . 0 . 0}. + + evt at:2 put: aMorphicEvent timeStamp. + evt at:3 put: aMorphicEvent keyValue. "<--this is wrong. See Sensor FirstEvt: for what needs to happen. hooo boy" + evt at:4 put: aMorphicEvent position y. + evt at:5 put: (aMorphicEvent buttons bitAnd: 7). "thanks Ron T." + evt at:6 put: (aMorphicEvent buttons >> 3). "Thanks dtl" + ^evt + + + ! Item was added: + ----- Method: SimulatorEventTransformer>>degenerateMouseButtonEvent: (in category 'event transformation') ----- + degenerateMouseButtonEvent: aMorphicEvent + | evt | + "see HandMorph>>generateMouseEvent" + evt := {1 . 0 . 0 . 0 . 0. 0 . 0 . 0}. + + evt at:2 put: aMorphicEvent timeStamp. + evt at:3 put: aMorphicEvent position x. + evt at:4 put: aMorphicEvent position y. + evt at:5 put: (aMorphicEvent buttons bitAnd: 7). "thanks Ron T." + evt at:6 put: (aMorphicEvent buttons >> 3). "Thanks dtl" + ^evt + + + ! Item was added: + ----- Method: SimulatorEventTransformer>>degenerateMouseEvent: (in category 'event transformation') ----- + degenerateMouseEvent: aMorphicEvent + "see HandMorph>>generateMouseEvent" + + (aMorphicEvent type) = #mouseMove + ifTrue:[^self degenerateMouseMoveEvent: aMorphicEvent]. + + ((aMorphicEvent type) = #mouseUp) | ((aMorphicEvent type) = #mouseDown) + ifTrue:[^self degenerateMouseButtonEvent: aMorphicEvent]. + " (aMorphicEvent type) = #mouseDrag + ifTrue:[evt := self degenerateMouseDragEvent: aMorphicEvent]. + " + ^{0 . 0. 0. 0. 0. 0. 0. 0}.! Item was added: + ----- Method: SimulatorEventTransformer>>degenerateMouseMoveEvent: (in category 'event transformation') ----- + degenerateMouseMoveEvent: aMorphicEvent + | evt | + "see HandMorph>>generateMouseEvent" + evt := {1 . 0 . 0 . 0 . 0. 0 . 0 . 0}. + + evt at:2 put: aMorphicEvent timeStamp. + evt at:3 put: aMorphicEvent position x. + evt at:4 put: aMorphicEvent position y. + evt at:5 put: (aMorphicEvent buttons bitAnd: 7). "thanks Ron T." + evt at:6 put: (aMorphicEvent buttons >> 3). "Thanks dtl" + ^evt + + + ! Item was added: + ImageMorph subclass: #SimulatorImageMorph + instanceVariableNames: 'eventForwarder' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-InterpreterSimulation-Morphic'! + + !SimulatorImageMorph commentStamp: 'eem 7/14/2015 17:05' prior: 0! + A SimulatorImageMorph is an ImageMorph The StackInterpreterSimulator paints its world on me. If tty can get event forwarding working along the HandMorph->StackInterpreterSimulatorMorphicModel->StackInterpreterSimulator path, then then I don't need to exist. If event forwarding attempt above fails, then I may need to handle it. + + + Instance Variables + + ! Item was added: + SystemWindow subclass: #SimulatorMorph + instanceVariableNames: 'loadButton helpButton resetButton stepButton overButton sendButton returnButton runButton toggleTranscriptButton optionsButton transcriptPanel commandPanel contextPanel stackPanel callStackPanel displayForm displayView eventEncoder ioExitButton fullDisplayUpdateButton forceInterruptCheckButton hackButton' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-InterpreterSimulation-Morphic'! + + !SimulatorMorph commentStamp: 'eem 7/14/2015 17:06' prior: 0! + A SimulatorMorph is a copy of PreferenceBrowserMorph that has been mangled into something that will support the simulator. I provide some UI features inspired by Bert Freudenberg's Lively Squeak VM at http://lively-web.org/users/bert/squeak.html. + + See class protocol 'documentation' for examples of invoking me. + + My model is SimulatorMorphicModel. + My model has a reference to the Simulator and itermediates all (?) interaction with it. + + The simulator renders the simulated World on a SimulatorImageMorph that I contain. + + There is some cruft (tight coupling via direct references along all three layers UI-Model-VM) in me that exists to support Eliot's original Simulator>>openAsMorph functionality and use-case. + Rumors that said cruft is an artifact of tty's rudimentary Morphic skills are entirely credible. + + I hold out the barest glimmer of hope that Bert Freudenberg's SqueakJS functionality can be integrated into my functionality as well. + see http://lively-web.org/users/bert/squeak.html for the inspiration. + + I am not amenable to Flaps or the WorldMenu as there is a lot of pre-run configuration that is done to the Simulator prior to its being run. + Managing that ability with a GUI is counter-productive. If said functionality is desired in the future, then inspiration can be gleaned by cut-n-paste from PreferenceBrowser and PreferenceBrowserModel.! Item was added: + ----- Method: SimulatorMorph class>>ttyOne (in category 'documentation') ----- + ttyOne + "Script tty uses to run the stackIntepreter using this class" + | vm | + Transcript clear. + vm := StackInterpreterSimulator newWithOptions: #(#STACKVM). + vm openOn: '/home/tty/usr/src/smalltalk/buildCogDevelopmentImageCog.app/Contents/Resources/targets/Squeak4.5.image'. + "vm setBreakSelector: #&." + vm + openAsSimulatorMorph "; + toggleTranscript; + halt; + run" + ! Item was added: + ----- Method: SimulatorMorph class>>withVMSimulator:title:transcript: (in category 'instance creation') ----- + withVMSimulator: aSimulatorMorphicModel title: aString transcript: aTranscript + ^self new initializeWithVMSimulator: aSimulatorMorphicModel title: aString aTranscript: aTranscript; + yourself. + + ! Item was added: + ----- Method: SimulatorMorph>>basicButton (in category 'submorphs - buttons') ----- + basicButton + | button | + button := SimpleButtonMorph new. + button + borderWidth: 2; + borderColor: #raised; + on: #mouseEnter send: #value to: [button borderColor: self paneColor]; + on: #mouseLeave send: #value to: [button borderColor: #raised]; + vResizing: #spaceFill; + useRoundedCorners; + clipSubmorphs: true; + color: self paneColor muchLighter; + target: self model. + ^button! Item was added: + ----- Method: SimulatorMorph>>buttonRowLayoutFrame (in category 'submorphs - buttons') ----- + buttonRowLayoutFrame + ^LayoutFrame fractions: (0@0 corner: 1@0) offsets: (0@0 corner: 0@ (TextStyle defaultFont height * 2.5)) + ! Item was added: + ----- Method: SimulatorMorph>>callStackPanel (in category 'submorphs - squeakJS') ----- + callStackPanel + "If any Morphic gurus exist, please have at it." + ^callStackPanel ifNil: + [callStackPanel := (PluggableTextMorph + on: self model + text: #processesAndContextStack + accept: nil + readSelection: nil + menu: nil) hideScrollBarsIndefinitely. + callStackPanel + color: Color transparent; + hResizing: #spaceFill; + vResizing: #spaceFill; + cellInset: 5; + yourself]. + + ! Item was added: + ----- Method: SimulatorMorph>>commandPanel (in category 'submorphs - simulator panel') ----- + commandPanel + self flag: 'tty'. "does this hybrid of PreferenceBrowser layout and Simulato openAsMorph stuff make sense?" + ^commandPanel ifNil: + [commandPanel := (PluggableTextMorph + on: self model vm + text: #byteCountText + accept: nil + readSelection: nil + menu: #utilitiesMenu:) hideScrollBarsIndefinitely. + commandPanel + color: Color transparent; + hResizing: #spaceFill; + vResizing: #spaceFill; + cellInset: 5; + yourself]. + ! Item was added: + ----- Method: SimulatorMorph>>contextPanel (in category 'submorphs - squeakJS') ----- + contextPanel + "This should show the currentContext and Special Objects array. as seen at SqueakJS + Doing that requires real talent. talent tty is lacking at the moment + on: [ Array with: (MorphWithSubmorphsWrapper with: self) ] + Array with: (ObjectExplorerWrapper with: rootObject name: 'root' model: self parent: nil) + " + ^contextPanel ifNil: + [contextPanel := (SimpleHierarchicalListMorph + on: [ Array with: (ObjectExplorerWrapper with: (self model vm) name: 'root' model: (self model vm) parent: nil) ] + list: #value + selected: nil + changeSelected: nil + menu: nil + keystroke: nil) showScrollBarsOnlyWhenNeeded: true. + contextPanel + color: Color transparent; + hResizing: #spaceFill; + vResizing: #spaceFill; + cellInset: 5; + yourself] + + + ! Item was added: + ----- Method: SimulatorMorph>>displayView (in category 'submorphs - simulator display view') ----- + displayView + "The VM SImulator draws directly on an imageMorph named displayView + displayView is housed on a Form named displayForm + displayForm is initialized in StackInterpreterSimulator >> initialize. + see StackInterpreterSimulator >>openAsMorph for original constructs." + ^displayView ifNil: + [displayView := SimulatorImageMorph new image: model vm displayForm. + self model displayView: displayView. + self model morph: displayView. "<-- N.B.. morph bounds are used to filter events in the model. tty" + displayView activeHand addEventListener: self model. + + displayView + color: Color transparent; + hResizing: #spaceFill; + vResizing: #spaceFill; + cellInset: 5; + yourself]! Item was added: + ----- Method: SimulatorMorph>>displayViewLayoutFrame (in category 'submorphs - simulator display view') ----- + displayViewLayoutFrame + | squeakJSFrame buttonFrame simulatorFrame| + "if any Morphic guru's understand layouts and offsets, please fix this. tty" + buttonFrame := self buttonRowLayoutFrame. + squeakJSFrame := self squeakJSRowLayoutFrame. + simulatorFrame := self simulatorLayoutFrame. + ^LayoutFrame fractions: (0@0 corner: 1@1) + offsets: (0@(buttonFrame bottomOffset) corner: simulatorFrame leftOffset@squeakJSFrame topOffset)! Item was added: + ----- Method: SimulatorMorph>>extent: (in category 'geometry') ----- + extent: aPoint + super extent: aPoint. + self fullBounds. + ! Item was added: + ----- Method: SimulatorMorph>>forceInterruptCheckButton (in category 'submorphs - buttons') ----- + forceInterruptCheckButton + self flag: 'tty'. + ^forceInterruptCheckButton ifNil: + [forceInterruptCheckButton := self basicButton + label: 'vm forceInterruptCheck' translated; + actionSelector: #forceInterruptCheck; + setBalloonText: + 'Invoke forceInterruptCheck on Simulator.' translated]! Item was added: + ----- Method: SimulatorMorph>>fullDisplayUpdateButton (in category 'submorphs - buttons') ----- + fullDisplayUpdateButton + self flag: 'tty'. + ^fullDisplayUpdateButton ifNil: + [fullDisplayUpdateButton := self basicButton + label: 'vm fullDisplayUpdate' translated; + actionSelector: #fullDisplayUpdate; + setBalloonText: + 'Invoke fullDisplayUpdate on Simulator.' translated]! Item was added: + ----- Method: SimulatorMorph>>hackButton (in category 'submorphs - buttons') ----- + hackButton + self flag: 'tty'. + ^hackButton ifNil: + [hackButton := self basicButton + label: 'Display ImageMorph Bounds' translated; + actionSelector: #hack; + setBalloonText: + 'tty needs a hack button.' translated]! Item was added: + ----- Method: SimulatorMorph>>helpButton (in category 'submorphs - buttons') ----- + helpButton + ^helpButton ifNil: + [helpButton := self basicButton + label: 'help' translated; + setBalloonText: + 'Click here to get some hints on use of me ', + 'Panel' translated; + actionSelector: #help]! Item was added: + ----- Method: SimulatorMorph>>initializeWithVMSimulator:title:aTranscript: (in category 'initialization') ----- + initializeWithVMSimulator: aStackInterpreterSimulator title: aString aTranscript: aTranscript + self flag: 'tty'. "need to get the layout right at this point. resizers and scroll bars would be nice. Layout offsets need a gimlet eye as well" + self + model: (SimulatorMorphicModel on: aStackInterpreterSimulator title: aString transcript: aTranscript); + clipSubmorphs: true; + setLabel: self model windowTitle; + name: aString; + addMorph: self newButtonRow fullFrame: self buttonRowLayoutFrame; + addMorph: self squeakJSRow fullFrame: self squeakJSRowLayoutFrame; + addMorph: self simulatorPanel fullFrame: self simulatorLayoutFrame; + addMorph: self displayView fullFrame: self displayViewLayoutFrame. + ^self! Item was added: + ----- Method: SimulatorMorph>>ioExitButton (in category 'submorphs - buttons') ----- + ioExitButton + self flag: 'tty'. + ^ioExitButton ifNil: + [ioExitButton := self basicButton + label: 'vm ioExit' translated; + actionSelector: #ioExit; + setBalloonText: + 'Invoke ioExit on Simulator.' translated]! Item was added: + ----- Method: SimulatorMorph>>loadButton (in category 'submorphs - buttons') ----- + loadButton + ^loadButton ifNil: + [loadButton := self basicButton + label: 'Load Image' translated; + actionSelector: #loadImage; + setBalloonText: + 'Select an image to load.' translated]! Item was added: + ----- Method: SimulatorMorph>>newButtonRow (in category 'submorphs - buttons') ----- + newButtonRow + ^BorderedMorph new + color: Color transparent; + cellInset: 2; + layoutInset: 2; + layoutPolicy: TableLayout new; + listDirection: #leftToRight; + listCentering: #topLeft; + cellPositioning: #topLeft; + on: #mouseEnter send: #paneTransition: to: self; + on: #mouseLeave send: #paneTransition: to: self; + addMorphBack: self hackButton; + addMorphBack: self newSeparator; + + " addMorphBack: self resetButton; + addMorphBack: self newSeparator; + addMorphBack: self forceInterruptCheckButton; + addMorphBack: self newSeparator; + addMorphBack: self fullDisplayUpdateButton; + addMorphBack: self newSeparator; + addMorphBack: self toggleTranscriptButton;" + addMorphBack: self runButton; + addMorphBack: self newSeparator; + addMorphBack: self ioExitButton; + addMorphBack: self newTransparentFiller; + addMorphBack: self stepButton; + addMorphBack: self newSeparator; + addMorphBack: self overButton; + addMorphBack: self newSeparator; + addMorphBack: self newSeparator; + addMorphBack: self sendButton; + addMorphBack: self newSeparator; + addMorphBack: self returnButton; + addMorphBack: self newTransparentFiller; + " addMorphBack: self loadButton; + addMorphBack: self newSeparator; + addMorphBack: self optionsButton; too complex to implement now. See StackInterpreterSimulator class comment for examples" + addMorphBack: self newTransparentFiller; + addMorphBack: self helpButton; + yourself.! Item was added: + ----- Method: SimulatorMorph>>newSeparator (in category 'submorphs - buttons') ----- + newSeparator + ^BorderedMorph new + borderWidth: 2; + borderColor: Color transparent; + color: self paneColor; + hResizing: #rigid; + width: 5; + vResizing: #spaceFill; + yourself! Item was added: + ----- Method: SimulatorMorph>>newTransparentFiller (in category 'submorphs - buttons') ----- + newTransparentFiller + ^Morph new + color: Color transparent; + vResizing: #spaceFill; + hResizing: #spaceFill; + yourself.! Item was added: + ----- Method: SimulatorMorph>>optionsButton (in category 'submorphs - buttons') ----- + optionsButton + ^optionsButton ifNil: + [optionsButton := self basicButton + label: 'VM Options' translated; + actionSelector: #options; + setBalloonText: + 'VM Options.' translated]! Item was added: + ----- Method: SimulatorMorph>>overButton (in category 'submorphs - buttons') ----- + overButton + ^overButton ifNil: + [overButton := self basicButton + label: 'Over' translated; + actionSelector: #over; + setBalloonText: + 'Step Over.' translated]! Item was added: + ----- Method: SimulatorMorph>>resetButton (in category 'submorphs - buttons') ----- + resetButton + ^resetButton ifNil: + [resetButton := self basicButton + label: 'Reset' translated; + actionSelector: #reset; + setBalloonText: + 'Reset running simulation.' translated]! Item was added: + ----- Method: SimulatorMorph>>returnButton (in category 'submorphs - buttons') ----- + returnButton + self flag: 'tty'. + ^returnButton ifNil: + [returnButton := self basicButton + label: 'Return' translated; + actionSelector: #return; + setBalloonText: + 'Return from what?.' translated]! Item was added: + ----- Method: SimulatorMorph>>runButton (in category 'submorphs - buttons') ----- + runButton + self flag: 'tty'. + ^runButton ifNil: + [runButton := self basicButton + label: 'vm run' translated; + actionSelector: #run; + setBalloonText: + 'Run Simulation.' translated]! Item was added: + ----- Method: SimulatorMorph>>sendButton (in category 'submorphs - buttons') ----- + sendButton + self flag: 'tty'. + ^sendButton ifNil: + [sendButton := self basicButton + label: 'Send' translated; + actionSelector: #send; + setBalloonText: + 'Send what exactly?.' translated]! Item was added: + ----- Method: SimulatorMorph>>simulatorLayoutFrame (in category 'submorphs - simulator panel') ----- + simulatorLayoutFrame + | squeakJSFrame buttonFrame | + "I don't understand offsets in the LayoutFrame. I just fiddled until it looked ok. If anybody knows what they are doing, please refactor." + self flag: 'tty'. + buttonFrame := self buttonRowLayoutFrame. + squeakJSFrame := self squeakJSRowLayoutFrame. + ^LayoutFrame fractions: (0.7@0 corner: 1@squeakJSFrame topOffset) + offsets: (0@(buttonFrame bottomOffset) corner: 0.70@squeakJSFrame topOffset) + ! Item was added: + ----- Method: SimulatorMorph>>simulatorPanel (in category 'submorphs - simulator panel') ----- + simulatorPanel + "standard controls from StackInterpreterSimulator >> openAsMorph" + ^BorderedMorph new + color: Color transparent; + layoutInset: 10; + cellInset: 10; + layoutPolicy: TableLayout new; + listDirection: #topToBottom; + listCentering: #topLeft; + cellPositioning: #topLeft; + on: #mouseEnter send: #paneTransition: to: self; + on: #mouseLeave send: #paneTransition: to: self; + addMorphBack: self transcriptPanel; + addMorphBack: self commandPanel; + yourself.! Item was added: + ----- Method: SimulatorMorph>>squeakJSRow (in category 'submorphs - squeakJS') ----- + squeakJSRow + "row fo SqueakJS context, stack and call-stack panels" + ^BorderedMorph new + color: Color blue; + cellInset: 2; + layoutInset: 2; + layoutPolicy: TableLayout new; + listDirection: #leftToRight; + listCentering: #topLeft; + cellPositioning: #topLeft; + on: #mouseEnter send: #paneTransition: to: self; + on: #mouseLeave send: #paneTransition: to: self; + addMorphBack: self callStackPanel; + addMorphBack: self contextPanel; + addMorphBack: self stackPanel; + yourself.! Item was added: + ----- Method: SimulatorMorph>>squeakJSRowLayoutFrame (in category 'submorphs - squeakJS') ----- + squeakJSRowLayoutFrame + ^LayoutFrame fractions: (0(a)0.8 corner: 1@1) offsets: (0(a)0.8 corner: 1@ (TextStyle defaultFont height * 2.5)) + ! Item was added: + ----- Method: SimulatorMorph>>stackPanel (in category 'submorphs - squeakJS') ----- + stackPanel + "If any Morphic gurus exist, please have at it." + ^stackPanel ifNil: + [stackPanel := (PluggableTextMorph + on: self model + text: #currentContextStack + accept: nil + readSelection: nil + menu: nil) hideScrollBarsIndefinitely. + stackPanel + color: Color transparent; + hResizing: #spaceFill; + vResizing: #spaceFill; + cellInset: 5; + yourself]. + + ! Item was added: + ----- Method: SimulatorMorph>>stepButton (in category 'submorphs - buttons') ----- + stepButton + self flag: 'tty'. + ^stepButton ifNil: + [stepButton := self basicButton + label: 'Step' translated; + actionSelector: #step; + setBalloonText: + 'Step Into.' translated]! Item was added: + ----- Method: SimulatorMorph>>toggleTranscriptButton (in category 'submorphs - buttons') ----- + toggleTranscriptButton + "tty I dont like this. I have diabled the button" + self flag: 'tty'. + ^toggleTranscriptButton ifNil: + [toggleTranscriptButton := self basicButton + label: 'Toggle Transcript' translated; + actionSelector: #toggleTranscript; + setBalloonText: + 'Use External Transcript Instead of Internal.' translated]! Item was added: + ----- Method: SimulatorMorph>>transcriptPanel (in category 'submorphs - simulator panel') ----- + transcriptPanel + self flag: 'tty'. "does this hybrid of PreferenceBrowser layout and Simulato openAsMorph stuff make sense?" + ^transcriptPanel ifNil: + [transcriptPanel := (PluggableTextMorph + on: self model vm transcript + text: nil + accept: nil + readSelection: nil + menu: #codePaneMenu:shifted:). + transcriptPanel + name: 'transcriptPanel'; + color: Color transparent; + hResizing: #spaceFill; + vResizing: #spaceFill; + cellInset: 5; + yourself]. + ! Item was added: + TestCase subclass: #SimulatorMorphicEventTests + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: 'EventSensorConstants' + category: 'VMMaker-InterpreterSimulation-Morphic'! Item was added: + ----- Method: SimulatorMorphicEventTests>>testKeyEventDegeneration (in category 'test event') ----- + testKeyEventDegeneration + |aMorphicEvent evtBuf type| + aMorphicEvent := HandMorph new generateKeyboardEvent: {2 . 0. 0. 0. 0. 0. 0. 0}. + evtBuf := SimulatorEventTransformer default degenerateEvent: aMorphicEvent. + type := evtBuf at:1. + self assert:(type = EventTypeKeyboard). + ! Item was added: + ----- Method: SimulatorMorphicEventTests>>testMouseEventDegeneration (in category 'test event') ----- + testMouseEventDegeneration + |aMorphicEvent evtBuf type| + "see class comment in EventSensor browse" + aMorphicEvent := HandMorph new generateMouseEvent: {1 . 0. 0. 0. 0. 0. 0. 0}. + evtBuf := SimulatorEventTransformer default degenerateEvent: aMorphicEvent. + type := evtBuf at:1. + self assert:(type = EventTypeMouse). + ! Item was added: + ----- Method: SimulatorMorphicEventTests>>testNullEventDegeneration (in category 'test event') ----- + testNullEventDegeneration + |aMorphicEvent evtBuf type| + "Test a bad morphic event returns a null event" "see class comment in EventSensor browse" + aMorphicEvent := UserInputEvent new. + evtBuf := SimulatorEventTransformer default degenerateEvent: aMorphicEvent. + type := evtBuf at:1. + self assert:(type = EventTypeNone). + + ! Item was added: + ----- Method: SimulatorMorphicEventTests>>testSimulatorDisplayViewAccess (in category 'test tight coupling') ----- + testSimulatorDisplayViewAccess + "There is tight coupling between the morph,model and vm simulator on the simulators displayView variable + this test makes sure it is accesible and is an ImageMorph." + + self assert: ((SystemNavigation allImplementorsOf: #displayView localTo: StackInterpreterSimulator) size = 1). + self assert: ((SystemNavigation allImplementorsOf: #displayView: localTo: StackInterpreterSimulator)size = 1). + + ! Item was added: + ----- Method: SimulatorMorphicEventTests>>testStackInterpreterSimulatorDisplayViewAccess (in category 'test tight coupling') ----- + testStackInterpreterSimulatorDisplayViewAccess + "There is tight coupling between the morph,model and vm simulator on the simulators displayView variable + this test makes sure it is accesible and is an ImageMorph." + + self assert: ((SystemNavigation allImplementorsOf: #displayView localTo: StackInterpreterSimulator) size = 1). + self assert: ((SystemNavigation allImplementorsOf: #displayView: localTo: StackInterpreterSimulator)size = 1). + + ! Item was added: + Model subclass: #SimulatorMorphicModel + instanceVariableNames: 'vm title stepping morph' + classVariableNames: '' + poolDictionaries: 'EventSensorConstants' + category: 'VMMaker-InterpreterSimulation-Morphic'! + + !SimulatorMorphicModel commentStamp: 'eem 7/14/2015 17:07' prior: 0! + A SimulatorMorphicModel handles Morphic callbacks and UI for (some parts of ) the simulator. + + I handle event forwarding management.. + + Currently, I am a listener to HandMorphs>>addPrimitiveEventListener. + I am added as a listener by SimulatorMorph>>displayView (which probably needs to change. tty)! Item was added: + ----- Method: SimulatorMorphicModel class>>initialize (in category 'class initialization') ----- + initialize + "I want to keep it launchable by script only for now. + Eliot has a bunch of options that aren't really feasible for a Morphic first approach. + " + "self + registerWindowColor; + registerInOpenMenu; + registerInFlaps"! Item was added: + ----- Method: SimulatorMorphicModel class>>on:title:transcript: (in category 'instance creation') ----- + on: aStackInterpreterSimulator title: aString transcript: aTranscriptStream + | simmodel | + simmodel := self new. + simmodel + vm: aStackInterpreterSimulator; + title: aString; + transcript: aTranscriptStream. + ^simmodel. ! Item was added: + ----- Method: SimulatorMorphicModel class>>registerInFlaps (in category 'class initialization') ----- + registerInFlaps + " Flaps + registerQuad: + { #StackInterpreterSimulator. + #prototypicalToolWindow. + 'StackInterpreter Simulator' translated. + 'A Morphic Wrapper for VM Simulations' translated } + forFlapNamed: 'Tools' translated. + Flaps replaceToolsFlap"! Item was added: + ----- Method: SimulatorMorphicModel class>>registerInOpenMenu (in category 'class initialization') ----- + registerInOpenMenu + (TheWorldMenu respondsTo: #registerOpenCommand:) ifTrue: [ + TheWorldMenu unregisterOpenCommand: 'StackInterpreter Simulator'. + TheWorldMenu registerOpenCommand: {'StackInterpreter Simulator'. {self. #open}}]. + ! Item was added: + ----- Method: SimulatorMorphicModel class>>registerWindowColor (in category 'class initialization') ----- + registerWindowColor + (Preferences windowColorFor: self name) = Color white + ifTrue: [ Preferences setWindowColorFor: self name to: (Color colorFrom: self windowColorSpecification brightColor) ].! Item was added: + ----- Method: SimulatorMorphicModel class>>unload (in category 'class initialization') ----- + unload + self + unregisterFromOpenMenu; + unregisterFromFlaps.! Item was added: + ----- Method: SimulatorMorphicModel class>>unregisterFromFlaps (in category 'class initialization') ----- + unregisterFromFlaps + "Flaps + unregisterQuadsWithReceiver: self; + replaceToolsFlap"! Item was added: + ----- Method: SimulatorMorphicModel class>>unregisterFromOpenMenu (in category 'class initialization') ----- + unregisterFromOpenMenu + (TheWorldMenu respondsTo: #registerOpenCommand:) + ifTrue: [TheWorldMenu unregisterOpenCommand: 'StackInterpreter Simulator']. + ! Item was added: + ----- Method: SimulatorMorphicModel class>>windowColorSpecification (in category 'window color') ----- + windowColorSpecification + "Answer a WindowColorSpec object that declares my preference" + + ^ WindowColorSpec classSymbol: self name wording: 'StackInterpreter Simulator' brightColor: #(0.645 1.0 1.0) pastelColor: #(0.886 1.0 1.0) helpMessage: 'A tool for simulating a Stack Interpreter Virtual Machine.'! Item was added: + ----- Method: SimulatorMorphicModel>>bounds (in category 'accessing') ----- + bounds + ^morph bounds.! Item was added: + ----- Method: SimulatorMorphicModel>>byteCountText (in category 'user interface') ----- + byteCountText + ^vm byteCountText! Item was added: + ----- Method: SimulatorMorphicModel>>currentContextStack (in category 'user interface - squeakJS') ----- + currentContextStack + self flag: 'tty'. + ^ 'Current Context Stack' printString asText! Item was added: + ----- Method: SimulatorMorphicModel>>displayForm (in category 'accessing') ----- + displayForm + ^ vm displayForm! Item was added: + ----- Method: SimulatorMorphicModel>>displayView (in category 'accessing') ----- + displayView + ^ vm displayView! Item was added: + ----- Method: SimulatorMorphicModel>>displayView: (in category 'accessing') ----- + displayView: anImageMorph + vm displayView: anImageMorph! Item was added: + ----- Method: SimulatorMorphicModel>>forceInterruptCheck (in category 'buttons callbacks') ----- + forceInterruptCheck + vm forceInterruptCheck + "^UserDialogBoxMorph inform: 'Toggle Transcript' title: 'TODO:'"! Item was added: + ----- Method: SimulatorMorphicModel>>fullDisplayUpdate (in category 'buttons callbacks') ----- + fullDisplayUpdate + vm fullDisplayUpdate + "^UserDialogBoxMorph inform: 'Toggle Transcript' title: 'TODO:'"! Item was added: + ----- Method: SimulatorMorphicModel>>hack (in category 'buttons callbacks') ----- + hack + UserDialogBoxMorph inform: (morph bounds printString) title: 'Hack:'! Item was added: + ----- Method: SimulatorMorphicModel>>handleListenEvent: (in category 'event-forwarding') ----- + handleListenEvent: aMorphicEvent + "The SimulatorImageMorph regsitered me (a SimulatorMorphicModel ) with HandMorph>>addEventListener + HandMorph then broadcasts events to all registered listeners at this method. See HandMorph>>sendListenPrimitiveEvent + " + | evtBuf xtranslated ytranslated | + morph ifNotNil: + [evtBuf := SimulatorEventTransformer default degenerateEvent: aMorphicEvent. + ((evtBuf at: 1) = EventTypeMouse and: [morph bounds containsPoint: aMorphicEvent position]) ifTrue: + [xtranslated := (evtBuf at:3) - (morph bounds left) - 2 . "<--heh" + ytranslated := (evtBuf at:4) - (morph bounds top). + evtBuf at: 3 put: xtranslated. + evtBuf at: 4 put: ytranslated. + vm queueForwardedEvent: evtBuf]]! Item was added: + ----- Method: SimulatorMorphicModel>>help (in category 'buttons callbacks') ----- + help + "Open up a workspace with explanatory info in it about the StackInterpreterSimulator" + Workspace new + contents: self helpText; + openLabel: self windowTitle, ' Help'.! Item was added: + ----- Method: SimulatorMorphicModel>>helpText (in category 'buttons callbacks') ----- + helpText + ^(String streamContents: [:str | + str nextPutAll: + 'Stack Intepreter Simulator Help Contents Go Here.']) translated! Item was added: + ----- Method: SimulatorMorphicModel>>initialExtent (in category 'user interface') ----- + initialExtent + ^ 1286@938! Item was added: + ----- Method: SimulatorMorphicModel>>initialize (in category 'initialize-release') ----- + initialize + + title := 'StackInterpreter Simulator (Beta))'.! Item was added: + ----- Method: SimulatorMorphicModel>>ioExit (in category 'buttons callbacks') ----- + ioExit + vm ioExit + displayView activeHand removeEventListener: self model. "This is a bug as the user in vm ioExit may have cancelled the confirm t.m." + "^UserDialogBoxMorph inform: 'Toggle Transcript' title: 'TODO:'"! Item was added: + ----- Method: SimulatorMorphicModel>>loadImage (in category 'buttons callbacks') ----- + loadImage + ^UserDialogBoxMorph inform: 'load image' title: 'TODO:'! Item was added: + ----- Method: SimulatorMorphicModel>>morph (in category 'accessing') ----- + morph + "I need the bounds of my morph for filtering mouse events. + If there is a canned way of doing this besides this tight binding to my SimulatorMorph, + then please refactor me. + + see my protocol event-forwarding for the gory details" + self flag:'tty'. + ^morph.! Item was added: + ----- Method: SimulatorMorphicModel>>morph: (in category 'accessing') ----- + morph: aMorph + "I need the bounds of my morph for filtering mouse events. + If there is a canned way of doing this besides this tight binding to my SimulatorMorph, + then please refactor me. + + see my protocol event-forwarding for the gory details" + self flag:'tty'. + morph := aMorph.! Item was added: + ----- Method: SimulatorMorphicModel>>onItemClicked: (in category 'user interface - squeakJS') ----- + onItemClicked: anItem + "I am an item in the current context display on the SqueakJS tree view".! Item was added: + ----- Method: SimulatorMorphicModel>>options (in category 'buttons callbacks') ----- + options + ^UserDialogBoxMorph inform: 'Options Popup--need checkboxes?' title: 'TODO:'! Item was added: + ----- Method: SimulatorMorphicModel>>over (in category 'buttons callbacks') ----- + over + stepping:=true. + ^UserDialogBoxMorph inform: 'Step Over' title: 'TODO:'! Item was added: + ----- Method: SimulatorMorphicModel>>processesAndContextStack (in category 'user interface - squeakJS') ----- + processesAndContextStack + "just a stub. see top right panel at http://lively-web.org/users/bert/squeak.html for what I intend to present" + self flag: 'tty'. + ^ 'Processes and ContextStack' printString asText + ! Item was added: + ----- Method: SimulatorMorphicModel>>reset (in category 'buttons callbacks') ----- + reset + ^UserDialogBoxMorph inform: 'Reset' title: 'TODO:'! Item was added: + ----- Method: SimulatorMorphicModel>>return (in category 'buttons callbacks') ----- + return + ^UserDialogBoxMorph inform: 'Return' title: 'TODO:'! Item was added: + ----- Method: SimulatorMorphicModel>>run (in category 'buttons callbacks') ----- + run + stepping:=false. + vm run + "^UserDialogBoxMorph inform: 'Run' title: 'TODO:'"! Item was added: + ----- Method: SimulatorMorphicModel>>send (in category 'buttons callbacks') ----- + send + ^UserDialogBoxMorph inform: 'Send' title: 'TODO:'! Item was added: + ----- Method: SimulatorMorphicModel>>specialObjectsAndActiveContext (in category 'user interface - squeakJS') ----- + specialObjectsAndActiveContext + "just a stub. see top left panel at http://lively-web.org/users/bert/squeak.html for what I intend to present" + self flag: 'tty'. + ^ 'Special Objects and Active Context' printString asText + ! Item was added: + ----- Method: SimulatorMorphicModel>>step (in category 'buttons callbacks') ----- + step + stepping:=true. + ^UserDialogBoxMorph inform: 'Step' title: 'TODO:'! Item was added: + ----- Method: SimulatorMorphicModel>>stepping (in category 'accessing') ----- + stepping + ^stepping! Item was added: + ----- Method: SimulatorMorphicModel>>stepping: (in category 'accessing') ----- + stepping: aBoolean + stepping := aBoolean! Item was added: + ----- Method: SimulatorMorphicModel>>title: (in category 'accessing') ----- + title: aString + title := aString! Item was added: + ----- Method: SimulatorMorphicModel>>toggleTranscript (in category 'buttons callbacks') ----- + toggleTranscript + vm toggleTranscriptForSimulatorMorph: self transcript. + "^UserDialogBoxMorph inform: 'Toggle Transcript' title: 'TODO:'"! Item was added: + ----- Method: SimulatorMorphicModel>>transcript (in category 'accessing') ----- + transcript + ^vm transcript! Item was added: + ----- Method: SimulatorMorphicModel>>transcript: (in category 'accessing') ----- + transcript: aTranscriptStream + vm transcript: aTranscriptStream.! Item was added: + ----- Method: SimulatorMorphicModel>>utilitiesMenu: (in category 'user interface') ----- + utilitiesMenu: aMenuMorph + ^vm utilitiesMenu: aMenuMorph! Item was added: + ----- Method: SimulatorMorphicModel>>vm (in category 'accessing') ----- + vm + ^vm! Item was added: + ----- Method: SimulatorMorphicModel>>vm: (in category 'accessing') ----- + vm: aVMSimulator + vm := aVMSimulator! Item was added: + ----- Method: SimulatorMorphicModel>>windowTitle (in category 'user interface') ----- + windowTitle + ^ title translated! Item was changed: ----- Method: Spur64BitMemoryManager>>newInputEventAccessorOfSize: (in category 'simulation') ----- newInputEventAccessorOfSize: numElements <doNotGenerate> self flag: #endianness. + ^(CPluggableAccessor on: (WordArray new: 16)) + atBlock: [:obj :idx| | v | + v := (obj at: idx - 1 * 2 + 1) + ((obj at: idx - 1 * 2 + 2) << 32). + v >> 63 > 0 ifTrue: + [v := v - (1 << 64)]. + v] - ^(CPluggableAccessor on: (IntegerArray new: 16)) - atBlock: [:obj :idx| (obj at: idx - 1 * 2) + ((obj at: idx - 1 * 2 + 1) << 32)] atPutBlock: [:obj :idx :val| + obj at: idx - 1 * 2 + 1 put: (val bitAnd: 16rFFFFFFFF). + obj at: idx - 1 * 2 + 2 put: (val >> 32 bitAnd: 16rFFFFFFFF). + val]; + objectSize: 8! - obj at: idx - 1 * 2 put: (val bitAnd: 16rFFFFFFFF). - obj at: idx - 1 * 2 + 1 put: val >> 32. - val]! Item was added: + ----- Method: StackInterpreterSimulator>>handleListenEvent: (in category 'I/O primitives support') ----- + handleListenEvent: aMorphicEvent + "openAsMorph regsitered me for listen events via HandMorph>>addEventListener. + Transform the listen event and add it to my event queue." + | evtBuf xtranslated ytranslated | + evtBuf := SimulatorEventTransformer default degenerateEvent: aMorphicEvent. + (evtBuf first = SimulatorEventTransformer eventTypeMouse + and: [displayView bounds containsPoint: aMorphicEvent position]) ifTrue: + [xtranslated := (evtBuf at:3) - displayView bounds left - 2. "<--heh" + ytranslated := (evtBuf at:4) - displayView bounds top. + evtBuf at: 3 put: xtranslated. + evtBuf at: 4 put: ytranslated]. + self queueForwardedEvent: evtBuf! Item was changed: ----- Method: StackInterpreterSimulator>>ioGetNextEvent: (in category 'I/O primitives') ----- ioGetNextEvent: evtBuf | evt | + "SimulatorMorphicModel browse" - "StackInterpreterSimulatorMorphicModel browse" eventQueue ifNil: [^self primitiveFail]. eventQueue isEmpty ifFalse: [evt := eventQueue next. + 1 to: evtBuf size do: - 1 to: evt size do: [:i| (evt at: i) ifNotNil: [:val| evtBuf at: (i - 1) put: val]]]! Item was changed: ----- Method: StackInterpreterSimulator>>openAsMorph (in category 'UI') ----- openAsMorph "Open a morphic view on this simulation." | localImageName borderWidth window | localImageName := imageName ifNotNil: [FileDirectory default localNameFor: imageName] ifNil: [' synthetic image']. window := (SystemWindow labelled: 'Simulation of ', localImageName) model: self. window addMorph: (displayView := ImageMorph new image: displayForm) + frame: (0@0 corner: 1(a)0.8). + displayView activeHand addEventListener: self. - frame: (0@0 corner: 1(a)0.8). transcript := TranscriptStream on: (String new: 10000). window addMorph: (PluggableTextMorph on: transcript text: nil accept: nil readSelection: nil menu: #codePaneMenu:shifted:) frame: (0(a)0.8 corner: 0.7@1). window addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil readSelection: nil menu: #utilitiesMenu:) hideScrollBarsIndefinitely frame: (0.7(a)0.8 corner: 1@1). borderWidth := [SystemWindow borderWidth] "Squeak 4.1" on: MessageNotUnderstood do: [:ex| 0]. "3.8" borderWidth := borderWidth + window borderWidth. window openInWorldExtent: (self desiredDisplayExtent + (2 * borderWidth) + (0@window labelHeight) * (1(a)(1/0.8))) rounded. ^window! Item was changed: ----- Method: StackInterpreterSimulator>>openAsMorphNoTranscript (in category 'UI') ----- openAsMorphNoTranscript "Open a morphic view on this simulation." | localImageName borderWidth window | localImageName := FileDirectory default localNameFor: imageName. window := (SystemWindow labelled: 'Simulation of ' , localImageName) model: self. window addMorph: (displayView := ImageMorph new image: displayForm) + frame: (0@0 corner: 1(a)0.95). + displayView activeHand addEventListener: self. - frame: (0@0 corner: 1(a)0.95). window addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil readSelection: nil menu: #utilitiesMenu:) hideScrollBarsIndefinitely frame: (0(a)0.95 corner: 1@1). borderWidth := [SystemWindow borderWidth] "Squeak 4.1" on: MessageNotUnderstood do: [:ex| 0]. "3.8" borderWidth := borderWidth + window borderWidth. window openInWorldExtent: (self desiredDisplayExtent + (2 * borderWidth) + (0@window labelHeight) * (1(a)(1/0.95))) rounded! Item was added: + ----- Method: StackInterpreterSimulator>>openAsSimulatorMorph (in category 'UI') ----- + openAsSimulatorMorph + "Open a morphic view on this simulation. ala Bert Freudenberg's + SqueakJS http://lively-web.org/users/bert/squeak.html " + | localImageName borderWidth window | + localImageName := imageName + ifNil: [' synthetic image'] + ifNotNil: [FileDirectory default localNameFor: imageName]. + + transcript := TranscriptStream on: (String new: 10000). + + window := SimulatorMorph + withVMSimulator: self + title: 'Simulation of ' , localImageName, ' (beta)' + transcript: transcript. + + borderWidth := [SimulatorMorph borderWidth] "Squeak 4.1" + on: MessageNotUnderstood + do: [:ex | 0]. + "3.8" + borderWidth := borderWidth + window borderWidth. + window openInWorldExtent: (self desiredDisplayExtent + (2 * borderWidth) + (0 @ window labelHeight) * (1 @ (1 / 0.8))) rounded. + ^window! Item was removed: - ----- Method: StackInterpreterSimulator>>openAsStackInterpreterSimulatorMorph (in category 'UI') ----- - openAsStackInterpreterSimulatorMorph - "Open a morphic view on this simulation. ala Bert Freudenberg's - SqueakJS http://lively-web.org/users/bert/squeak.html " - | localImageName borderWidth window | - localImageName := imageName - ifNil: [' synthetic image'] - ifNotNil: [FileDirectory default localNameFor: imageName]. - - transcript := TranscriptStream - on: (String new: 10000). - - window := StackInterpreterSimulatorMorph - withVMSimulator: self - title: 'Simulation of ' , localImageName, ' (beta)' - transcript: transcript. - - borderWidth := [StackInterpreterSimulatorMorph borderWidth - "Squeak 4.1"] - on: MessageNotUnderstood - do: [:ex | 0]. - "3.8" - borderWidth := borderWidth + window borderWidth. - window openInWorldExtent: (self desiredDisplayExtent + (2 * borderWidth) + (0 @ window labelHeight) * (1 @ (1 / 0.8))) rounded. - ^ window! Item was changed: + ----- Method: StackInterpreterSimulator>>queueForwardedEvent: (in category 'I/O primitives support') ----- + queueForwardedEvent: event + eventQueue ifNil: + [eventQueue := SharedQueue new]. + eventQueue nextPut: event! - ----- Method: StackInterpreterSimulator>>queueForwardedEvent: (in category 'event forwarding') ----- - queueForwardedEvent:evt - eventQueue isNil - ifTrue:[eventQueue := SharedQueue new]. - eventQueue nextPut: evt.! Item was removed: - Object subclass: #StackInterpreterSimulatorEventTransformer - instanceVariableNames: '' - classVariableNames: 'Default' - poolDictionaries: 'EventSensorConstants' - category: 'VMMaker-InterpreterSimulation-Morphic'! - - !StackInterpreterSimulatorEventTransformer commentStamp: 'tty 2/8/2014 12:54' prior: 0! - A StackInterpreterSimulatorEventUnwrapper takes events as wrapped by HandMorph and converts them to a form a StackInterpreterSimulator can deal with. - - See HandMorph >> handleEvent to see what the wrapping entails. - See HandMorph >> ProcessEvents or EventSensor >> fetchMoreEvents for examples of what an unwrapped event looks like when given to the system - - - for pre-wrapping - - Instance Variables - ! Item was removed: - ----- Method: StackInterpreterSimulatorEventTransformer class>>default (in category 'initialize-release') ----- - default - ^Default ifNil:[Default := self new]! Item was removed: - ----- Method: StackInterpreterSimulatorEventTransformer>>degenerateEvent: (in category 'event transformation') ----- - degenerateEvent: aMorphicEvent - "tty. Bert had mentioned a distinction between events and polling events and that Morphic could handle both. - I don't know what he is talking about." - | evt type | - self flag:'tty'. - - evt := nil. - type := aMorphicEvent type. - " Transcript show:type;cr." - (('mouse' charactersExactlyMatching: type asString) > 4) "mous" - ifTrue: [^self degenerateMouseEvent: aMorphicEvent]. - (('key' charactersExactlyMatching: type asString) > 2) "key" - ifTrue: [^self degenerateKeyboardEvent: aMorphicEvent]. - " type = EventTypeDragDropFiles ifTrue: [evt := self generateDropFilesEvent: evtBuf]. - type = EventTypeWindow ifTrue:[evt := self generateWindowEvent: evtBuf]." - - ^ #(0 0 0 0 0 0 0 0).! Item was removed: - ----- Method: StackInterpreterSimulatorEventTransformer>>degenerateKeyboardEvent: (in category 'event transformation') ----- - degenerateKeyboardEvent: aMorphicEvent - | evt | - "see HandMorph>>generateKeyboardEvent and EventSensor class comment" - evt := {2 . 0 . 0 . 0 . 0. 0 . 0 . 0}. - - evt at:2 put: aMorphicEvent timeStamp. - evt at:3 put: aMorphicEvent keyValue. "<--this is wrong. See Sensor FirstEvt: for what needs to happen. hooo boy" - evt at:4 put: aMorphicEvent position y. - evt at:5 put: (aMorphicEvent buttons bitAnd: 7). "thanks Ron T." - evt at:6 put: (aMorphicEvent buttons >> 3). "Thanks dtl" - ^evt - - - ! Item was removed: - ----- Method: StackInterpreterSimulatorEventTransformer>>degenerateMouseButtonEvent: (in category 'event transformation') ----- - degenerateMouseButtonEvent: aMorphicEvent - | evt | - "see HandMorph>>generateMouseEvent" - evt := {1 . 0 . 0 . 0 . 0. 0 . 0 . 0}. - - evt at:2 put: aMorphicEvent timeStamp. - evt at:3 put: aMorphicEvent position x. - evt at:4 put: aMorphicEvent position y. - evt at:5 put: (aMorphicEvent buttons bitAnd: 7). "thanks Ron T." - evt at:6 put: (aMorphicEvent buttons >> 3). "Thanks dtl" - ^evt - - - ! Item was removed: - ----- Method: StackInterpreterSimulatorEventTransformer>>degenerateMouseEvent: (in category 'event transformation') ----- - degenerateMouseEvent: aMorphicEvent - "see HandMorph>>generateMouseEvent" - - (aMorphicEvent type) = #mouseMove - ifTrue:[^self degenerateMouseMoveEvent: aMorphicEvent]. - - ((aMorphicEvent type) = #mouseUp) | ((aMorphicEvent type) = #mouseDown) - ifTrue:[^self degenerateMouseButtonEvent: aMorphicEvent]. - " (aMorphicEvent type) = #mouseDrag - ifTrue:[evt := self degenerateMouseDragEvent: aMorphicEvent]. - " - ^{0 . 0. 0. 0. 0. 0. 0. 0}.! Item was removed: - ----- Method: StackInterpreterSimulatorEventTransformer>>degenerateMouseMoveEvent: (in category 'event transformation') ----- - degenerateMouseMoveEvent: aMorphicEvent - | evt | - "see HandMorph>>generateMouseEvent" - evt := {1 . 0 . 0 . 0 . 0. 0 . 0 . 0}. - - evt at:2 put: aMorphicEvent timeStamp. - evt at:3 put: aMorphicEvent position x. - evt at:4 put: aMorphicEvent position y. - evt at:5 put: (aMorphicEvent buttons bitAnd: 7). "thanks Ron T." - evt at:6 put: (aMorphicEvent buttons >> 3). "Thanks dtl" - ^evt - - - ! Item was removed: - ImageMorph subclass: #StackInterpreterSimulatorImageMorph - instanceVariableNames: 'eventForwarder' - classVariableNames: '' - poolDictionaries: '' - category: 'VMMaker-InterpreterSimulation-Morphic'! - - !StackInterpreterSimulatorImageMorph commentStamp: 'tty 2/5/2014 12:28' prior: 0! - A StackInterpreterSimulatorImageMorph is an ImageMorph The StackInterpreterSimulator paints its world on me. - - If tty can get event forwarding working along the HandMorph->StackInterpreterSimulatorMorphicModel->StackInterpreterSimulator path, then then I don't need to exist. - - If event forwarding attempt above fails, then I may need to handle it. - - - Instance Variables - - ! Item was removed: - SystemWindow subclass: #StackInterpreterSimulatorMorph - instanceVariableNames: 'loadButton helpButton resetButton stepButton overButton sendButton returnButton runButton toggleTranscriptButton optionsButton transcriptPanel commandPanel contextPanel stackPanel callStackPanel displayForm displayView eventEncoder ioExitButton fullDisplayUpdateButton forceInterruptCheckButton hackButton' - classVariableNames: '' - poolDictionaries: '' - category: 'VMMaker-InterpreterSimulation-Morphic'! - - !StackInterpreterSimulatorMorph commentStamp: 'tty 2/5/2014 12:11' prior: 0! - A StackInterpreterSimulatorMorph is a copy of PreferenceBrowserMorph that has been mangled into something that will support the StackInterpreterSimulator. - - I provide some UI features inspired by Bert Freudenberg's Lively Squeak VM at http://lively-web.org/users/bert/squeak.html - - See class protocol 'documentation' for examples of invoking me. - - My model is StackInterpreterSimulatorMorphicModel. - My model has a reference to the StackInterpreterSimulator and itermediates all (?) interaction with it. - - The StackInterpreterSimulator renders the simulated World on a StackInterpreterSimulatorImageMorph that I contain. - - There is some cruft (tight coupling via direct references along all three layers UI-Model-VM )in me that exists to support Eliot's original StackInterpreterSimulator>>openAsMorph functionality and use-case. - Rumors that said cruft is an artifact of tty's rudimentary Morphic skills are entirely credible. - - I hold out the barest glimmer of hope that Bert Freudenberg's SqueakJS functionality can be integrated into my functionality as well. - see http://lively-web.org/users/bert/squeak.html for the inspiration. - - I am not amenable to Flaps or the WorldMenu as there is a lot of pre-run configuration that is done to the Simulator prior to its being run. - Managing that ability with a GUI is counter-productive. If said functionality is desired in the future, then inspiration can be gleaned by cut-n-paste from PreferenceBrowser and PreferenceBrowserModel.! Item was removed: - ----- Method: StackInterpreterSimulatorMorph class>>ttyOne (in category 'documentation') ----- - ttyOne - "Script tty uses to run the stackIntepreter using this class" - | vm | - Transcript clear. - vm := StackInterpreterSimulator newWithOptions: #(#STACKVM). - vm openOn: '/home/tty/usr/src/smalltalk/buildCogDevelopmentImageCog.app/Contents/Resources/targets/Squeak4.5.image'. - "vm setBreakSelector: #&." - vm - openAsStackInterpreterSimulatorMorph "; - toggleTranscript; - halt; - run" - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph class>>withVMSimulator:title:transcript: (in category 'instance creation') ----- - withVMSimulator: aStackInterpreterSimulatorMorphicModel title: aString transcript: aTranscript - ^self new initializeWithVMSimulator: aStackInterpreterSimulatorMorphicModel title: aString aTranscript: aTranscript; - yourself. - - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>basicButton (in category 'submorphs - buttons') ----- - basicButton - | button | - button := SimpleButtonMorph new. - button - borderWidth: 2; - borderColor: #raised; - on: #mouseEnter send: #value to: [button borderColor: self paneColor]; - on: #mouseLeave send: #value to: [button borderColor: #raised]; - vResizing: #spaceFill; - useRoundedCorners; - clipSubmorphs: true; - color: self paneColor muchLighter; - target: self model. - ^button! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>buttonRowLayoutFrame (in category 'submorphs - buttons') ----- - buttonRowLayoutFrame - ^LayoutFrame fractions: (0@0 corner: 1@0) offsets: (0@0 corner: 0@ (TextStyle defaultFont height * 2.5)) - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>callStackPanel (in category 'submorphs - squeakJS') ----- - callStackPanel - "If any Morphic gurus exist, please have at it." - ^callStackPanel ifNil: - [callStackPanel := (PluggableTextMorph - on: self model - text: #processesAndContextStack - accept: nil - readSelection: nil - menu: nil) hideScrollBarsIndefinitely. - callStackPanel - color: Color transparent; - hResizing: #spaceFill; - vResizing: #spaceFill; - cellInset: 5; - yourself]. - - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>commandPanel (in category 'submorphs - simulator panel') ----- - commandPanel - self flag: 'tty'. "does this hybrid of PreferenceBrowser layout and Simulato openAsMorph stuff make sense?" - ^commandPanel ifNil: - [commandPanel := (PluggableTextMorph - on: self model vm - text: #byteCountText - accept: nil - readSelection: nil - menu: #utilitiesMenu:) hideScrollBarsIndefinitely. - commandPanel - color: Color transparent; - hResizing: #spaceFill; - vResizing: #spaceFill; - cellInset: 5; - yourself]. - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>contextPanel (in category 'submorphs - squeakJS') ----- - contextPanel - "This should show the currentContext and Special Objects array. as seen at SqueakJS - Doing that requires real talent. talent tty is lacking at the moment - on: [ Array with: (MorphWithSubmorphsWrapper with: self) ] - Array with: (ObjectExplorerWrapper with: rootObject name: 'root' model: self parent: nil) - " - ^contextPanel ifNil: - [contextPanel := (SimpleHierarchicalListMorph - on: [ Array with: (ObjectExplorerWrapper with: (self model vm) name: 'root' model: (self model vm) parent: nil) ] - list: #value - selected: nil - changeSelected: nil - menu: nil - keystroke: nil) showScrollBarsOnlyWhenNeeded: true. - contextPanel - color: Color transparent; - hResizing: #spaceFill; - vResizing: #spaceFill; - cellInset: 5; - yourself] - - - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>displayView (in category 'submorphs - simulator display view') ----- - displayView - "The VM SImulator draws directly on an imageMorph named displayView - displayView is housed on a Form named displayForm - displayForm is initialized in StackInterpreterSimulator >> initialize. - see StackInterpreterSimulator >>openAsMorph for original constructs. - " - ^displayView ifNil: - [displayView := (StackInterpreterSimulatorImageMorph new image: (model vm displayForm)). - (self model) displayView: displayView. - (self model) morph: displayView. "<-- N.B.. morph bounds are used to filter events in the model. tty" - displayView activeHand addEventListener: self model. - - displayView - color: Color transparent; - hResizing: #spaceFill; - vResizing: #spaceFill; - cellInset: 5; - yourself - ]. - - - - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>displayViewLayoutFrame (in category 'submorphs - simulator display view') ----- - displayViewLayoutFrame - | squeakJSFrame buttonFrame simulatorFrame| - "if any Morphic guru's understand layouts and offsets, please fix this. tty" - buttonFrame := self buttonRowLayoutFrame. - squeakJSFrame := self squeakJSRowLayoutFrame. - simulatorFrame := self simulatorLayoutFrame. - ^LayoutFrame fractions: (0@0 corner: 1@1) - offsets: (0@(buttonFrame bottomOffset) corner: simulatorFrame leftOffset@squeakJSFrame topOffset)! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>extent: (in category 'geometry') ----- - extent: aPoint - super extent: aPoint. - self fullBounds. - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>forceInterruptCheckButton (in category 'submorphs - buttons') ----- - forceInterruptCheckButton - self flag: 'tty'. - ^forceInterruptCheckButton ifNil: - [forceInterruptCheckButton := self basicButton - label: 'vm forceInterruptCheck' translated; - actionSelector: #forceInterruptCheck; - setBalloonText: - 'Invoke forceInterruptCheck on Simulator.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>fullDisplayUpdateButton (in category 'submorphs - buttons') ----- - fullDisplayUpdateButton - self flag: 'tty'. - ^fullDisplayUpdateButton ifNil: - [fullDisplayUpdateButton := self basicButton - label: 'vm fullDisplayUpdate' translated; - actionSelector: #fullDisplayUpdate; - setBalloonText: - 'Invoke fullDisplayUpdate on Simulator.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>hackButton (in category 'submorphs - buttons') ----- - hackButton - self flag: 'tty'. - ^hackButton ifNil: - [hackButton := self basicButton - label: 'Display ImageMorph Bounds' translated; - actionSelector: #hack; - setBalloonText: - 'tty needs a hack button.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>helpButton (in category 'submorphs - buttons') ----- - helpButton - ^helpButton ifNil: - [helpButton := self basicButton - label: 'help' translated; - setBalloonText: - 'Click here to get some hints on use of me ', - 'Panel' translated; - actionSelector: #help]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>initializeWithVMSimulator:title:aTranscript: (in category 'initialization') ----- - initializeWithVMSimulator: aStackInterpreterSimulator title: aString aTranscript: aTranscript - |model| - self flag: 'tty'. "need to get the layout right at this point. resizers and scroll bars would be nice. Layout offsets need a gimlet eye as well" - model := StackInterpreterSimulatorMorphicModel on: aStackInterpreterSimulator title: aString transcript: aTranscript. - self - model: model; - clipSubmorphs: true; - setLabel: self model windowTitle; - name: aString; - addMorph: self newButtonRow fullFrame: self buttonRowLayoutFrame; - addMorph: self squeakJSRow fullFrame: self squeakJSRowLayoutFrame; - addMorph: self simulatorPanel fullFrame: self simulatorLayoutFrame; - addMorph: self displayView fullFrame: self displayViewLayoutFrame. - ^self ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>ioExitButton (in category 'submorphs - buttons') ----- - ioExitButton - self flag: 'tty'. - ^ioExitButton ifNil: - [ioExitButton := self basicButton - label: 'vm ioExit' translated; - actionSelector: #ioExit; - setBalloonText: - 'Invoke ioExit on Simulator.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>loadButton (in category 'submorphs - buttons') ----- - loadButton - ^loadButton ifNil: - [loadButton := self basicButton - label: 'Load Image' translated; - actionSelector: #loadImage; - setBalloonText: - 'Select an image to load.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>newButtonRow (in category 'submorphs - buttons') ----- - newButtonRow - ^BorderedMorph new - color: Color transparent; - cellInset: 2; - layoutInset: 2; - layoutPolicy: TableLayout new; - listDirection: #leftToRight; - listCentering: #topLeft; - cellPositioning: #topLeft; - on: #mouseEnter send: #paneTransition: to: self; - on: #mouseLeave send: #paneTransition: to: self; - addMorphBack: self hackButton; - addMorphBack: self newSeparator; - - " addMorphBack: self resetButton; - addMorphBack: self newSeparator; - addMorphBack: self forceInterruptCheckButton; - addMorphBack: self newSeparator; - addMorphBack: self fullDisplayUpdateButton; - addMorphBack: self newSeparator; - addMorphBack: self toggleTranscriptButton;" - addMorphBack: self runButton; - addMorphBack: self newSeparator; - addMorphBack: self ioExitButton; - addMorphBack: self newTransparentFiller; - addMorphBack: self stepButton; - addMorphBack: self newSeparator; - addMorphBack: self overButton; - addMorphBack: self newSeparator; - addMorphBack: self newSeparator; - addMorphBack: self sendButton; - addMorphBack: self newSeparator; - addMorphBack: self returnButton; - addMorphBack: self newTransparentFiller; - " addMorphBack: self loadButton; - addMorphBack: self newSeparator; - addMorphBack: self optionsButton; too complex to implement now. See StackInterpreterSimulator class comment for examples" - addMorphBack: self newTransparentFiller; - addMorphBack: self helpButton; - yourself.! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>newSeparator (in category 'submorphs - buttons') ----- - newSeparator - ^BorderedMorph new - borderWidth: 2; - borderColor: Color transparent; - color: self paneColor; - hResizing: #rigid; - width: 5; - vResizing: #spaceFill; - yourself! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>newTransparentFiller (in category 'submorphs - buttons') ----- - newTransparentFiller - ^Morph new - color: Color transparent; - vResizing: #spaceFill; - hResizing: #spaceFill; - yourself.! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>optionsButton (in category 'submorphs - buttons') ----- - optionsButton - ^optionsButton ifNil: - [optionsButton := self basicButton - label: 'VM Options' translated; - actionSelector: #options; - setBalloonText: - 'VM Options.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>overButton (in category 'submorphs - buttons') ----- - overButton - ^overButton ifNil: - [overButton := self basicButton - label: 'Over' translated; - actionSelector: #over; - setBalloonText: - 'Step Over.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>resetButton (in category 'submorphs - buttons') ----- - resetButton - ^resetButton ifNil: - [resetButton := self basicButton - label: 'Reset' translated; - actionSelector: #reset; - setBalloonText: - 'Reset running simulation.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>returnButton (in category 'submorphs - buttons') ----- - returnButton - self flag: 'tty'. - ^returnButton ifNil: - [returnButton := self basicButton - label: 'Return' translated; - actionSelector: #return; - setBalloonText: - 'Return from what?.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>runButton (in category 'submorphs - buttons') ----- - runButton - self flag: 'tty'. - ^runButton ifNil: - [runButton := self basicButton - label: 'vm run' translated; - actionSelector: #run; - setBalloonText: - 'Run Simulation.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>sendButton (in category 'submorphs - buttons') ----- - sendButton - self flag: 'tty'. - ^sendButton ifNil: - [sendButton := self basicButton - label: 'Send' translated; - actionSelector: #send; - setBalloonText: - 'Send what exactly?.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>simulatorLayoutFrame (in category 'submorphs - simulator panel') ----- - simulatorLayoutFrame - | squeakJSFrame buttonFrame | - "I don't understand offsets in the LayoutFrame. I just fiddled until it looked ok. If anybody knows what they are doing, please refactor." - self flag: 'tty'. - buttonFrame := self buttonRowLayoutFrame. - squeakJSFrame := self squeakJSRowLayoutFrame. - ^LayoutFrame fractions: (0.7@0 corner: 1@squeakJSFrame topOffset) - offsets: (0@(buttonFrame bottomOffset) corner: 0.70@squeakJSFrame topOffset) - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>simulatorPanel (in category 'submorphs - simulator panel') ----- - simulatorPanel - "standard controls from StackInterpreterSimulator >> openAsMorph" - ^BorderedMorph new - color: Color transparent; - layoutInset: 10; - cellInset: 10; - layoutPolicy: TableLayout new; - listDirection: #topToBottom; - listCentering: #topLeft; - cellPositioning: #topLeft; - on: #mouseEnter send: #paneTransition: to: self; - on: #mouseLeave send: #paneTransition: to: self; - addMorphBack: self transcriptPanel; - addMorphBack: self commandPanel; - yourself.! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>squeakJSRow (in category 'submorphs - squeakJS') ----- - squeakJSRow - "row fo SqueakJS context, stack and call-stack panels" - ^BorderedMorph new - color: Color blue; - cellInset: 2; - layoutInset: 2; - layoutPolicy: TableLayout new; - listDirection: #leftToRight; - listCentering: #topLeft; - cellPositioning: #topLeft; - on: #mouseEnter send: #paneTransition: to: self; - on: #mouseLeave send: #paneTransition: to: self; - addMorphBack: self callStackPanel; - addMorphBack: self contextPanel; - addMorphBack: self stackPanel; - yourself.! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>squeakJSRowLayoutFrame (in category 'submorphs - squeakJS') ----- - squeakJSRowLayoutFrame - ^LayoutFrame fractions: (0(a)0.8 corner: 1@1) offsets: (0(a)0.8 corner: 1@ (TextStyle defaultFont height * 2.5)) - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>stackPanel (in category 'submorphs - squeakJS') ----- - stackPanel - "If any Morphic gurus exist, please have at it." - ^stackPanel ifNil: - [stackPanel := (PluggableTextMorph - on: self model - text: #currentContextStack - accept: nil - readSelection: nil - menu: nil) hideScrollBarsIndefinitely. - stackPanel - color: Color transparent; - hResizing: #spaceFill; - vResizing: #spaceFill; - cellInset: 5; - yourself]. - - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>stepButton (in category 'submorphs - buttons') ----- - stepButton - self flag: 'tty'. - ^stepButton ifNil: - [stepButton := self basicButton - label: 'Step' translated; - actionSelector: #step; - setBalloonText: - 'Step Into.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>toggleTranscriptButton (in category 'submorphs - buttons') ----- - toggleTranscriptButton - "tty I dont like this. I have diabled the button" - self flag: 'tty'. - ^toggleTranscriptButton ifNil: - [toggleTranscriptButton := self basicButton - label: 'Toggle Transcript' translated; - actionSelector: #toggleTranscript; - setBalloonText: - 'Use External Transcript Instead of Internal.' translated]! Item was removed: - ----- Method: StackInterpreterSimulatorMorph>>transcriptPanel (in category 'submorphs - simulator panel') ----- - transcriptPanel - self flag: 'tty'. "does this hybrid of PreferenceBrowser layout and Simulato openAsMorph stuff make sense?" - ^transcriptPanel ifNil: - [transcriptPanel := (PluggableTextMorph - on: self model vm transcript - text: nil - accept: nil - readSelection: nil - menu: #codePaneMenu:shifted:). - transcriptPanel - name: 'transcriptPanel'; - color: Color transparent; - hResizing: #spaceFill; - vResizing: #spaceFill; - cellInset: 5; - yourself]. - ! Item was removed: - TestCase subclass: #StackInterpreterSimulatorMorphicEventTests - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: 'EventSensorConstants' - category: 'VMMaker-InterpreterSimulation-Morphic'! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicEventTests>>testKeyEventDegeneration (in category 'test event') ----- - testKeyEventDegeneration - |aMorphicEvent evtBuf type| - aMorphicEvent := HandMorph new generateKeyboardEvent: {2 . 0. 0. 0. 0. 0. 0. 0}. - evtBuf := (StackInterpreterSimulatorEventTransformer default) degenerateEvent: aMorphicEvent. - type := evtBuf at:1. - self assert:(type = EventTypeKeyboard). - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicEventTests>>testMouseEventDegeneration (in category 'test event') ----- - testMouseEventDegeneration - |aMorphicEvent evtBuf type| - "see class comment in EventSensor browse" - aMorphicEvent := HandMorph new generateMouseEvent: {1 . 0. 0. 0. 0. 0. 0. 0}. - evtBuf := (StackInterpreterSimulatorEventTransformer default) degenerateEvent: aMorphicEvent. - type := evtBuf at:1. - self assert:(type = EventTypeMouse). - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicEventTests>>testNullEventDegeneration (in category 'test event') ----- - testNullEventDegeneration - |aMorphicEvent evtBuf type| - "Test a bad morphic event returns a null event" "see class comment in EventSensor browse" - aMorphicEvent := UserInputEvent new. - evtBuf := (StackInterpreterSimulatorEventTransformer default) degenerateEvent: aMorphicEvent. - type := evtBuf at:1. - self assert:(type = EventTypeNone). - - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicEventTests>>testStackInterpreterSimulatorDisplayViewAccess (in category 'test tight coupling') ----- - testStackInterpreterSimulatorDisplayViewAccess - "There is tight coupling between the morph,model and vm simulator on the simulators displayView variable - this test makes sure it is accesible and is an ImageMorph." - - self assert: ((SystemNavigation allImplementorsOf: #displayView localTo: StackInterpreterSimulator) size = 1). - self assert: ((SystemNavigation allImplementorsOf: #displayView: localTo: StackInterpreterSimulator)size = 1). - - ! Item was removed: - Model subclass: #StackInterpreterSimulatorMorphicModel - instanceVariableNames: 'vm title stepping morph' - classVariableNames: '' - poolDictionaries: 'EventSensorConstants' - category: 'VMMaker-InterpreterSimulation-Morphic'! - - !StackInterpreterSimulatorMorphicModel commentStamp: 'tty 2/6/2014 09:43' prior: 0! - A StackInterpreterSimulatorMorphicModel handles Morphic callbacks and UI for (some parts of ) the StackInterpreterSimulator. - - I handle event forwarding management.. - - Currently, I am a listener to HandMorphs>>addPrimitiveEventListener. - I am added as a listener by StackInterpreterSimulatorMorph>>displayView (which probably needs to change. tty) - - - instance vars: - - stepping when true the vm is running, but the user is stepping throught the stack--like a debugger. (not implemented: tty) - - - sharedPools: EventSensorConstants! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel class>>initialize (in category 'class initialization') ----- - initialize - "I want to keep it launchable by script only for now. - Eliot has a bunch of options that aren't really feasible for a Morphic first approach. - " - "self - registerWindowColor; - registerInOpenMenu; - registerInFlaps"! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel class>>on:title:transcript: (in category 'instance creation') ----- - on: aStackInterpreterSimulator title: aString transcript: aTranscriptStream - | simmodel | - simmodel := self new. - simmodel - vm: aStackInterpreterSimulator; - title: aString; - transcript: aTranscriptStream. - ^simmodel. ! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel class>>registerInFlaps (in category 'class initialization') ----- - registerInFlaps - " Flaps - registerQuad: - { #StackInterpreterSimulator. - #prototypicalToolWindow. - 'StackInterpreter Simulator' translated. - 'A Morphic Wrapper for VM Simulations' translated } - forFlapNamed: 'Tools' translated. - Flaps replaceToolsFlap"! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel class>>registerInOpenMenu (in category 'class initialization') ----- - registerInOpenMenu - (TheWorldMenu respondsTo: #registerOpenCommand:) ifTrue: [ - TheWorldMenu unregisterOpenCommand: 'StackInterpreter Simulator'. - TheWorldMenu registerOpenCommand: {'StackInterpreter Simulator'. {self. #open}}]. - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel class>>registerWindowColor (in category 'class initialization') ----- - registerWindowColor - (Preferences windowColorFor: self name) = Color white - ifTrue: [ Preferences setWindowColorFor: self name to: (Color colorFrom: self windowColorSpecification brightColor) ].! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel class>>unload (in category 'class initialization') ----- - unload - self - unregisterFromOpenMenu; - unregisterFromFlaps.! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel class>>unregisterFromFlaps (in category 'class initialization') ----- - unregisterFromFlaps - "Flaps - unregisterQuadsWithReceiver: self; - replaceToolsFlap"! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel class>>unregisterFromOpenMenu (in category 'class initialization') ----- - unregisterFromOpenMenu - (TheWorldMenu respondsTo: #registerOpenCommand:) - ifTrue: [TheWorldMenu unregisterOpenCommand: 'StackInterpreter Simulator']. - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel class>>windowColorSpecification (in category 'window color') ----- - windowColorSpecification - "Answer a WindowColorSpec object that declares my preference" - - ^ WindowColorSpec classSymbol: self name wording: 'StackInterpreter Simulator' brightColor: #(0.645 1.0 1.0) pastelColor: #(0.886 1.0 1.0) helpMessage: 'A tool for simulating a Stack Interpreter Virtual Machine.'! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>bounds (in category 'accessing') ----- - bounds - ^morph bounds.! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>byteCountText (in category 'user interface') ----- - byteCountText - ^vm byteCountText! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>currentContextStack (in category 'user interface - squeakJS') ----- - currentContextStack - self flag: 'tty'. - ^ 'Current Context Stack' printString asText! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>displayForm (in category 'accessing') ----- - displayForm - ^ vm displayForm! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>displayView (in category 'accessing') ----- - displayView - ^ vm displayView! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>displayView: (in category 'accessing') ----- - displayView: anImageMorph - vm displayView: anImageMorph! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>forceInterruptCheck (in category 'buttons callbacks') ----- - forceInterruptCheck - vm forceInterruptCheck - "^UserDialogBoxMorph inform: 'Toggle Transcript' title: 'TODO:'"! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>fullDisplayUpdate (in category 'buttons callbacks') ----- - fullDisplayUpdate - vm fullDisplayUpdate - "^UserDialogBoxMorph inform: 'Toggle Transcript' title: 'TODO:'"! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>hack (in category 'buttons callbacks') ----- - hack - UserDialogBoxMorph inform: (morph bounds printString) title: 'Hack:'! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>handleListenEvent: (in category 'event-forwarding') ----- - handleListenEvent: aMorphicEvent - "The StackInterpreterSimulatorImageMorph regsitered me (a StackInterpreterSimulatorMorphicModel ) with HandMorph>>addEventListener - HandMorph then broadcasts events to all registered listeners at this method. See HandMorph>>sendListenPrimitiveEvent - " - |evtBuf xtranslated ytranslated| - morph - ifNotNil:[ - evtBuf := (StackInterpreterSimulatorEventTransformer default) degenerateEvent: aMorphicEvent. - ((evtBuf at: 1) = EventTypeMouse) & (morph bounds containsPoint: aMorphicEvent position) - ifTrue:[ - xtranslated := (evtBuf at:3) - (morph bounds left) - 2 . "<--heh" - ytranslated := (evtBuf at:4) - (morph bounds top). - evtBuf at: 3 put: xtranslated. - evtBuf at: 4 put: ytranslated. - vm queueForwardedEvent: evtBuf]] - - - - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>help (in category 'buttons callbacks') ----- - help - "Open up a workspace with explanatory info in it about the StackInterpreterSimulator" - Workspace new - contents: self helpText; - openLabel: self windowTitle, ' Help'.! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>helpText (in category 'buttons callbacks') ----- - helpText - ^(String streamContents: [:str | - str nextPutAll: - 'Stack Intepreter Simulator Help Contents Go Here.']) translated! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>initialExtent (in category 'user interface') ----- - initialExtent - ^ 1286@938! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>initialize (in category 'initialize-release') ----- - initialize - - title := 'StackInterpreter Simulator (Beta))'.! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>ioExit (in category 'buttons callbacks') ----- - ioExit - vm ioExit - displayView activeHand removeEventListener: self model. "This is a bug as the user in vm ioExit may have cancelled the confirm t.m." - "^UserDialogBoxMorph inform: 'Toggle Transcript' title: 'TODO:'"! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>loadImage (in category 'buttons callbacks') ----- - loadImage - ^UserDialogBoxMorph inform: 'load image' title: 'TODO:'! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>morph (in category 'accessing') ----- - morph - "I need the bounds of my morph for filtering mouse events. - If there is a canned way of doing this besides this tight binding to my StackInterpreterSimulatorMorph, - then please refactor me. - - see my protocol event-forwarding for the gory details" - self flag:'tty'. - ^morph.! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>morph: (in category 'accessing') ----- - morph: aMorph - "I need the bounds of my morph for filtering mouse events. - If there is a canned way of doing this besides this tight binding to my StackInterpreterSimulatorMorph, - then please refactor me. - - see my protocol event-forwarding for the gory details" - self flag:'tty'. - morph := aMorph.! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>onItemClicked: (in category 'user interface - squeakJS') ----- - onItemClicked: anItem - "I am an item in the current context display on the SqueakJS tree view".! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>options (in category 'buttons callbacks') ----- - options - ^UserDialogBoxMorph inform: 'Options Popup--need checkboxes?' title: 'TODO:'! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>over (in category 'buttons callbacks') ----- - over - stepping:=true. - ^UserDialogBoxMorph inform: 'Step Over' title: 'TODO:'! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>processesAndContextStack (in category 'user interface - squeakJS') ----- - processesAndContextStack - "just a stub. see top right panel at http://lively-web.org/users/bert/squeak.html for what I intend to present" - self flag: 'tty'. - ^ 'Processes and ContextStack' printString asText - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>reset (in category 'buttons callbacks') ----- - reset - ^UserDialogBoxMorph inform: 'Reset' title: 'TODO:'! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>return (in category 'buttons callbacks') ----- - return - ^UserDialogBoxMorph inform: 'Return' title: 'TODO:'! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>run (in category 'buttons callbacks') ----- - run - stepping:=false. - vm run - "^UserDialogBoxMorph inform: 'Run' title: 'TODO:'"! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>send (in category 'buttons callbacks') ----- - send - ^UserDialogBoxMorph inform: 'Send' title: 'TODO:'! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>specialObjectsAndActiveContext (in category 'user interface - squeakJS') ----- - specialObjectsAndActiveContext - "just a stub. see top left panel at http://lively-web.org/users/bert/squeak.html for what I intend to present" - self flag: 'tty'. - ^ 'Special Objects and Active Context' printString asText - ! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>step (in category 'buttons callbacks') ----- - step - stepping:=true. - ^UserDialogBoxMorph inform: 'Step' title: 'TODO:'! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>stepping (in category 'accessing') ----- - stepping - ^stepping! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>stepping: (in category 'accessing') ----- - stepping: aBoolean - stepping := aBoolean! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>title: (in category 'accessing') ----- - title: aString - title := aString! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>toggleTranscript (in category 'buttons callbacks') ----- - toggleTranscript - vm toggleTranscriptForSimulatorMorph: self transcript. - "^UserDialogBoxMorph inform: 'Toggle Transcript' title: 'TODO:'"! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>transcript (in category 'accessing') ----- - transcript - ^vm transcript! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>transcript: (in category 'accessing') ----- - transcript: aTranscriptStream - vm transcript: aTranscriptStream.! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>utilitiesMenu: (in category 'user interface') ----- - utilitiesMenu: aMenuMorph - ^vm utilitiesMenu: aMenuMorph! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>vm (in category 'accessing') ----- - vm - ^vm! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>vm: (in category 'accessing') ----- - vm: aVMSimulator - vm := aVMSimulator! Item was removed: - ----- Method: StackInterpreterSimulatorMorphicModel>>windowTitle (in category 'user interface') ----- - windowTitle - ^ title translated!

1 0

[commit][3403] CogVM source as per VMMaker.oscog-eem.1417
by commits＠squeakvm.org 15 Jul '15

15 Jul '15

Revision: 3403 Author: eliot Date: 2015-07-14 15:46:03 -0700 (Tue, 14 Jul 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1417 General: Change the type of the event buffer from int[8] to long[8], along with the matching event typedefs in sq.h. Add a fence before reading checkSignalRequests and useTideA in doSignalExternalSemaphores. Newspeak: Spill ReceiverResultReg before the runtime call to fix pushEnclosingObject on ARM. ReceiverResultReg is edx/caller-saved on IA32 but r7/callee-saved on ARM. Compile Newspeak self and super sends as clean sends as well. Slower in monomorphic case but net win for the larger benchmarks, presumably because it avoids I-cache flushes in the polymorphic case. Also means implem- enting polymorphic caches for clean sends will benefit all non-ordinary sends. DeltaBlue +8.2% Splay +7.6% ParserCombinators +4.7% Richards +0.5% SlotRead (replaced with self send) -17.6% ARM Cogit: Implement machine code div/mod primitives on ARM, calling __aeabit_idivmod for the implementation. Unix: Fix a warning in the drop plugin. Modified Paths: -------------- branches/Cog/build.linux64x64/squeak.stack.spur/build/mvm branches/Cog/build.linux64x64/squeak.stack.spur/build.assert/mvm branches/Cog/build.linux64x64/squeak.stack.spur/build.debug/mvm branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/Cross/vm/sq.h branches/Cog/platforms/Cross/vm/sqExternalSemaphores.c branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux64x64/squeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.stack.spur/build/mvm 2015-07-10 21:17:09 UTC (rev 3402) +++ branches/Cog/build.linux64x64/squeak.stack.spur/build/mvm 2015-07-14 22:46:03 UTC (rev 3403) @@ -10,7 +10,7 @@ read a case $a in n|no|N|NO) echo "ok but this isn't safe!!";; -*) rm config.h; test -f Makefile && make reallyclean +*) rm -f config.h; test -f Makefile && make reallyclean esac test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .) test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .) Modified: branches/Cog/build.linux64x64/squeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.stack.spur/build.assert/mvm 2015-07-10 21:17:09 UTC (rev 3402) +++ branches/Cog/build.linux64x64/squeak.stack.spur/build.assert/mvm 2015-07-14 22:46:03 UTC (rev 3403) @@ -11,7 +11,7 @@ read a case $a in n|no|N|NO) echo "ok but this isn't safe!!";; -*) rm config.h; test -f Makefile && make reallyclean +*) rm -f config.h; test -f Makefile && make reallyclean esac test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .) test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .) Modified: branches/Cog/build.linux64x64/squeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.stack.spur/build.debug/mvm 2015-07-10 21:17:09 UTC (rev 3402) +++ branches/Cog/build.linux64x64/squeak.stack.spur/build.debug/mvm 2015-07-14 22:46:03 UTC (rev 3403) @@ -11,7 +11,7 @@ read a case $a in n|no|N|NO) echo "ok but this isn't safe!!";; -*) rm config.h; test -f Makefile && make reallyclean +*) rm -f config.h; test -f Makefile && make reallyclean esac test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .) test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .) Modified: branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c 2015-07-10 21:17:09 UTC (rev 3402) +++ branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c 2015-07-14 22:46:03 UTC (rev 3403) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1359 uuid: 0e62a222-6136-430f-9bc2-8e7cee245076 + VMPluginCodeGenerator VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b from - FilePlugin VMMaker.oscog-eem.1359 uuid: 0e62a222-6136-430f-9bc2-8e7cee245076 + FilePlugin VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1359 uuid: 0e62a222-6136-430f-9bc2-8e7cee245076 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b " __DATE__ ; @@ -126,7 +126,7 @@ static sqInt (*stackIntegerValue)(sqInt offset); static sqInt (*stackValue)(sqInt offset); static sqInt (*storePointerofObjectwithValue)(sqInt index, sqInt oop, sqInt valuePointer); -static sqInt (*tenuringIncrementalGC)(void); +static void (*tenuringIncrementalGC)(void); static sqInt (*topRemappableOop)(void); static sqInt (*trueObject)(void); #else /* !defined(SQUEAK_BUILTIN_PLUGIN) */ @@ -170,7 +170,7 @@ extern sqInt stackIntegerValue(sqInt offset); extern sqInt stackValue(sqInt offset); extern sqInt storePointerofObjectwithValue(sqInt index, sqInt oop, sqInt valuePointer); -extern sqInt tenuringIncrementalGC(void); +extern void tenuringIncrementalGC(void); extern sqInt topRemappableOop(void); extern sqInt trueObject(void); extern @@ -178,9 +178,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.1359 (i)" + "FilePlugin VMMaker.oscog-eem.1417 (i)" #else - "FilePlugin VMMaker.oscog-eem.1359 (e)" + "FilePlugin VMMaker.oscog-eem.1417 (e)" #endif ; static void * sCCPfn; Modified: branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c 2015-07-10 21:17:09 UTC (rev 3402) +++ branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c 2015-07-14 22:46:03 UTC (rev 3403) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b from - LargeIntegersPlugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + LargeIntegersPlugin VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b " __DATE__ ; @@ -174,9 +174,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.1325 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.1417 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.1325 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.1417 (e)" #endif ; static const int orOpIndex = 1; @@ -312,7 +312,7 @@ newBytes = instantiateClassindexableSize(fetchClassOf(aBytesObject), newLen); #else /* SPURVM */ -pushRemappableOop(aBytesObject); + pushRemappableOop(aBytesObject); newBytes = instantiateClassindexableSize(fetchClassOf(aBytesObject), newLen); aBytesObject = popRemappableOop() #endif /* SPURVM */ @@ -362,7 +362,7 @@ newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); #else /* SPURVM */ -pushRemappableOop(aBytesOop); + pushRemappableOop(aBytesOop); newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); aBytesOop = popRemappableOop() #endif /* SPURVM */ @@ -478,7 +478,7 @@ newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); #else /* SPURVM */ -pushRemappableOop(aBytesOop); + pushRemappableOop(aBytesOop); newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); aBytesOop = popRemappableOop() #endif /* SPURVM */ @@ -1219,7 +1219,7 @@ sum = instantiateClassindexableSize(resClass, longLen); #else /* SPURVM */ -pushRemappableOop(shortInt); + pushRemappableOop(shortInt); pushRemappableOop(longInt); sum = instantiateClassindexableSize(resClass, longLen); longInt = popRemappableOop(); @@ -1251,7 +1251,7 @@ newSum = instantiateClassindexableSize(resClass, longLen + 1); #else /* SPURVM */ -pushRemappableOop(sum); + pushRemappableOop(sum); newSum = instantiateClassindexableSize(resClass, longLen + 1); sum = popRemappableOop() #endif /* SPURVM */ @@ -1298,7 +1298,7 @@ firstLarge = createLargeFromSmallInteger(firstInteger); #else /* SPURVM */ -pushRemappableOop(secondInteger); + pushRemappableOop(secondInteger); firstLarge = createLargeFromSmallInteger(firstInteger); secondInteger = popRemappableOop() #endif /* SPURVM */ @@ -1319,7 +1319,7 @@ secondLarge = createLargeFromSmallInteger(secondInteger); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); secondLarge = createLargeFromSmallInteger(secondInteger); firstLarge = popRemappableOop() #endif /* SPURVM */ @@ -1350,7 +1350,7 @@ result = instantiateClassindexableSize(classLargePositiveInteger(), longLen); #else /* SPURVM */ -pushRemappableOop(shortLarge); + pushRemappableOop(shortLarge); pushRemappableOop(longLarge); result = instantiateClassindexableSize(classLargePositiveInteger(), longLen); longLarge = popRemappableOop(); @@ -1483,7 +1483,7 @@ result = instantiateClassindexableSize(classArray(), 2); #else /* SPURVM */ -pushRemappableOop(firstInteger); + pushRemappableOop(firstInteger); result = instantiateClassindexableSize(classArray(), 2); firstInteger = popRemappableOop() #endif /* SPURVM */ @@ -1499,7 +1499,7 @@ div = bytesOrIntgrowTo(div, (digitLength(div)) + 1); #else /* SPURVM */ -pushRemappableOop(firstInteger); + pushRemappableOop(firstInteger); div = bytesLshift(secondInteger, d); div = bytesOrIntgrowTo(div, (digitLength(div)) + 1); firstInteger = popRemappableOop() @@ -1513,7 +1513,7 @@ } #else /* SPURVM */ -pushRemappableOop(div); + pushRemappableOop(div); rem = bytesLshift(firstInteger, d); if ((digitLength(rem)) == firstLen) { rem = bytesOrIntgrowTo(rem, firstLen + 1); @@ -1526,7 +1526,7 @@ quo = instantiateClassindexableSize(resultClass, l); #else /* SPURVM */ -pushRemappableOop(div); + pushRemappableOop(div); pushRemappableOop(rem); quo = instantiateClassindexableSize(resultClass, l); rem = popRemappableOop(); @@ -1669,7 +1669,7 @@ rem = bytesRshiftbyteslookfirst(rem, d, 0, (digitLength(div)) - 1); #else /* SPURVM */ -pushRemappableOop(quo); + pushRemappableOop(quo); rem = bytesRshiftbyteslookfirst(rem, d, 0, (digitLength(div)) - 1); quo = popRemappableOop() #endif /* SPURVM */ @@ -1679,7 +1679,7 @@ result = instantiateClassindexableSize(classArray(), 2); #else /* SPURVM */ -pushRemappableOop(quo); + pushRemappableOop(quo); pushRemappableOop(rem); result = instantiateClassindexableSize(classArray(), 2); rem = popRemappableOop(); @@ -1749,7 +1749,7 @@ prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); pushRemappableOop(secondLarge); pushRemappableOop(thirdLarge); prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); @@ -1862,7 +1862,7 @@ prod = instantiateClassindexableSize(resultClass, longLen + shortLen); #else /* SPURVM */ -pushRemappableOop(shortInt); + pushRemappableOop(shortInt); pushRemappableOop(longInt); prod = instantiateClassindexableSize(resultClass, longLen + shortLen); longInt = popRemappableOop(); @@ -2011,7 +2011,7 @@ : classLargePositiveInteger()), resLen); #else /* SPURVM */ -pushRemappableOop(smaller); + pushRemappableOop(smaller); pushRemappableOop(larger); res = instantiateClassindexableSize((neg ? classLargeNegativeInteger() @@ -2409,7 +2409,7 @@ firstLarge = createLargeFromSmallInteger(firstInteger); #else /* SPURVM */ -pushRemappableOop(secondInteger); + pushRemappableOop(secondInteger); firstLarge = createLargeFromSmallInteger(firstInteger); secondInteger = popRemappableOop() #endif /* SPURVM */ @@ -2427,7 +2427,7 @@ secondLarge = createLargeFromSmallInteger(secondInteger); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); secondLarge = createLargeFromSmallInteger(secondInteger); firstLarge = popRemappableOop() #endif /* SPURVM */ @@ -2471,7 +2471,7 @@ firstLarge = createLargeFromSmallInteger(firstInteger); #else /* SPURVM */ -pushRemappableOop(secondInteger); + pushRemappableOop(secondInteger); firstLarge = createLargeFromSmallInteger(firstInteger); secondInteger = popRemappableOop() #endif /* SPURVM */ @@ -2489,7 +2489,7 @@ secondLarge = createLargeFromSmallInteger(secondInteger); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); secondLarge = createLargeFromSmallInteger(secondInteger); firstLarge = popRemappableOop() #endif /* SPURVM */ @@ -2967,7 +2967,7 @@ firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); #else /* SPURVM */ -pushRemappableOop(secondInteger); + pushRemappableOop(secondInteger); firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); secondInteger = popRemappableOop() #endif /* SPURVM */ @@ -2989,7 +2989,7 @@ secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); #else /* SPURVM */ -pushRemappableOop(firstAsLargeInteger); + pushRemappableOop(firstAsLargeInteger); secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); firstAsLargeInteger = popRemappableOop() #endif /* SPURVM */ @@ -3039,7 +3039,7 @@ firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); #else /* SPURVM */ -pushRemappableOop(secondInteger); + pushRemappableOop(secondInteger); firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); secondInteger = popRemappableOop() #endif /* SPURVM */ @@ -3061,7 +3061,7 @@ secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); #else /* SPURVM */ -pushRemappableOop(firstAsLargeInteger); + pushRemappableOop(firstAsLargeInteger); secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); firstAsLargeInteger = popRemappableOop() #endif /* SPURVM */ @@ -3107,7 +3107,7 @@ firstLarge = createLargeFromSmallInteger(firstInteger); #else /* SPURVM */ -pushRemappableOop(secondInteger); + pushRemappableOop(secondInteger); firstLarge = createLargeFromSmallInteger(firstInteger); secondInteger = popRemappableOop() #endif /* SPURVM */ @@ -3125,7 +3125,7 @@ secondLarge = createLargeFromSmallInteger(secondInteger); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); secondLarge = createLargeFromSmallInteger(secondInteger); firstLarge = popRemappableOop() #endif /* SPURVM */ @@ -3171,7 +3171,7 @@ firstLarge = createLargeFromSmallInteger(firstInteger); #else /* SPURVM */ -pushRemappableOop(secondInteger); + pushRemappableOop(secondInteger); firstLarge = createLargeFromSmallInteger(firstInteger); secondInteger = popRemappableOop() #endif /* SPURVM */ @@ -3189,7 +3189,7 @@ secondLarge = createLargeFromSmallInteger(secondInteger); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); secondLarge = createLargeFromSmallInteger(secondInteger); firstLarge = popRemappableOop() #endif /* SPURVM */ @@ -3233,7 +3233,7 @@ firstLarge = createLargeFromSmallInteger(firstInteger); #else /* SPURVM */ -pushRemappableOop(secondInteger); + pushRemappableOop(secondInteger); firstLarge = createLargeFromSmallInteger(firstInteger); secondInteger = popRemappableOop() #endif /* SPURVM */ @@ -3251,7 +3251,7 @@ secondLarge = createLargeFromSmallInteger(secondInteger); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); secondLarge = createLargeFromSmallInteger(secondInteger); firstLarge = popRemappableOop() #endif /* SPURVM */ @@ -3295,7 +3295,7 @@ firstLarge = createLargeFromSmallInteger(firstInteger); #else /* SPURVM */ -pushRemappableOop(secondInteger); + pushRemappableOop(secondInteger); firstLarge = createLargeFromSmallInteger(firstInteger); secondInteger = popRemappableOop() #endif /* SPURVM */ @@ -3313,7 +3313,7 @@ secondLarge = createLargeFromSmallInteger(secondInteger); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); secondLarge = createLargeFromSmallInteger(secondInteger); firstLarge = popRemappableOop() #endif /* SPURVM */ @@ -3400,7 +3400,7 @@ firstLarge = createLargeFromSmallInteger(firstInteger); #else /* SPURVM */ -pushRemappableOop(secondOperandInteger); + pushRemappableOop(secondOperandInteger); pushRemappableOop(thirdModuloInteger); firstLarge = createLargeFromSmallInteger(firstInteger); thirdModuloInteger = popRemappableOop(); @@ -3420,7 +3420,7 @@ secondLarge = createLargeFromSmallInteger(secondOperandInteger); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); pushRemappableOop(thirdModuloInteger); secondLarge = createLargeFromSmallInteger(secondOperandInteger); thirdModuloInteger = popRemappableOop(); @@ -3440,7 +3440,7 @@ thirdLarge = createLargeFromSmallInteger(thirdModuloInteger); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); pushRemappableOop(secondLarge); thirdLarge = createLargeFromSmallInteger(thirdModuloInteger); secondLarge = popRemappableOop(); @@ -3473,7 +3473,7 @@ prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); #else /* SPURVM */ -pushRemappableOop(firstLarge); + pushRemappableOop(firstLarge); pushRemappableOop(secondLarge); pushRemappableOop(thirdLarge); prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-07-10 21:17:09 UTC (rev 3402) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-07-14 22:46:03 UTC (rev 3403) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 + CCodeGenerator VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-07-10 21:17:09 UTC (rev 3402) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-07-14 22:46:03 UTC (rev 3403) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1407 uuid: cc7c9003-2145-44b0-a3bd-937c285968bb + CCodeGenerator VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b from - StackToRegisterMappingCogit VMMaker.oscog-eem.1407 uuid: cc7c9003-2145-44b0-a3bd-937c285968bb + StackToRegisterMappingCogit VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1407 uuid: cc7c9003-2145-44b0-a3bd-937c285968bb " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -271,6 +271,9 @@ #define LogicalShiftLeftRR 87 #define LogicalShiftRightCqR 84 #define LogicalShiftRightRR 85 +#define LookupRuleDynamicSuper 0x101 +#define LookupRuleImplicit 0x100 +#define LookupRuleSelf 0 #define LR 14 #define LS 9 #define LT 11 @@ -433,6 +436,7 @@ static sqInt addsrnimmror(AbstractInstruction * self_in_addsrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot) NoDbgRegParms; static sqInt addrnimmror(AbstractInstruction * self_in_addrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot) NoDbgRegParms; static sqInt addrnrm(AbstractInstruction * self_in_addrnrm, sqInt destReg, sqInt srcReg, sqInt addReg) NoDbgRegParms; +static usqInt aeabiDivModFunctionAddr(AbstractInstruction * self_in_aeabiDivModFunctionAddr) NoDbgRegParms; static sqInt andsrnimmror(AbstractInstruction * self_in_andsrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot) NoDbgRegParms; static sqInt andrnimmror(AbstractInstruction * self_in_andrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot) NoDbgRegParms; static sqInt bicsrnimmror(AbstractInstruction * self_in_bicsrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot) NoDbgRegParms; @@ -563,7 +567,6 @@ static AbstractInstruction * annotateAbsolutePCRef(AbstractInstruction *abstractInstruction) NoDbgRegParms; static AbstractInstruction * annotateBytecode(AbstractInstruction *abstractInstruction) NoDbgRegParms; static AbstractInstruction * annotateobjRef(AbstractInstruction *abstractInstruction, sqInt anOop) NoDbgRegParms; -static sqInt annotationForMcpcin(sqInt mcpc, CogMethod *cogHomeMethod) NoDbgRegParms; static void assertSaneJumpTarget(AbstractInstruction *jumpTarget) NoDbgRegParms; static sqInt blockCreationBytecodeSizeForHeader(sqInt methodHeader) NoDbgRegParms; static sqInt blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg) NoDbgRegParms; @@ -643,6 +646,7 @@ static sqInt generateInstructionsAt(sqInt eventualAbsoluteAddress) NoDbgRegParms; static sqInt generateMapAtstart(sqInt addressOrNull, sqInt startAddress) NoDbgRegParms; static void generateNewspeakRuntime(void); +static void generateNewspeakSendTrampolines(void); static void generateOpenPICPrototype(void); static void generateRunTimeTrampolines(void); static void generateStackPointerCapture(void); @@ -652,7 +656,7 @@ static sqInt genInnerPICAbortTrampoline(char *name) NoDbgRegParms; static sqInt genLoadCStackPointersForPrimCall(void); static sqInt genNonLocalReturnTrampoline(void); -static sqInt genNSSendTrampolineFornumArgscalled(void *aRoutine, sqInt numArgs, char *aString) NoDbgRegParms; +static sqInt genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString) NoDbgRegParms; static sqInt genReturnTrampolineForcalledarg(void *aRoutine, char *aString, sqInt regOrConst0) NoDbgRegParms; static sqInt genSafeTrampolineForcalled(void *aRoutine, char *aString) NoDbgRegParms; static sqInt genSafeTrampolineForcalledarg(void *aRoutine, char *aString, sqInt regOrConst0) NoDbgRegParms; @@ -1025,9 +1029,11 @@ static sqInt genReturnNil(void); static sqInt genReturnTrue(void); static sqInt genSecondExtendedSendBytecode(void); +static sqInt genSendAbsentDynamicSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendAbsentImplicit0ArgsBytecode(void); static sqInt genSendAbsentImplicitnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendAbsentOuternumArgsdepth(sqInt selector, sqInt numArgs, sqInt depth) NoDbgRegParms; +static sqInt genSendAbsentSelfnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendLiteralSelector0ArgsBytecode(void); static sqInt genSendLiteralSelector1ArgBytecode(void); static sqInt genSendLiteralSelector2ArgsBytecode(void); @@ -1088,7 +1094,6 @@ static sqInt genExtPushClosureBytecode(void); static void generateEnilopmarts(void); static void generateMissAbortTrampolines(void); -static void generateNewspeakSendTrampolines(void); static void generateSendTrampolines(void); static void generateTracingTrampolines(void); static sqInt genJumpBackTo(sqInt targetBytecodePC) NoDbgRegParms; @@ -1096,6 +1101,7 @@ static sqInt genJumpTo(sqInt targetBytecodePC) NoDbgRegParms; static sqInt genMarshalledSendnumArgssendTable(sqInt selector, sqInt numArgs, sqInt *sendTable) NoDbgRegParms; static sqInt genMethodAbortTrampolineFor(sqInt numArgs) NoDbgRegParms; +static sqInt genNSSendnumArgsdepthsendTable(sqInt selector, sqInt numArgs, sqInt depth, sqInt *sendTable) NoDbgRegParms; static sqInt genNullaryInlinePrimitive(sqInt prim) NoDbgRegParms; static sqInt genPICAbortTrampolineFor(sqInt numArgs) NoDbgRegParms; static sqInt genPICMissTrampolineFor(sqInt numArgs) NoDbgRegParms; @@ -1143,12 +1149,8 @@ static sqInt genReturnReceiver(void); static sqInt genReturnTopFromBlock(void); static sqInt genReturnTopFromMethod(void); -static sqInt genSendAbsentDynamicSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; -static sqInt genSendAbsentImplicitOrOuternumArgsdepthsendTable(sqInt selector, sqInt numArgs, sqInt depth, sqInt *sendTable) NoDbgRegParms; -static sqInt genSendAbsentSelfnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendDirectedSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; -static sqInt genSendTrampolineFornumArgscalledargargarg(void *aRoutine, sqInt numArgs, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2) NoDbgRegParms; static sqInt genSendTrampolineFornumArgscalledargargargarg(void *aRoutine, sqInt numArgs, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3) NoDbgRegParms; static sqInt genSendnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSmallIntegerComparison(sqInt jumpOpcode) NoDbgRegParms; @@ -1803,11 +1805,11 @@ { genExtSendBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, { genExtSendSuperBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, { genExtSendAbsentImplicitBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0, 1 }, - { genExtSendAbsentDynamicSuperBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, + { genExtSendAbsentDynamicSuperBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0, 1 }, { genExtUnconditionalJump, v4LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, { genExtJumpIfTrue, v4LongBranchDistance, 0, 0, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0 }, { genExtJumpIfFalse, v4LongBranchDistance, 0, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0, 0 }, - { genExtSendAbsentSelfBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, + { genExtSendAbsentSelfBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0, 1 }, { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, @@ -2289,6 +2291,26 @@ } +/* return the address of the __aeabi_idivmod() call provided by the ARM low + level libs to do an integer divide that returns the quo in R0 and rem in + R1. A word on the somewhat strange usage of idivmod herein; we need a + declaration for the _aeabi_idivmod helper function, despite the fact that + in a simple C program test, you don't. To get that declaration we need a + variable to hang it off and said variable needs to be referred to in order + to not get culled. Thus the temp var idivmod, the declaration for it that + has nothing to do with it and the odd usage in the inSmalltalk: block. + */ + + /* CogARMCompiler>>#aeabiDivModFunctionAddr */ +static usqInt +aeabiDivModFunctionAddr(AbstractInstruction * self_in_aeabiDivModFunctionAddr) +{ + extern void __aeabi_idivmod(int dividend, int divisor); + + return (usqInt)__aeabi_idivmod; +} + + /* Remember the ROR is doubled by the cpu so use 30>>1 etc ANDS destReg, srcReg, #immediate ROR #rot */ @@ -6079,6 +6101,73 @@ static AbstractInstruction * genDivRRQuoRem(AbstractInstruction * self_in_genDivRRQuoRem, sqInt abstractRegDivisor, sqInt abstractRegDividend, sqInt abstractRegQuotient, sqInt abstractRegRemainder) { + AbstractInstruction *abstractInstruction; + sqInt callTarget; + usqInt divRemFunctionAddr; + AbstractInstruction * inst; + sqInt rDividend; + sqInt rDivisor; + sqInt rQuotient; + sqInt rRemainder; + AbstractInstruction * self_in_saveAndRestoreLinkRegAround; + + assert(abstractRegDividend != abstractRegDivisor); + assert(abstractRegQuotient != abstractRegRemainder); + rDividend = concreteRegister(self_in_genDivRRQuoRem, abstractRegDividend); + rDivisor = concreteRegister(self_in_genDivRRQuoRem, abstractRegDivisor); + if (!(rDividend == CArg0Reg)) { + + /* we need to move the value in rDividend to CArg0Reg. Best to double check if rDivisor is already using it first */ + + if (rDivisor == CArg0Reg) { + + /* oh dear; we also need to move rDivisor's value out of the way first.. I'll move it to CArg1Reg and if some nitwit has managed to put rDividend there they deserve the crash */ + + if (rDividend == CArg1Reg) { + error("register choices in genDivR:R:Quo:Rem: made life impossible"); + } + /* begin MoveR:R: */ + genoperandoperand(MoveRR, rDivisor, CArg1Reg); + rDivisor = CArg1Reg; + } + /* begin MoveR:R: */ + genoperandoperand(MoveRR, rDividend, CArg0Reg); + } + if (!(rDivisor == CArg1Reg)) { + /* begin MoveR:R: */ + genoperandoperand(MoveRR, rDivisor, CArg1Reg); + } + divRemFunctionAddr = aeabiDivModFunctionAddr(self_in_genDivRRQuoRem); + /* begin saveAndRestoreLinkRegAround: */ + self_in_saveAndRestoreLinkRegAround = ((AbstractInstruction *) (backEnd())); + /* begin PushR: */ + inst = genoperand(PushR, LinkReg); + /* begin CallFullRT: */ + callTarget = ((usqInt)divRemFunctionAddr); + /* begin CallFull: */ + /* begin gen:literal: */ + checkLiteralforInstruction(callTarget, genoperand(CallFull, callTarget)); + + + /* begin PopR: */ + genoperand(PopR, LinkReg); + inst; + rQuotient = concreteRegister(self_in_genDivRRQuoRem, abstractRegQuotient); + rRemainder = concreteRegister(self_in_genDivRRQuoRem, abstractRegRemainder); + if (!(rQuotient == CArg0Reg)) { + + /* oh good grief, not again */ + + /* begin MoveR:R: */ + genoperandoperand(MoveRR, CArg0Reg, rQuotient); + if (rQuotient == CArg1Reg) { + error("register choices in genDivR:R:Quo:Rem: made life impossible"); + } + } + if (!(rRemainder == CArg1Reg)) { + /* begin MoveR:R: */ + genoperandoperand(MoveRR, CArg1Reg, rRemainder); + } return self_in_genDivRRQuoRem; } @@ -7605,34 +7694,6 @@ return abstractInstruction; } - -/* Answer the annotation for mcpc in cogHomeMethod's map, or 0 if no entry - exists. - */ - - /* Cogit>>#annotationForMcpc:in: */ -static sqInt -annotationForMcpcin(sqInt mcpc, CogMethod *cogHomeMethod) -{ - sqInt annotation; - sqInt mapByte; - sqInt mapLocation; - - mapLocation = findMapLocationForMcpcinMethod(mcpc, cogHomeMethod); - if (mapLocation == 0) { - return 0; - } - mapByte = byteAt(mapLocation); - annotation = ((usqInt) mapByte) >> AnnotationShift; - if (annotation == IsSendCall) { - mapByte = byteAt(mapLocation - 1); - if ((((usqInt) mapByte) >> AnnotationShift) == IsAnnotationExtension) { - annotation += mapByte & DisplacementMask; - } - } - return annotation; -} - /* Cogit>>#assertSaneJumpTarget: */ static void assertSaneJumpTarget(AbstractInstruction *jumpTarget) @@ -8067,9 +8128,7 @@ sqInt ceSICMiss(sqInt receiver) { - sqInt annotation; sqInt cacheTag; - CogMethod *callerMethod; sqInt entryPoint; sqInt errorSelectorOrNil; sqInt errsel; @@ -8097,22 +8156,6 @@ entryPoint = callTargetFromReturnAddress(backEnd, outerReturn); assert(((targetMethod->selector)) != (nilObject())); assert(((((sqInt)targetMethod)) + cmEntryOffset) == entryPoint); - callerMethod = mframeHomeMethod(getFramePointer()); - assert(((outerReturn >= ((((usqInt)callerMethod)) + cmNoCheckEntryOffset)) && (outerReturn <= ((((usqInt)callerMethod)) + ((callerMethod->blockSize)))))); - annotation = annotationForMcpcin(outerReturn, callerMethod); - assert(annotation >= IsSendCall); - if (annotation == IsNSSelfSend) { - ceSelfSendtonumArgs((targetMethod->selector), receiver, (targetMethod->cmNumArgs)); - /* begin unreachable */ - error("UNREACHABLE"); - } - if (annotation == IsNSDynamicSuperSend) { - ceDynamicSuperSendtonumArgs((targetMethod->selector), receiver, (targetMethod->cmNumArgs)); - /* begin unreachable */ - error("UNREACHABLE"); - } - - assert(((((sqInt)targetMethod)) + cmEntryOffset) == entryPoint); /* begin lookup:for:methodAndErrorSelectorInto: */ selector = (targetMethod->selector); methodOrSelectorIndex = lookupOrdinaryreceiver(selector, receiver); @@ -10825,12 +10868,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -10899,6 +10942,29 @@ } +/* Self send, dynamic super send, implicit receiver send, and outer send */ + + /* Cogit>>#generateNewspeakSendTrampolines */ +static void +generateNewspeakSendTrampolines(void) +{ + sqInt numArgs; + + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + selfSendTrampolines[numArgs] = (genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(ceSelfSendreceiver, numArgs, 0, trampolineNamenumArgs("ceSelfSend", numArgs))); + } + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + dynamicSuperSendTrampolines[numArgs] = (genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(ceDynamicSuperSendreceiver, numArgs, 0, trampolineNamenumArgs("ceDynamicSuperSend", numArgs))); + } + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + implicitReceiverSendTrampolines[numArgs] = (genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(ceImplicitReceiverSendreceiver, numArgs, 1, trampolineNamenumArgs("ceImplicitReceiverSend", numArgs))); + } + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + outerSendTrampolines[numArgs] = (genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(ceOuterSendreceiver, numArgs, 1, trampolineNamenumArgs("ceOuterSend", numArgs))); + } +} + + /* Generate the prototype ClosedPIC to determine how much space as full PIC takes. When we first allocate a closed PIC it only has one or two cases and we want to grow it. @@ -11185,9 +11251,9 @@ /* ReceiverResultReg: method receiver SendNumArgsReg: the NSSendCache cache */ - /* Cogit>>#genNSSendTrampolineFor:numArgs:called: */ + /* Cogit>>#genNSSendTrampolineFor:numArgs:enclosingObjectCheck:called: */ static sqInt -genNSSendTrampolineFornumArgscalled(void *aRoutine, sqInt numArgs, char *aString) +genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString) { AbstractInstruction *jumpItsTheReceiverStupid; AbstractInstruction *jumpMiss; @@ -11202,39 +11268,41 @@ genoperandoperand(CmpRR, ClassReg, TempReg); /* begin JumpNonZero: */ jumpMiss = genoperand(JumpNonZero, ((sqInt)0)); - /* begin MoveMw:r:R: */ - /* begin gen:quickConstant:operand:operand: */ - checkQuickConstantforInstruction(NSCEnclosingObjectIndex * BytesPerWord, genoperandoperandoperand(MoveMwrR, NSCEnclosingObjectIndex * BytesPerWord, SendNumArgsReg, TempReg)); - /* begin CmpCq:R: */ - /* begin gen:quickConstant:operand: */ - checkQuickConstantforInstruction(0, genoperandoperand(CmpCqR, 0, TempReg)); - /* begin JumpZero: */ - jumpItsTheReceiverStupid = genoperand(JumpZero, ((sqInt)0)); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, TempReg, ReceiverResultReg); - if (numArgs > 2) { - if (numArgs >= (NumSendTrampolines - 1)) { + if (eoCheckFlag) { + /* begin MoveMw:r:R: */ + /* begin gen:quickConstant:operand:operand: */ + checkQuickConstantforInstruction(NSCEnclosingObjectIndex * BytesPerWord, genoperandoperandoperand(MoveMwrR, NSCEnclosingObjectIndex * BytesPerWord, SendNumArgsReg, TempReg)); + /* begin CmpCq:R: */ + /* begin gen:quickConstant:operand: */ + checkQuickConstantforInstruction(0, genoperandoperand(CmpCqR, 0, TempReg)); + /* begin JumpZero: */ + jumpItsTheReceiverStupid = genoperand(JumpZero, ((sqInt)0)); + /* begin MoveR:R: */ + genoperandoperand(MoveRR, TempReg, ReceiverResultReg); + if (numArgs > 2) { + if (numArgs >= (NumSendTrampolines - 1)) { - /* arbitrary argument count */ + /* arbitrary argument count */ - /* begin MoveMw:r:R: */ - /* begin gen:quickConstant:operand:operand: */ - checkQuickConstantforInstruction(NSCNumArgsIndex * BytesPerWord, genoperandoperandoperand(MoveMwrR, NSCNumArgsIndex * BytesPerWord, SendNumArgsReg, TempReg)); - - /* begin MoveR:Xwr:R: */ - genoperandoperandoperand(MoveRXwrR, ReceiverResultReg, TempReg, SPReg); - } - else { + /* begin MoveMw:r:R: */ + /* begin gen:quickConstant:operand:operand: */ + checkQuickConstantforInstruction(NSCNumArgsIndex * BytesPerWord, genoperandoperandoperand(MoveMwrR, NSCNumArgsIndex * BytesPerWord, SendNumArgsReg, TempReg)); + + /* begin MoveR:Xwr:R: */ + genoperandoperandoperand(MoveRXwrR, ReceiverResultReg, TempReg, SPReg); + } + else { - /* Known argument count */ + /* Known argument count */ - /* begin MoveR:Mw:r: */ - offset = ((0) + numArgs) * BytesPerWord; - /* begin gen:operand:quickConstant:operand: */ - checkQuickConstantforInstruction(offset, genoperandoperandoperand(MoveRMwr, TempReg, offset, SPReg)); + /* begin MoveR:Mw:r: */ + offset = ((0) + numArgs) * BytesPerWord; + /* begin gen:operand:quickConstant:operand: */ + checkQuickConstantforInstruction(offset, genoperandoperandoperand(MoveRMwr, TempReg, offset, SPReg)); + } } + jmpTarget(jumpItsTheReceiverStupid, gLabel()); } - jmpTarget(jumpItsTheReceiverStupid, gLabel()); /* begin MoveMw:r:R: */ /* begin gen:quickConstant:operand:operand: */ checkQuickConstantforInstruction(NSCTargetIndex * BytesPerWord, genoperandoperandoperand(MoveMwrR, NSCTargetIndex * BytesPerWord, SendNumArgsReg, TempReg)); @@ -11244,7 +11312,7 @@ genEnsureOopInRegNotForwardedscratchRegupdatingMwr(ReceiverResultReg, TempReg, FoxMFReceiver, FPReg); genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, TempReg); - return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, ReceiverResultReg, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, null, 1); } @@ -13826,14 +13894,14 @@ static sqInt processorHasDivQuoRemAndMClassIsSmallInteger(sqInt ignoredPrimIndex) { - return 0; + return mclassIsSmallInteger(ignoredPrimIndex); } /* Cogit>>#processorHasDivQuoRem: */ static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex) { - return 0; + return 1; } /* Cogit>>#processorHasDoublePrecisionFloatingPointSupport: */ @@ -22193,7 +22261,14 @@ return genSendnumArgs(getLiteral(byte1 & 0x3F), ((usqInt) byte1) >> 6); } + /* SimpleStackBasedCogit>>#genSendAbsentDynamicSuper:numArgs: */ +static sqInt +genSendAbsentDynamicSupernumArgs(sqInt selector, sqInt numArgs) +{ + return genNSSendnumArgsdepthsendTable(selector, numArgs, LookupRuleDynamicSuper, dynamicSuperSendTrampolines); +} + /* 160-175 1010 i i i i Send To Absent Implicit Receiver Literal Selector #iiii With 0 Arguments. */ @@ -22209,16 +22284,23 @@ static sqInt genSendAbsentImplicitnumArgs(sqInt selector, sqInt numArgs) { - return genSendAbsentImplicitOrOuternumArgsdepthsendTable(selector, numArgs, 0xFF, implicitReceiverSendTrampolines); + return genNSSendnumArgsdepthsendTable(selector, numArgs, LookupRuleImplicit, implicitReceiverSendTrampolines); } /* SimpleStackBasedCogit>>#genSendAbsentOuter:numArgs:depth: */ static sqInt genSendAbsentOuternumArgsdepth(sqInt selector, sqInt numArgs, sqInt depth) { - return genSendAbsentImplicitOrOuternumArgsdepthsendTable(selector, numArgs, depth, outerSendTrampolines); + return genNSSendnumArgsdepthsendTable(selector, numArgs, depth, outerSendTrampolines); } + /* SimpleStackBasedCogit>>#genSendAbsentSelf:numArgs: */ +static sqInt +genSendAbsentSelfnumArgs(sqInt selector, sqInt numArgs) +{ + return genNSSendnumArgsdepthsendTable(selector, numArgs, LookupRuleSelf, selfSendTrampolines); +} + /* SimpleStackBasedCogit>>#genSendLiteralSelector0ArgsBytecode */ static sqInt genSendLiteralSelector0ArgsBytecode(void) @@ -24551,40 +24633,10 @@ } -/* Self send, dynamic super send, implicit receiver send, and outer send. */ /* Override to generate code to push the register arg(s) for <= numRegArg arity sends. */ - /* StackToRegisterMappingCogit>>#generateNewspeakSendTrampolines */ -static void -generateNewspeakSendTrampolines(void) -{ - sqInt numArgs; - - for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { - selfSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargarg(ceSelfSendtonumArgs, numArgs, trampolineNamenumArgs("ceSelfSend", numArgs), ClassReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) - ? numArgs - : SendNumArgsReg))); - } - for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { - dynamicSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargarg(ceDynamicSuperSendtonumArgs, numArgs, trampolineNamenumArgs("ceDynSuperSend", numArgs), ClassReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) - ? numArgs - : SendNumArgsReg))); - } - for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { - implicitReceiverSendTrampolines[numArgs] = (genNSSendTrampolineFornumArgscalled(ceImplicitReceiverSendreceiver, numArgs, trampolineNamenumArgs("ceImplicitReceiverSend", numArgs))); - } - for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { - outerSendTrampolines[numArgs] = (genNSSendTrampolineFornumArgscalled(ceOuterSendreceiver, numArgs, trampolineNamenumArgs("ceOuterSend", numArgs))); - } -} - - -/* Override to generate code to push the register arg(s) for <= numRegArg - arity sends. - */ - /* StackToRegisterMappingCogit>>#generateSendTrampolines */ static void generateSendTrampolines(void) @@ -24859,7 +24911,42 @@ return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumRegArgs("ceMethodAbort", numArgs), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); } + /* StackToRegisterMappingCogit>>#genNSSend:numArgs:depth:sendTable: */ +static sqInt +genNSSendnumArgsdepthsendTable(sqInt selector, sqInt numArgs, sqInt depth, sqInt *sendTable) +{ + AbstractInstruction *anInstruction; + sqInt nsSendCache; + NSSendCache * nsSendCache1; + if (isYoung(selector)) { + hasYoungReferent = 1; + } + nsSendCache = theIRCs + ((NumOopsPerNSC * BytesPerOop) * indexOfIRC); + indexOfIRC += 1; + assert(isInOldSpace(nsSendCache)); + /* begin initializeNSSendCache:selector:numArgs:depth: */ + nsSendCache1 = ((NSSendCache *) nsSendCache); + (nsSendCache1->selector = selector); + (nsSendCache1->numArgs = numArgs); + (nsSendCache1->depth = depth); + (nsSendCache1->classTag = 2); + ssAllocateCallReg(SendNumArgsReg); + marshallAbsentReceiverSendArguments(numArgs); + /* begin MoveUniqueCw:R: */ + /* begin gen:uniqueLiteral:operand: */ + /* begin uniqueLiteral:forInstruction: */ + anInstruction = genoperandoperand(MoveCwR, nsSendCache, SendNumArgsReg); + assert(usesOutOfLineLiteral(anInstruction)); + (anInstruction->dependent = allocateLiteral(nsSendCache)); + anInstruction; + CallNewspeakSend(sendTable[((numArgs < (NumSendTrampolines - 1)) ? numArgs : (NumSendTrampolines - 1))]); + (optStatus.isReceiverResultRegLive = 0); + ssPushRegister(ReceiverResultReg); + return 0; +} + + /* Nullary inline primitives. */ /* SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after @@ -25741,7 +25828,7 @@ AbstractInstruction *abstractInstruction; (optStatus.isReceiverResultRegLive = 0); - ssAllocateCallReg(SendNumArgsReg); + ssAllocateCallRegand(SendNumArgsReg, ReceiverResultReg); /* begin MoveCq:R: */ /* begin gen:quickConstant:operand: */ checkQuickConstantforInstruction(level, genoperandoperand(MoveCqR, level, SendNumArgsReg)); @@ -25983,57 +26070,6 @@ return genUpArrowReturn(); } - /* StackToRegisterMappingCogit>>#genSendAbsentDynamicSuper:numArgs: */ -static sqInt -genSendAbsentDynamicSupernumArgs(sqInt selector, sqInt numArgs) -{ - marshallAbsentReceiverSendArguments(numArgs); - return genMarshalledSendnumArgssendTable(selector, numArgs, dynamicSuperSendTrampolines); -} - - /* StackToRegisterMappingCogit>>#genSendAbsentImplicitOrOuter:numArgs:depth:sendTable: */ -static sqInt -genSendAbsentImplicitOrOuternumArgsdepthsendTable(sqInt selector, sqInt numArgs, sqInt depth, sqInt *sendTable) -{ - AbstractInstruction *anInstruction; - sqInt nsSendCache; - NSSendCache * nsSendCache1; - - if (isYoung(selector)) { - hasYoungReferent = 1; - } - nsSendCache = theIRCs + ((NumOopsPerNSC * BytesPerOop) * indexOfIRC); - indexOfIRC += 1; - assert(isInOldSpace(nsSendCache)); - /* begin initializeNSSendCache:selector:numArgs:depth: */ - nsSendCache1 = ((NSSendCache *) nsSendCache); - (nsSendCache1->selector = selector); - (nsSendCache1->numArgs = numArgs); - (nsSendCache1->depth = depth); - (nsSendCache1->classTag = 2); - ssAllocateCallReg(SendNumArgsReg); - marshallAbsentReceiverSendArguments(numArgs); - /* begin MoveUniqueCw:R: */ - /* begin gen:uniqueLiteral:operand: */ - /* begin uniqueLiteral:forInstruction: */ - anInstruction = genoperandoperand(MoveCwR, nsSendCache, SendNumArgsReg); - assert(usesOutOfLineLiteral(anInstruction)); - (anInstruction->dependent = allocateLiteral(nsSendCache)); - anInstruction; - CallNewspeakSend(sendTable[((numArgs < (NumSendTrampolines - 1)) ? numArgs : (NumSendTrampolines - 1))]); - (optStatus.isReceiverResultRegLive = 0); - ssPushRegister(ReceiverResultReg); - return 0; -} - - /* StackToRegisterMappingCogit>>#genSendAbsentSelf:numArgs: */ -static sqInt -genSendAbsentSelfnumArgs(sqInt selector, sqInt numArgs) -{ - marshallAbsentReceiverSendArguments(numArgs); - return genMarshalledSendnumArgssendTable(selector, numArgs, selfSendTrampolines); -} - /* StackToRegisterMappingCogit>>#genSendDirectedSuper:numArgs: */ static sqInt genSendDirectedSupernumArgs(sqInt selector, sqInt numArgs) @@ -26054,24 +26090,6 @@ } -/* Generate a trampoline with three arguments. - Hack: a negative value indicates an abstract register, a non-negative - value indicates a constant. */ - - /* StackToRegisterMappingCogit>>#genSendTrampolineFor:numArgs:called:arg:arg:arg: */ -static sqInt -genSendTrampolineFornumArgscalledargargarg(void *aRoutine, sqInt numArgs, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2) -{ - sqInt startAddress; - - startAddress = methodZoneBase; - zeroOpcodeIndex(); - genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); - genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 3, regOrConst0, regOrConst1, regOrConst2, null, 0, 1, null, 1); - return startAddress; -} - - /* Generate a trampoline with four arguments. Hack: a negative value indicates an abstract register, a non-negative value indicates a constant. */ Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-07-10 21:17:09 UTC (rev 3402) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-07-14 22:46:03 UTC (rev 3403) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a + CCodeGenerator VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b from - StackToRegisterMappingCogit VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a + StackToRegisterMappingCogit VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -257,6 +257,9 @@ #define LogicalShiftLeftRR 87 #define LogicalShiftRightCqR 84 #define LogicalShiftRightRR 85 +#define LookupRuleDynamicSuper 0x101 +#define LookupRuleImplicit 0x100 +#define LookupRuleSelf 0 #define MapEnd 0 #define MaxCompiledPrimitiveIndex 222 #define MaxMethodSize 65535 @@ -508,7 +511,6 @@ static AbstractInstruction * annotateAbsolutePCRef(AbstractInstruction *abstractInstruction) NoDbgRegParms; static AbstractInstruction * annotateBytecode(AbstractInstruction *abstractInstruction) NoDbgRegParms; static AbstractInstruction * annotateobjRef(AbstractInstruction *abstractInstruction, sqInt anOop) NoDbgRegParms; -static sqInt annotationForMcpcin(sqInt mcpc, CogMethod *cogHomeMethod) NoDbgRegParms; static void assertSaneJumpTarget(AbstractInstruction *jumpTarget) NoDbgRegParms; static sqInt blockCreationBytecodeSizeForHeader(sqInt methodHeader) NoDbgRegParms; static sqInt blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg) NoDbgRegParms; @@ -588,6 +590,7 @@ static sqInt generateInstructionsAt(sqInt eventualAbsoluteAddress) NoDbgRegParms; static sqInt generateMapAtstart(sqInt addressOrNull, sqInt startAddress) NoDbgRegParms; static void generateNewspeakRuntime(void); +static void generateNewspeakSendTrampolines(void); static void generateOpenPICPrototype(void); static void generateRunTimeTrampolines(void); static void generateStackPointerCapture(void); @@ -597,7 +600,7 @@ static sqInt genInnerPICAbortTrampoline(char *name) NoDbgRegParms; static sqInt genLoadCStackPointersForPrimCall(void); static sqInt genNonLocalReturnTrampoline(void); -static sqInt genNSSendTrampolineFornumArgscalled(void *aRoutine, sqInt numArgs, char *aString) NoDbgRegParms; +static sqInt genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString) NoDbgRegParms; static sqInt genReturnTrampolineForcalledarg(void *aRoutine, char *aString, sqInt regOrConst0) NoDbgRegParms; static sqInt genSafeTrampolineForcalled(void *aRoutine, char *aString) NoDbgRegParms; static sqInt genSafeTrampolineForcalledarg(void *aRoutine, char *aString, sqInt regOrConst0) NoDbgRegParms; @@ -945,9 +948,11 @@ static sqInt genReturnNil(void); static sqInt genReturnTrue(void); static sqInt genSecondExtendedSendBytecode(void); +static sqInt genSendAbsentDynamicSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendAbsentImplicit0ArgsBytecode(void); static sqInt genSendAbsentImplicitnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendAbsentOuternumArgsdepth(sqInt selector, sqInt numArgs, sqInt depth) NoDbgRegParms; +static sqInt genSendAbsentSelfnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendLiteralSelector0ArgsBytecode(void); static sqInt genSendLiteralSelector1ArgBytecode(void); static sqInt genSendLiteralSelector2ArgsBytecode(void); @@ -1008,7 +1013,6 @@ static sqInt genExtPushClosureBytecode(void); static void generateEnilopmarts(void); static void generateMissAbortTrampolines(void); -static void generateNewspeakSendTrampolines(void); static void generateSendTrampolines(void); static void generateTracingTrampolines(void); static sqInt genJumpBackTo(sqInt targetBytecodePC) NoDbgRegParms; @@ -1016,6 +1020,7 @@ static sqInt genJumpTo(sqInt targetBytecodePC) NoDbgRegParms; static sqInt genMarshalledSendnumArgssendTable(sqInt selector, sqInt numArgs, sqInt *sendTable) NoDbgRegParms; static sqInt genMethodAbortTrampolineFor(sqInt numArgs) NoDbgRegParms; +static sqInt genNSSendnumArgsdepthsendTable(sqInt selector, sqInt numArgs, sqInt depth, sqInt *sendTable) NoDbgRegParms; static sqInt genNullaryInlinePrimitive(sqInt prim) NoDbgRegParms; static sqInt genPICAbortTrampolineFor(sqInt numArgs) NoDbgRegParms; static sqInt genPICMissTrampolineFor(sqInt numArgs) NoDbgRegParms; @@ -1063,12 +1068,8 @@ static sqInt genReturnReceiver(void); static sqInt genReturnTopFromBlock(void); static sqInt genReturnTopFromMethod(void); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1417.mcz
by commits＠source.squeak.org 15 Jul '15

15 Jul '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1417.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1417 Author: eem Time: 14 July 2015, 3:14:42.397 pm UUID: 5220753e-35a2-46e9-89ad-f7e65d93073b Ancestors: VMMaker.oscog-tpr.1416 Change the type of the event buffer from int[8] to long[8]. Provide simulation support for accessing it in the object memories. Fix a slip in ioGetNextEvent: =============== Diff against VMMaker.oscog-tpr.1416 =============== Item was changed: + ----- Method: CogARMCompiler>>initialize (in category 'generate machine code') ----- - ----- Method: CogARMCompiler>>initialize (in category 'initialization') ----- initialize + "This method intializes the Smalltalk instance. The C instance is merely a struct and doesn't need initialization." - "This method intializes the Smalltalk instance. The C instance is - merely a struct and doesn't need initialization." <doNotGenerate> + operands := CArrayAccessor on: (Array new: NumOperands). + machineCode := CArrayAccessor on: (Array new: self machineCodeWords)! - operands := CArrayAccessor - on: (Array new: NumOperands). - machineCode := CArrayAccessor - on: (Array new: self machineCodeWords) - ! Item was changed: ----- Method: InterpreterPrimitives>>primitiveGetNextEvent (in category 'I/O primitives') ----- primitiveGetNextEvent "Primitive. Return the next input event from the VM event queue." | evtBuf arg value eventTypeIs | + <var: #evtBuf declareC:'long evtBuf[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }'> + self cCode: [] inSmalltalk: [evtBuf := objectMemory newInputEventAccessorOfSize: 8]. - <var: #evtBuf declareC:'int evtBuf[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }'> - self cCode:'' inSmalltalk:[evtBuf := CArrayAccessor on: (IntegerArray new: 8)]. arg := self stackTop. + ((objectMemory isArray: arg) and:[(objectMemory slotSizeOf: arg) = 8]) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. - ((objectMemory isArray: arg) and:[(objectMemory slotSizeOf: arg) = 8]) ifFalse:[^self primitiveFail]. self ioGetNextEvent: (self cCoerce: evtBuf to: 'sqInputEvent*'). + self successful ifFalse: + [^nil]. - self successful ifFalse:[^nil]. "Event type" eventTypeIs := evtBuf at: 0. self storeInteger: 0 ofObject: arg withValue: (evtBuf at: 0). + self successful ifFalse: + [^nil]. - self successful ifFalse:[^nil]. - "Event is Complex, assume evtBuf is populated correctly and return" eventTypeIs = 6 + ifTrue: "Event is Complex, assume evtBuf is populated correctly and return" + [1 to: 7 do: [:i | - ifTrue: [ - 1 to: 7 do: [:i | value := evtBuf at: i. self storePointer: i ofObject: arg withValue: value]] + ifFalse: + ["Event time stamp" + self storeInteger: 1 ofObject: arg withValue: ((evtBuf at: 1) bitAnd: MillisecondClockMask). + self successful ifFalse: + [^nil]. - ifFalse: [ - "Event time stamp" - self storeInteger: 1 ofObject: arg withValue: ((evtBuf at: 1) bitAnd: MillisecondClockMask). - self successful ifFalse:[^nil]. + "Event arguments" + 2 to: 7 do:[:i| + value := evtBuf at: i. + (objectMemory isIntegerValue: value) + ifTrue:[self storeInteger: i ofObject: arg withValue: value] + ifFalse: + [value := self positiveMachineIntegerFor: value. + objectMemory storePointer: i ofObject: arg withValue: value]]]. - "Event arguments" - 2 to: 7 do:[:i| - value := evtBuf at: i. - (objectMemory isIntegerValue: value) - ifTrue:[self storeInteger: i ofObject: arg withValue: value] - ifFalse:[ - value := self positive32BitIntegerFor: value. - objectMemory storePointer: i ofObject: arg withValue: value] ] ]. + self successful ifTrue: [self pop: 1]! - self successful ifFalse:[^nil]. - self pop: 1! Item was added: + ----- Method: ObjectMemory>>newInputEventAccessorOfSize: (in category 'simulation') ----- + newInputEventAccessorOfSize: numElements + <doNotGenerate> + ^CArrayAccessor on: (IntegerArray new: 8)! Item was added: + ----- Method: Spur32BitMemoryManager>>newInputEventAccessorOfSize: (in category 'simulation') ----- + newInputEventAccessorOfSize: numElements + <doNotGenerate> + ^CArrayAccessor on: (IntegerArray new: 8)! Item was added: + ----- Method: Spur64BitMemoryManager>>newInputEventAccessorOfSize: (in category 'simulation') ----- + newInputEventAccessorOfSize: numElements + <doNotGenerate> + self flag: #endianness. + ^(CPluggableAccessor on: (IntegerArray new: 16)) + atBlock: [:obj :idx| (obj at: idx - 1 * 2) + ((obj at: idx - 1 * 2 + 1) << 32)] + atPutBlock: [:obj :idx :val| + obj at: idx - 1 * 2 put: (val bitAnd: 16rFFFFFFFF). + obj at: idx - 1 * 2 + 1 put: val >> 32. + val]! Item was changed: ----- Method: StackInterpreter>>doSignalSemaphoreWithIndex: (in category 'process primitive support') ----- doSignalSemaphoreWithIndex: index "Signal the external semaphore with the given index. Answer if a context switch occurs as a result. Do not bounds check. This has been done in the caller." <api> | xArray sema | xArray := objectMemory splObj: ExternalObjectsArray. + self assert: (objectMemory isArray: xArray). sema := objectMemory fetchPointer: index - 1 ofObject: xArray. "Note: semaphore indices are 1-based" self assert: (objectMemory isOopForwarded: sema) not. ^(objectMemory isSemaphoreOop: sema) and: [self synchronousSignal: sema]! Item was changed: ----- Method: StackInterpreterSimulator>>ioGetNextEvent: (in category 'I/O primitives') ----- ioGetNextEvent: evtBuf + | evt | - | evt | "StackInterpreterSimulatorMorphicModel browse" + eventQueue ifNil: - eventQueue isNil ifTrue: [^self primitiveFail]. + eventQueue isEmpty ifFalse: + [evt := eventQueue next. + 1 to: evt size do: + [:i| (evt at: i) ifNotNil: [:val| evtBuf at: (i - 1) put: val]]]! - eventQueue isEmpty - ifFalse: - [ evt := eventQueue next. - 1 to: (evt size) do: [:i | ((evt at: i) isNil) ifFalse: [evtBuf at: (i - 1) put: (evt at: i)]]]. - self success: true. - !

1 0

VM Maker: VMMaker.oscog-tpr.1416.mcz
by commits＠source.squeak.org 14 Jul '15

14 Jul '15

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.1416.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.1416 Author: tpr Time: 14 July 2015, 1:19:02.665 pm UUID: eac0fe5f-4fb3-4a57-8e6d-803471cce6ce Ancestors: VMMaker.oscog-rmacnak.1415 Merge Ryan's 1415 and fix a stupid deletion by that idiot tpr. =============== Diff against VMMaker.oscog-rmacnak.1415 =============== Item was added: + ----- Method: CogARMCompiler>>initialize (in category 'initialization') ----- + initialize + "This method intializes the Smalltalk instance. The C instance is + merely a struct and doesn't need initialization." + <doNotGenerate> + operands := CArrayAccessor + on: (Array new: NumOperands). + machineCode := CArrayAccessor + on: (Array new: self machineCodeWords) + !

1 0

unresponsive 64-bit Spur StackInterpreter, except...
by Eliot Miranda 14 Jul '15

14 Jul '15

Hi All, I've a bit of a mystery and could do with suggestions of what to look for. The 64-bit Spur StackInterpreter VM on linux was working fine up until a few months ago. Now it doesn't respond to input, unless that is, I put various breakpoints on various functions along the chain from aioPool through to allocateInputEvent to signalExternalSemaphore to doSignalExternalSemaphores when ... it can suddenly start working?! I'm planning to add a -debugeventchain flag or some such and if set write a different character to stderr form each function along the chain so I can see where the blockage is, but I fear heisenbugs; doing output could perturb the system into working (given that gdb can perturb the system also). And I'm lazy so I wondered if anyone had a good idea. I've thought of it being thread-related but that's not the case as all event processing in X11 happens on the main VM thread. Anyway, I'm open to suggestions. -- best, Eliot

5 6

Cog stack VM on ARM with B3DAcceleratorPlugin support?
by Phil (list) 14 Jul '15

14 Jul '15

Just curious as to whether or not the B3D plugin should work on ARM? If so, I'd like to request that it to be included in a future build. (I don't see it at least as of 3386) I'm working on OpenGL ES support and it would be great to include ARM devices like the Raspberry Pi. Thanks, Phil

3 3

VM Maker: VMMaker.oscog-rmacnak.1415.mcz
by commits＠source.squeak.org 14 Jul '15

14 Jul '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1415.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1415 Author: rmacnak Time: 13 July 2015, 8:33:03.418 pm UUID: b80baa14-1f7b-43f2-aeee-f17c4262fdf8 Ancestors: VMMaker.oscog-tpr.1414 Compile Newspeak self and super sends as clean sends as well. Slower in monomorphic case but net win for the larger benchmarks, presumably because it avoids I-cache flushes in the polymorphic case. Also means implementing polymorphic caches for clean sends will benefit all non-ordinary sends. DeltaBlue +8.2% Splay +7.6% ParserCombinators +4.7% Richards +0.5% SlotRead (replaced with self send) -17.6% =============== Diff against VMMaker.oscog-tpr.1414 =============== Item was added: + ----- Method: CoInterpreter>>ceDynamicSuperSend:receiver: (in category 'trampolines') ----- + ceDynamicSuperSend: cacheAddress receiver: methodReceiver + "A dynamic super send cache missed." + | nsSendCache methodReceiverClassTag cogMethod errSelIdx | + <api> + <option: #NewspeakVM> + <inline: false> + <var: #nsSendCache type: #'NSSendCache *'> + <var: #cogMethod type: #'CogMethod *'> + + cogit assertCStackWellAligned. + self assert: (objectMemory addressCouldBeOop: methodReceiver). + self deny: (objectMemory isOopForwarded: methodReceiver). + + nsSendCache := self cCoerceSimple: cacheAddress to: #'NSSendCache *'. + messageSelector := nsSendCache selector. + argumentCount := nsSendCache numArgs. + method := (self mframeHomeMethod: framePointer) methodObject. + + self assert: (self stackValue: argumentCount + 1 "ret addr") = methodReceiver. + + methodReceiverClassTag := objectMemory fetchClassTagOf: methodReceiver. + + (self + inlineLookupInNSMethodCacheSel: messageSelector + classTag: methodReceiverClassTag + method: method + lookupRule: LookupRuleDynamicSuper) + ifTrue: + [self assert: localAbsentReceiverOrZero = 0. + "check for coggability because method is in the cache" + self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector] + ifFalse: + [self deny: (objectMemory isOopForwarded: messageSelector). + self deny: (objectMemory isForwardedClassTag: methodReceiverClassTag). + lkupClassTag := methodReceiverClassTag. + errSelIdx := self lookupDynamicSuperSendNoMNU: methodReceiver. + errSelIdx ~= 0 ifTrue: + [self assert: errSelIdx == SelectorDoesNotUnderstand. + self handleMNU: errSelIdx + InMachineCodeTo: methodReceiver + classForMessage: (objectMemory classForClassTag: methodReceiverClassTag). + self unreachable]. + self addNewMethodToNSCache: LookupRuleDynamicSuper]. + + (self maybeMethodHasCogMethod: newMethod) + ifTrue: [ + cogMethod := self cogMethodOf: newMethod. + cogMethod selector = objectMemory nilObject + ifTrue: [cogit setSelectorOf: cogMethod to: messageSelector] + ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. + The cogMethod may not have the + correct selector. If not, try and compile a new method + with the correct selector." + cogMethod selector ~= messageSelector ifTrue: [ + (cogit cog: newMethod selector: messageSelector) + ifNotNil: [:newCogMethod | cogMethod := newCogMethod]]]. + cogMethod selector = messageSelector + ifTrue: + [cogit + linkNSSendCache: nsSendCache + classTag: methodReceiverClassTag + enclosingObject: 0 + target: cogMethod + caller: self mframeHomeMethodExport] + ifFalse: ["Out of code memory. Fall through to interpret."]. + instructionPointer := self popStack. + self executeNewMethod. + self unreachable]. + instructionPointer := self popStack. + self interpretMethodFromMachineCode. + self unreachable.! Item was removed: - ----- Method: CoInterpreter>>ceDynamicSuperSend:to:numArgs: (in category 'trampolines') ----- - ceDynamicSuperSend: selector to: rcvr numArgs: numArgs - "Entry-point for an unlinked dynamic super send in a CogMethod. Smalltalk stack looks like - receiver - args - head sp -> sender return pc - - If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and - may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise - attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. - because we're out of code memory. - - Continue execution via either executeMethod or interpretMethodFromMachineCode: - depending on whether the target method is cogged or not." - <api> - <option: #NewspeakVM> - | classTag errSelIdx cogMethod | - <inline: false> - <var: #cogMethod type: #'CogMethod *'> - <var: #newCogMethod type: #'CogMethod *'> - - cogit assertCStackWellAligned. - self assert: (objectMemory addressCouldBeOop: rcvr). - self sendBreakpoint: selector receiver: rcvr. - - classTag := objectMemory fetchClassTagOf: rcvr. - messageSelector := selector. - argumentCount := numArgs. - method := (self mframeHomeMethod: framePointer) methodObject. - - (self - inlineLookupInNSMethodCacheSel: messageSelector - classTag: classTag - method: method - lookupRule: LookupRuleDynamicSuper) - ifTrue: - ["check for coggability because method is in the cache" - self - ifAppropriateCompileToNativeCode: newMethod - selector: selector] - ifFalse: - [(objectMemory isOopForwarded: selector) ifTrue: - [self - ceDynamicSuperSend: (self handleForwardedSelectorFaultFor: selector) - to: rcvr - numArgs: numArgs. - self unreachable]. - (objectMemory isForwardedClassTag: classTag) ifTrue: - [self - ceDynamicSuperSend: selector - to: (self handleForwardedSendFaultForReceiver: rcvr stackDelta: 1 "skip return pc") - numArgs: numArgs. - self unreachable]. - lkupClassTag := classTag. - errSelIdx := self lookupDynamicSuperSendNoMNU: rcvr. - errSelIdx ~= 0 ifTrue: - [self assert: errSelIdx == SelectorDoesNotUnderstand. - self handleMNU: errSelIdx - InMachineCodeTo: rcvr - classForMessage: (objectMemory classForClassTag: classTag). - self unreachable]. - self addNewMethodToNSCache: LookupRuleSelf]. - - "Method found and has a cog method. Attempt to link to it." - (self maybeMethodHasCogMethod: newMethod) ifTrue: - [cogMethod := self cogMethodOf: newMethod. - cogMethod selector = objectMemory nilObject - ifTrue: [cogit setSelectorOf: cogMethod to: selector] - ifFalse: - ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct - selector. If not, try and compile a new method with the correct selector." - cogMethod selector ~= selector ifTrue: - [(cogit cog: newMethod selector: selector) ifNotNil: - [:newCogMethod| cogMethod := newCogMethod]]]. - cogMethod selector = selector ifTrue: - [cogit - linkSendAt: (stackPages longAt: stackPointer) - in: (self mframeHomeMethod: framePointer) - to: cogMethod - offset: cogit entryOffset - receiver: rcvr]. - instructionPointer := self popStack. - self executeNewMethod. - self unreachable]. - instructionPointer := self popStack. - self interpretMethodFromMachineCode. - self unreachable.! Item was added: + ----- Method: CoInterpreter>>ceSelfSend:receiver: (in category 'trampolines') ----- + ceSelfSend: cacheAddress receiver: methodReceiver + "A self send cache missed." + | nsSendCache methodReceiverClassTag cogMethod errSelIdx | + <api> + <option: #NewspeakVM> + <inline: false> + <var: #nsSendCache type: #'NSSendCache *'> + <var: #cogMethod type: #'CogMethod *'> + + cogit assertCStackWellAligned. + self assert: (objectMemory addressCouldBeOop: methodReceiver). + self deny: (objectMemory isOopForwarded: methodReceiver). + + nsSendCache := self cCoerceSimple: cacheAddress to: #'NSSendCache *'. + messageSelector := nsSendCache selector. + argumentCount := nsSendCache numArgs. + method := (self mframeHomeMethod: framePointer) methodObject. + + self assert: (self stackValue: argumentCount + 1 "ret addr") = methodReceiver. + + methodReceiverClassTag := objectMemory fetchClassTagOf: methodReceiver. + + (self + inlineLookupInNSMethodCacheSel: messageSelector + classTag: methodReceiverClassTag + method: method + lookupRule: LookupRuleSelf) + ifTrue: + [self assert: localAbsentReceiverOrZero = 0. + "check for coggability because method is in the cache" + self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector] + ifFalse: + [self deny: (objectMemory isOopForwarded: messageSelector). + self deny: (objectMemory isForwardedClassTag: methodReceiverClassTag). + lkupClassTag := methodReceiverClassTag. + errSelIdx := self lookupOuterSendNoMNU: methodReceiver depth: 0. + errSelIdx ~= 0 ifTrue: + [self assert: errSelIdx == SelectorDoesNotUnderstand. + self handleMNU: errSelIdx + InMachineCodeTo: methodReceiver + classForMessage: (objectMemory classForClassTag: methodReceiverClassTag). + self unreachable]. + self addNewMethodToNSCache: LookupRuleSelf]. + + (self maybeMethodHasCogMethod: newMethod) + ifTrue: [ + cogMethod := self cogMethodOf: newMethod. + cogMethod selector = objectMemory nilObject + ifTrue: [cogit setSelectorOf: cogMethod to: messageSelector] + ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. + The cogMethod may not have the + correct selector. If not, try and compile a new method + with the correct selector." + cogMethod selector ~= messageSelector ifTrue: [ + (cogit cog: newMethod selector: messageSelector) + ifNotNil: [:newCogMethod | cogMethod := newCogMethod]]]. + cogMethod selector = messageSelector + ifTrue: + [cogit + linkNSSendCache: nsSendCache + classTag: methodReceiverClassTag + enclosingObject: 0 + target: cogMethod + caller: self mframeHomeMethodExport] + ifFalse: ["Out of code memory. Fall through to interpret."]. + instructionPointer := self popStack. + self executeNewMethod. + self unreachable]. + instructionPointer := self popStack. + self interpretMethodFromMachineCode. + self unreachable.! Item was removed: - ----- Method: CoInterpreter>>ceSelfSend:to:numArgs: (in category 'trampolines') ----- - ceSelfSend: selector to: rcvr numArgs: numArgs - "Entry-point for an unlinked self send in a CogMethod. Smalltalk stack looks like - receiver - args - head sp -> sender return pc - - If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and - may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise - attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. - because we're out of code memory. - - Continue execution via either executeMethod or interpretMethodFromMachineCode: - depending on whether the target method is cogged or not." - <api> - <option: #NewspeakVM> - | classTag errSelIdx cogMethod | - <inline: false> - <var: #cogMethod type: #'CogMethod *'> - <var: #newCogMethod type: #'CogMethod *'> - - cogit assertCStackWellAligned. - self assert: (objectMemory addressCouldBeOop: rcvr). - self sendBreakpoint: selector receiver: rcvr. - - classTag := objectMemory fetchClassTagOf: rcvr. - messageSelector := selector. - argumentCount := numArgs. - method := (self mframeHomeMethod: framePointer) methodObject. - - (self - inlineLookupInNSMethodCacheSel: messageSelector - classTag: classTag - method: method - lookupRule: LookupRuleSelf) - ifTrue: - ["check for coggability because method is in the cache" - self - ifAppropriateCompileToNativeCode: newMethod - selector: selector] - ifFalse: - [(objectMemory isOopForwarded: selector) ifTrue: - [self - ceSelfSend: (self handleForwardedSelectorFaultFor: selector) - to: rcvr - numArgs: numArgs. - self unreachable]. - (objectMemory isForwardedClassTag: classTag) ifTrue: - [self - ceSelfSend: selector - to: (self handleForwardedSendFaultForReceiver: rcvr stackDelta: 1 "skip return pc") - numArgs: numArgs. - self unreachable]. - lkupClassTag := classTag. - errSelIdx := self lookupOuterSendNoMNU: rcvr depth: 0. - errSelIdx ~= 0 ifTrue: - [self assert: errSelIdx == SelectorDoesNotUnderstand. - self handleMNU: errSelIdx - InMachineCodeTo: rcvr - classForMessage: (objectMemory classForClassTag: classTag). - self unreachable]. - self addNewMethodToNSCache: LookupRuleSelf]. - - "Method found and has a cog method. Attempt to link to it." - (self maybeMethodHasCogMethod: newMethod) ifTrue: - [cogMethod := self cogMethodOf: newMethod. - cogMethod selector = objectMemory nilObject - ifTrue: [cogit setSelectorOf: cogMethod to: selector] - ifFalse: - ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct - selector. If not, try and compile a new method with the correct selector." - cogMethod selector ~= selector ifTrue: - [(cogit cog: newMethod selector: selector) ifNotNil: - [:newCogMethod| cogMethod := newCogMethod]]]. - cogMethod selector = selector ifTrue: - [cogit - linkSendAt: (stackPages longAt: stackPointer) - in: (self mframeHomeMethod: framePointer) - to: cogMethod - offset: cogit entryOffset - receiver: rcvr]. - instructionPointer := self popStack. - self executeNewMethod. - self unreachable]. - instructionPointer := self popStack. - self interpretMethodFromMachineCode. - self unreachable.! Item was changed: ----- Method: Cogit>>ceSICMiss: (in category 'in-line cacheing') ----- ceSICMiss: receiver "An in-line cache check in a method has failed. The failing entry check has jumped to the ceMethodAbort abort call at the start of the method which has called this routine. If possible allocate a closed PIC for the current and existing classes. The stack looks like: receiver args sender return address sp=> ceMethodAbort call return address So we can find the method that did the failing entry check at ceMethodAbort call return address - missOffset and we can find the send site from the outer return address." <api> | pic innerReturn outerReturn entryPoint targetMethod newTargetMethodOrNil errorSelectorOrNil cacheTag extent result | <var: #pic type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> <var: #callerMethod type: #'CogMethod *'> "Whether we can relink to a PIC or not we need to pop off the inner return and identify the target method." innerReturn := coInterpreter popStack asUnsignedInteger. targetMethod := self cCoerceSimple: innerReturn - missOffset to: #'CogMethod *'. (objectMemory isOopForwarded: receiver) ifTrue: [^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. outerReturn := coInterpreter stackTop asUnsignedInteger. self assert: (outerReturn between: methodZoneBase and: methodZone freeStart). entryPoint := backEnd callTargetFromReturnAddress: outerReturn. self assert: targetMethod selector ~= objectMemory nilObject. - self cppIf: NewspeakVM ifTrue: - [| callerMethod annotation | - self assert: targetMethod asInteger + cmEntryOffset = entryPoint. - callerMethod := coInterpreter mframeHomeMethod: coInterpreter getFramePointer. - self assert: (outerReturn - between: callerMethod asUnsignedInteger + cmNoCheckEntryOffset - and: callerMethod asUnsignedInteger + callerMethod blockSize). - annotation := self annotationForMcpc: outerReturn in: callerMethod. - self assert: annotation >= IsSendCall. - "Avoid the effort of implementing PICs for the relatively high dynamic frequency - self send and simply rebind the send site (for now)." - annotation = IsNSSelfSend ifTrue: - [coInterpreter - ceSelfSend: targetMethod selector - to: receiver - numArgs: targetMethod cmNumArgs. - self unreachable]. - "Avoid the effort of implementing PICs for the relatively low dynamic frequency - dynamic super send and simply rebind the send site." - annotation = IsNSDynamicSuperSend ifTrue: - [coInterpreter - ceDynamicSuperSend: targetMethod selector - to: receiver - numArgs: targetMethod cmNumArgs. - self unreachable]]. self assert: targetMethod asInteger + cmEntryOffset = entryPoint. self lookup: targetMethod selector for: receiver methodAndErrorSelectorInto: [:method :errsel| newTargetMethodOrNil := method. errorSelectorOrNil := errsel]. "We assume lookupAndCog:for: will *not* reclaim the method zone" self assert: outerReturn = coInterpreter stackTop. cacheTag := objectRepresentation inlineCacheTagForInstance: receiver. ((errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand]) or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag) or: [(backEnd inlineCacheTagAt: outerReturn) = self picAbortDiscriminatorValue or: [newTargetMethodOrNil isNil or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue: [result := self patchToOpenPICFor: targetMethod selector numArgs: targetMethod cmNumArgs receiver: receiver. self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory" ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. "See if an Open PIC is already available." pic := methodZone openPICWithSelector: targetMethod selector. pic isNil ifTrue: ["otherwise attempt to create a closed PIC for the two cases." pic := self cogPICSelector: targetMethod selector numArgs: targetMethod cmNumArgs Case0Method: targetMethod Case1Method: newTargetMethodOrNil tag: cacheTag isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand. (pic asInteger between: MaxNegativeErrorCode and: -1) ifTrue: ["For some reason the PIC couldn't be generated, most likely a lack of code memory. Continue as if this is an unlinked send." pic asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. processor flushICacheFrom: pic asUnsignedInteger to: pic asUnsignedInteger + closedPICSize]. "Relink the send site to the pic. If to an open PIC then reset the cache tag to the selector, for the benefit of the cacheTag assert check in checkIfValidObjectRef:pc:cogMethod:." extent := pic cmType = CMOpenPIC ifTrue: [backEnd rewriteInlineCacheAt: outerReturn tag: targetMethod selector target: pic asInteger + cmEntryOffset] ifFalse: [backEnd rewriteCallAt: outerReturn target: pic asInteger + cmEntryOffset]. processor flushICacheFrom: outerReturn asUnsignedInteger - extent to: outerReturn asUnsignedInteger. "Jump back into the pic at its entry in case this is an MNU (newTargetMethodOrNil is nil)" coInterpreter executeCogPIC: pic fromLinkedSendWithReceiver: receiver andCacheTag: (backEnd inlineCacheTagAt: outerReturn). "NOTREACHED" ^nil! Item was removed: - ----- Method: Cogit>>genNSSendTrampolineFor:numArgs:called: (in category 'initialization') ----- - genNSSendTrampolineFor: aRoutine numArgs: numArgs called: aString - "ReceiverResultReg: method receiver - SendNumArgsReg: the NSSendCache cache" - <option: #NewspeakVM> - <var: #aRoutine type: #'void *'> - <var: #aString type: #'char *'> - | jumpMiss jumpItsTheReceiverStupid | - <var: #jumpMiss type: #'AbstractInstruction *'> - <var: #jumpItsTheReceiverStupid type: #'AbstractInstruction *'> - self zeroOpcodeIndex. - objectRepresentation - genGetInlineCacheClassTagFrom: ReceiverResultReg - into: ClassReg - forEntry: false. - self MoveMw: NSCClassTagIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. - self CmpR: ClassReg R: TempReg. - jumpMiss := self JumpNonZero: 0. - self MoveMw: NSCEnclosingObjectIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. - self CmpCq: 0 R: TempReg. - jumpItsTheReceiverStupid := self JumpZero: 0. - self MoveR: TempReg R: ReceiverResultReg. - "Now set the stacked receiver, if needed. If there are reg args this is - not required; see genPushRegisterArgsForNumArgs:numArgs: below." - (self numRegArgs = 0 or: [numArgs > self numRegArgs]) ifTrue: - [numArgs >= (NumSendTrampolines - 1) - ifTrue: "arbitrary argument count" - [self MoveMw: NSCNumArgsIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. - backEnd hasLinkRegister ifFalse: - [self AddCq: 1 R: TempReg].. - self MoveR: ReceiverResultReg Xwr: TempReg R: SPReg] - ifFalse: "Known argument count" - [self MoveR: TempReg Mw: (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1]) + numArgs * objectMemory wordSize r: SPReg]]. - jumpItsTheReceiverStupid jmpTarget: self Label. - self MoveMw: NSCTargetIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. - self JumpR: TempReg. - - jumpMiss jmpTarget: self Label. - objectRepresentation - genEnsureOopInRegNotForwarded: ReceiverResultReg - scratchReg: TempReg - updatingMw: FoxMFReceiver - r: FPReg. - self numRegArgs > 0 ifTrue: - [backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: TempReg]. - ^self - genTrampolineFor: aRoutine - called: aString - numArgs: 2 - arg: SendNumArgsReg "The NSSendCache" - arg: ReceiverResultReg - arg: nil - arg: nil - saveRegs: false - pushLinkReg: true - resultReg: ReceiverResultReg "Never happens?" - appendOpcodes: true! Item was added: + ----- Method: Cogit>>genNSSendTrampolineFor:numArgs:enclosingObjectCheck:called: (in category 'initialization') ----- + genNSSendTrampolineFor: aRoutine numArgs: numArgs enclosingObjectCheck: eoCheckFlag called: aString + "ReceiverResultReg: method receiver + SendNumArgsReg: the NSSendCache cache" + <option: #NewspeakVM> + <var: #aRoutine type: #'void *'> + <var: #aString type: #'char *'> + | jumpMiss jumpItsTheReceiverStupid | + <var: #jumpMiss type: #'AbstractInstruction *'> + <var: #jumpItsTheReceiverStupid type: #'AbstractInstruction *'> + self zeroOpcodeIndex. + objectRepresentation + genGetInlineCacheClassTagFrom: ReceiverResultReg + into: ClassReg + forEntry: false. + self MoveMw: NSCClassTagIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. + self CmpR: ClassReg R: TempReg. + jumpMiss := self JumpNonZero: 0. + + eoCheckFlag ifTrue: + [self MoveMw: NSCEnclosingObjectIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. + self CmpCq: 0 R: TempReg. + jumpItsTheReceiverStupid := self JumpZero: 0. + self MoveR: TempReg R: ReceiverResultReg. + "Now set the stacked receiver, if needed. If there are reg args this is + not required; see genPushRegisterArgsForNumArgs:numArgs: below." + (self numRegArgs = 0 or: [numArgs > self numRegArgs]) ifTrue: + [numArgs >= (NumSendTrampolines - 1) + ifTrue: "arbitrary argument count" + [self MoveMw: NSCNumArgsIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. + backEnd hasLinkRegister ifFalse: + [self AddCq: 1 R: TempReg].. + self MoveR: ReceiverResultReg Xwr: TempReg R: SPReg] + ifFalse: "Known argument count" + [self MoveR: TempReg Mw: (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1]) + numArgs * objectMemory wordSize r: SPReg]]. + jumpItsTheReceiverStupid jmpTarget: self Label]. + + self MoveMw: NSCTargetIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. + self JumpR: TempReg. + + jumpMiss jmpTarget: self Label. + objectRepresentation + genEnsureOopInRegNotForwarded: ReceiverResultReg + scratchReg: TempReg + updatingMw: FoxMFReceiver + r: FPReg. + self numRegArgs > 0 ifTrue: + [backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: TempReg]. + ^self + genTrampolineFor: aRoutine + called: aString + numArgs: 2 + arg: SendNumArgsReg "The NSSendCache" + arg: ReceiverResultReg + arg: nil + arg: nil + saveRegs: false + pushLinkReg: true + resultReg: nil + appendOpcodes: true! Item was changed: ----- Method: Cogit>>generateNewspeakSendTrampolines (in category 'initialization') ----- generateNewspeakSendTrampolines "Self send, dynamic super send, implicit receiver send, and outer send" <option: #NewspeakVM> 0 to: NumSendTrampolines - 1 do: [:numArgs| selfSendTrampolines at: numArgs + put: (self + genNSSendTrampolineFor: #ceSelfSend:receiver: + numArgs: numArgs enclosingObjectCheck: false + called: (self trampolineName: 'ceSelfSend' numArgs: numArgs))]. - put: (self genTrampolineFor: #ceSelfSend:to:numArgs: - called: (self trampolineName: 'ceSelfSend' numArgs: numArgs) - arg: ClassReg - arg: ReceiverResultReg - arg: (self numArgsOrSendNumArgsReg: numArgs))]. 0 to: NumSendTrampolines - 1 do: [:numArgs| dynamicSuperSendTrampolines at: numArgs + put: (self + genNSSendTrampolineFor: #ceDynamicSuperSend:receiver: + numArgs: numArgs enclosingObjectCheck: false + called: (self trampolineName: 'ceDynamicSuperSend' numArgs: numArgs))]. - put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs: - called: (self trampolineName: 'ceDynSuperSend' numArgs: numArgs) - arg: ClassReg - arg: ReceiverResultReg - arg: (self numArgsOrSendNumArgsReg: numArgs))]. 0 to: NumSendTrampolines - 1 do: [:numArgs| implicitReceiverSendTrampolines at: numArgs put: (self genNSSendTrampolineFor: #ceImplicitReceiverSend:receiver: + numArgs: numArgs enclosingObjectCheck: true - numArgs: numArgs called: (self trampolineName: 'ceImplicitReceiverSend' numArgs: numArgs))]. 0 to: NumSendTrampolines - 1 do: [:numArgs| outerSendTrampolines at: numArgs put: (self genNSSendTrampolineFor: #ceOuterSend:receiver: + numArgs: numArgs enclosingObjectCheck: true - numArgs: numArgs called: (self trampolineName: 'ceOuterSend' numArgs: numArgs))]. ! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForNewspeakV4 (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV4 "SimpleStackBasedCogit initializeBytecodeTableForNewspeakV4" NSSendIsPCAnnotated := false. "IsNSSendCall used by SendAbsentImplicit" FirstSpecialSelector := 80. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode) (1 76 76 genPushReceiverBytecode) (1 77 77 genExtPushPseudoVariableOrOuterBytecode) (1 78 78 genPushConstantZeroBytecode) (1 79 79 genPushConstantOneBytecode) (1 80 101 genSpecialSelectorSend isMapped) "#+ #- #< #> #<= #>= #= #~= #* #/ #\\ #@ #bitShift: #// #bitAnd: #bitOr: #at: #at:put: #size #next #nextPut: #atEnd" (1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 103 103 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 112 127 genSendLiteralSelector0ArgsBytecode isMapped) (1 128 143 genSendLiteralSelector1ArgBytecode isMapped) (1 144 159 genSendLiteralSelector2ArgsBytecode isMapped) (1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped hasIRC) (1 176 183 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability" (1 184 191 genStoreAndPopTemporaryVariableBytecode) (1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1) (1 219 219 duplicateTopBytecode needsFrameNever: 1) (1 220 220 genPopStackBytecode needsFrameNever: -1) (1 221 221 genExtNopBytecode needsFrameNever: 0) (1 222 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genExtPushIntegerBytecode needsFrameNever: 1) (2 230 230 genLongPushTemporaryVariableBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtStoreReceiverVariableBytecode isInstVarRef) (2 233 233 genExtStoreLiteralVariableBytecode) (2 234 234 genLongStoreTemporaryVariableBytecode) (2 235 235 genExtStoreAndPopReceiverVariableBytecode isInstVarRef) (2 236 236 genExtStoreAndPopLiteralVariableBytecode) (2 237 237 genLongStoreAndPopTemporaryVariableBytecode) (2 238 238 genExtSendBytecode isMapped) (2 239 239 genExtSendSuperBytecode isMapped) (2 240 240 genExtSendAbsentImplicitBytecode isMapped hasIRC) + (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped hasIRC) - (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped) (2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) + (2 245 245 genExtSendAbsentSelfBytecode isMapped hasIRC) - (2 245 245 genExtSendAbsentSelfBytecode isMapped) (2 246 248 unknownBytecode) "3 byte bytecodes" (3 249 249 genCallPrimitiveBytecode) (3 250 250 genPushRemoteTempLongBytecode) (3 251 251 genStoreRemoteTempLongBytecode) (3 252 252 genStoreAndPopRemoteTempLongBytecode) (3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 254 254 genExtSendAbsentOuterBytecode isMapped hasIRC) (3 255 255 unknownBytecode))! Item was added: + ----- Method: SimpleStackBasedCogit>>genNSSend:numArgs:depth:sendTable: (in category 'bytecode generators') ----- + genNSSend: selector numArgs: numArgs depth: depth sendTable: sendTable + <var: #sendTable type: #'sqInt *'> + | nsSendCache | + (objectMemory isYoung: selector) ifTrue: + [hasYoungReferent := true]. + + nsSendCache := theIRCs + (NumOopsPerNSC * objectMemory bytesPerOop * indexOfIRC). + indexOfIRC := indexOfIRC + 1. + self assert: (objectMemory isInOldSpace: nsSendCache). + self initializeNSSendCache: nsSendCache selector: selector numArgs: numArgs depth: depth. + + "This leaves the method receiver on the stack, which might not be the implicit receiver. + But the lookup trampoline will establish the on-stack receiver once it locates it." + self marshallAbsentReceiverSendArguments: numArgs. + + "Load the cache last so it is a fixed distance from the call." + self MoveUniqueCw: nsSendCache R: SendNumArgsReg. + self CallNewspeakSend: (sendTable at: (numArgs min: NumSendTrampolines - 1)). + + self PushR: ReceiverResultReg. + ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genSendAbsentDynamicSuper:numArgs: (in category 'bytecode generators') ----- genSendAbsentDynamicSuper: selector numArgs: numArgs <inline: false> + ^self + genNSSend: selector + numArgs: numArgs + depth: LookupRuleDynamicSuper + sendTable: dynamicSuperSendTrampolines! - self marshallAbsentReceiverSendArguments: numArgs. - ^self genSend: selector numArgs: numArgs sendTable: dynamicSuperSendTrampolines! Item was changed: ----- Method: SimpleStackBasedCogit>>genSendAbsentImplicit:numArgs: (in category 'bytecode generators') ----- genSendAbsentImplicit: selector numArgs: numArgs <inline: false> ^self + genNSSend: selector - genSendAbsentImplicitOrOuter: selector numArgs: numArgs + depth: LookupRuleImplicit - depth: 255 "Unused" sendTable: implicitReceiverSendTrampolines! Item was removed: - ----- Method: SimpleStackBasedCogit>>genSendAbsentImplicitOrOuter:numArgs:depth:sendTable: (in category 'bytecode generators') ----- - genSendAbsentImplicitOrOuter: selector numArgs: numArgs depth: depth sendTable: sendTable - <var: #sendTable type: #'sqInt *'> - | nsSendCache | - (objectMemory isYoung: selector) ifTrue: - [hasYoungReferent := true]. - - nsSendCache := theIRCs + (NumOopsPerNSC * objectMemory bytesPerOop * indexOfIRC). - indexOfIRC := indexOfIRC + 1. - self assert: (objectMemory isInOldSpace: nsSendCache). - self initializeNSSendCache: nsSendCache selector: selector numArgs: numArgs depth: depth. - - "This leaves the method receiver on the stack, which might not be the implicit receiver. - But the lookup trampoline will establish the on-stack receiver once it locates it." - self marshallAbsentReceiverSendArguments: numArgs. - - "Load the cache last so it is a fixed distance from the call." - self MoveUniqueCw: nsSendCache R: SendNumArgsReg. - self CallNewspeakSend: (sendTable at: (numArgs min: NumSendTrampolines - 1)). - - self PushR: ReceiverResultReg. - ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genSendAbsentOuter:numArgs:depth: (in category 'bytecode generators') ----- genSendAbsentOuter: selector numArgs: numArgs depth: depth <inline: false> ^self + genNSSend: selector - genSendAbsentImplicitOrOuter: selector numArgs: numArgs depth: depth sendTable: outerSendTrampolines! Item was changed: ----- Method: SimpleStackBasedCogit>>genSendAbsentSelf:numArgs: (in category 'bytecode generators') ----- genSendAbsentSelf: selector numArgs: numArgs <inline: false> + ^self + genNSSend: selector + numArgs: numArgs + depth: LookupRuleSelf + sendTable: selfSendTrampolines! - self marshallAbsentReceiverSendArguments: numArgs. - ^self genSend: selector numArgs: numArgs sendTable: selfSendTrampolines! Item was changed: ----- Method: StackInterpreter>>lookupDynamicSuperSend (in category 'message sending') ----- lookupDynamicSuperSend "Do the full lookup for a Newspeak super send. IN: messageSelector IN: argumentCount OUT: localAbsentReceiver OUT: newMethod OUT: primitiveIndex RESULT: LookupRuleDynamicSuper or LookupRuleMNU" | methodMixin methodMixinApplication | localAbsentReceiver := self receiver. + localAbsentReceiverOrZero := 0. methodMixin := self methodClassOf: method. methodMixinApplication := self findApplicationOfTargetMixin: methodMixin startingAtBehavior: (objectMemory fetchClassOf: localAbsentReceiver). lkupClass := self superclassOf: methodMixinApplication. "For use by MNU" ^self lookupProtected: messageSelector startingAt: lkupClass rule: LookupRuleDynamicSuper! Item was changed: ----- Method: StackInterpreter>>lookupDynamicSuperSendNoMNU: (in category 'message sending') ----- lookupDynamicSuperSendNoMNU: methodReceiver "Do the full lookup for a Newspeak super send. IN: messageSelector IN: argumentCount OUT: localAbsentReceiver OUT: newMethod OUT: primitiveIndex RESULT: 0 or SelectorDoesNotUnderstand" | methodMixin methodMixinApplication | localAbsentReceiver := methodReceiver. + localAbsentReceiverOrZero := 0. methodMixin := self methodClassOf: method. methodMixinApplication := self findApplicationOfTargetMixin: methodMixin startingAtBehavior: (objectMemory fetchClassOf: localAbsentReceiver). lkupClass := self superclassOf: methodMixinApplication. "For use by MNU" ^self lookupProtectedNoMNU: messageSelector startingAt: lkupClass rule: LookupRuleDynamicSuper! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV4 (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV4 "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV4" numPushNilsFunction := #v4:Num:Push:Nils:. pushNilSizeFunction := #v4PushNilSize:numInitialNils:. NSSendIsPCAnnotated := true. "IsNSSendCall used by SendAbsentImplicit" FirstSpecialSelector := 80. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef needsFrameNever: 1) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genExtPushPseudoVariableOrOuterBytecode needsFrameIfExtBGT2: 1) (1 78 78 genPushConstantZeroBytecode needsFrameNever: 1) (1 79 79 genPushConstantOneBytecode needsFrameNever: 1) (1 80 80 genSpecialSelectorArithmetic isMapped AddRR) (1 81 81 genSpecialSelectorArithmetic isMapped SubRR) (1 82 82 genSpecialSelectorComparison isMapped JumpLess) (1 83 83 genSpecialSelectorComparison isMapped JumpGreater) (1 84 84 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 85 85 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 86 86 genSpecialSelectorComparison isMapped JumpZero) (1 87 87 genSpecialSelectorComparison isMapped JumpNonZero) (1 88 93 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 94 94 genSpecialSelectorArithmetic isMapped AndRR) (1 95 95 genSpecialSelectorArithmetic isMapped OrRR) (1 96 101 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 103 103 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 112 127 genSendLiteralSelector0ArgsBytecode isMapped) (1 128 143 genSendLiteralSelector1ArgBytecode isMapped) (1 144 159 genSendLiteralSelector2ArgsBytecode isMapped) (1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped hasIRC) (1 176 183 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability" (1 184 191 genStoreAndPopTemporaryVariableBytecode) (1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1) (1 219 219 duplicateTopBytecode needsFrameNever: 1) (1 220 220 genPopStackBytecode needsFrameNever: -1) (1 221 221 genExtNopBytecode needsFrameNever: 0) (1 222 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension needsFrameNever: 0) (2 225 225 extBBytecode extension needsFrameNever: 0) (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genExtPushIntegerBytecode needsFrameNever: 1) (2 230 230 genLongPushTemporaryVariableBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtStoreReceiverVariableBytecode isInstVarRef) (2 233 233 genExtStoreLiteralVariableBytecode) (2 234 234 genLongStoreTemporaryVariableBytecode) (2 235 235 genExtStoreAndPopReceiverVariableBytecode isInstVarRef) (2 236 236 genExtStoreAndPopLiteralVariableBytecode) (2 237 237 genLongStoreAndPopTemporaryVariableBytecode) (2 238 238 genExtSendBytecode isMapped) (2 239 239 genExtSendSuperBytecode isMapped) (2 240 240 genExtSendAbsentImplicitBytecode isMapped hasIRC) + (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped hasIRC) - (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped) (2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) + (2 245 245 genExtSendAbsentSelfBytecode isMapped hasIRC) - (2 245 245 genExtSendAbsentSelfBytecode isMapped) (2 246 248 unknownBytecode) "3 byte bytecodes" (3 249 249 genCallPrimitiveBytecode) (3 250 250 genPushRemoteTempLongBytecode) (3 251 251 genStoreRemoteTempLongBytecode) (3 252 252 genStoreAndPopRemoteTempLongBytecode) (3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 254 254 genExtSendAbsentOuterBytecode isMapped hasIRC) (3 255 255 unknownBytecode))! Item was added: + ----- Method: StackToRegisterMappingCogit>>genNSSend:numArgs:depth:sendTable: (in category 'bytecode generators') ----- + genNSSend: selector numArgs: numArgs depth: depth sendTable: sendTable + <var: #sendTable type: #'sqInt *'> + | nsSendCache | + (objectMemory isYoung: selector) ifTrue: + [hasYoungReferent := true]. + + nsSendCache := theIRCs + (NumOopsPerNSC * objectMemory bytesPerOop * indexOfIRC). + indexOfIRC := indexOfIRC + 1. + self assert: (objectMemory isInOldSpace: nsSendCache). + self initializeNSSendCache: nsSendCache selector: selector numArgs: numArgs depth: depth. + + self ssAllocateCallReg: SendNumArgsReg. + + "This may leave the method receiver on the stack, which might not be the implicit receiver. + But the lookup trampoline will establish an on-stack receiver once it locates it." + self marshallAbsentReceiverSendArguments: numArgs. + + "Load the cache last so it is a fixed distance from the call." + self MoveUniqueCw: nsSendCache R: SendNumArgsReg. + self CallNewspeakSend: (sendTable at: (numArgs min: NumSendTrampolines - 1)). + + optStatus isReceiverResultRegLive: false. + self ssPushRegister: ReceiverResultReg. + ^0! Item was removed: - ----- Method: StackToRegisterMappingCogit>>genSendAbsentDynamicSuper:numArgs: (in category 'bytecode generators') ----- - genSendAbsentDynamicSuper: selector numArgs: numArgs - <inline: false> - self marshallAbsentReceiverSendArguments: numArgs. - ^self genMarshalledSend: selector numArgs: numArgs sendTable: dynamicSuperSendTrampolines! Item was removed: - ----- Method: StackToRegisterMappingCogit>>genSendAbsentImplicitOrOuter:numArgs:depth:sendTable: (in category 'bytecode generators') ----- - genSendAbsentImplicitOrOuter: selector numArgs: numArgs depth: depth sendTable: sendTable - <var: #sendTable type: #'sqInt *'> - | nsSendCache | - (objectMemory isYoung: selector) ifTrue: - [hasYoungReferent := true]. - - nsSendCache := theIRCs + (NumOopsPerNSC * objectMemory bytesPerOop * indexOfIRC). - indexOfIRC := indexOfIRC + 1. - self assert: (objectMemory isInOldSpace: nsSendCache). - self initializeNSSendCache: nsSendCache selector: selector numArgs: numArgs depth: depth. - - self ssAllocateCallReg: SendNumArgsReg. - - "This may leave the method receiver on the stack, which might not be the implicit receiver. - But the lookup trampoline will establish an on-stack receiver once it locates it." - self marshallAbsentReceiverSendArguments: numArgs. - - "Load the cache last so it is a fixed distance from the call." - self MoveUniqueCw: nsSendCache R: SendNumArgsReg. - self CallNewspeakSend: (sendTable at: (numArgs min: NumSendTrampolines - 1)). - - optStatus isReceiverResultRegLive: false. - self ssPushRegister: ReceiverResultReg. - ^0! Item was removed: - ----- Method: StackToRegisterMappingCogit>>genSendAbsentSelf:numArgs: (in category 'bytecode generators') ----- - genSendAbsentSelf: selector numArgs: numArgs - <inline: false> - self marshallAbsentReceiverSendArguments: numArgs. - ^self genMarshalledSend: selector numArgs: numArgs sendTable: selfSendTrampolines! Item was removed: - ----- Method: StackToRegisterMappingCogit>>generateNewspeakSendTrampolines (in category 'initialization') ----- - generateNewspeakSendTrampolines - "Self send, dynamic super send, implicit receiver send, and outer send." - "Override to generate code to push the register arg(s) for <= numRegArg arity sends." - <option: #NewspeakVM> - 0 to: NumSendTrampolines - 1 do: - [:numArgs| - selfSendTrampolines - at: numArgs - put: (self genSendTrampolineFor: #ceSelfSend:to:numArgs: - numArgs: numArgs - called: (self trampolineName: 'ceSelfSend' numArgs: numArgs) - arg: ClassReg - arg: ReceiverResultReg - arg: (self numArgsOrSendNumArgsReg: numArgs))]. - - 0 to: NumSendTrampolines - 1 do: - [:numArgs| - dynamicSuperSendTrampolines - at: numArgs - put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs: - numArgs: numArgs - called: (self trampolineName: 'ceDynSuperSend' numArgs: numArgs) - arg: ClassReg - arg: ReceiverResultReg - arg: (self numArgsOrSendNumArgsReg: numArgs))]. - - 0 to: NumSendTrampolines - 1 do: - [:numArgs| - implicitReceiverSendTrampolines - at: numArgs - put: (self - genNSSendTrampolineFor: #ceImplicitReceiverSend:receiver: - numArgs: numArgs - called: (self trampolineName: 'ceImplicitReceiverSend' numArgs: numArgs))]. - - 0 to: NumSendTrampolines - 1 do: - [:numArgs| - outerSendTrampolines - at: numArgs - put: (self - genNSSendTrampolineFor: #ceOuterSend:receiver: - numArgs: numArgs - called: (self trampolineName: 'ceOuterSend' numArgs: numArgs))]!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-tpr.1414.mcz
by Eliot Miranda 14 Jul '15

14 Jul '15

Hi Tim, declaring it as int is misidentifying it under 64 bits. I'd declare it as __aeabi_idivmod(long dividend, long divisor). On Mon, Jul 13, 2015 at 4:53 PM, <commits(a)source.squeak.org> wrote: > > tim Rowledge uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.1414.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-tpr.1414 > Author: tpr > Time: 13 July 2015, 4:52:46.377 pm > UUID: cc8ee57d-fbf9-409f-93da-6a9d5442e435 > Ancestors: VMMaker.oscog-tpr.1413 > > Final (please) change for ARM __aeabit_idivmod support. > Benchmarks suggest a useful improvement as a result. Scratch PacMan on a > Raspberry Pi2 runs at 30fps or so. > > =============== Diff against VMMaker.oscog-tpr.1413 =============== > > Item was changed: > ----- Method: CogARMCompiler>>aeabiDivModFunctionAddr (in category 'ARM > convenience instructions') ----- > aeabiDivModFunctionAddr > + "return the address of the __aeabi_idivmod() call provided by the ARM > low level libs to do an integer divide that returns the quo in R0 and rem > in R1. > + A word on the somewhat strange usage of idivmod herein; we need a > declaration for the _aeabi_idivmod helper function, despite the fact that > in a simple C program test, you don't. To get that declaration we need a > variable to hang it off and said variable needs to be referred to in order > to not get culled. Thus the temp var idivmod, the declaration for it that > has nothing to do with it and the odd usage in the inSmalltalk: block." > + | idivmod | > - "return the address of the __aeabi_idivmod() call provided by the ARM > low level libs to do an integer divide that returns the quo in R0 and rem > in R1" > <returnTypeC: #usqInt> > + <var: #idivmod declareC: 'extern void __aeabi_idivmod(int > dividend, int divisor)'> > + > + ^self cCode: '(usqInt)__aeabi_idivmod' inSmalltalk:[idivmod := > #aeabiDiv:Mod:]! > - ^self cCode: '(usqInt)__aeabi_idivmod' > inSmalltalk:[#aeabiDiv:Mod:]! > > -- best, Eliot

1 0

VM Maker: VMMaker.oscog-tpr.1414.mcz
by commits＠source.squeak.org 14 Jul '15

14 Jul '15

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.1414.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.1414 Author: tpr Time: 13 July 2015, 4:52:46.377 pm UUID: cc8ee57d-fbf9-409f-93da-6a9d5442e435 Ancestors: VMMaker.oscog-tpr.1413 Final (please) change for ARM __aeabit_idivmod support. Benchmarks suggest a useful improvement as a result. Scratch PacMan on a Raspberry Pi2 runs at 30fps or so. =============== Diff against VMMaker.oscog-tpr.1413 =============== Item was changed: ----- Method: CogARMCompiler>>aeabiDivModFunctionAddr (in category 'ARM convenience instructions') ----- aeabiDivModFunctionAddr + "return the address of the __aeabi_idivmod() call provided by the ARM low level libs to do an integer divide that returns the quo in R0 and rem in R1. + A word on the somewhat strange usage of idivmod herein; we need a declaration for the _aeabi_idivmod helper function, despite the fact that in a simple C program test, you don't. To get that declaration we need a variable to hang it off and said variable needs to be referred to in order to not get culled. Thus the temp var idivmod, the declaration for it that has nothing to do with it and the odd usage in the inSmalltalk: block." + | idivmod | - "return the address of the __aeabi_idivmod() call provided by the ARM low level libs to do an integer divide that returns the quo in R0 and rem in R1" <returnTypeC: #usqInt> + <var: #idivmod declareC: 'extern void __aeabi_idivmod(int dividend, int divisor)'> + + ^self cCode: '(usqInt)__aeabi_idivmod' inSmalltalk:[idivmod := #aeabiDiv:Mod:]! - ^self cCode: '(usqInt)__aeabi_idivmod' inSmalltalk:[#aeabiDiv:Mod:]!

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2015