Vm-dev April 2017

vm-dev@lists.squeakfoundation.org

44 participants
105 discussions

Squeak-trunk VMs updated (was: FFI and current images/VMs)
by Fabio Niephaus 27 Apr '17

27 Apr '17

Hi all, I have updated the VMs that ship with the Squeak-trunk bundles. The version of all OpenSmalltalkVMs currently is 201704270225. The recent BlockContext/Context change unfortunately broke Metacello which is used as part of the trunk testing pipeline. I've put a workaround in place for the time being. TravisCI just produced new 32bit trunk bundles: [1]. The 64bit bundles fail for some reason during or after condensing the changes file [2]. But unfortunately, I don't have enough time to look into this at the moment. Best, Fabio [1] http://files.squeak.org/6.0alpha/Squeak6.0alpha-17229-32bit/ [2] https://travis-ci.org/squeak-smalltalk/squeak-app/jobs/226437862#L2424 -- On Thu, Apr 27, 2017 at 1:25 AM Eliot Miranda <eliot.miranda(a)gmail.com> wrote: > Hi Chris, > > On Mon, Apr 24, 2017 at 3:40 PM, Chris Muller <asqueaker(a)gmail.com> wrote: > >> >> After trying a fairly recent VM, I've actually had to go back to that >> Aug-17-2016 VM, because of the frequency of crashes in the new VM. Have >> the very latest latest VM's fixed these crashes? We might want to do some >> testing before making it the one the world sees.. >> > > My understanding is that the VM source as per VMMaker.oscog-eem.2187, 27 > March 2017, 3 pm, git commit 4ceff23323bcd0f2d3d0a4a43c2995f43d09c98a, Mon > Mar 27 16:07:32 2017 should be good. This fixed what I hope is the > remaining bug with the new compactor at snapshot. I certainly don't > experience crashes using it, and I hear from some members of the Pharo > community that it works well. That said, Levente reported a crash on > update in the 64-bit VM as of VMMaker.oscog-eem.2197 , git commit date 201704181925. > I haven't been able to reproduce this yet, and I haven't seen any problems > with update in my usage. > > >> On Thu, Apr 20, 2017 at 2:01 PM, Fabio Niephaus <lists(a)fniephaus.com> >> wrote: >> >>> Hi Chris, >>> >>> On Wed, Apr 19, 2017 at 6:57 PM Chris Cunningham < >>> cunningham.cb(a)gmail.com> wrote: >>> >>>> Over the last week, I've been trying to build a new image on the latest >>>> trunk, which for my purposes needs to include ODBC, and until just >>>> recently, I've been failing. >>>> >>>> After rooting around a bit, I finally found that the base trunk image I >>>> was using (from this location: http://files.squeak.org/6.0alpha/ ) >>>> seems to all be based off of this VM: >>>> [image: image.png] >>>> My previous image that I was porting from is: >>>> [image: image.png] >>>> which worked fine calling out FFI/ODBC. >>>> After trying many changes (looking at 64 bit image, 32 bit image, other >>>> fumbling around), I finally tracked down a current VM from >>>> https://bintray.com/opensmalltalk/vm/cog/_latestVersion#files >>>> This version: >>>> [image: image.png] >>>> seems to work just fine with FFI (at leat, it runs the ODBC code >>>> without a hitch). Even in the 64 bit version. >>>> >>>> I've sent this message for a few reasons: >>>> 1 - for my future self, to remember where the link is for the most >>>> current VM's (I can't find a link to it elsewhere outside of the email >>>> archives) >>>> >>> >>> I've added the link to the vm section at: http://squeak.org/downloads/ >>> >>> >>>> 2 - for anyone else having FFI issues >>>> 3 - as a subtle request to eventually update the stable, blessed >>>> version of the VMs that are used in the bleeding edge Image archives, so >>>> that they work better with less hassle. >>>> >>> >>> I'm afraid we still don't have a good release process in place. >>> However, I'm happy to update the vm used for the Squeak trunk bundles >>> with a current bleeding edge vm if no one objects. >>> >>> Best, >>> Fabio >>> >>> >>>> >>>> Thanks, >>>> cbc >>>> >>>> >>> >>> >>> >> >> > > > -- > _,,,^..^,,,_ > best, Eliot >

1 0

VM crash on update
by Levente Uzonyi 27 Apr '17

27 Apr '17

