Vm-dev July 2017

vm-dev@lists.squeakfoundation.org

18 participants
54 discussions

libtool suck :(
by Tobias Pape 08 Jul '17

08 Jul '17

Wanted to produce a new 'fat' SqueakSSL binary that's guaranteed to run on both CentOS-like and Debian-like. But no, libtool messes up my linker command line. A bug known since 2006[1]. So, no new SqueakSSL with host name verification for you today… Now I'm sad and go to bed. -t [1]: really: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650

3 6

[OpenSmalltalk/opensmalltalk-vm] 5afa7a: Fix travis tests for squeak after app rename
by GitHub 08 Jul '17

08 Jul '17

Branch: refs/heads/krono/highdpi-v2 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 5afa7aca38a13ad07bc615b45b43b9031dc1e7a5 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5afa7aca38a13ad07b… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M tests/smalltalkCI.sh Log Message: ----------- Fix travis tests for squeak after app rename Commit: a3f38c67c51d3e28be3d94feff22619a3155661c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a3f38c67c51d3e28be… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXView.h Log Message: ----------- This is shared, too Commit: b8db6de4ae7d36f589da955fdf91392c2e782345 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b8db6de4ae7d36f589… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile Log Message: ----------- Fix linking of the libB3DAcceleratorPlugin.dylib in the Pharo build. There is no equivalent of -bundle_loader for dylibs so use the explicit list of undefines approach passed throguh EXTRADYFLAGS. Commit: db818587f1cd785af1274932e164682d3eaf413d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/db818587f1cd785af1… Author: kksubbu <kksubbu(a)users.noreply.github.com> Date: 2017-05-07 (Sun, 07 May 2017) Changed paths: M build.linux64x64/HowToBuild Log Message: ----------- [skip ci] uuid-dev is needed on Ubuntu for configure script. GL libraries are also needed Commit: c15938059aadfa5505de400f12de954b4339068c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c15938059aadfa5505… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M build.linux64x64/HowToBuild Log Message: ----------- Merge pull request #137 from kksubbu/uuidpkg [skip ci] uuid-dev is needed on Ubuntu for configure script. Commit: d37a6ddfd0231d6905440c992edccca236a9ed0e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d37a6ddfd0231d6905… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M .gitignore M image/BuildSqueakSpurTrunkVMMakerImage.st A image/attic/makegetnsvmscripts.sh A image/attic/makegetvmscripts.sh M image/getGoodSpurVM.sh R image/makegetnsvmscripts.sh R image/makegetvmscripts.sh Log Message: ----------- Update the getGoodSpourVM script to download a VM from bintray. Currently linux x86(_64) and macos x86(64) platforms only. Please extend for windows & linux ARM. Move the old script makers to attic. Remove SpeechPools as one of the packages loaded into VMMaker. It's gone AWOL. Commit: 5fb5c090f21e6a95a1e550a1ff39bfc0dcc9ea7d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5fb5c090f21e6a95a1… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-09 (Tue, 09 May 2017) Changed paths: M platforms/Cross/plugins/SqueakSSL/SqueakSSL.h M platforms/iOS/plugins/SqueakSSL/sqMacSSL.c Log Message: ----------- SqueakSSL v3: With support for verifiation on macOS Commit: eb841f02e5cd0b08999fde1930f61fff22787657 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/eb841f02e5cd0b0899… Author: Ronie Salgado <roniesalg(a)gmail.com> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGLInfo.c M platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m Log Message: ----------- Make sure to restore the OpenGL context in OS X. drawRect: and other methods are called indirectly by Cocoa via ioProcessEvents. Comment the QuickTime includes. Missing on my machine, and they seem to not be used. Commit: 501b645516e4f3d90f99301629c53e4a641dfa6e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/501b645516e4f3d90f… Author: Ronie Salgado <roniesalg(a)gmail.com> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m Log Message: ----------- Fix a crash with the SDL2 bindings on OS X. Commit: c8c28de2dec963024984c938e16e83a44d833bf8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c8c28de2dec9630249… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M platforms/Cross/plugins/SqueakSSL/SqueakSSL.h M platforms/iOS/plugins/SqueakSSL/sqMacSSL.c Log Message: ----------- Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm into Cog Commit: 2c88b76b5d8a8e13dbac9f9a7c987a6641d9ad1d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2c88b76b5d8a8e13db… Author: sophie-kaleba <sophie.kaleba(a)etudiant.univ-lille1.fr> Date: 2017-05-13 (Sat, 13 May 2017) Changed paths: M build.linux32ARMv6/pharo.cog.spur/plugins.int M build.linux32x86/pharo.cog.spur.lowcode/plugins.int M build.linux32x86/pharo.cog.spur/plugins.int M build.linux32x86/pharo.stack.spur.lowcode/plugins.int M build.linux64x64/pharo.cog.spur/plugins.int M build.macos32x86/pharo.cog.spur.lowcode/plugins.int M build.macos32x86/pharo.cog.spur/plugins.int M build.macos32x86/pharo.stack.spur.lowcode/plugins.int M build.macos32x86/pharo.stack.spur/plugins.int M build.macos64x64/pharo.cog.spur.lowcode/plugins.int M build.macos64x64/pharo.cog.spur/plugins.int M build.macos64x64/pharo.stack.spur.lowcode/plugins.int M build.macos64x64/pharo.stack.spur/plugins.int Log Message: ----------- add linux and mac VMProfilePlugins for Pharo Commit: 78c402ea71ebcc9db12496f81021fdb9b57deb5f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/78c402ea71ebcc9db1… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M build.macos32x86/bochsx64/conf.COG M build.macos32x86/bochsx86/conf.COG M build.macos32x86/gdbarm32/conf.COG M image/BuildSqueakSpurTrunkVMMakerImage.st M nsspur64src/vm/cogit.h M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h 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 platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c M platforms/Cross/vm/sq.h M platforms/iOS/vm/Common/Classes/sqSqueakNullScreenAndWindow.m M platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m M platforms/iOS/vm/iPhone/Classes/SqueakUIView.h M platforms/iOS/vm/iPhone/Classes/SqueakUIView.m M platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m M platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m M platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGLAlternate.m M platforms/unix/vm-display-X11/sqUnixX11.c M platforms/unix/vm/sqUnixMain.c M platforms/win32/vm/sqWin32Window.c M spur64src/vm/cogit.h M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h 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/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h 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/plugins/FilePlugin/FilePlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2211 StackInterpreter: Simplify and make robust display bitmap access for display update. The old code required platforms that needed to redraw at arbitrary times to have to access the display bits through interpreterProxy->displayObject, decoding it each time. There exists a small window during compaction, etc, during whiuch such access will fail and cause a VM crash. The new code provides four variables to reference the display, displayBits, displayWidth, displayHeight and displayDepth, which are assigned appropriately in the primitiveBeDisplay primitive. After a GC the interpreter checks if the displayBits have changed location and if so calls ioNoteDisplayChanged:width:height:depth: (ioNoteDisplayChangedwidthheightdepth) to inform the platform of the change (currently all platforms implement this as a null function). On Spur the primitiveBeDIsplay primitive also pins the display bits. This scheme allows displayBitsOf:Left:Top:Right:Bottom: to be simplified to updateDisplayLeft:Top:Right:Bottom:. On Mac OS X and X11, replace access to the display Dits via displayObject with direct access to displayBits, displayWidth, displayHeight and displayDepth vars. Spur: Fix cloneInOldSpaceForPinning: to handle failed allocations correctly. Have pinObject: only clone an old space object that is 1Mb or less, simply pinning larger objects (whioch would include the display bitmap) where it sits. Lift the limits on Spur image segments. There is now no limit on the number of objects in a segment, but the classes in the segment must occupy no more than 2 ^ 21 bytes (maxIdentityHash / 2 * 8 - which allows for about 1.4 million 11 slot classes), and the segment can have no more than 2 ^ 21 out pointers (again maxIdentityHash / 2. Tested for simple examples. Manages to export a project but not load it yet. Fail if the segment store args that are mutated are either immutable or pinned. Fix bad bug in shorten:toIndexableSize: (which could affect Scorch/Sista). The old code for addressAfter: would be fooled by an object with overflow slows but fewer slots than numSlotsMask. So fix addressAfter: so it will still add the overflow header if there is one. Rewrite objectBytesForSlots: to follow the fixed addressAfter:. The code should be cleaner. Fix checkInterpreterIntegrity in the case of the primitiveDoPrimtiive code setting newMethod to an integer. Fix some translation-timer warnings by tweaking storeLiteralVariable:withValue:, storePointerImmutabilityCheck:ofObject:withValue: & primitiveGetenv. Commit: c69688a839b9a9a68477b3cb107452babe3f2207 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c69688a839b9a9a684… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: R platforms/win32/plugins/CameraPlugin/sqVirtualMachine.h M src/vm/cogit.h 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: ----------- Hmmm, don't know why but the v3 sources with the displayBits changes don't seem to have been comitted. Correct that omission. Also nuke the erroneous copy of sqVirtualMachine.h in the win32 CameraPlugin. It is out of date and builds /must/ pick up the proper definition from platforms/Cross/vm. Commit: 345be125160f5b5797d9a0c959bd69836cf0dc32 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/345be125160f5b5797… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M spurlowcodestack64src/vm/gcc3x-interp.c M spurlowcodestack64src/vm/interp.c M spurlowcodestacksrc/vm/gcc3x-interp.c M spurlowcodestacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2212 Fix the Lowcode non-Cog builds. primitiveVMParameter failed to guard against non-Cog for set access to the CogCodeZoneThreshold. Commit: 36f33e6cd7e44fc64198536d7e61a5c146164431 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/36f33e6cd7e44fc641… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: A build.macos32x86/common/Makefile.app.squeak R build.macos32x86/common/Makefile.app.squeak.cog M build.macos32x86/squeak.cog.spur+immutability/Makefile M build.macos32x86/squeak.cog.spur/Makefile M build.macos32x86/squeak.cog.v3/Makefile M build.macos32x86/squeak.stack.spur/Makefile M build.macos32x86/squeak.stack.v3/Makefile A build.macos64x64/common/Makefile.app.squeak R build.macos64x64/common/Makefile.app.squeak.cog M build.macos64x64/squeak.cog.spur.immutability/Makefile M build.macos64x64/squeak.cog.spur/Makefile M build.macos64x64/squeak.stack.spur/Makefile Log Message: ----------- Fix Squeak build failures on travis-ci. All Mac builds should include common/Makefile.app.squeak to build Squeak.app et al. Makefile.app.squeak.cog is a misnomer. cog refers to the VM internals (stack vs Cog etc). Makefile.app.squeak defines the external name of the app produced. Commit: bc6e34d1b2998cb8f3b38a2ce0818eda35a25ce9 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/bc6e34d1b2998cb8f3… Author: Ronie Salgado <roniesalg(a)gmail.com> Date: 2017-05-13 (Sat, 13 May 2017) Changed paths: M platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile R platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.h A platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.m R platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGLInfo.c R platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacUIConstants.h A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGL.c A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGL.h A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGLInfo.c A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacUIConstants.h M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m Log Message: ----------- The B3D plugin is now working again on Mac OS X. Commit: 732061467e682946c7ea75a05e5b917d5ba0a5d7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/732061467e682946c7… Author: Ronie Salgado <roniesalg(a)gmail.com> Date: 2017-05-13 (Sat, 13 May 2017) Changed paths: M .gitignore M build.macos32x86/bochsx64/conf.COG M build.macos32x86/bochsx86/conf.COG A build.macos32x86/common/Makefile.app.squeak R build.macos32x86/common/Makefile.app.squeak.cog M build.macos32x86/gdbarm32/conf.COG M build.macos32x86/squeak.cog.spur+immutability/Makefile M build.macos32x86/squeak.cog.spur/Makefile M build.macos32x86/squeak.cog.v3/Makefile M build.macos32x86/squeak.stack.spur/Makefile M build.macos32x86/squeak.stack.v3/Makefile A build.macos64x64/common/Makefile.app.squeak R build.macos64x64/common/Makefile.app.squeak.cog M build.macos64x64/squeak.cog.spur.immutability/Makefile M build.macos64x64/squeak.cog.spur/Makefile M build.macos64x64/squeak.stack.spur/Makefile M image/BuildSqueakSpurTrunkVMMakerImage.st A image/attic/makegetnsvmscripts.sh A image/attic/makegetvmscripts.sh M image/getGoodSpurVM.sh R image/makegetnsvmscripts.sh R image/makegetvmscripts.sh M nsspur64src/vm/cogit.h M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h 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 platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c M platforms/Cross/vm/sq.h M platforms/iOS/vm/Common/Classes/sqSqueakNullScreenAndWindow.m M platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m M platforms/iOS/vm/iPhone/Classes/SqueakUIView.h M platforms/iOS/vm/iPhone/Classes/SqueakUIView.m M platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m M platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m M platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGLAlternate.m M platforms/unix/vm-display-X11/sqUnixX11.c M platforms/unix/vm/sqUnixMain.c R platforms/win32/plugins/CameraPlugin/sqVirtualMachine.h M platforms/win32/vm/sqWin32Window.c M spur64src/vm/cogit.h M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h 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/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h 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/plugins/FilePlugin/FilePlugin.c M src/vm/cogit.h 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: ----------- Merge branch 'Cog' into B3DFixing Commit: ad7c0901d0ce7573ad8c3dc6b57fd6e2a58702ba https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ad7c0901d0ce7573ad… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2017-05-13 (Sat, 13 May 2017) Changed paths: M build.linux32ARMv6/pharo.cog.spur/plugins.int M build.linux32x86/pharo.cog.spur.lowcode/plugins.int M build.linux32x86/pharo.cog.spur/plugins.int M build.linux32x86/pharo.stack.spur.lowcode/plugins.int M build.linux64x64/pharo.cog.spur/plugins.int M build.macos32x86/pharo.cog.spur.lowcode/plugins.int M build.macos32x86/pharo.cog.spur/plugins.int M build.macos32x86/pharo.stack.spur.lowcode/plugins.int M build.macos32x86/pharo.stack.spur/plugins.int M build.macos64x64/pharo.cog.spur.lowcode/plugins.int M build.macos64x64/pharo.cog.spur/plugins.int M build.macos64x64/pharo.stack.spur.lowcode/plugins.int M build.macos64x64/pharo.stack.spur/plugins.int Log Message: ----------- Merge pull request #139 from sophie-kaleba/addingPharoProfilerPlugins add linux and mac VMProfilePlugins for Pharo Commit: 392eec6dbe97c66e387757698a7427c4b3e1b81d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/392eec6dbe97c66e38… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-13 (Sat, 13 May 2017) Changed paths: M platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m M platforms/unix/vm-display-X11/sqUnixX11.c M platforms/unix/vm/sqUnixMain.c Log Message: ----------- Set the flag that prevents error recursion on linux. On Mac add SIGILL and SIGBUS to teh set of signals that invoke the error reporting handler and use the same scheme as linux to report an error and avoid recursion. Fix a syntax error in the no-XSHM support code in linux argument parsing in sqUnixX11.c. Commit: 2ec84484d2b66d5b494e9ceeb10f5a9b0e8dc35a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2ec84484d2b66d5b49… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2017-05-13 (Sat, 13 May 2017) Changed paths: M platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile R platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.h A platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.m R platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGLInfo.c R platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacUIConstants.h A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGL.c A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGL.h A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGLInfo.c A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacUIConstants.h M platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m Log Message: ----------- Merge pull request #138 from ronsaldo/B3DFixing Fixing Pharo SDL2 on OS X Commit: 9f869d1c82062e1f57f8c6a214b67bb9d98de0ee https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9f869d1c82062e1f57… Author: Nicolas Cellier <nicolas.cellier(a)sirehna.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M platforms/Cross/plugins/IA32ABI/dax64win64business.h Log Message: ----------- Fix a compiler warning for WIN64/Alien about misuse of labs instead of llabs Note: thanks to little endianness, we believe that a size over 2^31 were necessary to trigger the bug. Nonetheless, decreasing exposure to exploits can't be a bad thing. Commit: 234a4e7d22c036e7e579ebd3ca1a2ab8bb81dae8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/234a4e7d22c036e7e5… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M platforms/Cross/plugins/EventsHandlerPlugin/EventsHandlerPluginImpl.c M platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m Log Message: ----------- Rename nativeIoProcessEvents to vmIOProcessEvents so as to be less confusing. Beg for commentary on the mysterious if (interpreterProxy->methodPrimitiveIndex() == 0) { [gDelegateApp.squeakApplication pumpRunLoopEventSendAndSignal:YES]; } else { [gDelegateApp.squeakApplication pumpRunLoop]; } usage. I want to understand this :-) Commit: 8354668ff4f7952052647f4bd61fff8f42539d1a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8354668ff4f7952052… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-16 (Tue, 16 May 2017) Changed paths: M build.linux32ARMv6/squeak.cog.spur/plugins.ext R image/XERRLOG M nsspur64src/vm/cogit.c 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.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.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.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/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/SqueakFFIPrims.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.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: ----------- Cog VM source as per VMMaker.oscog-eem.2213 Use _WIN32 and _WIN64 in place of WIN32 and WIN64 in C preprocessor expressions. Add a flag to VM parameter 65 identifying ITIMER_HEARTBEAT VMs. Make B3DAcceleratorPlugin an option as an external plugin on Raspberry Pi. Commit: ca7e8db32835f5d2489ebddc7e14a51c9bbd4697 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ca7e8db32835f5d248… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-16 (Tue, 16 May 2017) Changed paths: M platforms/Cross/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.h M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.h M platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp M platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp M platforms/Cross/plugins/IA32ABI/ia32abi.h M platforms/Cross/plugins/IA32ABI/ia32abicc.c M platforms/Cross/plugins/IA32ABI/x64win64stub.c M platforms/Cross/plugins/IA32ABI/xabicc.c M platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.c M platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3io.h M platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c M platforms/Cross/vm/sqVirtualMachine.c M platforms/win32/plugins/CameraPlugin/CameraPlugin.cpp M platforms/win32/vm/sqConfig.h M platforms/win32/vm/sqPlatformSpecific.h M platforms/win32/vm/sqWin32.h M platforms/win32/vm/sqWin32Window.c R spursistastacksrc/examplePlugins.ext R spursistastacksrc/examplePlugins.int R spursistastacksrc/vm/exampleSqNamedPrims.h R spursistastacksrc/vm/gcc3x-interp.c R spursistastacksrc/vm/interp.c R spursistastacksrc/vm/interp.h R spursistastacksrc/vm/vmCallback.h Log Message: ----------- Change platform sources to refer to _WIN32 & _WIN64, not WIN32 & WIN64. Change getSystemAttribute: 1005 (the Windowing system name) to answer 'Windows' insrtead of 'Win32' (we are stuck with answering 'Win32' on 'Win64' unless we want to break /lots/ of image platform-dependent code). If this breaks things then we'll have tio revert. But fingers crossed it is not a problem; there are no uses of 1005 assuming other than 'X11' in a base Squeak image. Nuke spursistastacksrc; it's a misnomer. Sista presupposes a Cogit. Commit: e45e7ebf8f7baf4548990a6f7fa09c480cfbc683 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e45e7ebf8f7baf4548… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-19 (Fri, 19 May 2017) Changed paths: M build.linux32ARMv6/HowToBuild M build.linux32ARMv7/HowToBuild M build.linux32x86/HowToBuild M build.linux64x64/HowToBuild 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 platforms/Cross/plugins/SoundPlugin/SoundPlugin.h M platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h M platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m M platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudioAPI.m M platforms/unix/plugins/SoundPlugin/sqUnixSound.c M platforms/unix/vm/SqSound.h M platforms/win32/plugins/SoundPlugin/sqWin32Sound.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 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 src/plugins/FilePlugin/FilePlugin.c M src/plugins/SoundPlugin/SoundPlugin.c M src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.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 Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2217 Cogit: The code for restoring saved registers after a CallRT: did a benign iteration in excess. Spur: Never inline objectsReachableFromRoots:. Fix a speeling rorre. SoundPlugin: Add the Terf SoundPlugin extensions (to deal with multiple devices, their names, volumes, etc). Provide a nearly full implementation on Mac OS X Cocoa (inc 64 bits, but no AEC as yet). Provide stub implementations for Unix & WIn32. Any one interested in win32/win64 I have the Terf C code in C++ files which needs to be recast as C files. Slang/FilePlugin: Avoid remapping oops on creating directory entries in the FilePlugin on Spur by using remapOop:in:. Change Slang to avoid creating nested #if-#else-#endif structures for nested remapOop:in:'s. Nuke an unused configuration. Cogit/CoInterpreter interaction: Use a special form of sigsetjmp to avoid stack unwinding on Windows 64. Note 1: stack unwinding is for C++ exception handling (for example for calling destructors). We do not need it, and it requires the presence of specific information on stack which is not honoured by our JIT frames. Note 2: this patch is specific to Mingw-w64. It might not work for another compiler (MSVC/Intel/...). Someone making the Vm compile with other tools might have to amend this #preambleCCode again. In mingw, there is a possibility to pass a 2nd parameter to a _setjmp, and if this 2nd argument is NULL, there will be no context unwinding. This knowledge is extracted from these references: http://mingw-w64-public.narkive.com/1mUoWEfG/setjmp-longjmp-crashes-second-… https://patchwork.ozlabs.org/patch/437794/ http://www.agardner.me/golang/windows/cgo/64-bit/setjmp/longjmp/2016/02/29/… https://sourceforge.net/p/mingw-w64/bugs/465/ Build system: Note that gcc beyond 4.8 does not work, at least on Debian linux. Commit: 1d60beaad5af99c14b3b8f7303902e34956228cc https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1d60beaad5af99c14b… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-19 (Fri, 19 May 2017) Changed paths: M src/plugins/SoundPlugin/SoundPlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2218 Fix slips in the SoundPlugin code. Commit: 2c6c2e5f9516fcfb040f04ff1028742a681f7a4a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2c6c2e5f9516fcfb04… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-20 (Sat, 20 May 2017) Changed paths: M platforms/iOS/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.m M platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m Log Message: ----------- Minor clean ups to the Mac Cocoa CoreAudio SoundPlugin support code. Commit: 28b4c888dac7670c84f3ac4201c8429ae8ac9a86 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/28b4c888dac7670c84… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-23 (Tue, 23 May 2017) Changed paths: M deploy/pharo/pack-vm.sh Log Message: ----------- On win64 we build pharo.stack.spur for the moment, not pharo.cog.spur yet. Commit: fb29a23251134ea6ae4f52358da2afbc339e1feb https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/fb29a23251134ea6ae… Author: Nicolas Cellier <nicolas.cellier(a)sirehna.com> Date: 2017-05-23 (Tue, 23 May 2017) Changed paths: M platforms/unix/plugins/SoundPlugin/sqUnixSound.c M platforms/unix/vm/SqSound.h Log Message: ----------- Let SoundPlugin compile on linux x64 The function snd_SetRecordBufferFrameCount must take a sqInt parameter, rather than an int, in order to be source-code-compatible with every other OS (iOS, Win32, ...). Commit: 24bea92739c825b642bf8dc60690ef48df23503d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/24bea92739c825b642… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-23 (Tue, 23 May 2017) Changed paths: M platforms/win32/plugins/SoundPlugin/sqWin32Sound.c Log Message: ----------- Fix compilation of SoundPlugin on Windows interpreterProxy must be defined before used! Commit: 235b21415025322f336f2df59addc4fb9c804869 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/235b21415025322f33… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-23 (Tue, 23 May 2017) Changed paths: M platforms/win32/plugins/SoundPlugin/sqWin32Sound.c Log Message: ----------- Fix compilation warning void function returning a value Commit: 9c10bf5278167f890d04a06bcfe49981ef17d7db https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9c10bf5278167f890d… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-23 (Tue, 23 May 2017) Changed paths: M platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c Log Message: ----------- Fix getsockopt for MSVC the len parameter must be a socket_len because it is a size_t on linux/cygwin (thus 64 bits) and int on MSVC (thus 32 bits) Commit: 527bff9d3c4cc64c4d06ed2d445fe490ed184f14 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/527bff9d3c4cc64c4d… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-23 (Tue, 23 May 2017) Changed paths: M platforms/win32/vm/sqWin32Backtrace.c Log Message: ----------- Don't convert Address* to DWORD for WIN64 compatibility Commit: a043f1cbcaa73fae34b07db564204ebecb81bc78 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a043f1cbcaa73fae34… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-23 (Tue, 23 May 2017) Changed paths: M platforms/win32/vm/sqWin32Utils.c Log Message: ----------- Cosmetic: remove warning about passing an LPVOID as argument to printf %s on MSVC Commit: da0cf27ccb18d469e4654efa5b3b0f8a2336c460 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/da0cf27ccb18d469e4… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-23 (Tue, 23 May 2017) Changed paths: M platforms/Cross/vm/sqVirtualMachine.h Log Message: ----------- Let's not loose the volatile qualifier of utcMicroseconds() Commit: f1dfe3c34335da5f38f0c436b4fd15920786246d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f1dfe3c34335da5f38… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-23 (Tue, 23 May 2017) Changed paths: M platforms/Cross/vm/sq.h Log Message: ----------- Declare displayBits &co as VM_EXPORT for MSVC compatibility Commit: ac49591e3c3a2f30c5492023c992d9ef75105872 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ac49591e3c3a2f30c5… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-25 (Thu, 25 May 2017) Changed paths: M platforms/Cross/plugins/FilePlugin/FilePlugin.h M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c Log Message: ----------- Cosmetic changes - unify style: char* x -> char *x - rename misleading sqFileNameIndex -> sqFileName - rename oldName -> sqOldName because we have to distinguish squeak names and c names - remove dead code #if 0 - call setFile with NULL rather than 0 to avoid making a pointer from integer warning Commit: c1db1eb40b73373b4e4fe6541cda74c8c742edc7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c1db1eb40b73373b4e… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-25 (Thu, 25 May 2017) Changed paths: M platforms/Cross/plugins/FilePlugin/FilePlugin.h M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c Log Message: ----------- Fix possible race condition in unix FilePlugin sqFileOpen >From original post of Monty http://forum.world.st/Please-review-and-merge-A-commit-to-fix-race-conditio… This commit fixes race conditions in sqFilePluginBasicPrims.c's sqFileOpen() and adds sqFileOpenNew() to support a new primitive to open only new files for IO atomically using open() with O_CREAT|O_EXCL and the equivalent on Windows, failing if they already exist. This will hopefully eventually replace any in-image code that tests for a file's existence before opening it for writing and creation/truncation, a classic race condition. sqFileOpen() issues: Look at the current implementation. It tries fopen() with "r+b", reading/writing of an existing file, then if that fails, with "w+b", reading/writing of a new or truncated file. If the file is created and modified elsewhere between the first and second fopen(), you get unintentional truncation with potential data loss. There's also a minor race condition involving the setting of Mac file characteristics. The fix is replacing use of fopen() with the more general sys call open() and fdopen() after and proper error checking throughout. Commit: 64a159ba324702316c4c74961118061a9e4fffed https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/64a159ba324702316c… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-26 (Fri, 26 May 2017) Changed paths: M platforms/Cross/plugins/FilePlugin/FilePlugin.h M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c Log Message: ----------- Merge pull request #140 from OpenSmalltalk/monty_fix_fopen_race Monty fix fopen race Commit: 27a9c75c56e0cb9547721eb39f33cd754f92ccbd https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/27a9c75c56e0cb9547… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-26 (Fri, 26 May 2017) Changed paths: M platforms/unix/plugins/FilePlugin/sqUnixFile.c Log Message: ----------- Fix potential buffer overrun in UNIX file plugin Note: this is a minimal fix for the bug reported by Monty http://forum.world.st/Please-review-and-merge-A-commit-to-fix-race-conditio… The patch provided by Monty was much more aggressive - see PR #82 https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/82 Nobody had enough energy to review all implications, thus the minimalist replacement. Commit: 009ff81ab09e08c134be3c8706639c4857fdb656 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/009ff81ab09e08c134… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-27 (Sat, 27 May 2017) Changed paths: M platforms/unix/plugins/FilePlugin/sqUnixFile.c Log Message: ----------- Fix missing ; Commit: 4d3f02655d68964e1fe4ed2b533658fe38168936 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4d3f02655d68964e1f… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-26 (Fri, 26 May 2017) Changed paths: M build.win64x64/common/Makefile.plugin M build.win64x64/common/Makefile.tools 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 platforms/unix/vm/aio.c M platforms/win32/vm/sqConfig.h M platforms/win32/vm/sqWin32DnsInfo.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.2222 StackInterpreter: Add time primitives to answer the UTC and local microsecond clocks as updated by the heartbeat (as the Cog VM was originally before David changed the primitives to access the time now). This access is much faster (of the order of 20 nsecs per invocartion vs 450 nsecs per invocatuon on a 2.3 GHz Mac Mini). Terf demands very fast clock times but is not concerned with fine granularity. The primitive numbers are 245 for UTC and 246 for local. primitiveMakePoint should fail if its /argument/ is not a SmallInteger or Float. Since the primitive is on Number we know the receiver is valid, and there is no point checking it. Fix warnings for addIdleUsecs: on WIN32/64 (must not be marked exporrt to avoid declspec being added). Fix display pixel reversal (for debug). Modern implementation of displayBits is (void *). We can't calculate an offset (dispalyBits + n) because we don't know the size of void! At least it fails on MSVC compiler. So it's necessary to convert it to char *, int *, or just sqInt. While at it, as calculated, the range is a pixel range (assumed on the first display line) not a word range, but this range will be rounded to a whole word boundary. Cogit: Modified with Sophie K the collectCogConstituents primitive to take a boolean parameter "withDetails". If false or no parameter, the primitive does the same thing as before. If true, the primitive maps each CogMethod that is frameful to an array starting with the cogMethod address followed by a mapping between the mcpc and the bcpc instead of just the cogMethod address. Fix the method for getting the stack pointer in Win64 ABI. The generated ceCaptureCStackPointers must account for the 32 bytes reserved for saving the 4 register parameters which are allocated whatever the real number of parameters. Minor fix in register in branchIfInstanceOf: in SistaCogit for Characters. Plugins: Fix slips in the SoundPlugin code. Win64 build. Do not define WIN32. Fix the win32 sqConfig.h file to work around the clang preprocessor's failure to default undefined identifiers to 0L. Commit: 7367a97ea5901b20b4b0b6f2023f09b752aa1a60 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7367a97ea5901b20b4… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-28 (Sun, 28 May 2017) Changed paths: M platforms/Cross/vm/sqCogStackAlignment.h Log Message: ----------- Define getsp and getfp for WIN64 MSVC Use the default COG engine generated functions ceGetSP ceGetFP Commit: 5dd7668b8d91f0bf789537cfc435a15c8935acc1 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5dd7668b8d91f0bf78… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-28 (Sun, 28 May 2017) Changed paths: M build.macos32x86/common/Makefile.plugin M build.macos64x64/common/Makefile.plugin M build.win32x86/common/Makefile M build.win32x86/common/Makefile.plugin M build.win64x64/common/Makefile M build.win64x64/common/Makefile.plugin M platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin M platforms/win32/plugins/BochsX64Plugin/Makefile.plugin Log Message: ----------- Implement the PREREQUISITES plugin exclusion mechanism for win32/64. Provide the same mechanism for Pharo dylib plugins on Mac OS X. Restore the dependency on the plugin makefile for win32. If the plugin makefile changes in any way we *should* rebuild the plugin; flags may have been changed, etc. Commit: 0f07ffbedcc184391ed973636f8968c93b63f2cc https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/0f07ffbedcc184391e… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-29 (Mon, 29 May 2017) Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m Log Message: ----------- [iOS] Dont autorelease what we not own Commit: 0364ee70e95e68d2acea04067147f102b1510ce0 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/0364ee70e95e68d2ac… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-29 (Mon, 29 May 2017) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64SysV.c M spur64src/vm/cogitX64WIN64.c M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cogitX64SysV.c M spurlowcode64src/vm/cogitX64WIN64.c M spurlowcodesrc/vm/cogit.h M spurlowcodesrc/vm/cogitARMv5.c M spurlowcodesrc/vm/cogitIA32.c M spurlowcodesrc/vm/cogitMIPSEL.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64SysV.c M spursista64src/vm/cogitX64WIN64.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M src/plugins/FilePlugin/FilePlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2227 Cogit: Use genMarshallNArgs:arg:arg:arg:arg: when compiling an interpreter primitive call to allow adding the shadow parameter space on Win64. Remove a couple of unused and dubious methods in the CogAbstractInstruction hierarchy. Inline arg removal to match inlining of arg marshalling, since removal is either no or one instruction. Fix generation of JumpR on x64. I forgot a rex byte. This doesn't affect SysV because we only ever jump through ClassReg (in an open PIC dispatch) which is RCX (1) on SysV but R8 (8) on Win64. With the fix to JumpR a Win64 image simulates correctly (with smashing of the shadow parameter space). FilePlugin: Incorporate Monty's file plugin changes: add a new primitiveFileOpenNew to open an unexisting file atomically without race condition. Commit: a8d70a803372fb4a766934f212f1e11df78c5c73 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a8d70a803372fb4a76… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-29 (Mon, 29 May 2017) Changed paths: M .appveyor.yml Log Message: ----------- Let the CI server build win64 cog spur for squeak/pharo Kudos to Eliot for making this possible! Commit: 304562526c798ddfae3ea82bfe40df60c6ab4d12 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/304562526c798ddfae… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-30 (Tue, 30 May 2017) Changed paths: M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c Log Message: ----------- Win32OSProcessPlugin MUST be regenerated from latest source This does fix a crash dump on Win64 (but might be insufficient to make the plugin work safely) Commit: d98ddedf4cc39553d2ebed6074c62b205f37990f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d98ddedf4cc39553d2… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-30 (Tue, 30 May 2017) Changed paths: A build.win64x64/pharo.cog.spur/Makefile A build.win64x64/pharo.cog.spur/Pharo.def.in A build.win64x64/pharo.cog.spur/Pharo.exe.manifest A build.win64x64/pharo.cog.spur/Pharo.ico A build.win64x64/pharo.cog.spur/Pharo.rc A build.win64x64/pharo.cog.spur/mvm A build.win64x64/pharo.cog.spur/plugins.ext A build.win64x64/pharo.cog.spur/plugins.int Log Message: ----------- Add Win64 pharo.cog.spur configuration Commit: 271300a0d3b3b0f1c3430b480121f9f5f846c7ea https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/271300a0d3b3b0f1c3… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-30 (Tue, 30 May 2017) Changed paths: M build.win64x64/squeak.cog.spur/plugins.ext M build.win64x64/squeak.cog.spur/plugins.int Log Message: ----------- Build Win64 squeak.cog.spur FFI & Alien plugins Commit: fd3688239f281f81a567108791fefbdea7579ead https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/fd3688239f281f81a5… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-05-30 (Tue, 30 May 2017) Changed paths: M deploy/pharo/pack-vm.sh Log Message: ----------- Make pharo deploy work for both WIN64 stack and cog Commit: 1af6780218671ceac9d05937b2a00b17da951168 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1af6780218671ceac9… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-30 (Tue, 30 May 2017) Changed paths: M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c Log Message: ----------- CogVm source as per VMMaker.oscog-eem.2228 Implement shadow parameter space in the Win64 FFI plugin by always incrememting currentArg, even if passed in a register. Commit: 9f04af30f26cd94d6545ba199230c3fedc89e429 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9f04af30f26cd94d65… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-30 (Tue, 30 May 2017) Changed paths: M .gitignore R image/.gdb_history M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2229 Fix a compilation warning in the FFI plugin. Commit: 8802cfef99b110aeb57142a27aa89d24dc73c831 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8802cfef99b110aeb5… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-30 (Tue, 30 May 2017) Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m Log Message: ----------- Use the NSProcessInfo API to get an accurate OS verison string on Mac OS X. Commit: 6a63f68a3dd4deb7c17dd2c7ac6e4dd4b0b6d937 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6a63f68a3dd4deb7c1… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-30 (Tue, 30 May 2017) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M spur64src/vm/cogit.h M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h M spurlowcodesrc/vm/cointerp.c M spurlowcodesrc/vm/cointerp.h M spurlowcodesrc/vm/gcc3x-cointerp.c M spursista64src/vm/cogit.h M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/vm/cogit.h Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2232 Spur: Fix an assert fail with receiverTagBitsForMethod: for mixin methods in the Newspeak VM. ThreadedFFIPlugin: ThreadedFFICalloutStateForX64 can save a little space using chars for the register indices and format. Commit: fe6078f0fe7dede0f737a485f75a8cd23122718b https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/fe6078f0fe7dede0f7… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c Log Message: ----------- Regenerate Unix OS ProcessPlugin from oscog-dtl.56 Signal number references are one-based, dimension arrays accordingly. Remove unreferenced instance variable and accessor. Commit: 4fe42439a7bed2f0da7835596781b78b478abfd9 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4fe42439a7bed2f0da… Author: Nicolas Cellier <nicolas.cellier(a)sirehna.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M platforms/Mac OS/plugins/FilePlugin/sqMacDirectory.c M platforms/Mac OS/vm/Developer/sqMacMinimal.c M platforms/Mac OS/vm/sqMacNSPlugin.c M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c M platforms/win32/vm/sqWin32Directory.c Log Message: ----------- Fix int */sqInt * mismatch for Win64 FilePlugin While at it, also revise a few potential mismatch for legacy Mac OS (which did not have a 64 bits flavour, but well...) Commit: 2f8eedd80ecc762d43bfcf6af481c0c8dbd8ab51 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2f8eedd80ecc762d43… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M build.win64x64/common/Makefile.plugin Log Message: ----------- Fix plugin compilation for Win64 PharoVM The plugins where compiled without -DPharoVM=1 flags, making FilePlugin crash This is because this flag was in COGDEFS, but COGDEFS was not used in CFLAGS Commit: a6771d7531219b29f98a6233e136971a7d610c29 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a6771d7531219b29f9… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-06-05 (Mon, 05 Jun 2017) Changed paths: M platforms/Cross/plugins/FilePlugin/FilePlugin.h M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c Log Message: ----------- Make recent FilePlugin changes MSVC compatible mode_t is not defined, it's int, and authorization flags will be different than unix Commit: 768987b363c724184752a939b306b7195a0b36aa https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/768987b363c7241847… Author: monty <monty2(a)programmer.net> Date: 2017-06-05 (Mon, 05 Jun 2017) Changed paths: M platforms/Cross/plugins/FilePlugin/FilePlugin.h M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c Log Message: ----------- added a flag pointer parameter to sqFileOpenNew() for failure being caused by the file already existing Commit: 1a3827782176bed9cffe511277116360b22844da https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1a3827782176bed9cf… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-06-05 (Mon, 05 Jun 2017) Changed paths: M src/plugins/FilePlugin/FilePlugin.c Log Message: ----------- Fail primitiveFileOpenNew with PrimErrInappropriate if file already exists Fixed on behalf of monty. Commit: 66133d2224585cff9a1342b1e36962a9adf12ab8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/66133d2224585cff9a… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-06-05 (Mon, 05 Jun 2017) Changed paths: M platforms/unix/plugins/FilePlugin/sqUnixFile.c Log Message: ----------- cosmetic: fix weird alignment Commit: 5ca1dfd981b768108e4c783a3f4a68984cd47dd2 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5ca1dfd981b768108e… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-06-06 (Tue, 06 Jun 2017) Changed paths: M build.macos32x86/HowToBuild M build.macos64x64/HowToBuild M platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m Log Message: ----------- Fix regression in recent system attribute 1002 (OS Version) change on Mac OS X. Answering e.g. 10.10.5 breaks everyting that uses Smalltalk osVerison asNumber. So answer e.g. 1010.5 insteads so that Smalltalk osVerison asNumber = 1010. Typical image code looks like Smalltalk osVerison asNumber >= 1000 to identify Mac OS X over MacOS 9 et al. Mention how to get past an error when using lldb via ssh in the Mac HowToBuilds. Commit: 77dcd09cdd6c8c889e91578b62f04201ebdc9999 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/77dcd09cdd6c8c889e… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-06-07 (Wed, 07 Jun 2017) Changed paths: M image/BuildSqueakSpurTrunkVMMakerImage.st 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.2237 Interpreter: Fix regression in VMMaker.oscog-eem.2222. If primitiveMakePoint no longer checks its receiver the inlined special selector form must. Add isFloatOrInt: to make checking simpler. Provide a breakLookupClassTag check on full lookup sends for debugging. Spur: Implement an allocated bytes tally accessible via vmParameterAt: 34 (which used to access statAllocationCount). Do this by counting bytes allocated in eden plus change in usage between scavenges. Hence maintain totalHeapSizeIncludingBridges in SpurSegmentManager. N.B. the parameter can be reset, e.g. to 0, via vmParameterAt: 34 put: 0, hence it can be used to measure allocation over a span of code. Fix a bug in calculating heapSizeAtPreviousGC which simply calculated the extentof oldSpace, potentially a huge overestimate, not its size. Add printOopsExcept: for debugging. Add printMarkedOops: and printUnmarkedOops: to get round an LLDB limitation with calling printOopsSuchThat:/Except: VMMaker build scripts: KlattResonatorIndices does need to be loaded. classnamed: => classNamed: Commit: 5ec678cdc4c1c2a66ef81b47762b7338d8ee81d1 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5ec678cdc4c1c2a66e… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-06-09 (Fri, 09 Jun 2017) Changed paths: 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 Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2240 SistaCogit: Fix (I think) genGetInstanceOfFixedClass:into:initializingIf: for duff's device instance creation, and restore its use in genUnaryInlinePrimitive:. Fixed a regression where primitiveCollectCogCodeConstituents would not extract the details of CogMethods anymore if the first parameter is true. Simulator: Fix a bad bug with the simulation of the remembered set in 64-bits; the type for rememberedSet was ending up as int *. It must be int * on 32-bits but long long * on 64-bits. Commit: 9a98be0c6d5968627db24a3e4d97d0be28fba27c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9a98be0c6d5968627d… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-06-09 (Fri, 09 Jun 2017) Changed paths: 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 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 spursista64src/vm/cogit.h M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h 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 Log Message: ----------- CogVm source as per VMMaker.oscog-eem.2241 Spur: Fix sign extension bug with new allocated bytes count. Commit: b1bb2e26d0efe204b742681ba5674d9af57a4304 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b1bb2e26d0efe204b7… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-06-12 (Mon, 12 Jun 2017) Changed paths: M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.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/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.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/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.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/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.2242 The self assert: (stackPages isFree: thePage) not in findSPOf:on:startingFrom: is misplaced. Relocate it to avoid a bogus assert fail running the Cadence debugger tests. Commit: 8044775ccbb1d4b61af8fcdd1bc999346112b82c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8044775ccbb1d4b61a… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-06-13 (Tue, 13 Jun 2017) Changed paths: M .appveyor.yml M .gitignore M build.linux32ARMv6/HowToBuild M build.linux32ARMv6/pharo.cog.spur/plugins.int M build.linux32ARMv6/squeak.cog.spur/plugins.ext M build.linux32ARMv7/HowToBuild M build.linux32x86/HowToBuild M build.linux32x86/pharo.cog.spur.lowcode/plugins.int M build.linux32x86/pharo.cog.spur/plugins.int M build.linux32x86/pharo.stack.spur.lowcode/plugins.int M build.linux64x64/HowToBuild M build.linux64x64/pharo.cog.spur/plugins.int M build.macos32x86/HowToBuild M build.macos32x86/bochsx64/conf.COG M build.macos32x86/bochsx86/conf.COG A build.macos32x86/common/Makefile.app.squeak R build.macos32x86/common/Makefile.app.squeak.cog M build.macos32x86/common/Makefile.plugin M build.macos32x86/gdbarm32/conf.COG M build.macos32x86/pharo.cog.spur.lowcode/plugins.int M build.macos32x86/pharo.cog.spur/plugins.int M build.macos32x86/pharo.stack.spur.lowcode/plugins.int M build.macos32x86/pharo.stack.spur/plugins.int M build.macos32x86/squeak.cog.spur+immutability/Makefile M build.macos32x86/squeak.cog.spur/Makefile M build.macos32x86/squeak.cog.v3/Makefile M build.macos32x86/squeak.stack.spur/Makefile M build.macos32x86/squeak.stack.v3/Makefile M build.macos64x64/HowToBuild A build.macos64x64/common/Makefile.app.squeak R build.macos64x64/common/Makefile.app.squeak.cog M build.macos64x64/common/Makefile.plugin M build.macos64x64/pharo.cog.spur.lowcode/plugins.int M build.macos64x64/pharo.cog.spur/plugins.int M build.macos64x64/pharo.stack.spur.lowcode/plugins.int M build.macos64x64/pharo.stack.spur/plugins.int M build.macos64x64/squeak.cog.spur.immutability/Makefile M build.macos64x64/squeak.cog.spur/Makefile M build.macos64x64/squeak.stack.spur/Makefile M build.win32x86/common/Makefile M build.win32x86/common/Makefile.plugin M build.win64x64/common/Makefile M build.win64x64/common/Makefile.plugin M build.win64x64/common/Makefile.tools A build.win64x64/pharo.cog.spur/Makefile A build.win64x64/pharo.cog.spur/Pharo.def.in A build.win64x64/pharo.cog.spur/Pharo.exe.manifest A build.win64x64/pharo.cog.spur/Pharo.ico A build.win64x64/pharo.cog.spur/Pharo.rc A build.win64x64/pharo.cog.spur/mvm A build.win64x64/pharo.cog.spur/plugins.ext A build.win64x64/pharo.cog.spur/plugins.int M build.win64x64/squeak.cog.spur/plugins.ext M build.win64x64/squeak.cog.spur/plugins.int M deploy/pharo/pack-vm.sh R image/.gdb_history M image/BuildSqueakSpurTrunkVMMakerImage.st R image/XERRLOG A image/attic/makegetnsvmscripts.sh A image/attic/makegetvmscripts.sh M image/getGoodSpurVM.sh R image/makegetnsvmscripts.sh R image/makegetvmscripts.sh M nsspur64src/vm/cogit.c 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 platforms/Cross/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.h M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.h M platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp M platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp M platforms/Cross/plugins/EventsHandlerPlugin/EventsHandlerPluginImpl.c M platforms/Cross/plugins/FilePlugin/FilePlugin.h M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/Cross/plugins/IA32ABI/dax64win64business.h M platforms/Cross/plugins/IA32ABI/ia32abi.h M platforms/Cross/plugins/IA32ABI/ia32abicc.c M platforms/Cross/plugins/IA32ABI/x64win64stub.c M platforms/Cross/plugins/IA32ABI/xabicc.c M platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.c M platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3io.h M platforms/Cross/plugins/SoundPlugin/SoundPlugin.h M platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c M platforms/Cross/plugins/SqueakSSL/SqueakSSL.h M platforms/Cross/vm/sq.h M platforms/Cross/vm/sqCogStackAlignment.h M platforms/Cross/vm/sqVirtualMachine.c M platforms/Cross/vm/sqVirtualMachine.h M platforms/Mac OS/plugins/FilePlugin/sqMacDirectory.c M platforms/Mac OS/vm/Developer/sqMacMinimal.c M platforms/Mac OS/vm/sqMacNSPlugin.c M platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile R platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.h A platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.m R platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGLInfo.c R platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacUIConstants.h A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGL.c A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGL.h A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGLInfo.c A platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacUIConstants.h M platforms/iOS/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.m M platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h M platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m M platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudioAPI.m M platforms/iOS/plugins/SqueakSSL/sqMacSSL.c M platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m M platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m M platforms/iOS/vm/Common/Classes/sqSqueakNullScreenAndWindow.m M platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m M platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m M platforms/iOS/vm/OSX/sqSqueakOSXView.h M platforms/iOS/vm/iPhone/Classes/SqueakUIView.h M platforms/iOS/vm/iPhone/Classes/SqueakUIView.m M platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m M platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m M platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGLAlternate.m M platforms/unix/plugins/FilePlugin/sqUnixFile.c M platforms/unix/plugins/SoundPlugin/sqUnixSound.c M platforms/unix/vm-display-X11/sqUnixX11.c M platforms/unix/vm/SqSound.h M platforms/unix/vm/aio.c M platforms/unix/vm/sqUnixMain.c M platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin M platforms/win32/plugins/BochsX64Plugin/Makefile.plugin M platforms/win32/plugins/CameraPlugin/CameraPlugin.cpp R platforms/win32/plugins/CameraPlugin/sqVirtualMachine.h M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c M platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c M platforms/win32/plugins/SoundPlugin/sqWin32Sound.c M platforms/win32/vm/sqConfig.h M platforms/win32/vm/sqPlatformSpecific.h M platforms/win32/vm/sqWin32.h M platforms/win32/vm/sqWin32Backtrace.c M platforms/win32/vm/sqWin32Directory.c M platforms/win32/vm/sqWin32DnsInfo.c M platforms/win32/vm/sqWin32Utils.c M platforms/win32/vm/sqWin32Window.c M spur64src/vm/cogit.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.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.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 R spursistastacksrc/examplePlugins.ext R spursistastacksrc/examplePlugins.int R spursistastacksrc/vm/exampleSqNamedPrims.h R spursistastacksrc/vm/gcc3x-interp.c R spursistastacksrc/vm/interp.c R spursistastacksrc/vm/interp.h R spursistastacksrc/vm/vmCallback.h 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/plugins/FilePlugin/FilePlugin.c M src/plugins/SoundPlugin/SoundPlugin.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/SqueakFFIPrims.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c M src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.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 M tests/smalltalkCI.sh Log Message: ----------- Merge remote-tracking branch 'origin/Cog' into krono/highdpi-v2 * origin/Cog: (61 commits) CogVM source as per VMMaker.oscog-eem.2242 CogVm source as per VMMaker.oscog-eem.2241 CogVM source as per VMMaker.oscog-eem.2240 CogVM source as per VMMaker.oscog-eem.2237 Fix regression in recent system attribute 1002 (OS Version) change on Mac OS X. Answering e.g. 10.10.5 breaks everyting that uses Smalltalk osVerison asNumber. So answer e.g. 1010.5 insteads so that Smalltalk osVerison asNumber = 1010. Typical image code looks like Smalltalk osVerison asNumber >= 1000 to identify Mac OS X over MacOS 9 et al. cosmetic: fix weird alignment Fail primitiveFileOpenNew with PrimErrInappropriate if file already exists added a flag pointer parameter to sqFileOpenNew() for failure being caused by the file already existing Make recent FilePlugin changes MSVC compatible Fix plugin compilation for Win64 PharoVM Fix int */sqInt * mismatch for Win64 FilePlugin Regenerate Unix OS ProcessPlugin from oscog-dtl.56 CogVM source as per VMMaker.oscog-eem.2232 Use the NSProcessInfo API to get an accurate OS verison string on Mac OS X. CogVM source as per VMMaker.oscog-eem.2229 CogVm source as per VMMaker.oscog-eem.2228 Make pharo deploy work for both WIN64 stack and cog Build Win64 squeak.cog.spur FFI & Alien plugins Add Win64 pharo.cog.spur configuration Win32OSProcessPlugin MUST be regenerated from latest source ... Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/4181d8e8872f...80…

4 8

[OpenSmalltalk/opensmalltalk-vm] c5c935: CogVM source as per VMMaker.oscog-eem.2252
by GitHub 08 Jul '17

08 Jul '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: c5c935d5b9b401a8a5c6bc7d83546f683787f9a9 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c5c935d5b9b401a8a5… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-07-07 (Fri, 07 Jul 2017) Changed paths: M build.win32x86/HowToBuild M build.win32x86/common/Makefile.tools M build.win64x64/HowToBuild M build.win64x64/common/Makefile.tools 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 platforms/win32/vm/sqWin32Main.c M platforms/win32/vm/sqWin32Utils.c M platforms/win32/vm/sqWin32Window.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/plugins/B2DPlugin/B2DPlugin.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.2252 Spur: Round the space estimate when a new segment is used for planning compaction to avoid an assert fail. Add some debugging routines: forwardersIn:, indexOf:in:. SpurImageSegments Fix bad slip in computing objectsReachableFromRoots: (the wrong object was being marked when pushing unmarked objects onto the objStack), and rewrite to avoid growing the markStack unnecessarily. Fix an assert fail in adding to the mark stack by handling totalFreeOldSpace correctly (and comment other callers of allocateLargestFreeChunk). Refactor use of marked bit to identify heap objects copied into the segment into isCopiedIntoSegment: & markAsCopiedIntoSegment:. Make sure unsigned comparisons are used for several address/oop comparisons in the segment code. Slang: Propagate types from "ible" to "var" in "var := ible := expr" when inferring types from assignments.

1 0

VM Maker: VMMaker.oscog-eem.2252.mcz
by commits＠source.squeak.org 08 Jul '17

08 Jul '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2252.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2252 Author: eem Time: 7 July 2017, 5:06:09.422305 pm UUID: 2f3e9b0e-ecd3-4adf-b092-cce2e2587a5c Ancestors: VMMaker.oscog-eem.2251 SpurImageSegments Fix some signed comparisons in mapOopsAndValidateClassRefsFrom:to:outPointers:. Add class side analysis a la SpurPlanningCompactor. Slang: Propagate types from "ible" to "var" in "var := ible := expr" when inferring types from assignments. =============== Diff against VMMaker.oscog-eem.2251 =============== Item was added: + ----- Method: SpurMemoryManager class>>identify32BitSignedComparisonsInSegmentIO (in category 'analysis') ----- + identify32BitSignedComparisonsInSegmentIO + "self identify32BitSignedComparisonsInSegmentIO" + self identifySignedComparisonsFor: #(ObjectMemory Spur32BitMemoryManager) + in: (self organization listAtCategoryNamed: #'image segment in/out') + noise: #( 'classIndex* >= numOutPointers' + 'count > ptr - start / self bytesPerOop' + 'endSeg - segAddr < self baseHeaderSize + self bytesPerOop' + 'errorCode* > 0' + 'GCModeImageSegment > 0' + 'hash - TopHashBit <= outIndex' + 'limit - ptr <= 8' + 'num* >= self numSlotsMask' + 'num* <= 1' + 'outIndex >= (self numSlotsOf: outPointerArray)' + 'outIndex := self mapOopsFrom: * < 0' + 'segAddr - segStart / 8 + self lastClassIndexPun >= TopHashBit' + 'there > 0' + '* > self identityHashHalfWordMask' + '*segmentLimit >= self numSlotsMask*' + '* > self isForwardedObjectClassIndexPun' + '* > self lastClassIndexPun')! Item was added: + ----- Method: SpurMemoryManager class>>identify64BitSignedComparisonsInSegmentIO (in category 'analysis') ----- + identify64BitSignedComparisonsInSegmentIO + "self identify64BitSignedComparisonsInSegmentIO" + self identifySignedComparisonsFor: #(ObjectMemory Spur64BitMemoryManager) + in: (self organization listAtCategoryNamed: #'image segment in/out') + noise: #( 'classIndex* >= numOutPointers' + 'count > ptr - start / self bytesPerOop' + 'endSeg - segAddr < self baseHeaderSize + self bytesPerOop' + 'errorCode* > 0' + 'GCModeImageSegment > 0' + 'hash - TopHashBit <= outIndex' + 'limit - ptr <= 8' + 'num* >= self numSlotsMask' + 'num* <= 1' + 'num* > 0' + 'num* < 1' + 'outIndex >= (self numSlotsOf: outPointerArray)' + 'outIndex := self mapOopsFrom: * < 0' + 'segAddr - segStart / 8 + self lastClassIndexPun >= TopHashBit' + 'there > 0' + '* > self identityHashHalfWordMask' + '*segmentLimit >= self numSlotsMask*' + '* > self isForwardedObjectClassIndexPun' + '* > self lastClassIndexPun')! Item was added: + ----- Method: SpurMemoryManager class>>identifySignedComparisonsFor:in:noise: (in category 'analysis') ----- + identifySignedComparisonsFor: options in: selectors noise: noise + "self identify32BitSignedComparisonsInSegmentIO" + "self identify64BitSignedComparisonsInSegmentIO" + | vmm cg halt | + halt := false. + vmm := (VMMaker forPlatform: 'Cross') + interpreterClass: StackInterpreter; + options: options. + cg := [vmm buildCodeGeneratorForInterpreter] + on: Notification + do: [:ex| + ex tag == #getVMMaker + ifTrue: [ex resume: vmm] + ifFalse: [ex pass]]. + cg vmClass preGenerationHook: cg. + cg inferTypesForImplicitlyTypedVariablesAndMethods. + cg retainMethods: self selectors. + cg prepareMethods. + cg doInlining: true. + selectors sort do: + [:sel| + (cg methodNamed: sel) ifNotNil: + [:m| + m parseTree nodesDo: + [:node| + (node isSend + and: [(#(< > <= >=) includes: node selector) + and: [({node receiver. node args first } anySatisfy: + [:o| (cg typeFor: o in: m) + ifNil: [true] + ifNotNil: [:t| (cg isIntegralCType: t) and: [t first ~= $u]]]) + and: [noise noneSatisfy: [:n| n match: node printString]]]]) ifTrue: + [halt ifTrue: [self halt: node printString]. + Transcript ensureCr; nextPutAll: sel; space; print: node; flush]]]]! Item was changed: ----- Method: SpurMemoryManager>>mapOopsAndValidateClassRefsFrom:to:outPointers: (in category 'image segment in/out') ----- mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until the second pass in assignClassIndicesAndPinFrom:to:outPointers:." + <var: 'segmentLimit' type: #usqInt> | numOutPointers numSegObjs objOop | + <var: #oop type: #usqInt> numOutPointers := self numSlotsOf: outPointerArray. numSegObjs := 0. objOop := self objectStartingAt: segmentStart. [self oop: objOop isLessThan: segmentLimit] whileTrue: [| classIndex hash oop mappedOop | numSegObjs := numSegObjs + 1. "No object in the segment should be marked. If is is something is wrong." (self isMarked: objOop) ifTrue: [^PrimErrInappropriate]. classIndex := self classIndexOf: objOop. "validate the class ref, but don't update it until any internal classes have been added to the class table." (classIndex anyMask: TopHashBit) ifTrue: [classIndex := classIndex - TopHashBit. classIndex >= numOutPointers ifTrue: [^PrimErrBadIndex halt]. mappedOop := self fetchPointer: classIndex ofObject: outPointerArray. hash := self rawHashBitsOf: mappedOop. (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = mappedOop]) ifFalse: [^PrimErrInappropriate halt]] ifFalse: "The class is contained within the segment." [(oop := classIndex - self firstClassIndexPun * self allocationUnit + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex halt]. (self rawHashBitsOf: oop) ~= 0 ifTrue: [^PrimErrInappropriate halt]]. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: [(oop anyMask: TopOopBit) ifTrue: [(oop := oop - TopOopBit / self bytesPerOop) >= numOutPointers ifTrue: [^PrimErrBadIndex halt]. mappedOop := self fetchPointer: oop ofObject: outPointerArray] ifFalse: [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: [^PrimErrInappropriate halt]. (mappedOop := oop + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex halt]]. self storePointerUnchecked: i ofObject: objOop withValue: mappedOop]]. objOop := self objectAfter: objOop limit: segmentLimit]. ^numSegObjs negated! Item was changed: ----- Method: TMethod>>inferTypesForImplicitlyTypedVariablesIn: (in category 'type inference') ----- inferTypesForImplicitlyTypedVariablesIn: aCodeGen "infer types for untyped variables from assignments and arithmetic uses. For debugging answer a Dictionary from var to the nodes that determined types This for debugging: (self copy inferTypesForImplicitlyTypedVariablesIn: aCodeGen)" | alreadyExplicitlyTypedOrNotToBeTyped asYetUntyped mustBeSigned newDeclarations effectiveNodes | aCodeGen maybeBreakForTestToInline: selector in: self. alreadyExplicitlyTypedOrNotToBeTyped := declarations keys asSet. asYetUntyped := locals copyWithoutAll: alreadyExplicitlyTypedOrNotToBeTyped. mustBeSigned := Set new. newDeclarations := Dictionary new. effectiveNodes := Dictionary new. "this for debugging" parseTree nodesDo: [:node| | type var | "If there is something of the form i >= 0, then i should be signed, not unsigned." (node isSend and: [(locals includes: (var := node receiver variableNameOrNil)) and: [(#(<= < >= >) includes: node selector) and: [node args first isConstant and: [node args first value = 0]]]]) ifTrue: [mustBeSigned add: var. effectiveNodes at: var put: { #signed. node }, (effectiveNodes at: var ifAbsent: [#()])]. "if an assignment to an untyped local of a known type, set the local's type to that type. Only observe known sends (methods in the current set) and typed local variables." (node isAssignment and: [(locals includes: (var := node variable name)) and: [(alreadyExplicitlyTypedOrNotToBeTyped includes: var) not]]) ifTrue: "don't be fooled by previously inferred types" [type := node expression isSend ifTrue: [aCodeGen returnTypeForSend: node expression in: self ifNil: nil] + ifFalse: [self typeFor: (node expression isAssignment + ifTrue: [node expression variable] + ifFalse: [node expression]) in: aCodeGen]. - ifFalse: [self typeFor: node expression in: aCodeGen]. type "If untyped, then cannot type the variable yet. A subsequent assignment may assign a subtype of what this type ends up being" ifNil: "Further, if the type derives from an as-yet-untyped method, we must defer." [alreadyExplicitlyTypedOrNotToBeTyped add: var. (node expression isSend and: [(aCodeGen methodNamed: node expression selector) notNil]) ifTrue: [newDeclarations removeKey: var ifAbsent: nil]] ifNotNil: "Merge simple types (but *don't* merge untyped vars); complex types must be defined by the programmer." [(aCodeGen isSimpleType: type) ifTrue: [(asYetUntyped includes: var) ifTrue: [newDeclarations at: var put: type, ' ', var. asYetUntyped remove: var] ifFalse: [aCodeGen mergeTypeOf: var in: newDeclarations with: type method: self]. effectiveNodes at: var put: { newDeclarations at: var. node }, (effectiveNodes at: var ifAbsent: [#()])]]]]. mustBeSigned do: [:var| (newDeclarations at: var ifAbsent: nil) ifNotNil: [:decl| | type | type := aCodeGen extractTypeFor: var fromDeclaration: decl. type first == $u ifTrue: [newDeclarations at: var put: (aCodeGen signedTypeForIntegralType: type), ' ', var]]]. newDeclarations keysAndValuesDo: [:var :decl| declarations at: var put: decl]. ^effectiveNodes!

1 0

Debugging the VM under gdb on cygwin
by Eliot Miranda 07 Jul '17

07 Jul '17

Hi All, I'm finding it very difficult to debug the 32-bit VM on 64-bit Windows using cygwin. The default gdb for 64-bit cygwin simply doesn't work properly, finding set facts in programs that work out side of the debugger. I've tried to build a 32-bit gdb from the 7.11 sources, configuring with ./configure --target=i686-w64-mingw32, but the resulting gdb doesn't find the 32-bit dlls in C:\Windows\SysWOW64', and complains "Don't know how to run.". Does anyone else have a working gdb for 32-bit programs on 64-bit Windows? How did you build it? Does anyone else have a working gdb for 32-bit programs on 32-bit Windows? How did you build it? Do I need to create a 32-bit cygwin installation on 32-bit windows for this to work? Does anyone have the cygwin gdb 7.8 sources or a pointer to them? One poster claimed that 32-bit gdb on cygwin only works if compiled from the 7.8 sources. Any other ideas? AdvThanksance _,,,^..^,,,_ best, Eliot

2 2

VM Maker: VMMaker.oscog-eem.2251.mcz
by commits＠source.squeak.org 07 Jul '17

07 Jul '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2251.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2251 Author: eem Time: 7 July 2017, 12:55:32.357331 pm UUID: d951ed1a-ef1a-4934-b379-3bef3773f2b3 Ancestors: VMMaker.oscog-eem.2250 Spur: Round the space estimate when a new segment is used for planning compaction to avoid an assert fail. Fix bad slip in computing objectsReachableFromRoots: (the wrong object was being marked when pushing unmarked objects onto the objStack), and rewrite to avoid growing the markStack unnecessarily. Fix an assert fail in adding to the mark stack by handling totalFreeOldSpace correctly (and comment other callers of allocateLargestFreeChunk). Refactor use of marked bit to identify heap objects copied into the segment into isCopiedIntoSegment: & markAsCopiedIntoSegment:. Make sure unsigned comparisons are used for several address/oop comparisons in the segment code. Add support for doing an image segment save and/or load in a clone (which was key in debugging the slip in objectsReachableFromRoots:). Add some debugging routines: forwardersIn:, indexOf:in:. =============== Diff against VMMaker.oscog-eem.2250 =============== Item was changed: ----- Method: Spur32BitMMLECoSimulator>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots self leakCheckImageSegments ifTrue: + [parent ifNil: + [| result | + self halt. + result := coInterpreter cloneSimulation objectMemory storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots. + Smalltalk garbageCollect]]. - [self halt]. ^super storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots! Item was changed: ----- Method: Spur32BitMMLESimulator>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots self leakCheckImageSegments ifTrue: + [parent ifNil: + [| result | + self halt. + result := coInterpreter cloneSimulation objectMemory storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots. + Smalltalk garbageCollect]]. - [self halt]. ^super storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots! Item was changed: ----- Method: Spur64BitMMLECoSimulator>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots self leakCheckImageSegments ifTrue: + [parent ifNil: + [| result | + self halt. + result := coInterpreter cloneSimulation objectMemory storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots. + Smalltalk garbageCollect]]. - [self halt]. ^super storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots! Item was changed: ----- Method: Spur64BitMMLESimulator>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots self leakCheckImageSegments ifTrue: + [parent ifNil: + [| result | + self halt. + result := coInterpreter cloneSimulation objectMemory storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots. + Smalltalk garbageCollect]]. - [self halt]. ^super storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots! Item was changed: ----- Method: SpurImageSegmentTests>>testSaveHashedCollectionAndAllSubclasses (in category 'tests') ----- testSaveHashedCollectionAndAllSubclasses SimulatorHarnessForTests new withExecutableInterpreter: self initializedVM do: [:vm :harness| | error objects | CheckForLeaks == true ifTrue: "CheckForLeaks := self confirm: 'Check for leaks?'" [vm objectMemory setCheckForLeaks: (vm objectMemory class bindingOf: #GCModeImageSegment) value]. error := harness findSymbol: #error. self deny: error isNil. objects := harness interpreter: vm object: (harness findClassNamed: 'Compiler') perform: (harness findSymbol: #evaluate:) withArguments: {vm objectMemory stringForCString: + '[| seg out roots result | - '[| seg out result | seg := WordArray new: 1024 * 1024. out := Array new: 512. roots := HashedCollection withAllSubclasses asArray. roots := roots, (roots collect: [:ea| ea class]). (thisContext isPrimFailToken: (nil tryPrimitive: 98 withArgs: { roots. seg. out })) ifTrue: [^#error]. result := { seg. out }. (thisContext isPrimFailToken: (nil tryPrimitive: 99 withArgs: result)) ifTrue: [^#error]. result] on: Error do: [:ex| ^#error]'}. self deny: objects = error]! Item was changed: ----- Method: SpurImageSegmentTests>>testSaveHashedCollectionSubclasses (in category 'tests') ----- testSaveHashedCollectionSubclasses SimulatorHarnessForTests new withExecutableInterpreter: self initializedVM do: [:vm :harness| | error objects | CheckForLeaks == true ifTrue: "CheckForLeaks := self confirm: 'Check for leaks?'" [vm objectMemory setCheckForLeaks: (vm objectMemory class bindingOf: #GCModeImageSegment) value]. error := harness findSymbol: #error. self deny: error isNil. objects := harness interpreter: vm object: (harness findClassNamed: 'Compiler') perform: (harness findSymbol: #evaluate:) withArguments: {vm objectMemory stringForCString: + '[| seg out roots result | - '[| seg out result | seg := WordArray new: 1024 * 1024. out := Array new: 256. roots := HashedCollection subclasses asArray. roots := roots, (roots collect: [:ea| ea class]). (thisContext isPrimFailToken: (nil tryPrimitive: 98 withArgs: { roots. seg. out })) ifTrue: [^#error]. result := { seg. out }. (thisContext isPrimFailToken: (nil tryPrimitive: 99 withArgs: result)) ifTrue: [^#error]. result] on: Error do: [:ex| ^#error]'}. self deny: objects = error]! Item was changed: ----- Method: SpurMemoryManager>>allInstancesOf: (in category 'primitive support') ----- allInstancesOf: aClass "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of instances as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | classIndex freeChunk ptr start limit count bytes | classIndex := self rawHashBitsOf: aClass. classIndex = 0 ifTrue: [freeChunk := self allocateSlots: 0 format: self arrayFormat classIndex: ClassArrayCompactIndex. ^freeChunk]. MarkObjectsForEnumerationPrimitives ifTrue: [self markObjects: true]. "may not want to revive objects unnecessarily; but marking is sloooow." + freeChunk := self allocateLargestFreeChunk. "N.B. Does /not/ update totalFreeOldSpace" - freeChunk := self allocateLargestFreeChunk. start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. (self isClassAtUniqueIndex: aClass) ifTrue: [self uniqueIndex: classIndex allInstancesInto: start limit: limit resultsInto: [:c :p| count := c. ptr := p]] ifFalse: [self ambiguousClass: aClass allInstancesInto: start limit: limit resultsInto: [:c :p| count := c. ptr := p]]. self assert: (self isEmptyObjStack: markStack). MarkObjectsForEnumerationPrimitives ifTrue: [self assert: self allObjectsUnmarked. self emptyObjStack: weaklingStack] ifFalse: [self assert: (self isEmptyObjStack: weaklingStack)]. (count > (ptr - start / self bytesPerOop) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeObject: freeChunk. ^self integerObjectOf: count]. count < self numSlotsMask ifTrue: [| smallObj | smallObj := self allocateSlots: count format: self arrayFormat classIndex: ClassArrayCompactIndex. 0 to: count - 1 do: [:i| self storePointerUnchecked: i ofObject: smallObj withValue: (self fetchPointer: i ofFreeChunk: freeChunk)]. self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self beRootIfOld: smallObj. self checkFreeSpace: GCModeFull. ^smallObj]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self rawOverflowSlotsOf: freeChunk put: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace: GCModeFull. self runLeakCheckerFor: GCModeFull. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>allObjects (in category 'primitive support') ----- allObjects "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of objects as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | freeChunk ptr start limit count bytes | MarkObjectsForEnumerationPrimitives ifTrue: [self markObjects: true]. "may not want to revive objects unnecessarily; but marking is sloooow." + freeChunk := self allocateLargestFreeChunk. "N.B. Does /not/ update totalFreeOldSpace" - freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. self allHeapEntitiesDo: [:obj| "continue enumerating even if no room so as to unmark all objects." (MarkObjectsForEnumerationPrimitives ifTrue: [self isMarked: obj] ifFalse: [true]) ifTrue: [(self isNormalObject: obj) ifTrue: [MarkObjectsForEnumerationPrimitives ifTrue: [self setIsMarkedOf: obj to: false]. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: obj. ptr := ptr + self bytesPerOop]] ifFalse: [MarkObjectsForEnumerationPrimitives ifTrue: [(self isSegmentBridge: obj) ifFalse: [self setIsMarkedOf: obj to: false]]]]]. self assert: (self isEmptyObjStack: markStack). MarkObjectsForEnumerationPrimitives ifTrue: [self assert: self allObjectsUnmarked. self emptyObjStack: weaklingStack] ifFalse: [self assert: (self isEmptyObjStack: weaklingStack)]. self assert: count >= self numSlotsMask. (count > (ptr - start / self bytesPerOop) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace: GCModeFull. ^self integerObjectOf: count]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self rawOverflowSlotsOf: freeChunk put: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace: GCModeFull. self runLeakCheckerFor: GCModeFull. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>assignClassIndicesAndPinFrom:to:outPointers:filling: (in category 'image segment in/out') ----- assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray filling: loadedObjectsArray "This is part of loadImageSegmentFrom:outPointers:. Make a final pass, assigning the real class indices and/or pinning pinned objects." | fillIdx objOop | objOop := self objectStartingAt: segmentStart. fillIdx := 0. + [self oop: objOop isLessThan: segmentLimit] whileTrue: - [objOop < segmentLimit] whileTrue: [| classRef classOop classIndex | self storePointerUnchecked: fillIdx ofObject: loadedObjectsArray withValue: objOop. fillIdx := fillIdx + 1. "In the segment, class indices are offset indexes into the segment data, or into outPointers. See mapOopsFrom:to:outPointers:outHashes: and newOutPointer:at:in:hashes:." classRef := self classIndexOf: objOop. classOop := (classRef anyMask: TopHashBit) ifTrue: [self fetchPointer: classRef - TopHashBit ofObject: outPointerArray] ifFalse: [classRef - self firstClassIndexPun * self allocationUnit + segmentStart]. classIndex := self rawHashBitsOf: classOop. self assert: (classIndex > self lastClassIndexPun and: [(self classOrNilAtIndex: classIndex) = classOop]). self setClassIndexOf: objOop to: classIndex. ((self isInNewSpace: objOop) and: [self isPinned: objOop]) ifTrue: [| oldClone | oldClone := self cloneInOldSpaceForPinning: objOop. oldClone ~= 0 ifTrue: [self setIsPinnedOf: oldClone to: true. self forward: objOop to: oldClone]]. objOop := self objectAfter: objOop limit: segmentLimit]! Item was changed: ----- Method: SpurMemoryManager>>copyObj:toAddr:startAt:stopAt:savedFirstFields:index: (in category 'image segment in/out') ----- copyObj: objOop toAddr: segAddr startAt: segStart stopAt: endSeg savedFirstFields: savedFirstFields index: i "This is part of storeImageSegmentInto:outPointers:roots:. Copy objOop into the segment beginning at segAddr, and forward it to the copy, saving its first field in savedFirstField, and setting its marked bit to indicate it has been copied. If it is a class in the class table, set the copy's hash to 0 for reassignment on load, and mark it as a class by setting its isRemembered bit. Answer the next segmentAddr if successful. Answer an appropriate error code if not" "Copy the object..." | bodySize copy hash | <inline: false> + self deny: (self isCopiedIntoSegment: objOop). bodySize := self bytesInObject: objOop. (self oop: segAddr + bodySize isGreaterThanOrEqualTo: endSeg) ifTrue: [^PrimErrWritePastObject halt]. self mem: segAddr asVoidPointer cp: (self startOfObject: objOop) asVoidPointer y: bodySize. copy := self objectStartingAt: segAddr. "Clear remembered, mark bits of all headers copied into the segment (except classes)" self setIsRememberedOf: copy to: false; setIsMarkedOf: copy to: false. "Make any objects with hidden dynamic state (contexts, methods) look like normal objects." self ifAProxy: objOop updateCopy: copy. "If the object is a class, zero its identityHash (which is its classIndex) and set its isRemembered bit. It will be assigned a new hash and entered into the table on load." hash := self rawHashBitsOf: objOop. (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = objOop]) ifTrue: [self setHashBitsOf: copy to: 0. self setIsRememberedOf: copy to: true]. "Now forward the object to its copy in the segment." self storePointerUnchecked: i ofObject: savedFirstFields withValue: (self fetchPointer: 0 ofObject: objOop); storePointerUnchecked: 0 ofObject: objOop withValue: copy; + markAsCopiedIntoSegment: objOop. - setIsMarkedOf: objOop to: true. "Answer the new end of segment" ^segAddr + bodySize! Item was changed: ----- Method: SpurMemoryManager>>enterClassesIntoClassTableFrom:to: (in category 'image segment in/out') ----- enterClassesIntoClassTableFrom: segmentStart to: segmentLimit "This is part of loadImageSegmentFrom:outPointers:. Scan for classes contained in the segment, entering them into the class table, and clearing their isRemembered: bit. Classes are at the front, after the root array and have the remembered bit set. If the attempt succeeds, answer 0, otherwise remove all entered entries and answer an error code." | objOop errorCode| objOop := self objectAfter: (self objectStartingAt: segmentStart). + [(self oop: objOop isLessThan: segmentLimit) - [objOop < segmentLimit and: [self isRemembered: objOop]] whileTrue: [self setIsRememberedOf: objOop to: false. (errorCode := self enterIntoClassTable: objOop) ~= 0 ifTrue: [| oop | oop := objOop. objOop := self objectAfter: (self objectStartingAt: segmentStart). + [self oop: objOop isLessThan: oop] whileTrue: - [objOop < oop] whileTrue: [self expungeFromClassTable: objOop. objOop := self objectAfter: objOop limit: segmentLimit]. ^errorCode]. objOop := self objectAfter: objOop limit: segmentLimit]. ^0! Item was added: + ----- Method: SpurMemoryManager>>forwardersIn: (in category 'debug support') ----- + forwardersIn: anObject + "Answer if anObject is itself forwarded, or is a pointer object containing any references to forwarded objects." + (self isForwarded: anObject) ifTrue: + [^true]. + 0 to: (self numPointerSlotsOf: anObject) - 1 do: + [:i| | oop | + oop := self fetchPointer: i ofMaybeForwardedObject: anObject. + ((self isNonImmediate: oop) + and: [self isForwarded: oop]) ifTrue: + [^true]]. + ^false! Item was added: + ----- Method: SpurMemoryManager>>indexOf:in: (in category 'debug support') ----- + indexOf: anElement in: anObject + <api> + | fmt numSlots | + fmt := self formatOf: anObject. + + fmt <= self lastPointerFormat ifTrue: + [numSlots := self numSlotsOf: anObject. + 0 to: numSlots do: + [:i| anElement = (self fetchPointer: i ofMaybeForwardedObject: anObject) ifTrue: [^i]]. + -1]. + + fmt >= self firstByteFormat ifTrue: + [fmt >= self firstCompiledMethodFormat ifTrue: + [^self primitiveFailFor: PrimErrUnsupported]. + numSlots := self numBytesOfBytes: anObject. + 0 to: numSlots do: + [:i| (self fetchByte: i ofObject: anObject) ifTrue: [^i]]. + -1]. + + fmt >= self firstShortFormat ifTrue: + [numSlots := self num16BitUnitsOf: anObject. + 0 to: numSlots do: + [:i| anElement = (self fetchUnsignedShort16: i ofObject: anObject) ifTrue: [^i]]. + -1]. + + fmt = self sixtyFourBitIndexableFormat ifTrue: + [numSlots := self num64BitUnitsOf: anObject. + 0 to: numSlots do: + [:i| anElement = (self fetchLong64: i ofObject: anObject) ifTrue: [^i]]. + -1]. + + fmt >= self firstLongFormat ifTrue: + [numSlots := self num32BitUnitsOf: anObject. + 0 to: numSlots do: + [:i| anElement = (self fetchLong32: i ofObject: anObject) ifTrue: [^i]]. + -1]. + + ^-1! Item was added: + ----- Method: SpurMemoryManager>>isCopiedIntoSegment: (in category 'image segment in/out') ----- + isCopiedIntoSegment: anObjectInTheHeap + <inline: true> + ^self isMarked: anObjectInTheHeap! Item was changed: ----- Method: SpurMemoryManager>>mapOopsAndValidateClassRefsFrom:to:outPointers: (in category 'image segment in/out') ----- mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until the second pass in assignClassIndicesAndPinFrom:to:outPointers:." | numOutPointers numSegObjs objOop | numOutPointers := self numSlotsOf: outPointerArray. numSegObjs := 0. objOop := self objectStartingAt: segmentStart. + [self oop: objOop isLessThan: segmentLimit] whileTrue: - [objOop < segmentLimit] whileTrue: [| classIndex hash oop mappedOop | numSegObjs := numSegObjs + 1. + "No object in the segment should be marked. If is is something is wrong." (self isMarked: objOop) ifTrue: [^PrimErrInappropriate]. classIndex := self classIndexOf: objOop. "validate the class ref, but don't update it until any internal classes have been added to the class table." (classIndex anyMask: TopHashBit) ifTrue: [classIndex := classIndex - TopHashBit. classIndex >= numOutPointers ifTrue: [^PrimErrBadIndex halt]. mappedOop := self fetchPointer: classIndex ofObject: outPointerArray. hash := self rawHashBitsOf: mappedOop. (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = mappedOop]) ifFalse: [^PrimErrInappropriate halt]] ifFalse: "The class is contained within the segment." [(oop := classIndex - self firstClassIndexPun * self allocationUnit + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex halt]. (self rawHashBitsOf: oop) ~= 0 ifTrue: [^PrimErrInappropriate halt]]. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: [(oop anyMask: TopOopBit) ifTrue: [(oop := oop - TopOopBit / self bytesPerOop) >= numOutPointers ifTrue: [^PrimErrBadIndex halt]. mappedOop := self fetchPointer: oop ofObject: outPointerArray] ifFalse: [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: [^PrimErrInappropriate halt]. (mappedOop := oop + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex halt]]. self storePointerUnchecked: i ofObject: objOop withValue: mappedOop]]. objOop := self objectAfter: objOop limit: segmentLimit]. ^numSegObjs negated! Item was changed: ----- Method: SpurMemoryManager>>mapOopsFrom:to:outPointers:outHashes: (in category 'image segment in/out') ----- mapOopsFrom: segStart to: segAddr outPointers: outPointerArray outHashes: savedOutHashes "This is part of storeImageSegmentInto:outPointers:roots:. Now scan, adding out pointers to the outPointersArray; all objects in arrayOfObjects have had their first fields set to point to their copies in segmentWordArray. Answer the outIndex if the scan succeded. Fail if outPointers is too small and answer -1. As established by copyObj:toAddr:startAt:stopAt:savedFirstFields:index:, the marked bit is set for all objects in the segment the remembered bit is set for all classes in the segment. Class indices should be set as follows (see assignClassIndicesAndPinFrom:to:outPointers:filling:) - class indices for classes in the segment " | objOop outIndex | outIndex := 0. self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. objOop := self objectStartingAt: segStart. + [self oop: objOop isLessThan: segAddr] whileTrue: + [| heapOop oop hash segIndex | + heapOop := self fetchClassOfNonImm: objOop. - [objOop < segAddr] whileTrue: - [| oop hash segIndex | - oop := self fetchClassOfNonImm: objOop. "Set the classIndex of the instance. This is a segment offset (segAddr - segStart / allocatiopnUnit) for instances of classes within the segment, and an outPointer index (index in outPointers + TopHashBit) for classes outside the segment." + (self isCopiedIntoSegment: heapOop) - (self isMarked: oop) ifTrue: "oop is a class in the segment; storeImageSegmentInto:outPointers:roots: established offset is within range." + [oop := self fetchPointer: 0 ofObject: heapOop. - [oop := self fetchPointer: 0 ofObject: oop. self assert: (self oop: oop isGreaterThanOrEqualTo: segStart andLessThan: segAddr). segIndex := oop - segStart / self allocationUnit + self firstClassIndexPun. (segIndex anyMask: TopHashBit) ifTrue: "Too many classes in the segment" [^-1 halt]] ifFalse: "oop is an outPointer; locate or allocate its oop" + [hash := self rawHashBitsOf: heapOop. + (self is: hash outPointerClassHashFor: heapOop in: outPointerArray limit: outIndex) - [hash := self rawHashBitsOf: oop. - (self is: hash outPointerClassHashFor: oop in: outPointerArray limit: outIndex) ifTrue: [segIndex := hash] ifFalse: "oop is a new outPointer; allocate its oop" + [outIndex := self newOutPointer: heapOop at: outIndex in: outPointerArray hashes: savedOutHashes. - [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes. outIndex = 0 ifTrue: "no room in outPointers; fail" [^-1 halt]. + segIndex := self rawHashBitsOf: heapOop]. - segIndex := self rawHashBitsOf: oop]. self assert: (segIndex anyMask: TopHashBit)]. self setClassIndexOf: objOop to: segIndex. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| + heapOop := self fetchPointer: i ofObject: objOop. + (self isNonImmediate: heapOop) ifTrue: + [(self isCopiedIntoSegment: heapOop) - oop := self fetchPointer: i ofObject: objOop. - (self isNonImmediate: oop) ifTrue: - [(self isMarked: oop) ifTrue: "oop is an object in the segment." + [oop := self fetchPointer: 0 ofObject: heapOop. - [oop := self fetchPointer: 0 ofObject: oop. self assert: (self oop: oop isGreaterThanOrEqualTo: segStart andLessThan: segAddr). oop := oop - segStart] ifFalse: "oop is an outPointer; locate or allocate its oop" + [hash := self rawHashBitsOf: heapOop. + (self is: hash outPointerClassHashFor: heapOop in: outPointerArray limit: outIndex) - [hash := self rawHashBitsOf: oop. - (self is: hash outPointerClassHashFor: oop in: outPointerArray limit: outIndex) ifTrue: [oop := hash - TopHashBit * self bytesPerOop + TopOopBit] ifFalse: "oop is a new outPointer; allocate its oop" + [outIndex := self newOutPointer: heapOop at: outIndex in: outPointerArray hashes: savedOutHashes. - [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes. outIndex = 0 ifTrue: "no room in outPointers; fail" [^-1 halt]. + self assert: ((self rawHashBitsOf: heapOop) anyMask: TopHashBit). + oop := (self rawHashBitsOf: heapOop) - TopHashBit * self bytesPerOop + TopOopBit]]. - self assert: ((self rawHashBitsOf: oop) anyMask: TopHashBit). - oop := (self rawHashBitsOf: oop) - TopHashBit * self bytesPerOop + TopOopBit]]. self storePointerUnchecked: i ofObject: objOop withValue: oop]]. objOop := self objectAfter: objOop limit: segAddr]. ^outIndex! Item was added: + ----- Method: SpurMemoryManager>>markAsCopiedIntoSegment: (in category 'image segment in/out') ----- + markAsCopiedIntoSegment: anObjectInTheHeap + <inline: true> + self setIsMarkedOf: anObjectInTheHeap to: true! Item was changed: ----- Method: SpurMemoryManager>>objectsReachableFromRoots: (in category 'image segment in/out') ----- objectsReachableFromRoots: arrayOfRoots "This is part of storeImageSegmentInto:outPointers:roots:. Answer an Array of all the objects only reachable from the argument, an Array of root objects, starting with arrayOfRoots. If there is no space, answer a SmallInteger whose value is the number of slots required. This is used to collect the objects to include in an image segment on Spur, separate from creating the segment, hence simplifying the implementation. Thanks to Igor Stasenko for this idea." | freeChunk ptr start limit count oop objOop | + <var: #freeChunk type: #usqInt> "& hence start & ptr are too; limit is also because of addressAfter:" <inline: #never> self assert: (self isArray: arrayOfRoots). "Mark all objects except those only reachable from the arrayOfRoots by marking each object in arrayOfRoots and then marking all reachable objects (from the system roots). This leaves unmarked only objects reachable from the arrayOfRoots. N.B. A side-effect of the marking is that all forwarders in arrayOfRoots will be followed." self assert: self allObjectsUnmarked. self markObjectsIn: arrayOfRoots. self markObjects: false. "After the mark phase all unreachable weak slots will have been nilled and all active ephemerons fired." self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self noUnscannedEphemerons. "Use the largest free chunk to answer the result." + freeChunk := self allocateLargestFreeChunk. "N.B. Does /not/ update totalFreeOldSpace" + totalFreeOldSpace := totalFreeOldSpace - (self bytesInObject: freeChunk). "but must update so that growth in the markStack does not cause assert fails." - freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. "First put the arrayOfRoots; order is important." count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: arrayOfRoots. ptr := ptr + self bytesPerOop]. + "Now collect the roots and the transitive closure of unmarked objects from them." 0 to: (self numSlotsOf: arrayOfRoots) - 1 do: + [:rx| + oop := self fetchPointer: rx ofObject: arrayOfRoots. - [:i| - oop := self fetchPointer: i ofObject: arrayOfRoots. (self isNonImmediate: oop) ifTrue: + [self deny: (self isForwarded: oop). + self noCheckPush: oop onObjStack: markStack. - [self noCheckPush: oop onObjStack: markStack]]. + "Collect the unmarked objects reachable from this root." + [self isEmptyObjStack: markStack] whileFalse: + [objOop := self popObjStack: markStack. + count := count + 1. + ptr < limit ifTrue: + [self longAt: ptr put: objOop. + ptr := ptr + self bytesPerOop]. + oop := self fetchClassOfNonImm: objOop. + (self isMarked: oop) ifFalse: + [self setIsMarkedOf: oop to: true. + self noCheckPush: oop onObjStack: markStack]. + ((self isContextNonImm: objOop) + and: [coInterpreter isStillMarriedContext: objOop]) "widow now, before the loop" + ifTrue: + [0 to: (coInterpreter numSlotsOfMarriedContext: objOop) - 1 do: + [:i| + oop := coInterpreter fetchPointer: i ofMarriedContext: objOop. + ((self isImmediate: oop) + or: [self isMarked: oop]) ifFalse: + [self setIsMarkedOf: oop to: true. + self noCheckPush: oop onObjStack: markStack]]] + ifFalse: + [0 to: (self numPointerSlotsOf: objOop) - 1 do: + [:i| + oop := self fetchPointer: i ofObject: objOop. + ((self isImmediate: oop) + or: [self isMarked: oop]) ifFalse: + [self setIsMarkedOf: oop to: true. + self noCheckPush: oop onObjStack: markStack]]]]]]. - "Now collect the unmarked objects reachable from the roots." - [self isEmptyObjStack: markStack] whileFalse: - [objOop := self popObjStack: markStack. - count := count + 1. - ptr < limit ifTrue: - [self longAt: ptr put: objOop. - ptr := ptr + self bytesPerOop]. - oop := self fetchClassOfNonImm: objOop. - (self isMarked: oop) ifFalse: - [self setIsMarkedOf: objOop to: true. - self noCheckPush: oop onObjStack: markStack]. - ((self isContextNonImm: objOop) - and: [coInterpreter isStillMarriedContext: objOop]) "widow now, before the loop" - ifTrue: - [0 to: (coInterpreter numSlotsOfMarriedContext: objOop) - 1 do: - [:i| - oop := coInterpreter fetchPointer: i ofMarriedContext: objOop. - ((self isImmediate: oop) - or: [self isMarked: oop]) ifFalse: - [self setIsMarkedOf: objOop to: true. - self noCheckPush: oop onObjStack: markStack]]] - ifFalse: - [0 to: (self numPointerSlotsOf: objOop) - 1 do: - [:i| - oop := self fetchPointer: i ofObject: objOop. - ((self isImmediate: oop) - or: [self isMarked: oop]) ifFalse: - [self setIsMarkedOf: objOop to: true. - self noCheckPush: oop onObjStack: markStack]]]]. self unmarkAllObjects. - totalFreeOldSpace := totalFreeOldSpace - (self bytesInObject: freeChunk). "Now try and allocate the result" (count > (ptr - start / self bytesPerOop) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" + [self freeObject: freeChunk. - [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace: GCModeImageSegment. ^self integerObjectOf: count]. "There's room; set the format, & classIndex and shorten." self setFormatOf: freeChunk to: self arrayFormat. self setClassIndexOf: freeChunk to: ClassArrayCompactIndex. self shorten: freeChunk toIndexableSize: count. (self isForwarded: freeChunk) ifTrue: [freeChunk := self followForwarded: freeChunk]. self possibleRootStoreInto: freeChunk. self checkFreeSpace: GCModeImageSegment. self runLeakCheckerFor: GCModeImageSegment. ^freeChunk! Item was changed: ----- Method: SpurMemoryManager>>return:restoringObjectsIn:savedFirstFields:and:savedHashes: (in category 'image segment in/out') ----- return: errCode restoringObjectsIn: firstArray savedFirstFields: savedFirstFields and: secondArray savedHashes: savedHashes <inline: false> "This is part of storeImageSegmentInto:outPointers:roots:." + self cCode: [] inSmalltalk: [errCode ~= 0 ifTrue: [self halt]]. self restoreObjectsIn: firstArray upTo: -1 savedFirstFields: savedFirstFields. self restoreObjectsIn: secondArray savedHashes: savedHashes. self runLeakCheckerFor: GCModeImageSegment. self assert: self allObjectsUnmarked. ^errCode! Item was changed: ----- Method: SpurMemoryManager>>return:restoringObjectsIn:upTo:savedFirstFields: (in category 'image segment in/out') ----- return: errCode restoringObjectsIn: firstArray upTo: limitOrTag savedFirstFields: savedFirstFields <inline: false> "This is part of storeImageSegmentInto:outPointers:roots:." + self cCode: [] inSmalltalk: [errCode ~= 0 ifTrue: [self halt]]. self restoreObjectsIn: firstArray upTo: limitOrTag savedFirstFields: savedFirstFields. self runLeakCheckerFor: GCModeImageSegment. self assert: self allObjectsUnmarked. ^errCode! Item was changed: ----- Method: SpurMemoryManager>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArrayArg outPointers: outPointerArrayArg roots: arrayOfRootsArg "This primitive is called from Squeak as... <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray. This primitive will store a binary image segment (in the same format as objects in the heap) of the set of objects in arrayOfObjects. All pointers from within the set to objects outside the set will be copied into the array of outPointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 8), but with the high bit set. Since Spur has a class table the load primitive must insert classes that have instances into the class table. This primitive marks such classes using the isRemembered bit, which isn't meaningful as a remembered bit in the segment. The primitive expects the segmentWordArray and outPointerArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. The primitive can fail for the following reasons with the specified failure codes: PrimErrGenericError: the segmentWordArray is too small for the version stamp PrimErrWritePastObject: the segmentWordArray is too small to contain the reachable objects PrimErrBadIndex: the outPointerArray is too small PrimErrNoMemory: additional allocations failed PrimErrLimitExceeded: there is no room in the hash field to store out pointer indices or class references." <inline: false> | segmentWordArray outPointerArray arrayOfRoots arrayOfObjects savedFirstFields savedOutHashes segStart segAddr endSeg outIndex numClassesInSegment | + <var: 'segAddr' type: #usqInt> ((self isObjImmutable: segmentWordArrayArg) or: [self isObjImmutable: outPointerArrayArg]) ifTrue: [^PrimErrNoModification]. "Since segmentWordArrayArg & outPointerArrayArg may get shortened, they can't be pinned." ((self isPinned: segmentWordArrayArg) or: [self isPinned: outPointerArrayArg]) ifTrue: [^PrimErrObjectIsPinned]. (self numSlotsOf: outPointerArrayArg) > self maxIdentityHash ifTrue: [^PrimErrLimitExceeded]. self runLeakCheckerFor: GCModeImageSegment. "First scavenge to collect any new space garbage that refers to the graph." self scavengingGC. segmentWordArray := self updatePostScavenge: segmentWordArrayArg. outPointerArray := self updatePostScavenge: outPointerArrayArg. arrayOfRoots := self updatePostScavenge: arrayOfRootsArg. + self deny: (self forwardersIn: outPointerArray). + self deny: (self forwardersIn: arrayOfRoots). "Now compute the transitive closure, collecting the sequence of objects to be stored in the arrayOfObjects array. Included in arrayOfObjects are the arrayOfRoots and all its contents. All objects have been unmarked." arrayOfObjects := self objectsReachableFromRoots: arrayOfRoots. arrayOfObjects ifNil: [^PrimErrNoMemory]. self assert: self allObjectsUnmarked. "work to be done when the incremental GC is written" + self deny: (self forwardersIn: arrayOfObjects). "Both to expand the max size of segment and to reduce the length of the load-time pass that adds classes to the class table, move classes to the front of arrayOfObjects, leaving the root array as the first element." numClassesInSegment := self moveClassesForwardsIn: arrayOfObjects. "The scheme is to copy the objects into segmentWordArray, and then map the oops in segmentWordArray. Therefore the primitive needs to both map efficiently originals to copies in segmentWordArray and be able to undo any side-effects if the primitive fails because either segmentWordArray or outPointerArray is too small. The mapping is done by having the objects to be stored in arrayOfObjects refer to their mapped locations through their first field, just like a forwarding pointer, but without becoming a forwarder, saving their first field in savedFirstFields, and the objects in outPointerArray pointing to their locations in the outPointerArray through their identityHashes, saved in savedOutHashes. Since arrayOfObjects and its savedFirstFields, and outPointerArray and its saved hashes, can be enumerated side-by-side, the hashes can be restored to the originals. So the first field of the heap object corresponding to an object in arrayOfObjects is set to its location in segmentWordArray, and the hash of an object in outPointerArray is set to its index in outPointerArray plus the top hash bit. Classes in arrayOfObjects have their marked bit set. Oops in objects in segmentWordArray are therefore mapped by accessing the original oop, and following its first field. Class indices in segmentWordArray are mapped by fetching the original class, and testing its marked bit. If marked, the first field is followed to access the class copy in the segment. Out pointers (objects and classes, which are unmarked), the object's identityHash is set (eek!!!!) to its index in the outPointerArray. So savedOutHashes parallels the outPointerArray. The saved hash array is initialized with an out-of-range hash value so that the first unused entry can be identified." savedFirstFields := self allocateSlots: (self numSlotsOf: arrayOfObjects) format: self wordIndexableFormat classIndex: self wordSizeClassIndexPun. savedOutHashes := self allocateSlots: (self numSlotsForBytes: (self numSlotsOf: outPointerArray) * 4) format: self firstLongFormat classIndex: self thirtyTwoBitLongsClassIndexPun. (savedFirstFields isNil or: [savedOutHashes isNil]) ifTrue: [self freeObject: arrayOfObjects. ^PrimErrNoMemory]. self fillObj: savedFirstFields numSlots: (self numSlotsOf: savedFirstFields) with: 0. self fillObj: savedOutHashes numSlots: (self numSlotsOf: savedOutHashes) with: self savedOutHashFillValue. segAddr := segmentWordArray + self baseHeaderSize. endSeg := self addressAfter: segmentWordArray. "Write a version number for byte order and version check." segAddr >= endSeg ifTrue: [^PrimErrGenericFailure]. self long32At: segAddr put: self imageSegmentVersion. self long32At: segAddr + 4 put: self imageSegmentVersion. segStart := segAddr := segAddr + self allocationUnit. "Copy all reachable objects to the segment, setting the marked bit for all objects (clones) in the segment, and the remembered bit for all classes (clones) in the segment." 0 to: (self numSlotsOf: arrayOfObjects) - 1 do: [:i| | newSegAddrOrError objOop | "Check that classes in the segment are addressible. Since the top bit of the hash field is used to tag classes external to the segment, the segment offset must not inadvertently set this bit. This limit still allows for a million or more classes." (i = numClassesInSegment and: [segAddr - segStart / self allocationUnit + self lastClassIndexPun >= TopHashBit]) ifTrue: [^self return: PrimErrLimitExceeded restoringObjectsIn: arrayOfObjects upTo: i savedFirstFields: savedFirstFields]. objOop := self fetchPointer: i ofObject: arrayOfObjects. self deny: ((self isImmediate: objOop) or: [self isForwarded: objOop]). newSegAddrOrError := self copyObj: objOop toAddr: segAddr startAt: segStart stopAt: endSeg savedFirstFields: savedFirstFields index: i. + (self oop: newSegAddrOrError isLessThan: segStart) ifTrue: - newSegAddrOrError < segStart ifTrue: [^self return: newSegAddrOrError restoringObjectsIn: arrayOfObjects upTo: i savedFirstFields: savedFirstFields]. segAddr := newSegAddrOrError]. "Check that it can be safely shortened." (endSeg ~= segAddr and: [endSeg - segAddr < (self baseHeaderSize + self bytesPerOop)]) ifTrue: [^self return: PrimErrWritePastObject restoringObjectsIn: arrayOfObjects upTo: -1 savedFirstFields: savedFirstFields]. "Now scan, adding out pointers to the outPointersArray; all objects in arrayOfObjects have their first field pointing to the corresponding copy in segmentWordArray." (outIndex := self mapOopsFrom: segStart to: segAddr outPointers: outPointerArray outHashes: savedOutHashes) < 0 ifTrue: "no room in outPointers; fail" [^self return: PrimErrBadIndex restoringObjectsIn: arrayOfObjects savedFirstFields: savedFirstFields and: outPointerArray savedHashes: savedOutHashes]. "We're done. Shorten the results, restore hashes and return." self shorten: segmentWordArray toIndexableSize: segAddr - (segmentWordArray + self baseHeaderSize) / 4. self shorten: outPointerArray toIndexableSize: outIndex. ^self return: PrimNoErr restoringObjectsIn: arrayOfObjects savedFirstFields: savedFirstFields and: outPointerArray savedHashes: savedOutHashes! Item was changed: ----- Method: SpurPlanningCompactor>>useSegmentForSavedFirstFieldsSpace: (in category 'space management') ----- useSegmentForSavedFirstFieldsSpace: spaceEstimate "Attempt to allocate a memory segment large enough to hold the savedFirstFieldsSpace. Invoked when neither eden nor a large free chunk are found to be big enough for the job." + | roundedSize allocatedSize | - | allocatedSize | <var: #segAddress type: #'void *'> + roundedSize := spaceEstimate + 1023 // 1024 * 1024. (manager "sent to the manager so that the simulator can increase memory to simulate a new segment" + sqAllocateMemorySegmentOfSize: roundedSize + Above: (manager segmentManager firstGapOfSizeAtLeast: roundedSize) - sqAllocateMemorySegmentOfSize: spaceEstimate - Above: (self firstGapOfSizeAtLeast: spaceEstimate) AllocatedSizeInto: (self cCode: [self addressOf: allocatedSize] inSmalltalk: [[:sz| allocatedSize := sz]])) ifNotNil: [:segAddress| savedFirstFieldsSpace start: segAddress asUnsignedIntegerPtr; limit: segAddress asUnsignedIntegerPtr + allocatedSize. savedFirstFieldsSpaceNotInOldSpace := true. self assert: self savedFirstFieldsSpaceWasAllocated. ^true]. ^false!

1 0

VM Maker: CogTools-sk.81.mcz
by commits＠source.squeak.org 06 Jul '17

06 Jul '17

Sophie Kaleba uploaded a new version of CogTools to project VM Maker: http://source.squeak.org/VMMaker/CogTools-sk.81.mcz ==================== Summary ==================== Name: CogTools-sk.81 Author: sk Time: 6 July 2017, 4:43:21.854769 pm UUID: 935fdb8e-4d7f-4d2c-a60c-a3ec94260d69 Ancestors: CogTools-sk.80 * Refactor (cleaner structure when initializing to get either a SqueakVMProfiler or PharoVMProfiler instance) * added the detailed profiling features (at last!) - still need to work on the display * Fixed rounded percentages in the report * Display of the profiled expression in headless mode * cleaning / renaming classes and methods for consistency =============== Diff against CogTools-sk.80 =============== Item was added: + ----- Method: PharoVMFileSystem>>round:downTo: (in category 'as yet unclassified') ----- + round: anInteger downTo: decimalPlaces + + ^ anInteger printShowingDecimalPlaces: decimalPlaces! Item was added: + VMMethodConverter subclass: #PharoVMMethodConverter + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CogTools-VMProfiler'! Item was added: + ----- Method: PharoVMMethodConverter>>convertAsString: (in category 'as yet unclassified') ----- + convertAsString: aBlock + + ^ aBlock asString! Item was added: + ----- Method: PharoVMMethodConverter>>deleteContentsOf: (in category 'as yet unclassified') ----- + deleteContentsOf: aDirectory + + aDirectory deleteAll. + ! Item was added: + ----- Method: PharoVMMethodConverter>>ensureExistenceOfDirectory: (in category 'public') ----- + ensureExistenceOfDirectory: aDirName + ^ aDirName ensureCreateDirectory ! Item was added: + ----- Method: PharoVMMethodConverter>>exists: (in category 'public') ----- + exists: aFilename + + ^ aFilename asFileReference exists! Item was added: + ----- Method: PharoVMMethodConverter>>nameFordirPath:plus: (in category 'as yet unclassified') ----- + nameFordirPath: aDirPath plus: aProcessId + + ^ (aDirPath, aProcessId) asFileReference ! Item was added: + ----- Method: PharoVMMethodConverter>>nameOfFile:in: (in category 'as yet unclassified') ----- + nameOfFile: aFilename in: aDirectory + + ^ aFilename asFileReference basename ! Item was added: + ----- Method: PharoVMMethodConverter>>parentPathOfFile: (in category 'as yet unclassified') ----- + parentPathOfFile: aFilename + + ^ (aFilename asFileReference) parent pathString ! Item was added: + ----- Method: PharoVMMethodConverter>>print:showingDecimalPlaces: (in category 'as yet unclassified') ----- + print: anInteger showingDecimalPlaces: decimalPlaces + + ^ anInteger printShowingDecimalPlaces: decimalPlaces! Item was added: + ----- Method: PharoVMProfiler>>initialize (in category 'initialization') ----- + initialize + + super initializeMost. + self withDetails: false. + CompatibilityClass := PharoVMMethodConverter new. + expressionTextMorph := PluggableTextMorph new. + self initializeSymbols.! Item was added: + ----- Method: SqueakVMFileSystem>>round:downTo: (in category 'as yet unclassified') ----- + round: anInteger downTo: decimalPlaces + + ^ anInteger printShowingMaxDecimalPlaces: decimalPlaces! Item was added: + VMMethodConverter subclass: #SqueakVMMethodConverter + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CogTools-VMProfiler'! Item was added: + ----- Method: SqueakVMMethodConverter>>convertAsString: (in category 'as yet unclassified') ----- + convertAsString: aBlock + + ^ aBlock sourceString! Item was added: + ----- Method: SqueakVMMethodConverter>>deleteContentsOf: (in category 'as yet unclassified') ----- + deleteContentsOf: aDirectory + + aDirectory recursiveDelete! Item was added: + ----- Method: SqueakVMMethodConverter>>ensureExistenceOfDirectory: (in category 'public') ----- + ensureExistenceOfDirectory: aDirName + + ^ aDirName assureExistence! Item was added: + ----- Method: SqueakVMMethodConverter>>exists: (in category 'public') ----- + exists: aFilename + + ^FileDirectory default fileExists: aFilename ! Item was added: + ----- Method: SqueakVMMethodConverter>>nameFordirPath:plus: (in category 'as yet unclassified') ----- + nameFordirPath: aDirPath plus: aProcessId + + ^ FileDirectory on: aDirPath, aProcessId! Item was added: + ----- Method: SqueakVMMethodConverter>>nameOfFile:in: (in category 'as yet unclassified') ----- + nameOfFile: aFilename in: aDirectory + + ^ aDirectory localNameFor: aFilename ! Item was added: + ----- Method: SqueakVMMethodConverter>>parentPathOfFile: (in category 'as yet unclassified') ----- + parentPathOfFile: aFilename + + ^ FileDirectory dirPathFor: aFilename ! Item was added: + ----- Method: SqueakVMMethodConverter>>print:showingDecimalPlaces: (in category 'as yet unclassified') ----- + print: anInteger showingDecimalPlaces: decimalPlaces + + ^ anInteger printShowingMaxDecimalPlaces: decimalPlaces! Item was added: + ----- Method: SqueakVMProfiler>>initialize (in category 'initialization') ----- + initialize + super initializeMost. + self withDetails: false. + CompatibilityClass := SqueakVMMethodConverter new. + expressionTextMorph := PluggableTextMorph new. + super initializeSymbols. + self toggleShowing: #module.! Item was changed: + ----- Method: SqueakVMProfiler>>stopProfiling (in category 'profiling') ----- - ----- Method: SqueakVMProfiler>>stopProfiling (in category 'as yet unclassified') ----- stopProfiling super stopProfiling. self updateButtons! Item was added: + ----- Method: VMFileSystem>>round:downTo: (in category 'as yet unclassified') ----- + round: anInteger downTo: decimalPlaces + + self subclassResponsability! Item was added: + Object subclass: #VMMcpcBcpcMap + instanceVariableNames: 'map' + classVariableNames: '' + poolDictionaries: '' + category: 'CogTools-VMProfiler'! + + !VMMcpcBcpcMap commentStamp: 'ClementBera 6/13/2017 15:56' prior: 0! + My instances represent the mapping between mcpc (machine code program counter) to bcpc (bytecode program counter) for a given compiled code. + + map is an orderedCollection, each element being an association, the key being the range in the bytecode, the value the number of samples within that range.! Item was added: + ----- Method: VMMcpcBcpcMap>>addRange:numSamples: (in category 'accessing') ----- + addRange: range numSamples: numSamples + map add: (range key + 1 -> (range value + 1)) -> numSamples! Item was added: + ----- Method: VMMcpcBcpcMap>>bcRangeAndNumSamplesDo: (in category 'iterating') ----- + bcRangeAndNumSamplesDo: binaryBlock + map do: [ :assoc | + binaryBlock + value: assoc key + value: assoc value ]! Item was added: + ----- Method: VMMcpcBcpcMap>>initialize (in category 'initialization') ----- + initialize + + super initialize. + + map := OrderedCollection new.! Item was added: + ----- Method: VMMcpcBcpcMap>>printOn: (in category 'printing') ----- + printOn: s + s << 'McpcBcpcMap ('. + map do: + [ :assoc | + s + << '[' + << assoc key key printString + << ';' + << assoc key value printString + << ']>' + << assoc value printString + << ' ' ]. + s << ')'! Item was added: + Object subclass: #VMMethodConverter + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CogTools-VMProfiler'! + + !VMMethodConverter commentStamp: 'sk 7/6/2017 11:10' prior: 0! + I make a link between the methods that are implemented differently between Squeak and Pharo. + + ! Item was added: + ----- Method: VMMethodConverter>>convertAsString: (in category 'as yet unclassified') ----- + convertAsString: aBlock + + self subclassResponsability.! Item was added: + ----- Method: VMMethodConverter>>deleteContentsOf: (in category 'as yet unclassified') ----- + deleteContentsOf: aDirectory + self subclassResponsability! Item was added: + ----- Method: VMMethodConverter>>ensureExistenceOfDirectory: (in category 'public') ----- + ensureExistenceOfDirectory: aDirName + "if the directory doesn't exist, create it" + + self subclassResponsibility ! Item was added: + ----- Method: VMMethodConverter>>exists: (in category 'public') ----- + exists: aFilename + "checks if a given file exists" + + self subclassResponsibility ! Item was added: + ----- Method: VMMethodConverter>>nameFordirPath:plus: (in category 'as yet unclassified') ----- + nameFordirPath: aDirPath plus: aProcessId + "answers a FileSystem/Directory object representing a directory. The name of this directory is its path+the name of a process id" + + self subclassResponsibility ! Item was added: + ----- Method: VMMethodConverter>>nameOfFile:in: (in category 'as yet unclassified') ----- + nameOfFile: aFilename in: aDirectory + + self subclassResponsibility ! Item was added: + ----- Method: VMMethodConverter>>parentPathOfFile: (in category 'as yet unclassified') ----- + parentPathOfFile: aFilename + + self subclassResponsibility ! Item was added: + ----- Method: VMMethodConverter>>print:showingDecimalPlaces: (in category 'as yet unclassified') ----- + print: anInteger showingDecimalPlaces: decimalPlaces + + self subclassResponsability! Item was changed: VMPSymbol subclass: #VMPFunctionSymbol + instanceVariableNames: 'mcpcbcpcmap' - instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CogTools-VMProfiler'! !VMPFunctionSymbol commentStamp: '<historical>' prior: 0! A symbol for a function or procedure (see subclasses)! Item was added: + ----- Method: VMPFunctionSymbol>>mcpcbcpcmap (in category 'accessing') ----- + mcpcbcpcmap + ^ mcpcbcpcmap! Item was added: + ----- Method: VMPFunctionSymbol>>mcpcbcpcmap: (in category 'accessing') ----- + mcpcbcpcmap: anObject + mcpcbcpcmap := anObject! Item was added: + ----- Method: VMPFunctionSymbol>>mcpcbcpcmapDo: (in category 'iterating') ----- + mcpcbcpcmapDo: binaryBlock + 2 to: mcpcbcpcmap size by: 2 do: + [ :index | + "value at index is mcpc and index + 1 bcpc" + binaryBlock + value: (mcpcbcpcmap at: index) + value: (mcpcbcpcmap at: index + 1) ]! Item was changed: Model subclass: #VMProfiler + instanceVariableNames: 'sampleBuffer sampleBag sortedSamples sortedSymbols sortedSymbolsBeforeCogCode sortedSymbolsAfterCogCode symbolsMode symbolTypes symbolManager symbolList selections minSelectionIndex maxSelectionIndex total rangeTotal highAddress lowAddress history historyIndex expressionTextMorph previousPattern graph aboutToProfile startTime elapsedTime startStats elapsedStats clearPriorToProfile gcPriorToProfile forkProfile cogCodeConstituents withDetails' + classVariableNames: 'CannedBenchmarkStrings CompatibilityClass' - instanceVariableNames: 'sampleBuffer sampleBag sortedSamples sortedSymbols sortedSymbolsBeforeCogCode sortedSymbolsAfterCogCode symbolsMode symbolTypes symbolManager symbolList selections minSelectionIndex maxSelectionIndex total rangeTotal highAddress lowAddress history historyIndex expressionTextMorph previousPattern graph aboutToProfile startTime elapsedTime startStats elapsedStats clearPriorToProfile gcPriorToProfile forkProfile cogCodeConstituents version fileSystem' - classVariableNames: 'CannedBenchmarkStrings' poolDictionaries: '' category: 'CogTools-VMProfiler'! !VMProfiler commentStamp: 'eem 7/9/2013 14:08' prior: 0! This tool is a pc-sampling profiler for the VM. It presents the profile data graphically. Copyright© 2011-2013, 3D ICC Immersive Collaboration. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.! Item was changed: ----- Method: VMProfiler class>>headlessSpyOn:reportOn: (in category 'as yet unclassified') ----- headlessSpyOn: aBlock reportOn: aStream "initialize the profiler version (squeak or pharo) and profile headless, writing the results on a given stream" + VMProfiler new + selectBenchmark: (CompatibilityClass convertAsString: aBlock); - (VMProfiler new) version new headlessSpyOn: aBlock; report: aStream. ! Item was added: + ----- Method: VMProfiler class>>headlessSpyOn:reportOn:withDetails: (in category 'as yet unclassified') ----- + headlessSpyOn: aBlock reportOn: aStream withDetails: aBoolean + "initialize the profiler version (squeak or pharo) and profile headless, writing the results on a given stream" + + VMProfiler new + withDetails: aBoolean; + selectBenchmark: (CompatibilityClass convertAsString: aBlock); + headlessSpyOn: aBlock; + report: aStream. + ! Item was changed: ----- Method: VMProfiler class>>reportGCStats:upTime:on: (in category 'reports') ----- reportGCStats: gcStatsArray upTime: elapsedMilliseconds on: str | oldSpaceEnd youngSpaceEnd memoryEnd fullGCs fullGCTime incrGCs incrGCTime tenureCount rootOverflows | gcStatsArray ifNil: [^self]. oldSpaceEnd := gcStatsArray at: 2. "a.k.a. oldSpace size on Spur" fullGCs := gcStatsArray at: 7. fullGCTime := gcStatsArray at: 8. incrGCs := gcStatsArray at: 9. incrGCTime := gcStatsArray at: 10. tenureCount := gcStatsArray at: 11. rootOverflows := gcStatsArray at: 22. str cr. str nextPutAll: '**Memory**'; cr. str nextPutAll: ' old '; nextPutAll: oldSpaceEnd asStringWithCommasSigned; nextPutAll: ' bytes'; cr. self amOnSpur ifTrue: [(gcStatsArray at: 54) ifNotNil: [:freeSpace| str nextPutAll: ' free '; nextPutAll: freeSpace asStringWithCommasSigned; nextPutAll: ' bytes'; cr]] ifFalse: [youngSpaceEnd := gcStatsArray at: 1. memoryEnd := gcStatsArray at: 3. str nextPutAll: ' young '; nextPutAll: (youngSpaceEnd - oldSpaceEnd) asStringWithCommasSigned; nextPutAll: ' bytes'; cr. str nextPutAll: ' used '; nextPutAll: youngSpaceEnd asStringWithCommasSigned; nextPutAll: ' bytes'; cr. str nextPutAll: ' free '; nextPutAll: (memoryEnd - youngSpaceEnd) asStringWithCommasSigned; nextPutAll: ' bytes'; cr]. str cr. str nextPutAll: '**GCs**'; cr. str nextPutAll: ' full '; print: fullGCs; nextPutAll: ' totalling '; nextPutAll: fullGCTime asStringWithCommas; nextPutAll: 'ms ('; + nextPutAll: (CompatibilityClass print:(fullGCTime / elapsedMilliseconds * 100) showingDecimalPlaces: 3 ); - print: ((fullGCTime / elapsedMilliseconds * 100) roundTo: 0.001); nextPutAll: '% elapsed time)'. fullGCs = 0 ifFalse: + [str nextPutAll: ', avg '; nextPutAll: (CompatibilityClass print:(fullGCTime / fullGCs) showingDecimalPlaces: 3); nextPutAll: 'ms']. - [str nextPutAll: ', avg '; print: (fullGCTime / fullGCs roundTo: 0.001); nextPutAll: 'ms']. str cr. str nextPutAll: (self amOnSpur ifTrue: [' scavenges '] ifFalse: [' incr ']); print: incrGCs; nextPutAll: ' totalling '; nextPutAll: incrGCTime asStringWithCommas; nextPutAll: 'ms ('; + nextPutAll: (CompatibilityClass print:incrGCTime / elapsedMilliseconds * 100 showingDecimalPlaces: 3); - print: ((incrGCTime / elapsedMilliseconds * 100) roundTo: 0.001); nextPutAll: '% elapsed time)'. incrGCs = 0 ifFalse: + [str nextPutAll:', avg '; nextPutAll: (CompatibilityClass print:incrGCTime / incrGCs showingDecimalPlaces:3); nextPutAll: 'ms']. - [str nextPutAll:', avg '; print: (incrGCTime / incrGCs roundTo: 0.001); nextPutAll: 'ms']. str cr. str nextPutAll: ' tenures '; nextPutAll: tenureCount asStringWithCommas. tenureCount = 0 ifFalse: [str nextPutAll: ' (avg '; print: (incrGCs / tenureCount) asInteger; nextPutAll: ' GCs/tenure)']. str cr. str nextPutAll: ' root table '; nextPutAll: rootOverflows asStringWithCommas; nextPutAll:' overflows'. str cr. (gcStatsArray size >= 63 and: [(gcStatsArray at: 63) isInteger]) ifTrue: [| numCompactions compactionMsecs | str cr; nextPutAll: '**Compiled Code Compactions**'; cr. numCompactions := gcStatsArray at: 62. compactionMsecs := gcStatsArray at: 63. str tab; print: numCompactions; nextPutAll: ' totalling '; nextPutAll: compactionMsecs asStringWithCommas; nextPutAll: 'ms ('; + nextPutAll: (CompatibilityClass print:compactionMsecs / elapsedMilliseconds * 100 showingDecimalPlaces: 3); - print: ((compactionMsecs / elapsedMilliseconds * 100) roundTo: 0.001); nextPutAll: '% elapsed time)'. numCompactions = 0 ifFalse: + [str nextPutAll: ', avg '; nextPutAll: (CompatibilityClass print:compactionMsecs / numCompactions showingDecimalPlaces:3); nextPutAll: 'ms']. - [str nextPutAll: ', avg '; print: (compactionMsecs / numCompactions roundTo: 0.001); nextPutAll: 'ms']. str cr]. gcStatsArray size >= 61 ifTrue: [str cr; nextPutAll: '**Events**'; cr. (56 to: 61) with: #('Process switches' 'ioProcessEvents calls' 'Interrupt checks' 'Event checks' 'Stack overflows' 'Stack page divorces') do: [:index :eventName| | value n | value := gcStatsArray at: index. n := 22 - eventName size // 4 + 1. str nextPutAll: eventName; tab: n; print: value; nextPutAll: ' ('; print: (value * 1000 / elapsedMilliseconds) rounded; nextPutAll: ' per second)'; cr]]! Item was added: + ----- Method: VMProfiler>>countSymbols:totals: (in category 'reports') ----- + countSymbols: symbols totals: totals + | totalSamples | + totalSamples := 0. + symbols do: + [:sym| | samples | + ((#(publicFunction privateFunction) includes: sym type) + and: [(samples := self samplesForSymbol: sym) > 0]) ifTrue: + [totals at: sym put: samples. + totalSamples := totalSamples + samples]]. + ^ totalSamples + ! Item was added: + ----- Method: VMProfiler>>createMcpcBcpcMapFor: (in category 'Cog compiled code') ----- + createMcpcBcpcMapFor: functionSymbol + | map minBCRange minMCRange | + map := VMMcpcBcpcMap new. + functionSymbol mcpcbcpcmap isArray ifFalse: + [ map addRange: (0->6666) numSamples: (self samplesForSymbol: functionSymbol). + ^ map ]. + minBCRange := 0. + minMCRange := functionSymbol address. + functionSymbol mcpcbcpcmapDo: [ :mcpc :bcpc | + map addRange: (minBCRange -> bcpc) numSamples: (self samplesForRange: minMCRange to: mcpc). + minBCRange := bcpc. + minMCRange := mcpc ]. + map addRange: (minBCRange -> 6666) numSamples: (self samplesForRange: minMCRange to: functionSymbol limit). + ^ map! Item was changed: ----- Method: VMProfiler>>initialize (in category 'initialization') ----- initialize + + ('Pharo*' match: Smalltalk version) ifTrue: [ ^PharoVMProfiler new]. + ('Squeak*' match: Smalltalk version) ifTrue: [ ^SqueakVMProfiler new]. + + ! - self initializeSamples. - self initializeVersion. - self initializeSymbols. - self clearHistory. - symbolsMode := #byAddress. - symbolTypes := IdentitySet new. - selections := ByteArray new. - highAddress := lowAddress := minSelectionIndex := maxSelectionIndex := 0. - self toggleShowing: #module. - aboutToProfile := false. - total := rangeTotal := startTime := elapsedTime := 0. - gcPriorToProfile := clearPriorToProfile := true. - forkProfile := false! Item was added: + ----- Method: VMProfiler>>initializeInstance (in category 'initialization') ----- + initializeInstance + self initializeSamples. + self clearHistory. + symbolsMode := #byAddress. + symbolTypes := IdentitySet new. + selections := ByteArray new. + highAddress := lowAddress := minSelectionIndex := maxSelectionIndex := 0. + aboutToProfile := false. + total := rangeTotal := startTime := elapsedTime := 0. + gcPriorToProfile := clearPriorToProfile := true. + forkProfile := false! Item was added: + ----- Method: VMProfiler>>initializeMost (in category 'initialization') ----- + initializeMost + self initializeSamples. + self clearHistory. + symbolsMode := #byAddress. + symbolTypes := IdentitySet new. + selections := ByteArray new. + highAddress := lowAddress := minSelectionIndex := maxSelectionIndex := 0. + aboutToProfile := false. + total := rangeTotal := startTime := elapsedTime := 0. + gcPriorToProfile := clearPriorToProfile := true. + forkProfile := false! Item was changed: ----- Method: VMProfiler>>initializeSymbols (in category 'initialization') ----- initializeSymbols Smalltalk platformName caseOf: { ['Mac OS'] -> [Cursor wait showWhile: + [ symbolManager := VMProfilerMacSymbolsManager using: CompatibilityClass ]]. - [ symbolManager := VMProfilerMacSymbolsManager using: fileSystem ]]. ['unix'] -> [Cursor wait showWhile: + [symbolManager := VMProfilerLinuxSymbolsManager using: CompatibilityClass ]] } - [symbolManager := VMProfilerLinuxSymbolsManager using: fileSystem]] } otherwise: [self error: 'not yet supported on ', Smalltalk platformName]! Item was removed: - ----- Method: VMProfiler>>initializeVersion (in category 'initialization') ----- - initializeVersion - - ('Pharo*' match: Smalltalk version) ifTrue: [ version := PharoVMProfiler. - fileSystem := PharoVMFileSystem new]. - ('Squeak*' match: Smalltalk version) ifTrue: [ version := SqueakVMProfiler. - fileSystem := SqueakVMFileSystem new]. - - ! Item was changed: ----- Method: VMProfiler>>primitiveCollectCogCodeConstituents (in category 'primitives') ----- primitiveCollectCogCodeConstituents + ^ self primitiveCollectCogCodeConstituents: self withDetails! - "Answer the contents of the code zone as an array of pair-wise element, address - in ascending address order. Answer a string for a runtime routine or abstract label - (beginning, end, etc), a CompiledMethod for a cog machine-code method, - or a selector (presumably a Symbol) for a cog machine-code open or closed PIC. - Fail if this isn't a Cog VM or if out of memory. If this isn't a Cog VM answer nil." - <primitive: 253 error: ec> - ^ec ifNotNil: [self primitiveFailed] - - "self basicNew primitiveCollectCogCodeConstituents"! Item was added: + ----- Method: VMProfiler>>primitiveCollectCogCodeConstituents: (in category 'primitives') ----- + primitiveCollectCogCodeConstituents: withDetails + "Answer the contents of the code zone as an array of pair-wise element, address + in ascending address order. Answer a string for a runtime routine or abstract label + (beginning, end, etc), a CompiledMethod for a cog machine-code method, + or a selector (presumably a Symbol) for a cog machine-code open or closed PIC. + Fail if this isn't a Cog VM or if out of memory. If this isn't a Cog VM answer nil. + + If the parameter is true, answers the mapping between machine code pc and + bytecode pc in relevant methods instead of just the start address. + " + <primitive: 253 error: ec> + ^ec ifNotNil: [self primitiveFailed] + + "self basicNew primitiveCollectCogCodeConstituents"! Item was added: + ----- Method: VMProfiler>>printInnerDetails:with:on: (in category 'reports') ----- + printInnerDetails: assoc with: cogMethodMaps on: aStream + | functionSymbol totalSamples map cumulative n | + functionSymbol := assoc key. + totalSamples := assoc value. + cumulative := 0. + map := cogMethodMaps at: functionSymbol. + map bcRangeAndNumSamplesDo: [ :bcRange :numSamples | + numSamples > 0 ifTrue: + [ aStream tab. + self printPercentage: numSamples total: totalSamples on: aStream. + aStream tab:2. + aStream << bcRange printString. + n := 10 - bcRange printString size // 4 + 1. + aStream tab:n. + aStream nextPut: $(; print: numSamples; nextPut: $); tab: (numSamples < 100 ifTrue: [1] ifFalse: [1]); nextPut: $(. + cumulative := cumulative + numSamples. + self printPercentage: cumulative total: totalSamples on: aStream. + aStream nextPut: $); cr. ]] + + ! Item was changed: ----- Method: VMProfiler>>printSymbolTotals:labelled:on:sumTotal: (in category 'reports') ----- printSymbolTotals: totals labelled: label on: aStream sumTotal: sumTotal + ^ self + printSymbolTotals: totals + labelled: label + on: aStream + sumTotal: sumTotal + cogMethodMaps: Dictionary new! - "Print sorted totals for all symbols with a total greater than 0.01% of the grand total." - | substantial insubstantial cut cumulative heading percentageWidth compositionWidth tabWidth labelWidthCut labelledInFull | - cut := total / 10000.0. - substantial := totals associations select: [:assoc| assoc value > cut]. - labelWidthCut := total / 1000.0. - labelledInFull := totals associations select: [:assoc| assoc value > labelWidthCut]. - insubstantial := totals associations - inject: 0 - into: [:sum :assoc| - (assoc value <= cut ifTrue: [assoc value] ifFalse: [0]) + sum]. - substantial := substantial asSortedCollection: - [:a1 :a2| - a1 value > a2 value - or: [a1 value = a2 value and: [a1 name < a2 name]]]. - insubstantial > 0 ifTrue: - [substantial := substantial asArray, {'...others...'->insubstantial}]. - cumulative := 0. - heading := '% of ', label, ' (% of total)'. - tabWidth := self widthInDefaultFontOf: (String with: Character tab). - percentageWidth := self widthInDefaultFontOf: '99.99% (99.99%) '. - compositionWidth := (self longestWidthIn: labelledInFull) + tabWidth - max: (self widthInDefaultFontOf: heading) + tabWidth - percentageWidth. - self put: heading paddedTo: compositionWidth + percentageWidth tabWidth: tabWidth on: aStream. - aStream nextPutAll: '(samples) (cumulative)'; cr. - substantial do: - [:assoc| - self printPercentage: assoc value total: sumTotal on: aStream. - aStream space; space; space; space; nextPut: $(. - self printPercentage: assoc value total: total on: aStream. - aStream nextPut: $); tab. - self put: (assoc key isString ifTrue: [assoc key] ifFalse: [assoc key name]) - paddedTo: compositionWidth - tabWidth: tabWidth - on: aStream. - aStream nextPut: $(; print: assoc value; nextPut: $); tab: (assoc value < 100 ifTrue: [2] ifFalse: [1]); nextPut: $(. - cumulative := cumulative + assoc value. - self printPercentage: cumulative total: sumTotal on: aStream. - aStream nextPut: $); cr]. - aStream cr; cr! Item was added: + ----- Method: VMProfiler>>printSymbolTotals:labelled:on:sumTotal:cogMethodMaps: (in category 'reports') ----- + printSymbolTotals: totals labelled: label on: aStream sumTotal: sumTotal cogMethodMaps: cogMethodMaps + "Print sorted totals for all symbols with a total greater than 0.01% of the grand total." + | substantial insubstantial cut cumulative heading percentageWidth compositionWidth tabWidth labelWidthCut labelledInFull | + cut := total / 10000.0. + substantial := totals associations select: [:assoc| assoc value > cut]. + labelWidthCut := total / 1000.0. + labelledInFull := totals associations select: [:assoc| assoc value > labelWidthCut]. + insubstantial := totals associations + inject: 0 + into: [:sum :assoc| + (assoc value <= cut ifTrue: [assoc value] ifFalse: [0]) + sum]. + substantial := substantial asSortedCollection: + [:a1 :a2| + a1 value > a2 value + or: [a1 value = a2 value and: [a1 name < a2 name]]]. + insubstantial > 0 ifTrue: + [substantial := substantial asArray, {'...others...'->insubstantial}]. + cumulative := 0. + heading := '% of ', label, ' (% of total)'. + tabWidth := self widthInDefaultFontOf: (String with: Character tab). + percentageWidth := self widthInDefaultFontOf: '99.99% (99.99%) '. + compositionWidth := (self longestWidthIn: labelledInFull) + tabWidth + max: (self widthInDefaultFontOf: heading) + tabWidth - percentageWidth. + self put: heading paddedTo: compositionWidth + percentageWidth tabWidth: tabWidth on: aStream. + aStream nextPutAll: '(samples) (cumulative)'; cr. + substantial do: + [:assoc| + self printPercentage: assoc value total: sumTotal on: aStream. + aStream space; space; space; space; nextPut: $(. + self printPercentage: assoc value total: total on: aStream. + aStream nextPut: $); tab. + self put: (assoc key isString ifTrue: [assoc key] ifFalse: [assoc key name]) + paddedTo: compositionWidth + tabWidth: tabWidth + on: aStream. + aStream nextPut: $(; print: assoc value; nextPut: $); tab: (assoc value < 100 ifTrue: [2] ifFalse: [1]); nextPut: $(. + cumulative := cumulative + assoc value. + self printPercentage: cumulative total: sumTotal on: aStream. + aStream nextPut: $); cr. + self withDetails ifTrue: [cogMethodMaps at: assoc key ifPresent: [ :i | self printInnerDetails: assoc with: cogMethodMaps on: aStream ]. ].]. + aStream cr; cr! Item was changed: ----- Method: VMProfiler>>report: (in category 'reports') ----- report: s self totalsDo: [:vmTotals :cogTotals :nonVMTotals + :samplesInVM :samplesInCog :samplesInNonVMModules :samplesInNonVM + :cogMethodMaps | - :samplesInVM :samplesInCog :samplesInNonVMModules :samplesInNonVM | self putReportPreambleOn: s. s print: samplesInVM + samplesInCog; nextPutAll: ' samples in the VM'; tab; nextPut: $(; print: total; nextPutAll: ' samples in the entire program) '. self printPercentage: samplesInVM + samplesInCog total: total on: s. s nextPutAll: ' of total'; cr; cr. cogTotals isEmpty ifFalse: [s print: samplesInCog; nextPutAll: ' samples in generated vm code '. self printPercentage: samplesInCog total: samplesInVM + samplesInCog on: s. s nextPutAll: ' of entire vm ('. self printPercentage: samplesInCog total: total on: s. s nextPutAll: ' of total)'; cr. s print: samplesInVM; nextPutAll: ' samples in vanilla vm code '. self printPercentage: samplesInVM total: samplesInVM + samplesInCog on: s. s nextPutAll: ' of entire vm ('. self printPercentage: samplesInVM total: total on: s. s nextPutAll: ' of total)'; cr; cr. + self printSymbolTotals: cogTotals labelled: 'generated vm code' on: s sumTotal: samplesInCog cogMethodMaps: cogMethodMaps]. - self printSymbolTotals: cogTotals labelled: 'generated vm code' on: s sumTotal: samplesInCog]. vmTotals isEmpty ifFalse: [self printSymbolTotals: vmTotals labelled: 'vanilla vm code' on: s sumTotal: samplesInVM]. (samplesInNonVM * 100 >= total and: [nonVMTotals notEmpty]) ifTrue: [s print: samplesInNonVM; nextPutAll: ' samples in the rest '. self printPercentage: samplesInNonVM total: total on: s. s nextPutAll: ' of total'; cr; cr. self printSymbolTotals: nonVMTotals labelled: 'rest' on: s sumTotal: samplesInNonVM]. self class reportGCStats: elapsedStats upTime: elapsedTime on: s]! Item was added: + ----- Method: VMProfiler>>symbolsInNonVMModule (in category 'reports') ----- + symbolsInNonVMModule + ^ (symbolManager modules + copyWithout: symbolManager vmModule) + copyWithout: symbolManager cogModule! Item was changed: ----- Method: VMProfiler>>totalsDo: (in category 'reports') ----- + totalsDo: octuaryBlock - totalsDo: septuaryBlock "Evaluate aBlock with a Dictionary of symbol -> total for the functions in the VM (excluding generated code) a Dictionary of symbol -> total for the generated code in the VM a Dictionary of symbol -> total for the functions in other code total number of samples in functions in the VM (excluding generated code) total number of samples in generated code in the VM total number of samples in generated code in the VM total number of samples in functions in other code total number of samples not in VM or VM-generated code (incudes code not in any function)" | vmTotals cogTotals nonVMTotals + samplesInVM samplesInCog samplesInNonVMModules samplesInNonVM cogMethodMaps | - samplesInVM samplesInCog samplesInNonVMModules samplesInNonVM | vmTotals := Dictionary new. cogTotals := Dictionary new. nonVMTotals := Dictionary new. + cogMethodMaps := Dictionary new. + samplesInVM := self countSymbols: (symbolManager symbolsInModule: symbolManager vmModule) totals: vmTotals. + samplesInCog := self countSymbols: (symbolManager symbolsInModule: symbolManager cogModule) totals: cogTotals. + samplesInNonVMModules := self countSymbols: self symbolsInNonVMModule totals: nonVMTotals. - samplesInVM := samplesInCog := samplesInNonVMModules := 0. - (symbolManager symbolsInModule: symbolManager vmModule) do: - [:sym| | samples | - ((#(publicFunction privateFunction) includes: sym type) - and: [(samples := self samplesForSymbol: sym) > 0]) ifTrue: - [vmTotals at: sym put: samples. - samplesInVM := samplesInVM + samples]]. - (symbolManager symbolsInModule: symbolManager cogModule) do: - [:sym| | samples | - ((#(publicFunction privateFunction) includes: sym type) - and: [(samples := self samplesForSymbol: sym) > 0]) ifTrue: - [cogTotals at: sym put: samples. - samplesInCog := samplesInCog + samples]]. - ((symbolManager modules - copyWithout: symbolManager vmModule) - copyWithout: symbolManager cogModule) do: - [:module| - (symbolManager symbolsInModule: module) do: - [:sym| | samples | - ((#(publicFunction privateFunction) includes: sym type) - and: [(samples := self samplesForSymbol: sym) > 0]) ifTrue: - [nonVMTotals at: sym put: samples. - samplesInNonVMModules := samplesInNonVMModules + samples]]]. samplesInNonVM := total - samplesInVM - samplesInCog. + cogTotals keysAndValuesDo: + [ :key :value | + value > 10 ifTrue: [ cogMethodMaps at: key put: (self createMcpcBcpcMapFor: key) ] ]. nonVMTotals at: 'Samples Not In Any Function' put: samplesInNonVM - samplesInNonVMModules. + octuaryBlock valueWithArguments: - septuaryBlock valueWithArguments: {vmTotals. cogTotals. nonVMTotals. samplesInVM. samplesInCog. samplesInNonVMModules. + samplesInNonVM. + cogMethodMaps}! - samplesInNonVM}! Item was changed: ----- Method: VMProfiler>>trimmedExpressionText (in category 'menus') ----- trimmedExpressionText | expression | - expressionTextMorph ifNil: [expressionTextMorph := PluggableTextMorph new - setText: '' asText]. ^((expression := expressionTextMorph text asString) notEmpty and: [expression first = $[ and: [expression last = $] ]]) ifTrue: [expression copyFrom: 2 to: expression size - 1] ifFalse: [expression]! Item was added: + ----- Method: VMProfiler>>withDetails (in category 'as yet unclassified') ----- + withDetails + + ^ withDetails! Item was added: + ----- Method: VMProfiler>>withDetails: (in category 'as yet unclassified') ----- + withDetails: aBoolean + "is the boolean is set to true, then the profiler will provide a detailed report (with bytecode ranges within a function)" + + withDetails:= aBoolean! Item was added: + ----- Method: VMProfilerLinuxSymbolsManager class>>tempDirectory (in category 'accessing') ----- + tempDirectory + + ^ VMFileSystem ifNotNil: [VMFileSystem nameFordirPath:'/tmp/vmsyms' plus:OSProcess thisOSProcess pid printString] + ! Item was changed: ----- Method: VMProfilerLinuxSymbolsManager>>initializeMost (in category 'initialize-release') ----- initializeMost | shortNames | initialized := false. maxAddressMask := (2 raisedToInteger: 32) - 1. modulesByName := Dictionary new. symbolsByModule := Dictionary new. shortNames := Set new. tempDir := self class tempDirectory. + VMFileSystem ensureExistenceOfDirectory: tempDir. - self fileSystem ensureExistenceOfDirectory: tempDir. modules := self primitiveExecutableModules. modules := (1 to: modules size by: 2) collect: [:i| | fileName shortName counter longName | fileName := modules at: i. (fileName beginsWith: '/dgagent') ifTrue: [fileName := fileName allButFirst: 8]. shortName := VMFileSystem nameOfFile: fileName in: tempDir. counter := 0. [shortNames includes: shortName] whileTrue: [counter := counter + 1. shortName := (VMFileSystem nameOfFile: fileName in: tempDir), counter printString]. shortNames add: shortName. longName := (modules at: i + 1) ifNil: [fileName] ifNotNil: [:symlink| symlink first = $/ ifTrue: [symlink] ifFalse: [( VMFileSystem parentPathOfFile: fileName ), '/', symlink]]. "some files are off limits (e.g. /dgagent/lib/preload.so)" (VMFileSystem exists: longName) ifTrue: [(modulesByName at: longName put: VMPExecutableModuleSymbol new) name: longName; shortName: shortName]]. "The primitive always answers the VM info in the first entry." vmModule := modules first. "now filter out the files we can't read..." + modules := modules select: [:m| m notNil and: [modulesByName includesKey: m name]]! - modules := modules select: [:m| modulesByName includesKey: m name]! Item was added: + ----- Method: VMProfilerMacSymbolsManager class>>tempDirectory (in category 'accessing') ----- + tempDirectory + + ^ VMFileSystem ifNotNil: [VMFileSystem nameFordirPath:'private/tmp/vmsyms' plus:OSProcess thisOSProcess pid printString] + ! Item was changed: ----- Method: VMProfilerMacSymbolsManager>>initializeMost (in category 'initialize-release') ----- initializeMost | shortNames | initialized := false. maxAddressMask := (2 raisedToInteger: Smalltalk wordSize * 8) - 1. modulesByName := Dictionary new. symbolsByModule := Dictionary new. shortNames := Set new. modules := self primitiveExecutableModulesAndOffsets. tempDir := self class tempDirectory. + VMFileSystem ensureExistenceOfDirectory: tempDir. - self fileSystem ensureExistenceOfDirectory: tempDir. modules := (1 to: modules size by: 4) collect: [:i| | shortName counter | shortName := VMFileSystem nameOfFile: (modules at: i) in: tempDir. counter := 0. [shortNames includes: shortName] whileTrue: [counter := counter + 1. shortName := (VMFileSystem nameOfFile: (modules at: i) in: tempDir), counter printString]. shortNames add: shortName. (modulesByName at: (modules at: i) put: VMPExecutableModuleSymbol new) name: (modules at: i); shortName: shortName; vmshift: (modules at: i + 1); address: (maxAddressMask bitAnd: (modules at: i + 2) + (modules at: i + 1)); size: (modules at: i + 3)]. modules := self filter: modules. "The primitive always answers the VM info in the first entry." vmModule := modules first. modules := modules asSortedCollection: [:m1 :m2| m1 address <= m2 address]! Item was changed: ----- Method: VMProfilerSymbolsManager>>addCogModuleSymbols: (in category 'Cog compiled code') ----- addCogModuleSymbols: symbols self initialized ifFalse: + [Cursor wait showWhile: + [[self initialized] whileFalse: + [(Delay forMilliseconds: 100) wait]]]. - [(Delay forMilliseconds: 1000) wait]. modules removeAllSuchThat: [:existingModule| cogModule name = existingModule name]; add: cogModule. modulesByName at: cogModule name put: cogModule. symbolsByModule at: cogModule put: symbols! Item was changed: ----- Method: VMProfilerSymbolsManager>>computeCogCodeModule: (in category 'Cog compiled code') ----- computeCogCodeModule: cogCodeConstituents | symbols | (cogModule := VMPExecutableModuleSymbol new) name: vmModule shortName, '.', cogCodeConstituents first; shortName: cogCodeConstituents first; vmshift: 0; address: cogCodeConstituents second; size: cogCodeConstituents last - cogCodeConstituents second. symbols := (3 to: cogCodeConstituents size - 2 by: 2) collect: [:i| "Declare methods as public; PICs and entries as private" | thing | ((thing := cogCodeConstituents at: i) isCompiledMethod ifTrue: [VMPPublicFunctionSymbol] ifFalse: [VMPPrivateFunctionSymbol]) new name: (thing isCompiledMethod ifTrue: [thing methodClass name, '>>', thing selector] ifFalse: [thing class == cogCodeConstituents first class ifTrue: [thing] ifFalse: ['PIC ', (thing isString ifTrue: [thing] ifFalse: [thing printString])]]); + address: (self extractAddress: (cogCodeConstituents at: i + 1)); + mcpcbcpcmap: (cogCodeConstituents at: i + 1); + limit: (self extractAddress: (cogCodeConstituents at: i + 3 ifAbsent: [cogCodeConstituents last]))]. - address: (cogCodeConstituents at: i + 1); - limit: (cogCodeConstituents at: i + 3 ifAbsent: [cogCodeConstituents last])]. self addCogModuleSymbols: symbols! Item was added: + ----- Method: VMProfilerSymbolsManager>>extractAddress: (in category 'Cog compiled code') ----- + extractAddress: thing + ^ thing isArray ifTrue: [ thing first ] ifFalse: [ thing ]! Item was removed: - ----- Method: VMProfilerSymbolsManager>>fileSystem (in category 'accessing') ----- - fileSystem - - ^VMFileSystem ! Item was removed: - ----- Method: VMProfilerSymbolsManager>>fileSystem: (in category 'accessing') ----- - fileSystem: aVMFileSystem - - VMFileSystem := aVMFileSystem. !

1 0

Android VM threaded
by Michael Rueger 06 Jul '17

06 Jul '17

after a bit more digging it seems that the getRedzoneSize (sqUnixMain.c) magic doesn't work as expected in Android if it is called on a non-UI thread. The behavior isn't consistent, it simply crashes or gives back impossibly large (negative) numbers. Just for proof of concept I hard coded a value that I got from executing getRedzoneSize on the main thread and the VM now runs (I see regular calls to invalidate display in the log). The code in that function is way over my head, so any help appreciated! Discovered I need to sched_yield, otherwise the display is never updated even though draw is called from the UI thread after a VM initiated invalidate. Not handling actual display bits yet, hopefully really soon now :-) Michael static int getRedzoneSize() { struct sigaction handler_action, old; handler_action.sa_sigaction = sighandler; handler_action.sa_flags = SA_NODEFER | SA_SIGINFO; sigemptyset(&handler_action.sa_mask); (void)sigaction(SIGPROF, &handler_action, &old); do kill(getpid(),SIGPROF); while (!p); (void)sigaction(SIGPROF, &old, 0); return (char *)min(&old,&handler_action) - sizeof(struct sigaction) - p; }

5 9

tar sec files for windows Pharo VM build
by Eliot Miranda 06 Jul '17

06 Jul '17

Hi All, if I'm reading the build.winMNxOP/third-party/Makefile.libXXX files correctly there should be a libXXX.spec.win file for each library in build.winMNxOP/third-party. There are no such files in the Cog or master branches. Can anybody point me to these files? _,,,^..^,,,_ best, Eliot

1 1

32-bit Mac VM squeak.cog.spur not built?
by Bernhard Pieber 04 Jul '17

04 Jul '17

Hi all, The build files of the latest build [1] cog_macos32x86_squeak.cog.spur_201707031616.tar.gz is missing. How can I find out why? And how can I find out when it was last built successfully? Maybe I am not asking the right questions? I try to find out what would be the recommended VM for production on the latest macOS Sierra? - I assume this would still be the 32-bit VM, right? - The latest released stable VM is from 25 Sep 2016. That’s too old, right? Cheers, Bernhard [1]https://bintray.com/opensmalltalk/vm/cog/201707031616#files

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2017