Hi All, The current latest VM[1] crashes when updating the latest Squeak Trunk image[2]. To reproduce, start the image and try to update it. Relevant info from crash.dmp: Segmentation fault Sun Apr 23 17:41:12 2017 /squeak/spur64/sqcogspur64linuxht/lib/squeak/5.0-201704181925/squeak Squeak VM version: 5.0-201704181925 Tue Apr 18 19:29:51 UTC 2017 gcc 4.6.3 [Production Spur 64-bit VM] Built from: CoInterpreter VMMaker.oscog-eem.2197 uuid: ef120220-dcf2-4825-ad2c-eab126683414 Apr 18 2017 With: StackToRegisterMappingCogit VMMaker.oscog-eem.2197 uuid: ef120220-dcf2-4825-ad2c-eab126683414 Apr 18 2017 Revision: VM: 201704181925 https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ Date: Tue Apr 18 12:25:44 2017 -0700 $ Plugins: 201704181925 https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ Build host: Linux testing-gce-46330aa4-6c3e-4be3-9779-10895e30baf1 3.13.0-103-generic #150~precise1-Ubuntu SMP Thu Nov 24 11:05:34 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux plugin path: ./sqcogspur64linuxht/lib/squeak/5.0-201704181925 [default: /squeak/spur64/sqcogspur64linuxht/lib/squeak/5.0-201704181925/] C stack backtrace & registers: rax 0x03e2a8c0 rbx 0x03e2a750 rcx 0x03e2a978 rdx 0x03e2a808 rdi 0x03e2a528 rsi 0x03e2a528 rbp 0x03e2a698 rsp 0x03e2aa30 r8 0x03e29f68 r9 0x03e2a020 r10 0x03e2a0d8 r11 0x03e2a190 r12 0x03e2a248 r13 0x03e2a300 r14 0x03e2a3b8 r15 0x03e2a470 rip 0x03e2aae8 *[0x7ffc03e2aae8] ./sqcogspur64linuxht/lib/squeak/5.0-201704181925/squeak[0x41c9f1] ./sqcogspur64linuxht/lib/squeak/5.0-201704181925/squeak[0x41cd35] /lib/x86_64-linux-gnu/libpthread.so.0(+0x10330)[0x7fdc881ac330] ./sqcogspur64linuxht/lib/squeak/5.0-201704181925/squeak[0x4333d1] ./sqcogspur64linuxht/lib/squeak/5.0-201704181925/squeak[0x44ae11] ./sqcogspur64linuxht/lib/squeak/5.0-201704181925/squeak[0x41cb61] ./sqcogspur64linuxht/lib/squeak/5.0-201704181925/squeak(error+0xf)[0x41cd7f] ./sqcogspur64linuxht/lib/squeak/5.0-201704181925/squeak[0x45963f] ./sqcogspur64linuxht/lib/squeak/5.0-201704181925/squeak(ceSendFromInLineCacheMiss+0x16c)[0x45a02c] [0x173d2dc] /lib/x86_64-linux-gnu/libc.so.6(+0x3bffe0)[0x7fdc87e8dfe0] Most recent primitives replaceFrom:to:with:startingAt: stringHash:initialHash: stringHash:initialHash: compare:with:collated: replaceFrom:to:with:startingAt: replaceFrom:to:with:startingAt: replaceFrom:to:with:startingAt: replaceFrom:to:with:startingAt: stringHash:initialHash: stringHash:initialHash: compare:with:collated: replaceFrom:to:with:startingAt: replaceFrom:to:with:startingAt: ... stack page bytes 8192 available headroom 5576 minimum unused headroom 4752 (Segmentation fault) Levente [1] https://bintray.com/opensmalltalk/vm/download_file?file_path=cog_linux64x64… [2] http://files.squeak.org/6.0alpha/Squeak6.0alpha-17086-64bit/Squeak6.0alpha-…

2 3

cleaning LLP64 git branches
by Nicolas Cellier 27 Apr '17

27 Apr '17

The historical LLP64 and LLP64-v2 on https://github.com/OpenSmalltalk/opensmalltalk-vm/branches have been integrated back in Cog branch for some time now (by way of cherry-picking). They won't be merged (they can't because of generated VMMaker code). They served for building a win64 artifact in 2016. But this artifact is obsolete IMO. Does anybody mind if I delete them?

3 3

[OpenSmalltalk/opensmalltalk-vm]
by GitHub 27 Apr '17

27 Apr '17

Branch: refs/heads/LLP64 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm

1 0

[OpenSmalltalk/opensmalltalk-vm]
by GitHub 27 Apr '17

27 Apr '17

Branch: refs/heads/LLP64_v2 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm

1 0

[OpenSmalltalk/opensmalltalk-vm] 47688b: CogVM source as per VMMaker.oscog-eem.2203
by GitHub 27 Apr '17

27 Apr '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 47688b5d37a2e935b267f4d0ae42a18f41164aab https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/47688b5d37a2e935b2… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M build.linux32ARMv6/editnewspeakinstall.sh M build.linux32ARMv7/editnewspeakinstall.sh M build.linux32x86/editnewspeakinstall.sh M build.linux64x64/editnewspeakinstall.sh M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64SysV.c M spur64src/vm/cogitX64WIN64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cogitX64SysV.c M spurlowcode64src/vm/cogitX64WIN64.c M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h M spurlowcodesrc/vm/cogitARMv5.c M spurlowcodesrc/vm/cogitIA32.c M spurlowcodesrc/vm/cogitMIPSEL.c M spurlowcodesrc/vm/cointerp.c M spurlowcodesrc/vm/cointerp.h M spurlowcodesrc/vm/gcc3x-cointerp.c M spurlowcodestack64src/vm/gcc3x-interp.c M spurlowcodestack64src/vm/interp.c M spurlowcodestacksrc/vm/gcc3x-interp.c M spurlowcodestacksrc/vm/interp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64SysV.c M spursista64src/vm/cogitX64WIN64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2203 StackInterpreter: Slight refactor of primitiveClosureValue support routines to avoid accessing outerContext and method more than once. Sista: Fix pc mapping issue with inlined identityHash primitive. Inlined primitives are not mapped. Added unsafe array copy (even though I am not using it right now, just not to loose the code). Refactor access to optStatus in StackToRegisterMappingCogit behind receiverIsInReceiverResultReg et al so that it can be and is elided in RegisterAllocatingCogit in favour of simSelf liveRegister. Restore SistaCogitClone methods lost in previous commit. Build: Add fallback code for linking the sources in the newspeak linux buiulds for broken filesystems such as in Parallels.

1 0

problem with configure and libGL on CentOS 6.5
by Eliot Miranda 27 Apr '17

27 Apr '17

Hi All, I just tried to build 64-bit VMs in build.linux64x64 on CentOS 6.5, a system I've been building such VMs on for a long time now. The configure step produced a config.h which specifies #define HAVE_GL_GL_H 1 #define USE_X11_GLX 1 but -lGL was not added to the X_LIBS= line in the generated vm-display-X11/Makefile Anyone know why this is or how to fix it? It's frustrating not to be able to build out of the box on linux :-( _,,,^..^,,,_ best, Eliot

1 0

Re: [Vm-dev] [squeak-dev] FFI and current images/VMs
by Fabio Niephaus 27 Apr '17

27 Apr '17

Hi Chris, On Wed, Apr 19, 2017 at 6:57 PM Chris Cunningham <cunningham.cb(a)gmail.com> wrote: > Over the last week, I've been trying to build a new image on the latest > trunk, which for my purposes needs to include ODBC, and until just > recently, I've been failing. > > After rooting around a bit, I finally found that the base trunk image I > was using (from this location: http://files.squeak.org/6.0alpha/ ) seems > to all be based off of this VM: > [image: image.png] > My previous image that I was porting from is: > [image: image.png] > which worked fine calling out FFI/ODBC. > After trying many changes (looking at 64 bit image, 32 bit image, other > fumbling around), I finally tracked down a current VM from > https://bintray.com/opensmalltalk/vm/cog/_latestVersion#files > This version: > [image: image.png] > seems to work just fine with FFI (at leat, it runs the ODBC code without a > hitch). Even in the 64 bit version. > > I've sent this message for a few reasons: > 1 - for my future self, to remember where the link is for the most current > VM's (I can't find a link to it elsewhere outside of the email archives) > I've added the link to the vm section at: http://squeak.org/downloads/ > 2 - for anyone else having FFI issues > 3 - as a subtle request to eventually update the stable, blessed version > of the VMs that are used in the bleeding edge Image archives, so that they > work better with less hassle. > I'm afraid we still don't have a good release process in place. However, I'm happy to update the vm used for the Squeak trunk bundles with a current bleeding edge vm if no one objects. Best, Fabio > > Thanks, > cbc > >

4 4

VM Maker: VMMaker.oscog-eem.2203.mcz
by commits＠source.squeak.org 27 Apr '17

27 Apr '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2203.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2203 Author: eem Time: 26 April 2017, 4:16:26.709864 pm UUID: 12d4afae-8498-4e76-8efe-60eba6ef4db2 Ancestors: VMMaker.oscog-eem.2202 StackInterpreter: Slight refactor of primitiveClosureValue support routines to avoid accessing outerContext and method more than once. =============== Diff against VMMaker.oscog-eem.2202 =============== Item was added: + ----- Method: CoInterpreter>>activateNewClosure:outer:method:numArgs:mayContextSwitch: (in category 'control primitives') ----- + activateNewClosure: blockClosure outer: outerContext method: theMethod numArgs: numArgs mayContextSwitch: mayContextSwitch + "Similar to activateNewMethod but for Closure and newMethod. + Override to handle the various interpreter/machine code transitions + and to create an appropriate frame layout." + | numCopied methodHeader inInterpreter closureIP switched | + <inline: true> + self assert: (objectMemory isContext: outerContext). + numCopied := self copiedValueCountOfClosure: blockClosure. + self assert: theMethod = (objectMemory fetchPointer: MethodIndex ofObject: outerContext). + self assert: (objectMemory isOopCompiledMethod: theMethod). + methodHeader := self rawHeaderOf: theMethod. + (self isCogMethodReference: methodHeader) ifTrue: + [^self executeCogBlock: (self cogMethodOf: theMethod) + closure: blockClosure + mayContextSwitch: mayContextSwitch]. + "How do we know when to compile a block method? + One simple criterion is to check if the block is running within its inner context, + i.e. if the outerContext is married. + Even simpler is to remember the previous block entered via the interpreter and + compile if this is the same one. But we can thrash trying to compile an uncoggable + method unless we try and remember which ones can't be cogged. So also record + the last block method we failed to compile and avoid recompiling it." + (self methodWithHeaderShouldBeCogged: methodHeader) + ifTrue: + [(instructionPointer < objectMemory startOfMemory "If from machine code (via value primitive) attempt jitting" + or: [theMethod = lastCoggableInterpretedBlockMethod]) "If from interpreter and repeat block, attempt jitting" + ifTrue: + [theMethod ~= lastUncoggableInterpretedBlockMethod ifTrue: + [cogit cog: theMethod selector: objectMemory nilObject. + (self methodHasCogMethod: theMethod) ifTrue: + [^self executeCogBlock: (self cogMethodOf: theMethod) + closure: blockClosure + mayContextSwitch: mayContextSwitch]. + cogCompiledCodeCompactionCalledFor ifFalse: + [lastUncoggableInterpretedBlockMethod := theMethod]]] + ifFalse: + [lastCoggableInterpretedBlockMethod := theMethod]] + ifFalse: + [self maybeFlagMethodAsInterpreted: theMethod]. + + self assert: (self methodHasCogMethod: theMethod) not. + "Because this is an uncogged method we need to continue via the interpreter. + We could have been reached either from the interpreter, in which case we + should simply return, or from a machine code frame or from a compiled + primitive. In these latter two cases we must longjmp back to the interpreter. + The instructionPointer tells us which path we took. + If the sender was an interpreter frame but called through a (failing) primitive + then make sure we restore the saved instruction pointer and avoid pushing + ceReturnToInterpreterPC which is only valid between an interpreter caller + frame and a machine code callee frame." + (inInterpreter := instructionPointer >= objectMemory startOfMemory) ifFalse: + [instructionPointer = cogit ceReturnToInterpreterPC ifTrue: + [instructionPointer := self iframeSavedIP: framePointer]]. + self push: instructionPointer. + self push: framePointer. + framePointer := stackPointer. + self push: theMethod. + self push: objectMemory nilObject. "FxThisContext field" + self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). + self push: 0. "FoxIFSavedIP" + "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." + self push: (objectMemory followField: ReceiverIndex ofObject: outerContext). + + "Copy the copied values..." + 0 to: numCopied - 1 do: + [:i| + self push: (objectMemory + fetchPointer: i + ClosureFirstCopiedValueIndex + ofObject: blockClosure)]. + + self assert: (self frameIsBlockActivation: framePointer). + self assert: (self frameHasContext: framePointer) not. + + "The initial instructions in the block nil-out remaining temps." + + "the instruction pointer is a pointer variable equal to + method oop + ip + BaseHeaderSize + -1 for 0-based addressing of fetchByte + -1 because it gets incremented BEFORE fetching currentByte" + closureIP := self quickFetchInteger: ClosureStartPCIndex ofObject: blockClosure. + instructionPointer := theMethod + closureIP + objectMemory baseHeaderSize - 2. + self setMethod: theMethod methodHeader: methodHeader. + + "Now check for stack overflow or an event (interrupt, must scavenge, etc)" + switched := false. + stackPointer < stackLimit ifTrue: + [switched := self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]. + self returnToExecutive: inInterpreter postContextSwitch: switched! Item was removed: - ----- Method: CoInterpreter>>activateNewClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') ----- - activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch - "Similar to activateNewMethod but for Closure and newMethod. - Override to handle the various interpreter/machine code transitions - and to create an appropriate frame layout." - | numCopied outerContext theMethod methodHeader inInterpreter closureIP switched | - <inline: true> - outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. - self assert: (objectMemory isContext: outerContext). - self assert: outerContext ~= blockClosure. - numCopied := self copiedValueCountOfClosure: blockClosure. - theMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. - self assert: (objectMemory isOopCompiledMethod: theMethod). - methodHeader := self rawHeaderOf: theMethod. - (self isCogMethodReference: methodHeader) ifTrue: - [^self executeCogBlock: (self cogMethodOf: theMethod) - closure: blockClosure - mayContextSwitch: mayContextSwitch]. - "How do we know when to compile a block method? - One simple criterion is to check if the block is running within its inner context, - i.e. if the outerContext is married. - Even simpler is to remember the previous block entered via the interpreter and - compile if this is the same one. But we can thrash trying to compile an uncoggable - method unless we try and remember which ones can't be cogged. So also record - the last block method we failed to compile and avoid recompiling it." - (self methodWithHeaderShouldBeCogged: methodHeader) - ifTrue: - [(instructionPointer < objectMemory startOfMemory "If from machine code (via value primitive) attempt jitting" - or: [theMethod = lastCoggableInterpretedBlockMethod]) "If from interpreter and repeat block, attempt jitting" - ifTrue: - [theMethod ~= lastUncoggableInterpretedBlockMethod ifTrue: - [cogit cog: theMethod selector: objectMemory nilObject. - (self methodHasCogMethod: theMethod) ifTrue: - [^self executeCogBlock: (self cogMethodOf: theMethod) - closure: blockClosure - mayContextSwitch: mayContextSwitch]. - cogCompiledCodeCompactionCalledFor ifFalse: - [lastUncoggableInterpretedBlockMethod := theMethod]]] - ifFalse: - [lastCoggableInterpretedBlockMethod := theMethod]] - ifFalse: - [self maybeFlagMethodAsInterpreted: theMethod]. - - self assert: (self methodHasCogMethod: theMethod) not. - "Because this is an uncogged method we need to continue via the interpreter. - We could have been reached either from the interpreter, in which case we - should simply return, or from a machine code frame or from a compiled - primitive. In these latter two cases we must longjmp back to the interpreter. - The instructionPointer tells us which path we took. - If the sender was an interpreter frame but called through a (failing) primitive - then make sure we restore the saved instruction pointer and avoid pushing - ceReturnToInterpreterPC which is only valid between an interpreter caller - frame and a machine code callee frame." - (inInterpreter := instructionPointer >= objectMemory startOfMemory) ifFalse: - [instructionPointer = cogit ceReturnToInterpreterPC ifTrue: - [instructionPointer := self iframeSavedIP: framePointer]]. - self push: instructionPointer. - self push: framePointer. - framePointer := stackPointer. - self push: theMethod. - self push: objectMemory nilObject. "FxThisContext field" - self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). - self push: 0. "FoxIFSavedIP" - "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." - self push: (objectMemory followField: ReceiverIndex ofObject: outerContext). - - "Copy the copied values..." - 0 to: numCopied - 1 do: - [:i| - self push: (objectMemory - fetchPointer: i + ClosureFirstCopiedValueIndex - ofObject: blockClosure)]. - - self assert: (self frameIsBlockActivation: framePointer). - self assert: (self frameHasContext: framePointer) not. - - "The initial instructions in the block nil-out remaining temps." - - "the instruction pointer is a pointer variable equal to - method oop + ip + BaseHeaderSize - -1 for 0-based addressing of fetchByte - -1 because it gets incremented BEFORE fetching currentByte" - closureIP := self quickFetchInteger: ClosureStartPCIndex ofObject: blockClosure. - instructionPointer := theMethod + closureIP + objectMemory baseHeaderSize - 2. - self setMethod: theMethod methodHeader: methodHeader. - - "Now check for stack overflow or an event (interrupt, must scavenge, etc)" - switched := false. - stackPointer < stackLimit ifTrue: - [switched := self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]. - self returnToExecutive: inInterpreter postContextSwitch: switched! Item was added: + ----- Method: CoInterpreter>>activateNewFullClosure:method:numArgs:mayContextSwitch: (in category 'control primitives') ----- + activateNewFullClosure: blockClosure method: theMethod numArgs: numArgs mayContextSwitch: mayContextSwitch + "Similar to activateNewMethod but for Closure and newMethod." + | numCopied methodHeader numTemps inInterpreter switched | + <inline: true> + self assert: theMethod = (objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure). + methodHeader := self rawHeaderOf: theMethod. + (self isCogMethodReference: methodHeader) ifTrue: + [^self + executeFullCogBlock: (self cogMethodOf: theMethod) + closure: blockClosure + mayContextSwitch: mayContextSwitch]. + numCopied := self copiedValueCountOfFullClosure: blockClosure. + "How do we know when to compile a block method? + One simple criterion is to check if the block is running within its inner context, + i.e. if the outerContext is married. + Even simpler is to remember the previous block entered via the interpreter and + compile if this is the same one. But we can thrash trying to compile an uncoggable + method unless we try and remember which ones can't be cogged. So also record + the last block method we failed to compile and avoid recompiling it." + (self methodWithHeaderShouldBeCogged: methodHeader) + ifTrue: + [(instructionPointer < objectMemory startOfMemory "If from machine code (via value primitive) attempt jitting" + or: [theMethod = lastCoggableInterpretedBlockMethod]) "If from interpreter and repeat block, attempt jitting" + ifTrue: + [theMethod ~= lastUncoggableInterpretedBlockMethod ifTrue: + [cogit cogFullBlockMethod: theMethod numCopied: numCopied. + (self methodHasCogMethod: theMethod) ifTrue: + [^self executeFullCogBlock: (self cogMethodOf: theMethod) + closure: blockClosure + mayContextSwitch: mayContextSwitch]. + cogCompiledCodeCompactionCalledFor ifFalse: + [lastUncoggableInterpretedBlockMethod := theMethod]]] + ifFalse: + [lastCoggableInterpretedBlockMethod := theMethod]] + ifFalse: + [self maybeFlagMethodAsInterpreted: theMethod]. + + self assert: (self methodHasCogMethod: theMethod) not. + "Because this is an uncogged method we need to continue via the interpreter. + We could have been reached either from the interpreter, in which case we + should simply return, or from a machine code frame or from a compiled + primitive. In these latter two cases we must longjmp back to the interpreter. + The instructionPointer tells us which path we took. + If the sender was an interpreter frame but called through a (failing) primitive + then make sure we restore the saved instruction pointer and avoid pushing + ceReturnToInterpreterPC which is only valid between an interpreter caller + frame and a machine code callee frame." + (inInterpreter := instructionPointer >= objectMemory startOfMemory) ifFalse: + [instructionPointer = cogit ceReturnToInterpreterPC ifTrue: + [instructionPointer := self iframeSavedIP: framePointer]]. + + self push: instructionPointer. + self push: framePointer. + framePointer := stackPointer. + self push: theMethod. + self push: objectMemory nilObject. "FxThisContext field" + self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). + self push: 0. "FoxIFSavedIP" + "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." + self push: (objectMemory followField: FullClosureReceiverIndex ofObject: blockClosure). + + "Copy the copied values..." + 0 to: numCopied - 1 do: + [:i| + self push: (objectMemory + fetchPointer: i + FullClosureFirstCopiedValueIndex + ofObject: blockClosure)]. + + self assert: (self frameIsBlockActivation: framePointer). + self assert: (self frameHasContext: framePointer) not. + + methodHeader := objectMemory methodHeaderOf: theMethod. + numTemps := self temporaryCountOfMethodHeader: methodHeader. + + numArgs + numCopied + 1 to: numTemps do: [ :i | self push: objectMemory nilObject]. + + instructionPointer := (self initialIPForHeader: methodHeader method: theMethod) - 1. + + self setMethod: theMethod. + + "Now check for stack overflow or an event (interrupt, must scavenge, etc)" + switched := false. + stackPointer < stackLimit ifTrue: + [switched := self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]. + self returnToExecutive: inInterpreter postContextSwitch: switched! Item was removed: - ----- Method: CoInterpreter>>activateNewFullClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') ----- - activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch - "Similar to activateNewMethod but for Closure and newMethod." - | numCopied theMethod methodHeader numTemps inInterpreter switched | - <inline: true> - numCopied := self copiedValueCountOfFullClosure: blockClosure. - theMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. - self assert: (objectMemory isOopCompiledMethod: theMethod). - methodHeader := self rawHeaderOf: theMethod. - (self isCogMethodReference: methodHeader) ifTrue: - [^self - executeFullCogBlock: (self cogMethodOf: theMethod) - closure: blockClosure - mayContextSwitch: mayContextSwitch]. - "How do we know when to compile a block method? - One simple criterion is to check if the block is running within its inner context, - i.e. if the outerContext is married. - Even simpler is to remember the previous block entered via the interpreter and - compile if this is the same one. But we can thrash trying to compile an uncoggable - method unless we try and remember which ones can't be cogged. So also record - the last block method we failed to compile and avoid recompiling it." - (self methodWithHeaderShouldBeCogged: methodHeader) - ifTrue: - [(instructionPointer < objectMemory startOfMemory "If from machine code (via value primitive) attempt jitting" - or: [theMethod = lastCoggableInterpretedBlockMethod]) "If from interpreter and repeat block, attempt jitting" - ifTrue: - [theMethod ~= lastUncoggableInterpretedBlockMethod ifTrue: - [cogit cogFullBlockMethod: theMethod numCopied: numCopied. - (self methodHasCogMethod: theMethod) ifTrue: - [^self executeFullCogBlock: (self cogMethodOf: theMethod) - closure: blockClosure - mayContextSwitch: mayContextSwitch]. - cogCompiledCodeCompactionCalledFor ifFalse: - [lastUncoggableInterpretedBlockMethod := theMethod]]] - ifFalse: - [lastCoggableInterpretedBlockMethod := theMethod]] - ifFalse: - [self maybeFlagMethodAsInterpreted: theMethod]. - - self assert: (self methodHasCogMethod: theMethod) not. - "Because this is an uncogged method we need to continue via the interpreter. - We could have been reached either from the interpreter, in which case we - should simply return, or from a machine code frame or from a compiled - primitive. In these latter two cases we must longjmp back to the interpreter. - The instructionPointer tells us which path we took. - If the sender was an interpreter frame but called through a (failing) primitive - then make sure we restore the saved instruction pointer and avoid pushing - ceReturnToInterpreterPC which is only valid between an interpreter caller - frame and a machine code callee frame." - (inInterpreter := instructionPointer >= objectMemory startOfMemory) ifFalse: - [instructionPointer = cogit ceReturnToInterpreterPC ifTrue: - [instructionPointer := self iframeSavedIP: framePointer]]. - - self push: instructionPointer. - self push: framePointer. - framePointer := stackPointer. - self push: theMethod. - self push: objectMemory nilObject. "FxThisContext field" - self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). - self push: 0. "FoxIFSavedIP" - "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." - self push: (objectMemory followField: FullClosureReceiverIndex ofObject: blockClosure). - - "Copy the copied values..." - 0 to: numCopied - 1 do: - [:i| - self push: (objectMemory - fetchPointer: i + FullClosureFirstCopiedValueIndex - ofObject: blockClosure)]. - - self assert: (self frameIsBlockActivation: framePointer). - self assert: (self frameHasContext: framePointer) not. - - methodHeader := objectMemory methodHeaderOf: theMethod. - numTemps := self temporaryCountOfMethodHeader: methodHeader. - - numArgs + numCopied + 1 to: numTemps do: [ :i | self push: objectMemory nilObject]. - - instructionPointer := (self initialIPForHeader: methodHeader method: theMethod) - 1. - - self setMethod: theMethod. - - "Now check for stack overflow or an event (interrupt, must scavenge, etc)" - switched := false. - stackPointer < stackLimit ifTrue: - [switched := self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]. - self returnToExecutive: inInterpreter postContextSwitch: switched! Item was changed: ----- Method: InterpreterPrimitives>>primitiveClosureValue (in category 'control primitives') ----- primitiveClosureValue | blockClosure numArgs closureMethod outerContext | blockClosure := self stackValue: argumentCount. numArgs := self argumentCountOfClosure: blockClosure. argumentCount = numArgs ifFalse: [^self primitiveFail]. "Somewhat paranoiac checks we need while debugging that we may be able to discard in a robust system." outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. (objectMemory isContext: outerContext) ifFalse: [^self primitiveFail]. closureMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. "Check if the closure's method is actually a CompiledMethod." (objectMemory isOopCompiledMethod: closureMethod) ifFalse: [^self primitiveFail]. + self activateNewClosure: blockClosure outer: outerContext method: closureMethod numArgs: numArgs mayContextSwitch: true! - self activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: true! Item was changed: ----- Method: InterpreterPrimitives>>primitiveClosureValueNoContextSwitch (in category 'control primitives') ----- primitiveClosureValueNoContextSwitch "An exact clone of primitiveClosureValue except that this version will not check for interrupts on stack overflow. It may invoke the garbage collector but will not switch processes. See checkForInterruptsMayContextSwitch:" <api> | blockClosure numArgs closureMethod outerContext | blockClosure := self stackValue: argumentCount. numArgs := self argumentCountOfClosure: blockClosure. argumentCount = numArgs ifFalse: [^self primitiveFail]. "Somewhat paranoiac checks we need while debugging that we may be able to discard in a robust system." outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. (objectMemory isContext: outerContext) ifFalse: [^self primitiveFail]. closureMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. "Check if the closure's method is actually a CompiledMethod." (objectMemory isOopCompiledMethod: closureMethod) ifFalse: [^self primitiveFail]. + self activateNewClosure: blockClosure outer: outerContext method: closureMethod numArgs: numArgs mayContextSwitch: false! - self activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: false! Item was changed: ----- Method: InterpreterPrimitives>>primitiveClosureValueWithArgs (in category 'control primitives') ----- primitiveClosureValueWithArgs | argumentArray arraySize blockClosure numArgs closureMethod index outerContext | argumentArray := self stackTop. (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFail]. "Check for enough space in thisContext to push all args" arraySize := objectMemory numSlotsOf: argumentArray. (self roomToPushNArgs: arraySize) ifFalse: [^self primitiveFail]. blockClosure := self stackValue: argumentCount. numArgs := self argumentCountOfClosure: blockClosure. arraySize = numArgs ifFalse: [^self primitiveFail]. "Somewhat paranoiac checks we need while debugging that we may be able to discard in a robust system." outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. (objectMemory isContext: outerContext) ifFalse: [^self primitiveFail]. closureMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. "Check if the closure's method is actually a CompiledMethod." (objectMemory isOopCompiledMethod: closureMethod) ifFalse: [^self primitiveFail]. self popStack. "Copy the arguments to the stack, and activate" index := 1. [index <= numArgs] whileTrue: [self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray). index := index + 1]. + self activateNewClosure: blockClosure outer: outerContext method: closureMethod numArgs: numArgs mayContextSwitch: true! - self activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: true! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFullClosureValue (in category 'control primitives') ----- primitiveFullClosureValue <option: #SistaV1BytecodeSet> | blockClosure numArgs closureMethod | blockClosure := self stackValue: argumentCount. numArgs := self argumentCountOfClosure: blockClosure. argumentCount = numArgs ifFalse: [^self primitiveFail]. closureMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. (objectMemory isOopCompiledMethod: closureMethod) ifFalse: [^self primitiveFail]. + self activateNewFullClosure: blockClosure method: closureMethod numArgs: numArgs mayContextSwitch: true! - self activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: true! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFullClosureValueNoContextSwitch (in category 'control primitives') ----- primitiveFullClosureValueNoContextSwitch "An exact clone of primitiveFullClosureValue except that this version will not check for interrupts on stack overflow. It may invoke the garbage collector but will not switch processes. See checkForInterruptsMayContextSwitch:" <api> <option: #SistaV1BytecodeSet> | blockClosure numArgs closureMethod | blockClosure := self stackValue: argumentCount. numArgs := self argumentCountOfClosure: blockClosure. argumentCount = numArgs ifFalse: [^self primitiveFail]. closureMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. (objectMemory isOopCompiledMethod: closureMethod) ifFalse: [^self primitiveFail]. + self activateNewFullClosure: blockClosure method: closureMethod numArgs: numArgs mayContextSwitch: false! - self activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: false! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFullClosureValueWithArgs (in category 'control primitives') ----- primitiveFullClosureValueWithArgs <option: #SistaV1BytecodeSet> | argumentArray arraySize blockClosure numArgs closureMethod index | argumentArray := self stackTop. (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFail]. "Check for enough space in thisContext to push all args" arraySize := objectMemory numSlotsOf: argumentArray. (self roomToPushNArgs: arraySize) ifFalse: [^self primitiveFail]. blockClosure := self stackValue: argumentCount. numArgs := self argumentCountOfClosure: blockClosure. arraySize = numArgs ifFalse: [^self primitiveFail]. - closureMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. (objectMemory isOopCompiledMethod: closureMethod) ifFalse: [^self primitiveFail]. self popStack. "Copy the arguments to the stack, and activate" index := 1. [index <= numArgs] whileTrue: [self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray). index := index + 1]. + self activateNewFullClosure: blockClosure method: closureMethod numArgs: numArgs mayContextSwitch: true! - self activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: true! Item was added: + ----- Method: StackInterpreter>>activateNewClosure:outer:method:numArgs:mayContextSwitch: (in category 'control primitives') ----- + activateNewClosure: blockClosure outer: outerContext method: theMethod numArgs: numArgs mayContextSwitch: mayContextSwitch + "Similar to activateNewMethod but for Closure and newMethod." + | numCopied closureIP | + <inline: true> + self assert: (objectMemory isContext: outerContext). + numCopied := self copiedValueCountOfClosure: blockClosure. + self assert: theMethod = (objectMemory fetchPointer: MethodIndex ofObject: outerContext). + self assert: (objectMemory isOopCompiledMethod: theMethod). + + self push: instructionPointer. + self push: framePointer. + framePointer := stackPointer. + self push: theMethod. + self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). + self push: objectMemory nilObject. "FxThisContext field" + "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." + self push: (objectMemory followField: ReceiverIndex ofObject: outerContext). + + "Copy the copied values..." + 0 to: numCopied - 1 do: + [:i| + self push: (objectMemory + fetchPointer: i + ClosureFirstCopiedValueIndex + ofObject: blockClosure)]. + + self assert: (self frameIsBlockActivation: framePointer). + self assert: (self frameHasContext: framePointer) not. + + "The initial instructions in the block nil-out remaining temps." + + "the instruction pointer is a pointer variable equal to + method oop + ip + BaseHeaderSize + -1 for 0-based addressing of fetchByte + -1 because it gets incremented BEFORE fetching currentByte" + closureIP := self quickFetchInteger: ClosureStartPCIndex ofObject: blockClosure. + instructionPointer := theMethod + closureIP + objectMemory baseHeaderSize - 2. + self setMethod: theMethod. + + "Now check for stack overflow or an event (interrupt, must scavenge, etc)" + stackPointer < stackLimit ifTrue: + [self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]! Item was removed: - ----- Method: StackInterpreter>>activateNewClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') ----- - activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch - "Similar to activateNewMethod but for Closure and newMethod." - | numCopied outerContext theMethod closureIP | - <inline: true> - outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. - self assert: (objectMemory isContext: outerContext). - numCopied := self copiedValueCountOfClosure: blockClosure. - - theMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. - self assert: (objectMemory isOopCompiledMethod: theMethod). - self push: instructionPointer. - self push: framePointer. - framePointer := stackPointer. - self push: theMethod. - self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). - self push: objectMemory nilObject. "FxThisContext field" - "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." - self push: (objectMemory followField: ReceiverIndex ofObject: outerContext). - - "Copy the copied values..." - 0 to: numCopied - 1 do: - [:i| - self push: (objectMemory - fetchPointer: i + ClosureFirstCopiedValueIndex - ofObject: blockClosure)]. - - self assert: (self frameIsBlockActivation: framePointer). - self assert: (self frameHasContext: framePointer) not. - - "The initial instructions in the block nil-out remaining temps." - - "the instruction pointer is a pointer variable equal to - method oop + ip + BaseHeaderSize - -1 for 0-based addressing of fetchByte - -1 because it gets incremented BEFORE fetching currentByte" - closureIP := self quickFetchInteger: ClosureStartPCIndex ofObject: blockClosure. - instructionPointer := theMethod + closureIP + objectMemory baseHeaderSize - 2. - self setMethod: theMethod. - - "Now check for stack overflow or an event (interrupt, must scavenge, etc)" - stackPointer < stackLimit ifTrue: - [self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]! Item was added: + ----- Method: StackInterpreter>>activateNewFullClosure:method:numArgs:mayContextSwitch: (in category 'control primitives') ----- + activateNewFullClosure: blockClosure method: theMethod numArgs: numArgs mayContextSwitch: mayContextSwitch + "Similar to activateNewMethod but for Closure and newMethod." + | numCopied methodHeader numTemps | + <inline: true> + self assert: theMethod = (objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure). + numCopied := self copiedValueCountOfFullClosure: blockClosure. + self push: instructionPointer. + self push: framePointer. + framePointer := stackPointer. + self push: theMethod. + self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). + self push: objectMemory nilObject. "FxThisContext field" + "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." + self push: (objectMemory followField: FullClosureReceiverIndex ofObject: blockClosure). + + "Copy the copied values..." + 0 to: numCopied - 1 do: + [:i| + self push: (objectMemory + fetchPointer: i + FullClosureFirstCopiedValueIndex + ofObject: blockClosure)]. + + self assert: (self frameIsBlockActivation: framePointer). + self assert: (self frameHasContext: framePointer) not. + + methodHeader := objectMemory methodHeaderOf: theMethod. + numTemps := self temporaryCountOfMethodHeader: methodHeader. + + numArgs + numCopied + 1 to: numTemps do: [ :i | self push: objectMemory nilObject]. + + instructionPointer := (self initialIPForHeader: methodHeader method: theMethod) - 1. + + self setMethod: theMethod. + + "Now check for stack overflow or an event (interrupt, must scavenge, etc)" + stackPointer < stackLimit ifTrue: + [self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]! Item was removed: - ----- Method: StackInterpreter>>activateNewFullClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') ----- - activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch - "Similar to activateNewMethod but for Closure and newMethod." - | numCopied theMethod methodHeader numTemps | - <inline: true> - numCopied := self copiedValueCountOfFullClosure: blockClosure. - theMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. - self assert: (objectMemory isOopCompiledMethod: theMethod). - self push: instructionPointer. - self push: framePointer. - framePointer := stackPointer. - self push: theMethod. - self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). - self push: objectMemory nilObject. "FxThisContext field" - "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." - self push: (objectMemory followField: FullClosureReceiverIndex ofObject: blockClosure). - - "Copy the copied values..." - 0 to: numCopied - 1 do: - [:i| - self push: (objectMemory - fetchPointer: i + FullClosureFirstCopiedValueIndex - ofObject: blockClosure)]. - - self assert: (self frameIsBlockActivation: framePointer). - self assert: (self frameHasContext: framePointer) not. - - methodHeader := objectMemory methodHeaderOf: theMethod. - numTemps := self temporaryCountOfMethodHeader: methodHeader. - - numArgs + numCopied + 1 to: numTemps do: [ :i | self push: objectMemory nilObject]. - - instructionPointer := (self initialIPForHeader: methodHeader method: theMethod) - 1. - - self setMethod: theMethod. - - "Now check for stack overflow or an event (interrupt, must scavenge, etc)" - stackPointer < stackLimit ifTrue: - [self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]!

1 0

VM Maker: VMMaker.oscog-eem.2202.mcz
by commits＠source.squeak.org 26 Apr '17

26 Apr '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2202.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2202 Author: eem Time: 26 April 2017, 2:45:32.212149 pm UUID: 664974d4-7a05-43ae-a940-515e14f5f110 Ancestors: VMMaker.oscog-cb.2201 Fix pc mapping issue with inlined identityhash primitive. Inlined primitives are not mapped. Fix extension issue with bc-mc mapping tests. As elsewhere, the mapped bcpc is that of the prefixed bytecode, not the bytecode following the prefix. =============== Diff against VMMaker.oscog-cb.2201 =============== Item was changed: ----- Method: CogObjectRepresentationForSpur>>genGetIdentityHash:resultReg: (in category 'sista support') ----- genGetIdentityHash: rcvrReg resultReg: resultReg <var: #jumpSet type: #'AbstractInstruction *'> | jumpSet | "ReceiverResultReg is required for the trampoline. We force the allocation, and we have two path to avoid conflicts in ReceiverResultReg." cogit voidReceiverResultRegContainsSelf. resultReg = ReceiverResultReg ifTrue: [cogit ssTop popToReg: rcvrReg. self genGetHashFieldNonImmOf: rcvrReg asSmallIntegerInto: resultReg. cogit CmpCq: ConstZero R: resultReg. jumpSet := cogit JumpNonZero: 0. cogit MoveR: rcvrReg R: resultReg. + cogit CallRT: ceInlineNewHashTrampoline] - cogit CallRT: ceInlineNewHashTrampoline. - cogit annotateBytecode: cogit Label] ifFalse: [cogit ssTop popToReg: ReceiverResultReg. self genGetHashFieldNonImmOf: ReceiverResultReg asSmallIntegerInto: resultReg. cogit CmpCq: ConstZero R: resultReg. jumpSet := cogit JumpNonZero: 0. cogit CallRT: ceInlineNewHashTrampoline. + cogit MoveR: ReceiverResultReg R: resultReg]. - cogit annotateBytecode: (cogit MoveR: ReceiverResultReg R: resultReg)]. jumpSet jmpTarget: cogit Label! Item was changed: ----- Method: Cogit>>testBcToMcPcMappingForCogMethod: (in category 'testing') ----- testBcToMcPcMappingForCogMethod: cogMethod <doNotGenerate> "self disassembleMethod: cogMethod" "self printPCMapPairsFor: cogMethod on: Transcript" | aMethodObj subMethods bsOffset | aMethodObj := cogMethod methodObject. subMethods := self subMethodsAsRangesFor: cogMethod. subMethods first endPC: (self endPCOf: aMethodObj). bsOffset := self bytecodeSetOffsetFor: aMethodObj. self bcpcsDescriptorsAndStartpcsFor: aMethodObj bsOffset: bsOffset do: [:bcpc :byte :desc :nExts :startpc| (desc notNil and: [desc isBlockCreation]) ifTrue: ["dead code removal may result in blocks not being generated ;-)" (subMethods detect: [:sm| sm startpc = (bcpc + desc numBytes)] ifNone: [nil]) ifNotNil: [:subMethod| subMethod endPC: bcpc + desc numBytes + (self spanFor: desc at: bcpc exts: -1 in: aMethodObj) - 1]]]. subMethods allButFirst do: [:blockSubMethod| | cogBlockMethod | cogBlockMethod := self findMethodForStartBcpc: blockSubMethod startpc inHomeMethod: cogMethod. self assert: cogBlockMethod address = (blockSubMethod first - (self sizeof: CogBlockMethod))]. self bcpcsDescriptorsAndStartpcsFor: aMethodObj bsOffset: bsOffset do: [:bcpc :byte :desc :nExts :startpc| | startBcpc currentSubMethod subCogMethod absMcpc mappedBcpc | currentSubMethod := self innermostSubMethodFor: bcpc in: subMethods startingAt: 1. startpc = currentSubMethod startpc ifTrue: [subCogMethod := currentSubMethod cogMethod. (subCogMethod stackCheckOffset > 0 and: [desc isNil or: [desc isMapped or: [inBlock = InFullBlock and: [desc isMappedInBlock]]]]) ifTrue: [startBcpc := subCogMethod = cogMethod ifTrue: [coInterpreter startPCOfMethod: aMethodObj] ifFalse: [currentSubMethod startpc]. "The first bytecode and backward branch bytecodes are mapped to their pc. Other bytecodes map to their following pc." absMcpc := (desc notNil and: [desc isBranch and: [self isBackwardBranch: desc at: bcpc exts: nExts in: aMethodObj]]) ifTrue: "Backward branches have a special mapper" + [mappedBcpc := bcpc - (2 * nExts). - [mappedBcpc := bcpc. self mcPCForBackwardBranch: mappedBcpc startBcpc: startBcpc in: subCogMethod] ifFalse: "All others use the generic mapper" [mappedBcpc := desc ifNil: [bcpc] ifNotNil: [bcpc + desc numBytes]. self mcPCFor: mappedBcpc startBcpc: startBcpc in: subCogMethod]. self assert: absMcpc >= (subCogMethod asInteger + subCogMethod stackCheckOffset). self assert: (self bytecodePCFor: absMcpc startBcpc: startBcpc in: subCogMethod) = mappedBcpc]]]!

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2017