Vm-dev May 2017

vm-dev@lists.squeakfoundation.org

39 participants
158 discussions

[OpenSmalltalk/opensmalltalk-vm] 11d990: CogVM source as per VMMaker.oscog-eem.2204
by GitHub 05 May '17

05 May '17

Branch: refs/heads/krono/highdpi-v2 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 11d990e8fa8b24c725c0a828b6ea6d3646da99be https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/11d990e8fa8b24c725… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-04-27 (Thu, 27 Apr 2017) Changed paths: M src/plugins/CroquetPlugin/CroquetPlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2204 Include a primitive from the Terf version of the CroquetPlugin (thanks Josh). Commit: 9fd4e371ae0895078fce13ea35c491daf0e448e0 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9fd4e371ae0895078f… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-04-27 (Thu, 27 Apr 2017) Changed paths: M .gitattributes M image/BuildSpurReader64Image.st M image/BuildSpurTrunk64Image.st M image/BuildSqueakSpurTrunkVMMakerImage.st M image/CompiledMethod-usesAlternateBytecodeSet.st M image/FT2Constants.st M image/LoadReader.st M image/LoadSistaSupport.st M image/Object-performwithwithwithwithwith.st M image/RunATestClass.st M image/StartReader.st M image/UpdateSqueakTrunkImage.st Log Message: ----------- Use LF instead of CR as image/*.st line ending This is to be able to review/blame/ etc... from GitHub web interface (1 liner with 500+ columns is not tool friendly) Commit: bfe983b7a720f079edda4e3015b90babdbd16a73 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/bfe983b7a720f079ed… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-04-27 (Thu, 27 Apr 2017) Changed paths: M platforms/Cross/plugins/CroquetPlugin/CroquetPlugin.h M platforms/Cross/plugins/CroquetPlugin/TriBoxStub.c Log Message: ----------- Add the stup for the CroquetPlugin's new, but currently unsupported, primitive. Commit: c4881946c2bb8b7da7b191489dbf7ae180b05f51 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c4881946c2bb8b7da7… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-04-27 (Thu, 27 Apr 2017) Changed paths: M platforms/Cross/plugins/CroquetPlugin/CroquetPlugin.h M platforms/Cross/plugins/CroquetPlugin/TriBoxStub.c Log Message: ----------- Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm into Cog Commit: 433b24327993c6e3ae5957ee9b06b40d48f83fdf https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/433b24327993c6e3ae… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-04-27 (Thu, 27 Apr 2017) Changed paths: M image/BuildSqueakSpurTrunkVMMakerImage.st Log Message: ----------- Eliminate CogCompatibility (which prvided Context) now that Spur trunk has changed MethodContext to Context. Commit: bc2f9bbf14e06fe07fd37347be0a3108a0d152c1 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/bc2f9bbf14e06fe07f… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-04-27 (Thu, 27 Apr 2017) Changed paths: M image/BuildSqueakSpurTrunkVMMakerImage.st Log Message: ----------- Fix building of VMMaker image CogCompatibility package attempts to load a Context class for compatibility with Pharo. This is no more required in Squeak since latest trunk now have renamed ContextPart/MethodContext to Context. Commit: 5a57d70fca771d2fc750f542a6ff496cc14feb1f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5a57d70fca771d2fc7… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-04-27 (Thu, 27 Apr 2017) Changed paths: A image/NukePreferenceWizardMorph.st A image/getlatesttrunk64image.sh A image/getlatesttrunkimage.sh Log Message: ----------- Add a couple of scripts to download the latest trunk 6 images, and a script to nuke the preference wizard morph. Commit: eb383228583d7142d6b0a99bd1cecf14a1d1f270 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/eb383228583d7142d6… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-04-27 (Thu, 27 Apr 2017) Changed paths: M .gitattributes M image/BuildSpurReader64Image.st M image/BuildSpurTrunk64Image.st M image/BuildSqueakSpurTrunkVMMakerImage.st M image/CompiledMethod-usesAlternateBytecodeSet.st M image/FT2Constants.st M image/LoadReader.st M image/LoadSistaSupport.st M image/Object-performwithwithwithwithwith.st M image/RunATestClass.st M image/StartReader.st M image/UpdateSqueakTrunkImage.st Log Message: ----------- Merge branch 'Cog' of http://github.com/OpenSmalltalk/vm into Cog Commit: 68e88ee8c47d1935c8edeeb8b95d06364012930b https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/68e88ee8c47d1935c8… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-04-27 (Thu, 27 Apr 2017) Changed paths: M image/BuildSqueakSpurTrunkVMMakerImage.st M image/NukePreferenceWizardMorph.st A image/attic/envvars.sh A image/attic/getGoodCogVM.sh A image/attic/getGoodSpurNsvm.sh A image/attic/getGoodSpurVM.sh M image/buildspurtrunkvmmakerimage.sh M image/envvars.sh R image/getGoodCogVM.sh R image/getGoodSpurNsvm.sh M image/getGoodSpurVM.sh M image/getlatesttrunk64image.sh M image/getlatesttrunkimage.sh M image/updatespurimage.sh Log Message: ----------- Modify the image build scripts to start from the most recently built trunk6 image. Awaiting the bintray work to build a VM that runs on Mac OS X 10.9 or 10.10 make getGoodSpurVM.sh prompt the user to build their own VM. Commit: 845ae199a72cb55504cfa64c95f55ec0c00d509c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/845ae199a72cb55504… Author: Fabio Niephaus <code(a)fniephaus.com> Date: 2017-04-28 (Fri, 28 Apr 2017) Changed paths: M .travis.yml Log Message: ----------- Use `osx_image: xcode6.4` to support OS X 10.9 This should only affect `osx` build jobs. We still need to find out if this breaks compatibility to macOS 10.12. Related: http://forum.world.st/fixing-the-binary-builds-td4944620.html https://docs.travis-ci.com/user/osx-ci-environment/#Xcode-6.4 Commit: 995e7aedc3b5aeb76904f92abbd8a7a1bcf8138f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/995e7aedc3b5aeb769… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-01 (Mon, 01 May 2017) Changed paths: M build.macos32x86/common/Makefile.app.squeak.cog M build.macos32x86/common/Makefile.flags M build.macos32x86/common/Makefile.plugin M build.macos32x86/pharo.cog.spur.lowcode/plugins.ext M build.macos32x86/pharo.cog.spur.lowcode/plugins.int M build.macos32x86/pharo.cog.spur/plugins.ext M build.macos32x86/pharo.cog.spur/plugins.int M build.macos32x86/pharo.stack.spur.lowcode/plugins.ext M build.macos32x86/pharo.stack.spur.lowcode/plugins.int M build.macos32x86/pharo.stack.spur/plugins.ext M build.macos32x86/pharo.stack.spur/plugins.int M build.macos32x86/squeak.cog.spur+immutability/plugins.ext M build.macos32x86/squeak.cog.spur+immutability/plugins.int M build.macos32x86/squeak.cog.spur/plugins.ext M build.macos32x86/squeak.cog.spur/plugins.int M build.macos32x86/squeak.cog.v3/plugins.ext M build.macos32x86/squeak.cog.v3/plugins.int M build.macos32x86/squeak.sista.spur/plugins.ext M build.macos32x86/squeak.sista.spur/plugins.int M build.macos32x86/squeak.stack.spur/plugins.ext M build.macos32x86/squeak.stack.spur/plugins.int M build.macos32x86/squeak.stack.v3/plugins.ext M build.macos32x86/squeak.stack.v3/plugins.int M build.macos64x64/common/Makefile.app.squeak.cog M build.macos64x64/common/Makefile.flags M build.macos64x64/common/Makefile.plugin M build.macos64x64/pharo.cog.spur.lowcode/plugins.ext M build.macos64x64/pharo.cog.spur/plugins.ext M build.macos64x64/pharo.stack.spur.lowcode/plugins.ext M build.macos64x64/pharo.stack.spur/plugins.ext M build.macos64x64/squeak.cog.spur.immutability/plugins.ext M build.macos64x64/squeak.cog.spur.immutability/plugins.int M build.macos64x64/squeak.cog.spur/plugins.ext M build.macos64x64/squeak.cog.spur/plugins.int M build.macos64x64/squeak.sista.spur/plugins.ext M build.macos64x64/squeak.sista.spur/plugins.int M build.macos64x64/squeak.stack.spur/plugins.ext M build.macos64x64/squeak.stack.spur/plugins.int M image/CompiledMethod-usesAlternateBytecodeSet.st M image/FT2Constants.st M image/Object-performwithwithwithwithwith.st M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.h A platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGLInfo.c M platforms/iOS/plugins/CameraPlugin/Makefile M platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m M platforms/unix/vm/sqUnixMain.c M platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c M platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.c Log Message: ----------- Add the B3DAcceleratorPlugin (OpenGL interface) to the 32-bit Mac builds. These link against the Carbon fwk so make it an external plugin. Modify debug log printing to be simpler. Use varargs to avoid calling fprintf with the logfile as an argument. Close the log file via an atexit call. Make sure all the Mac plugins.int and plugins.ext are in the right format (all lines except the first and last should be escaped with a trailing backslash). Make the Squea builds build Squeak.app, SqueakAssert.app and SqueakDebug.app as per the Pharo builds. CocoaFast et al are descriptive but require an additional packaging step that requires work on bintray. So less is more. Make sure the files filed into the VMMaker image have CR line endings. Commit: 5a98630bae65d5b55d08104576cd591489447779 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5a98630bae65d5b55d… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-01 (Mon, 01 May 2017) Changed paths: M platforms/Mac OS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c Log Message: ----------- Use the correct define to determine if the B3DAcceleratorPlugin is being built as an internal or external plugin on Mac OS X (Cocoa and/or Carbon). Commit: 975bf44778a823b011dcfd8912077614090490af https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/975bf44778a823b011… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-01 (Mon, 01 May 2017) Changed paths: M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c Log Message: ----------- And implement the needed GetMainDevice replacement. See https://lists.apple.com/archives/mac-opengl/2006/Jun/msg00021.html. Commit: db9ed209f3996bcc7554503a6c7fac5b0b847f99 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/db9ed209f3996bcc75… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-01 (Mon, 01 May 2017) Changed paths: M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m M platforms/iOS/vm/OSX/macintoshosxextra.c R platforms/iOS/vm/OSX/macintoshosxextra.h M platforms/iOS/vm/OSX/osExports.c M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m Log Message: ----------- Get the B3DAcceleratorPlugin to load. Add a setWindowChangedHook to simplify updating renderers on window change. ELiminates the event processing. Add a getSTWindow. Add the funcitons to OSX's osExports.c. Nuke macintoshosxextra.h; it merely includes sq.h. Commit: c94ebce7b49e657839c0923ba52d801ba5101826 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c94ebce7b49e657839… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-02 (Tue, 02 May 2017) Changed paths: M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.h M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGLInfo.c M platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+vmAndImagePath.m M platforms/iOS/vm/Common/Classes/sqSqueakVmAndImagePathAPI.h M platforms/iOS/vm/OSX/osExports.c M platforms/unix/plugins/B3DAcceleratorPlugin/sqUnixOpenGL.c M platforms/unix/vm-display-X11/sqUnixOpenGL.X11 M platforms/unix/vm-display-X11/sqUnixX11.c M platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c M platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.c Log Message: ----------- Define DPRINTF3D only in sqOpenGLRenderer.h. Rename verboseLevel to glVerbosityLevel. Make it global to the VM or plugin. Fix the linux B3DAcceleratorPlugin/OpenGL build. If I've broken the win32/win64 builds apologies. Can someone LMK and/or fix it along these lines? Commit: bd9c4e3186644b09f4e7a0eb031dbb4d47fdc2c2 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/bd9c4e3186644b09f4… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-02 (Tue, 02 May 2017) Changed paths: M .gitignore M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.h M platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/unix/vm-display-X11/sqUnixOpenGL.X11 M platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c M platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.c Log Message: ----------- Fix print3Dlog's chain call; it should of course call vfprintf, not fprintf. Fix the Mac B3DAcceleratorPlugin's Makefile to use -bundle_loader to access symbols directly from the main VM. Have all platforms initialize glVerbosityLevel suitably. Commit: 912d9172fc1f3c316bce9b0fe0fb32fc59af2cce https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/912d9172fc1f3c316b… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-02 (Tue, 02 May 2017) Changed paths: M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m M platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m M platforms/unix/vm-display-X11/sqUnixX11.c Log Message: ----------- Fix syntax error in sqUnixX11.c now that the DPRINTF3D macro works like a normal statement. Nuke some non-empty whitespace (a nervous tick). Commit: ac699a55da4670bbd0c41bfe4f06b639b51298ac https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ac699a55da4670bbd0… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-02 (Tue, 02 May 2017) Changed paths: M platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m M platforms/unix/vm-display-X11/sqUnixOpenGL.X11 M platforms/unix/vm-display-X11/sqUnixX11.c M platforms/unix/vm/sqUnixExternalPrims.c Log Message: ----------- Fix loading of the vm-display-X11 module by giving it its own log print routine. Modify module loading on Mac OS X and unix to - filter-out non-existent directories in tryLoadingVariations hence avoiding lots of futile dlopens and the ensuing obscuring flood of error messages - always print an error message if a dlopen failed because of an undefined symbol. Commit: d1f88876025e437eaeb480658cd72b2112dff7aa https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d1f88876025e437eae… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-03 (Wed, 03 May 2017) Changed paths: M platforms/win32/vm/sqWin32Window.c Log Message: ----------- [win32] Guard Virtual keycode mapping for pharo only. Breaks current event expectations of squeak. See #55 Commit: e23c5aaae39540e7dc32e240f820f8cd433955be https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e23c5aaae39540e7dc… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-03 (Wed, 03 May 2017) Changed paths: M platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c Log Message: ----------- Cope for the d3d/gl dualism on win32 Commit: aa9503fd8c372b38c086d2daf7d3d2cf9e0453be https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/aa9503fd8c372b38c0… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-03 (Wed, 03 May 2017) Changed paths: M platforms/win32/vm/sqWin32Window.c Log Message: ----------- All other have that, so windows, too Commit: eb13e599494ebfb42ce354eefcb15d50339e7d13 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/eb13e599494ebfb42c… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-04 (Thu, 04 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 nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M platforms/unix/plugins/B3DAcceleratorPlugin/sqUnixOpenGL.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/vm/cogit.h M src/vm/cogitARMv5.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2206 Fix the ARM regression introduced in VMMaker.oscog-eem.2160. On ARM the link register must be saved and restored around the call to the ceNewHash trampoline in the identityHash primitive. Initialize logging in the unix B3DAcceleratorPlugin, and add an error check t to allow inferring from the log file that it has initialized correctly. Add mesa-libGL-devel as to be installed in the linux HowToBuilds. Commit: 2400268fa3889ff208fb766fe1911047b7b9ec11 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2400268fa3889ff208… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-04 (Thu, 04 May 2017) Changed paths: A image/.gdb_history A image/XERRLOG M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cointerp.c 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/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/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/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/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/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/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/cointerpmt.c 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.2208 Cogit: Fix regression in or about VMMaker.oscog-eem.2144 that made simStackPtr char in a BytecodeFixup. This must be signed char to swork; on ARM char is by default unsigned. Slang: Don't iinline unused self_in_foo variables when inlining struct methods. Commit: b7944dbba7b71f7351b2e2d34eca33751dd01373 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b7944dbba7b71f7351… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-04 (Thu, 04 May 2017) Changed paths: M build.macos32x86/common/Makefile.flags M build.macos32x86/common/Makefile.plugin M build.macos64x64/common/Makefile.plugin M platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile Log Message: ----------- Add the bundle_loader check to all bundle links on Mac OS X moving it from the platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile. Nuke the unused CARBON facility. Commit: 66c08a267415896735fb715edcaaef393d1166e2 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/66c08a267415896735… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/vm/OSX/SqueakOSXApplication.m M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m M platforms/iOS/vm/OSX/sqSqueakOSXInfoPlistInterface.h M platforms/iOS/vm/OSX/sqSqueakOSXInfoPlistInterface.m M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h Log Message: ----------- [iOS] Clean up Cocoa event mapping Going Cocoa->Carbon->Squeak is unneccessary. Also, introduce constant names for some Magic numbers, also, use 10.12+ names with fallbacks. Commit: e32d90d07ad9eb64adc54b92a9ba0a47cb1b1616 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e32d90d07ad9eb64ad… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M build.macos32x86/common/Makefile.vm A platforms/iOS/vm/English.lproj/MainMenu-cg.xib M platforms/iOS/vm/OSX/SqueakOSXAppDelegate.h M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m M platforms/iOS/vm/OSX/sqSqueakOSXCGView.h M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m M platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m M platforms/iOS/vm/OSX/sqSqueakOSXView.h Log Message: ----------- [iOS] Cleanup and Synchronize OpenGL/CG views Adds a XIB that loads the CG-view instead of an openGL view Commit: d0e7bfa0f8d99b856d9ac56372f7dacecdd63106 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d0e7bfa0f8d99b856d… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/vm/OSX/SqueakOSXApplication.m M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m Log Message: ----------- [iOS] Fixe Keyboard events. Now correctly gengerats up/stroke/down for cmd/opt/str and combinations with other keys Commit: 7cb97798b6389a8efb4ea96f8d80b6fbd4e7f17b https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7cb97798b6389a8efb… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/vm/OSX/SqViewBitmapConversion.h M platforms/iOS/vm/OSX/SqViewBitmapConversion.m M platforms/iOS/vm/OSX/SqViewClut.h M platforms/iOS/vm/OSX/SqViewClut.m M platforms/iOS/vm/OSX/sqSqueakOSXCGView.h M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h Log Message: ----------- [iOS] Disentangle viewclut/bitmapconverions from opengl [ci skip] Commit: 63286696d51db5d4e3b4f8b9fe873217e215b186 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/63286696d51db5d4e3… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M .gitattributes M .gitignore M .travis.yml M build.linux32ARMv6/HowToBuild M build.linux32ARMv7/HowToBuild M build.linux32x86/HowToBuild M build.linux64x64/HowToBuild M build.macos32x86/common/Makefile.app.squeak.cog M build.macos32x86/common/Makefile.flags M build.macos32x86/common/Makefile.plugin M build.macos32x86/common/Makefile.vm M build.macos32x86/pharo.cog.spur.lowcode/plugins.ext M build.macos32x86/pharo.cog.spur.lowcode/plugins.int M build.macos32x86/pharo.cog.spur/plugins.ext M build.macos32x86/pharo.cog.spur/plugins.int M build.macos32x86/pharo.stack.spur.lowcode/plugins.ext M build.macos32x86/pharo.stack.spur.lowcode/plugins.int M build.macos32x86/pharo.stack.spur/plugins.ext M build.macos32x86/pharo.stack.spur/plugins.int M build.macos32x86/squeak.cog.spur+immutability/plugins.ext M build.macos32x86/squeak.cog.spur+immutability/plugins.int M build.macos32x86/squeak.cog.spur/plugins.ext M build.macos32x86/squeak.cog.spur/plugins.int M build.macos32x86/squeak.cog.v3/plugins.ext M build.macos32x86/squeak.cog.v3/plugins.int M build.macos32x86/squeak.sista.spur/plugins.ext M build.macos32x86/squeak.sista.spur/plugins.int M build.macos32x86/squeak.stack.spur/plugins.ext M build.macos32x86/squeak.stack.spur/plugins.int M build.macos32x86/squeak.stack.v3/plugins.ext M build.macos32x86/squeak.stack.v3/plugins.int M build.macos64x64/common/Makefile.app.squeak.cog M build.macos64x64/common/Makefile.flags M build.macos64x64/common/Makefile.plugin M build.macos64x64/pharo.cog.spur.lowcode/plugins.ext M build.macos64x64/pharo.cog.spur/plugins.ext M build.macos64x64/pharo.stack.spur.lowcode/plugins.ext M build.macos64x64/pharo.stack.spur/plugins.ext M build.macos64x64/squeak.cog.spur.immutability/plugins.ext M build.macos64x64/squeak.cog.spur.immutability/plugins.int M build.macos64x64/squeak.cog.spur/plugins.ext M build.macos64x64/squeak.cog.spur/plugins.int M build.macos64x64/squeak.sista.spur/plugins.ext M build.macos64x64/squeak.sista.spur/plugins.int M build.macos64x64/squeak.stack.spur/plugins.ext M build.macos64x64/squeak.stack.spur/plugins.int A image/.gdb_history M image/BuildSpurReader64Image.st M image/BuildSpurTrunk64Image.st M image/BuildSqueakSpurTrunkVMMakerImage.st M image/LoadReader.st M image/LoadSistaSupport.st A image/NukePreferenceWizardMorph.st M image/RunATestClass.st M image/StartReader.st M image/UpdateSqueakTrunkImage.st A image/XERRLOG A image/attic/envvars.sh A image/attic/getGoodCogVM.sh A image/attic/getGoodSpurNsvm.sh A image/attic/getGoodSpurVM.sh M image/buildspurtrunkvmmakerimage.sh M image/envvars.sh R image/getGoodCogVM.sh R image/getGoodSpurNsvm.sh M image/getGoodSpurVM.sh A image/getlatesttrunk64image.sh A image/getlatesttrunkimage.sh M image/updatespurimage.sh M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cointerp.c 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/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/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.h M platforms/Cross/plugins/CroquetPlugin/CroquetPlugin.h M platforms/Cross/plugins/CroquetPlugin/TriBoxStub.c M platforms/Mac OS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c A platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGLInfo.c M platforms/iOS/plugins/CameraPlugin/Makefile M platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m M platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+vmAndImagePath.m M platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m M platforms/iOS/vm/Common/Classes/sqSqueakVmAndImagePathAPI.h A platforms/iOS/vm/English.lproj/MainMenu-cg.xib M platforms/iOS/vm/OSX/SqViewBitmapConversion.h M platforms/iOS/vm/OSX/SqViewBitmapConversion.m M platforms/iOS/vm/OSX/SqViewClut.h M platforms/iOS/vm/OSX/SqViewClut.m M platforms/iOS/vm/OSX/SqueakOSXAppDelegate.h M platforms/iOS/vm/OSX/SqueakOSXApplication.m M platforms/iOS/vm/OSX/macintoshosxextra.c R platforms/iOS/vm/OSX/macintoshosxextra.h M platforms/iOS/vm/OSX/osExports.c M platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m M platforms/iOS/vm/OSX/sqSqueakOSXCGView.h M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m M platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m M platforms/iOS/vm/OSX/sqSqueakOSXInfoPlistInterface.h M platforms/iOS/vm/OSX/sqSqueakOSXInfoPlistInterface.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m M platforms/iOS/vm/OSX/sqSqueakOSXView.h M platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m M platforms/unix/plugins/B3DAcceleratorPlugin/sqUnixOpenGL.c M platforms/unix/vm-display-X11/sqUnixOpenGL.X11 M platforms/unix/vm-display-X11/sqUnixX11.c M platforms/unix/vm/sqUnixExternalPrims.c M platforms/unix/vm/sqUnixMain.c M platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c M platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.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/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/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/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/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/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/CroquetPlugin/CroquetPlugin.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/cointerpmt.c 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 remote-tracking branch 'origin/Cog' into krono/highdpi-v2 * origin/Cog: (26 commits) [iOS] Disentangle viewclut/bitmapconverions from opengl [iOS] Fixe Keyboard events. [iOS] Cleanup and Synchronize OpenGL/CG views [iOS] Clean up Cocoa event mapping Add the bundle_loader check to all bundle links on Mac OS X moving it from the platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile. Nuke the unused CARBON facility. CogVM source as per VMMaker.oscog-eem.2208 CogVM source as per VMMaker.oscog-eem.2206 All other have that, so windows, too Cope for the d3d/gl dualism on win32 [win32] Guard Virtual keycode mapping for pharo only. Fix loading of the vm-display-X11 module by giving it its own log print routine. Modify module loading on Mac OS X and unix to - filter-out non-existent directories in tryLoadingVariations hence avoiding lots of futile dlopens and the ensuing obscuring flood of error messages - always print an error message if a dlopen failed because of an undefined symbol. Fix syntax error in sqUnixX11.c now that the DPRINTF3D macro works like a normal statement. Nuke some non-empty whitespace (a nervous tick). Fix print3Dlog's chain call; it should of course call vfprintf, not fprintf. Fix the Mac B3DAcceleratorPlugin's Makefile to use -bundle_loader to access symbols directly from the main VM. Define DPRINTF3D only in sqOpenGLRenderer.h. Rename verboseLevel to glVerbosityLevel. Make it global to the VM or plugin. Get the B3DAcceleratorPlugin to load. Add a setWindowChangedHook to simplify updating renderers on window change. ELiminates the event processing. Add a getSTWindow. Add the funcitons to OSX's osExports.c. Nuke macintoshosxextra.h; it merely includes sq.h. And implement the needed GetMainDevice replacement. See https://lists.apple.com/archives/mac-opengl/2006/Jun/msg00021.html. Use the correct define to determine if the B3DAcceleratorPlugin is being built as an internal or external plugin on Mac OS X (Cocoa and/or Carbon). Add the B3DAcceleratorPlugin (OpenGL interface) to the 32-bit Mac builds. These link against the Carbon fwk so make it an external plugin. Modify debug log printing to be simpler. Use varargs to avoid calling fprintf with the logfile as an argument. Close the log file via an atexit call. Use `osx_image: xcode6.4` to support OS X 10.9 Modify the image build scripts to start from the most recently built trunk6 image. Awaiting the bintray work to build a VM that runs on Mac OS X 10.9 or 10.10 make getGoodSpurVM.sh prompt the user to build their own VM. ... Commit: 4514bcfa72394e27389b236baeead0bf393ea574 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4514bcfa72394e2738… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h Log Message: ----------- [iOS] since we use the 10.9 sdk, also forward-declare one more type Commit: 81ab6be3919c9cfa5eaf7a045115a99ab6386ad0 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/81ab6be3919c9cfa5e… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h Log Message: ----------- Merge remote-tracking branch 'origin/Cog' into krono/highdpi-v2 * origin/Cog: [iOS] since we use the 10.9 sdk, also forward-declare one more type Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/c07df4f3a4c3...81…

1 0

[OpenSmalltalk/opensmalltalk-vm] 4514bc: [iOS] since we use the 10.9 sdk, also forward-decl...
by GitHub 05 May '17

05 May '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 4514bcfa72394e27389b236baeead0bf393ea574 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4514bcfa72394e2738… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h Log Message: ----------- [iOS] since we use the 10.9 sdk, also forward-declare one more type

1 0

[OpenSmalltalk/opensmalltalk-vm] 7cb977: [iOS] Disentangle viewclut/bitmapconverions from o...
by GitHub 05 May '17

05 May '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 7cb97798b6389a8efb4ea96f8d80b6fbd4e7f17b https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7cb97798b6389a8efb… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/vm/OSX/SqViewBitmapConversion.h M platforms/iOS/vm/OSX/SqViewBitmapConversion.m M platforms/iOS/vm/OSX/SqViewClut.h M platforms/iOS/vm/OSX/SqViewClut.m M platforms/iOS/vm/OSX/sqSqueakOSXCGView.h M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h Log Message: ----------- [iOS] Disentangle viewclut/bitmapconverions from opengl [ci skip]

1 0

[OpenSmalltalk/opensmalltalk-vm] 66c08a: [iOS] Clean up Cocoa event mapping
by GitHub 05 May '17

05 May '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 66c08a267415896735fb715edcaaef393d1166e2 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/66c08a267415896735… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/vm/OSX/SqueakOSXApplication.m M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m M platforms/iOS/vm/OSX/sqSqueakOSXInfoPlistInterface.h M platforms/iOS/vm/OSX/sqSqueakOSXInfoPlistInterface.m M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h Log Message: ----------- [iOS] Clean up Cocoa event mapping Going Cocoa->Carbon->Squeak is unneccessary. Also, introduce constant names for some Magic numbers, also, use 10.12+ names with fallbacks. Commit: e32d90d07ad9eb64adc54b92a9ba0a47cb1b1616 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e32d90d07ad9eb64ad… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M build.macos32x86/common/Makefile.vm A platforms/iOS/vm/English.lproj/MainMenu-cg.xib M platforms/iOS/vm/OSX/SqueakOSXAppDelegate.h M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m M platforms/iOS/vm/OSX/sqSqueakOSXCGView.h M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m M platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m M platforms/iOS/vm/OSX/sqSqueakOSXView.h Log Message: ----------- [iOS] Cleanup and Synchronize OpenGL/CG views Adds a XIB that loads the CG-view instead of an openGL view Commit: d0e7bfa0f8d99b856d9ac56372f7dacecdd63106 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d0e7bfa0f8d99b856d… Author: Tobias Pape <tobias(a)netshed.de> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M platforms/iOS/vm/OSX/SqueakOSXApplication.m M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m Log Message: ----------- [iOS] Fixe Keyboard events. Now correctly gengerats up/stroke/down for cmd/opt/str and combinations with other keys Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/b7944dbba7b7...d0…

1 0

Recent changes.
by Tobias Pape 05 May '17

05 May '17

Dear all a small summary of some latest issues. 1. With the pulling of the Pharo sources (see PR #55), there was one unguarded change that messed up ctrl-... keystrokes for Squeak. Since the input event handling in Pharo is now completely different from Squeak's, this change probably makes sense for Pharo. Hence, I guarded the change[1] to Pharo only. 2. I put that into the repo. Meanwhile, Eliot has worked on B3D. This changes broke the build for windows. Yes, this was also mentioned in a commit comment[2]. However, since this work looks decidedly in-progress and not-windows-centered (which is totally fine), I would have recommended to put such work in a dedicated branch. This could have been done via $ git checkout -b eliot-B3D-fixes Cog and then committing and pushing to this branch (commit would still be `git commit` or `scripts/gitci` for that matter, push would be `git push origin eliot-B3D-fixes`) That way, all the changes and the (decidedly) broken parts would have been isolated to that branch. Since I needed a working windows VM with the fixes for (1.), I have gone forward and 3. I added back the logging stuff for B3D/DirectX[3]. Eliot, I hope this is matches your intentions? 4. Eliot's B3D Debugging code relies on getImageName which is defined in sq.h. Yet it seems to have always been missing on Win32? I added it hence[4]. Best regards -Tobias [1]: https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d1f88876025e437eae… [2]: https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c94ebce7b49e657839… [3]: https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e23c5aaae39540e7dc… [4]: https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/aa9503fd8c372b38c0…

4 10

[OpenSmalltalk/opensmalltalk-vm] eb13e5: CogVM source as per VMMaker.oscog-eem.2206
by GitHub 04 May '17

04 May '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: eb13e599494ebfb42ce354eefcb15d50339e7d13 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/eb13e599494ebfb42c… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-04 (Thu, 04 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 nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M platforms/unix/plugins/B3DAcceleratorPlugin/sqUnixOpenGL.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/vm/cogit.h M src/vm/cogitARMv5.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2206 Fix the ARM regression introduced in VMMaker.oscog-eem.2160. On ARM the link register must be saved and restored around the call to the ceNewHash trampoline in the identityHash primitive. Initialize logging in the unix B3DAcceleratorPlugin, and add an error check t to allow inferring from the log file that it has initialized correctly. Add mesa-libGL-devel as to be installed in the linux HowToBuilds. Commit: 2400268fa3889ff208fb766fe1911047b7b9ec11 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2400268fa3889ff208… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-04 (Thu, 04 May 2017) Changed paths: A image/.gdb_history A image/XERRLOG M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cointerp.c 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/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/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/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/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/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/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/cointerpmt.c 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.2208 Cogit: Fix regression in or about VMMaker.oscog-eem.2144 that made simStackPtr char in a BytecodeFixup. This must be signed char to swork; on ARM char is by default unsigned. Slang: Don't iinline unused self_in_foo variables when inlining struct methods. Commit: b7944dbba7b71f7351b2e2d34eca33751dd01373 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b7944dbba7b71f7351… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-05-04 (Thu, 04 May 2017) Changed paths: M build.macos32x86/common/Makefile.flags M build.macos32x86/common/Makefile.plugin M build.macos64x64/common/Makefile.plugin M platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile Log Message: ----------- Add the bundle_loader check to all bundle links on Mac OS X moving it from the platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile. Nuke the unused CARBON facility. Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/aa9503fd8c37...b7…

1 0

VM Maker: VMMaker.oscog-eem.2208.mcz
by commits＠source.squeak.org 04 May '17

04 May '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2208.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2208 Author: eem Time: 4 May 2017, 1:33:09.085365 pm UUID: 4877be7d-941d-4e15-b6df-4f1b8c7072a8 Ancestors: VMMaker.oscog-eem.2207 Slang: Re previous commit, the arg's declaration can only be removed if it isn't used. If we elide the decl then its type is lost and field accesses through struct accessors will break. =============== Diff against VMMaker.oscog-eem.2207 =============== Item was added: + ----- Method: TMethod>>argAssignmentsFor:send:except:in: (in category 'inlining') ----- + argAssignmentsFor: meth send: aSendNode except: elidedArgs in: aCodeGen + "Return a collection of assignment nodes that assign the given argument expressions to the formal parameter variables of the given method." + "Optimization: If the actual parameters are either constants or local variables in the target method (the receiver), substitute them directly into the body of meth. Note that global variables cannot be subsituted because the inlined method might depend on the exact ordering of side effects to the globals." + + | stmtList substitutionDict argList | + meth args size > (argList := aSendNode args) size ifTrue: + [self assert: (meth args first beginsWith: 'self_in_'). + argList := {aSendNode receiver}, aSendNode args]. + + stmtList := OrderedCollection new: argList size. + substitutionDict := Dictionary new: argList size. + meth args with: argList do: + [:argName :exprNode | + (self isNode: exprNode substitutableFor: argName inMethod: meth in: aCodeGen) + ifTrue: + [substitutionDict + at: argName + put: (aCodeGen + node: exprNode + typeCompatibleWith: argName + inliningInto: meth + in: self). + locals remove: argName ifAbsent: [self assert: (argName beginsWith: 'self_in_')]. + declarations removeKey: argName ifAbsent: nil] + ifFalse: "Add an assignment for anything except an unused self_in_foo argument" + [(elidedArgs includes: argName) ifFalse: + [stmtList addLast: + (TAssignmentNode new + setVariable: (TVariableNode new setName: argName) + expression: (aCodeGen + node: exprNode copy + typeCompatibleWith: argName + inliningInto: meth + in: self))]]]. + meth parseTree: (meth parseTree bindVariablesIn: substitutionDict). + ^stmtList! Item was removed: - ----- Method: TMethod>>argAssignmentsFor:send:in: (in category 'inlining') ----- - argAssignmentsFor: meth send: aSendNode in: aCodeGen - "Return a collection of assignment nodes that assign the given argument expressions to the formal parameter variables of the given method." - "Optimization: If the actual parameters are either constants or local variables in the target method (the receiver), substitute them directly into the body of meth. Note that global variables cannot be subsituted because the inlined method might depend on the exact ordering of side effects to the globals." - - | stmtList substitutionDict argList | - meth args size > (argList := aSendNode args) size ifTrue: - [self assert: (meth args first beginsWith: 'self_in_'). - argList := {aSendNode receiver}, aSendNode args]. - - stmtList := OrderedCollection new: argList size. - substitutionDict := Dictionary new: argList size. - meth args with: argList do: - [:argName :exprNode | | varNode | - (self isNode: exprNode substitutableFor: argName inMethod: meth in: aCodeGen) - ifTrue: - [substitutionDict - at: argName - put: (aCodeGen - node: exprNode - typeCompatibleWith: argName - inliningInto: meth - in: self). - locals remove: argName ifAbsent: [self assert: (argName beginsWith: 'self_in_')]. - declarations removeKey: argName ifAbsent: nil] - ifFalse: "Add an assignment for anything except an unused self_in_foo argument" - [varNode := TVariableNode new setName: argName. - ((argName beginsWith: 'self_in_') - and: [meth parseTree noneSatisfy: [:node| varNode isSameAs: node]]) ifFalse: - [stmtList addLast: - (TAssignmentNode new - setVariable: varNode - expression: (aCodeGen - node: exprNode copy - typeCompatibleWith: argName - inliningInto: meth - in: self))]]]. - meth parseTree: (meth parseTree bindVariablesIn: substitutionDict). - ^stmtList! Item was changed: ----- Method: TMethod>>inlineSend:directReturn:exitVar:in: (in category 'inlining') ----- inlineSend: aSendNode directReturn: directReturn exitVar: exitVar in: aCodeGen "Answer a collection of statements to replace the given send. directReturn indicates that the send is the expression in a return statement, so returns can be left in the body of the inlined method. If exitVar is nil, the value returned by the send is not used; thus, returns need not assign to the output variable. Types are propagated to as-yet-untyped variables when inlining a send that is assigned, otherwise the assignee variable type must match the return type of the inlinee. Return types are not propagated." + | sel meth methArgs exitLabel inlineStmts label exitType elidedArgs | - | sel meth methArgs exitLabel inlineStmts label exitType notToBeRenamed | sel := aSendNode selector. meth := aCodeGen methodNamed: sel. methArgs := meth args. "convenient for debugging..." aCodeGen maybeBreakForInlineOf: aSendNode in: self. + elidedArgs := #(). (methArgs notEmpty and: [methArgs first beginsWith: 'self_in_']) + ifTrue: "If the first arg is not used we can and should elide it." + [| varNode | + varNode := TVariableNode new setName: methArgs first. + (meth parseTree noneSatisfy: [:node| varNode isSameAs: node]) ifTrue: + [elidedArgs := {methArgs first}]. + methArgs := methArgs allButFirst]. - ifTrue: - [notToBeRenamed := {methArgs first}. - methArgs := methArgs allButFirst] - ifFalse: - [notToBeRenamed := #()]. methArgs size = aSendNode args size ifFalse: [^nil]. meth := meth copy. (meth statements size > 1 and: [meth statements first isSend and: [meth statements first selector == #flag:]]) ifTrue: [meth statements removeFirst]. "Propagate the return type of an inlined method" (directReturn or: [exitVar notNil]) ifTrue: [exitType := directReturn ifTrue: [returnType] ifFalse: [(self typeFor: exitVar in: aCodeGen) ifNil: [#sqInt]]. (exitType = #void or: [exitType = meth returnType]) ifFalse: [meth propagateReturnIn: aCodeGen]]. "Propagate any unusual argument types to untyped argument variables" methArgs with: aSendNode args do: [:formal :actual| (meth declarationAt: formal ifAbsent: nil) ifNil: [(self typeFor: actual in: aCodeGen) ifNotNil: [:type| type ~= #sqInt ifTrue: [meth declarationAt: formal put: (type last = $* ifTrue: [type, formal] ifFalse: [type, ' ', formal])]]]]. + meth renameVarsForInliningInto: self except: elidedArgs in: aCodeGen. - meth renameVarsForInliningInto: self except: notToBeRenamed in: aCodeGen. meth renameLabelsForInliningInto: self. + self addVarsDeclarationsAndLabelsOf: meth except: elidedArgs. - self addVarsDeclarationsAndLabelsOf: meth except: notToBeRenamed. meth hasReturn ifTrue: [directReturn ifFalse: [exitLabel := self unusedLabelForInliningInto: self. (meth exitVar: exitVar label: exitLabel) "is label used?" ifTrue: [ labels add: exitLabel ] ifFalse: [ exitLabel := nil ]]]. (inlineStmts := OrderedCollection new: meth statements size + meth args size + 2) add: (label := TLabeledCommentNode new setComment: 'begin ', sel); + addAll: (self argAssignmentsFor: meth send: aSendNode except: elidedArgs in: aCodeGen); - addAll: (self argAssignmentsFor: meth send: aSendNode in: aCodeGen); addAll: meth statements. "method body" directReturn ifTrue: [meth endsWithReturn ifTrue: [exitVar ifNotNil: "don't remove the returns if being invoked in the context of a return" [inlineStmts at: inlineStmts size put: inlineStmts last copyWithoutReturn]] ifFalse: [inlineStmts add: (TReturnNode new setExpression: (TVariableNode new setName: 'nil'))]]. exitLabel ifNotNil: [inlineStmts add: (TLabeledCommentNode new setLabel: exitLabel comment: 'end ', meth selector)]. inlineStmts size = 1 ifTrue: "Nuke empty methods; e.g. override of flushAtCache" [self assert: inlineStmts first isComment. inlineStmts removeFirst]. ^inlineStmts!

1 0

VM Maker: VMMaker.oscog-eem.2207.mcz
by commits＠source.squeak.org 04 May '17

04 May '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2207.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2207 Author: eem Time: 4 May 2017, 1:06:35.361278 pm UUID: 8da5de9b-33d7-478b-9081-58591f7da69a Ancestors: VMMaker.oscog-eem.2206 Cogit: Fix regression in or about VMMaker.oscog-eem.2144 that made simStackPtr char in a BytecodeFixup. This must be signed char to swork; on ARM char is by default unsigned. Slang: Don't iinline unused self_in_foo variables when inlining struct methods. =============== Diff against VMMaker.oscog-eem.2206 =============== Item was changed: ----- Method: CogAbstractInstruction>>genAlignCStackSavingRegisters:numArgs:wordAlignment: (in category 'abi') ----- + genAlignCStackSavingRegisters: regMask numArgs: numArgs wordAlignment: alignment - genAlignCStackSavingRegisters: registerMask numArgs: numArgs wordAlignment: alignment <inline: true> | regMaskCopy numRegsPushed wordsPushedModAlignment delta | <var: 'regMaskCopy' type: #usqInt> + regMaskCopy := regMask asUnsignedInteger. - regMaskCopy := registerMask asUnsignedInteger. numRegsPushed := 0. [regMaskCopy ~= 0] whileTrue: [numRegsPushed := numRegsPushed + (regMaskCopy bitAnd: 1). regMaskCopy := regMaskCopy bitShift: -1]. (numRegsPushed = 0 and: [self numIntRegArgs >= numArgs]) ifTrue: [^0]. wordsPushedModAlignment := numRegsPushed + numArgs \\ alignment. wordsPushedModAlignment ~= 0 ifTrue: [delta := alignment - wordsPushedModAlignment. cogit SubCq: delta * objectMemory wordSize R: SPReg]. ^0! Item was changed: ----- Method: CogBytecodeFixup class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') ----- instVarNamesAndTypesForTranslationDo: aBinaryBlock "Enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a BytecodeFixup struct." "self withAllSubclasses collect: [:ea| ea typedef]" self filteredInstVarNames do: [:ivn| aBinaryBlock value: ivn value: (ivn first ~= $# ifTrue: [ivn caseOf: { ['targetInstruction'] -> [#'AbstractInstruction *']. ['mergeSimStack'] -> [#'SimStackEntry *']. ['instructionIndex'] -> [#'unsigned short']. + ['simStackPtr'] -> [#'signed char']. - ['simStackPtr'] -> [#char]. ['simNativeStackPtr'] -> [#'short']. ['simNativeStackSize'] -> [#'unsigned short']. ['isReceiverResultRegSelf'] -> [#char] }])]! Item was changed: ----- Method: StackToRegisterMappingCogit>>printRegisterMask:on: (in category 'debug printing') ----- printRegisterMask: registerMask on: aStream + <doNotGenerate> | first | aStream nextPut: ${. registerMask = 0 ifTrue: [aStream nextPutAll: 'NoReg'] ifFalse: [first := true. 0 to: 31 do: [:reg| (registerMask anyMask: 1 << reg) ifTrue: [first ifFalse: [aStream space]. first := false. aStream nextPutAll: (backEnd nameForRegister: reg)]]]. aStream nextPut: $}; flush! Item was changed: ----- Method: TMethod>>argAssignmentsFor:send:in: (in category 'inlining') ----- argAssignmentsFor: meth send: aSendNode in: aCodeGen "Return a collection of assignment nodes that assign the given argument expressions to the formal parameter variables of the given method." "Optimization: If the actual parameters are either constants or local variables in the target method (the receiver), substitute them directly into the body of meth. Note that global variables cannot be subsituted because the inlined method might depend on the exact ordering of side effects to the globals." | stmtList substitutionDict argList | meth args size > (argList := aSendNode args) size ifTrue: [self assert: (meth args first beginsWith: 'self_in_'). argList := {aSendNode receiver}, aSendNode args]. stmtList := OrderedCollection new: argList size. substitutionDict := Dictionary new: argList size. meth args with: argList do: + [:argName :exprNode | | varNode | - [:argName :exprNode | (self isNode: exprNode substitutableFor: argName inMethod: meth in: aCodeGen) ifTrue: [substitutionDict at: argName put: (aCodeGen node: exprNode typeCompatibleWith: argName inliningInto: meth in: self). + locals remove: argName ifAbsent: [self assert: (argName beginsWith: 'self_in_')]. + declarations removeKey: argName ifAbsent: nil] + ifFalse: "Add an assignment for anything except an unused self_in_foo argument" + [varNode := TVariableNode new setName: argName. + ((argName beginsWith: 'self_in_') + and: [meth parseTree noneSatisfy: [:node| varNode isSameAs: node]]) ifFalse: + [stmtList addLast: + (TAssignmentNode new + setVariable: varNode + expression: (aCodeGen + node: exprNode copy + typeCompatibleWith: argName + inliningInto: meth + in: self))]]]. - locals remove: argName. - declarations removeKey: argName ifAbsent: nil] - ifFalse: - [stmtList addLast: - (TAssignmentNode new - setVariable: (TVariableNode new setName: argName) - expression: (aCodeGen - node: exprNode copy - typeCompatibleWith: argName - inliningInto: meth - in: self))]]. meth parseTree: (meth parseTree bindVariablesIn: substitutionDict). ^stmtList! Item was changed: ----- Method: TMethod>>inlineSend:directReturn:exitVar:in: (in category 'inlining') ----- inlineSend: aSendNode directReturn: directReturn exitVar: exitVar in: aCodeGen "Answer a collection of statements to replace the given send. directReturn indicates that the send is the expression in a return statement, so returns can be left in the body of the inlined method. If exitVar is nil, the value returned by the send is not used; thus, returns need not assign to the output variable. Types are propagated to as-yet-untyped variables when inlining a send that is assigned, otherwise the assignee variable type must match the return type of the inlinee. Return types are not propagated." + | sel meth methArgs exitLabel inlineStmts label exitType notToBeRenamed | - | sel meth methArgs exitLabel inlineStmts label exitType | sel := aSendNode selector. meth := aCodeGen methodNamed: sel. methArgs := meth args. "convenient for debugging..." aCodeGen maybeBreakForInlineOf: aSendNode in: self. + (methArgs notEmpty and: [methArgs first beginsWith: 'self_in_']) + ifTrue: + [notToBeRenamed := {methArgs first}. + methArgs := methArgs allButFirst] + ifFalse: + [notToBeRenamed := #()]. - (methArgs notEmpty and: [methArgs first beginsWith: 'self_in_']) ifTrue: - [methArgs := methArgs allButFirst]. methArgs size = aSendNode args size ifFalse: [^nil]. meth := meth copy. (meth statements size > 1 and: [meth statements first isSend and: [meth statements first selector == #flag:]]) ifTrue: [meth statements removeFirst]. "Propagate the return type of an inlined method" (directReturn or: [exitVar notNil]) ifTrue: [exitType := directReturn ifTrue: [returnType] ifFalse: [(self typeFor: exitVar in: aCodeGen) ifNil: [#sqInt]]. (exitType = #void or: [exitType = meth returnType]) ifFalse: [meth propagateReturnIn: aCodeGen]]. "Propagate any unusual argument types to untyped argument variables" methArgs with: aSendNode args do: [:formal :actual| (meth declarationAt: formal ifAbsent: nil) ifNil: [(self typeFor: actual in: aCodeGen) ifNotNil: [:type| type ~= #sqInt ifTrue: [meth declarationAt: formal put: (type last = $* ifTrue: [type, formal] ifFalse: [type, ' ', formal])]]]]. + meth renameVarsForInliningInto: self except: notToBeRenamed in: aCodeGen. - meth renameVarsForInliningInto: self except: #() in: aCodeGen. meth renameLabelsForInliningInto: self. + self addVarsDeclarationsAndLabelsOf: meth except: notToBeRenamed. - self addVarsDeclarationsAndLabelsOf: meth except: #(). meth hasReturn ifTrue: [directReturn ifFalse: [exitLabel := self unusedLabelForInliningInto: self. (meth exitVar: exitVar label: exitLabel) "is label used?" ifTrue: [ labels add: exitLabel ] ifFalse: [ exitLabel := nil ]]]. (inlineStmts := OrderedCollection new: meth statements size + meth args size + 2) add: (label := TLabeledCommentNode new setComment: 'begin ', sel); addAll: (self argAssignmentsFor: meth send: aSendNode in: aCodeGen); addAll: meth statements. "method body" directReturn ifTrue: [meth endsWithReturn ifTrue: [exitVar ifNotNil: "don't remove the returns if being invoked in the context of a return" [inlineStmts at: inlineStmts size put: inlineStmts last copyWithoutReturn]] ifFalse: [inlineStmts add: (TReturnNode new setExpression: (TVariableNode new setName: 'nil'))]]. exitLabel ifNotNil: [inlineStmts add: (TLabeledCommentNode new setLabel: exitLabel comment: 'end ', meth selector)]. inlineStmts size = 1 ifTrue: "Nuke empty methods; e.g. override of flushAtCache" [self assert: inlineStmts first isComment. inlineStmts removeFirst]. ^inlineStmts! Item was changed: + ----- Method: TVariableNode>>hasSideEffect (in category 'testing') ----- - ----- Method: TVariableNode>>hasSideEffect (in category 'as yet unclassified') ----- hasSideEffect "Answer if the parse tree rooted at this node has a side-effect or not." ^false!

1 0

VM Maker: VMMaker.oscog-eem.2206.mcz
by commits＠source.squeak.org 04 May '17

04 May '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2206.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2206 Author: eem Time: 4 May 2017, 11:54:12.797765 am UUID: 057f2258-7a2e-45e2-a425-7329bb4306ce Ancestors: VMMaker.oscog-eem.2205 Fix the ARM regression introduced in VMMaker.oscog-eem.2160. On ARM the link register must be saved and restored around the call to the ceNewHash trampoline in the identityHash primitive. Add a convenience to test loading of the B3DAcceleratorPlugin. =============== Diff against VMMaker.oscog-eem.2205 =============== Item was added: + ----- Method: B3DAcceleratorPlugin class>>testLoadPlugin (in category 'testing') ----- + testLoadPlugin + "B3DAcceleratorPlugin testLoadPlugin" + <primitive: 'primitiveRendererVersion' module: 'B3DAcceleratorPlugin' error: ec> + self primitiveFailed! Item was changed: ----- Method: CogARMCompiler>>genDivR:R:Quo:Rem: (in category 'abstract instructions') ----- genDivR: abstractRegDivisor R: abstractRegDividend Quo: abstractRegQuotient Rem: abstractRegRemainder "Currently no instruction level support for divide on ARM. See also #canDivQuoRem" | rDividend rDivisor rQuotient rRemainder divRemFunctionAddr | <var: #divRemFunctionAddr type: #usqInt> self assert: abstractRegDividend ~= abstractRegDivisor. self assert: abstractRegQuotient ~= abstractRegRemainder. rDividend := abstractRegDividend. rDivisor := abstractRegDivisor. rDividend = CArg0Reg ifFalse: ["we need to move the value in rDividend to CArg0Reg. Best to double check if rDivisor is already using it first" rDivisor = CArg0Reg ifTrue: "oh dear; we also need to move rDivisor's value out of the way first.. I'll move it to CArg1Reg and if some nitwit has managed to put rDividend there they deserve the crash" [rDividend = CArg1Reg ifTrue: [self error: 'register choices in genDivR:R:Quo:Rem: made life impossible']. cogit MoveR: rDivisor R: CArg1Reg. "and update rDivisor or we get buggerd by the next clause" rDivisor := CArg1Reg]. cogit MoveR: rDividend R: CArg0Reg]. rDivisor = CArg1Reg ifFalse: [cogit MoveR: rDivisor R: CArg1Reg]. divRemFunctionAddr := self aeabiDivModFunctionAddr. + self saveAndRestoreLinkRegAround: - cogit backEnd saveAndRestoreLinkRegAround: [cogit CallFullRT: (self cCode: [divRemFunctionAddr asUnsignedInteger] inSmalltalk: [cogit simulatedTrampolineFor: divRemFunctionAddr]) registersToBeSavedMask: (cogit registerMaskFor: CArg2Reg and: CArg3Reg)]. "Now we need to move the r0/1 results back to rQuotient & rRemainder" rQuotient := abstractRegQuotient. rRemainder := abstractRegRemainder. rQuotient = CArg0Reg ifFalse: "oh good grief, not again" [cogit MoveR: CArg0Reg R: rQuotient. rQuotient = CArg1Reg ifTrue: [self error: 'register choices in genDivR:R:Quo:Rem: made life impossible'] ]. rRemainder = CArg1Reg ifFalse: [cogit MoveR: CArg1Reg R: rRemainder] ! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genPrimitiveIdentityHash (in category 'primitive generators') ----- genPrimitiveIdentityHash "Arguably we should fail for immediates, but so far no one has complained, so..." | jumpImm jumpSI jumpNotSet ret | <var: #jumpSI type: #'AbstractInstruction *'> <var: #jumpImm type: #'AbstractInstruction *'> <var: #jumpNotSet type: #'AbstractInstruction *'> jumpImm := self genJumpImmediate: ReceiverResultReg. self genGetHashFieldNonImmOf: ReceiverResultReg asSmallIntegerInto: TempReg. cogit CmpCq: ConstZero R: TempReg. jumpNotSet := cogit JumpZero: 0. cogit MoveR: TempReg R: ReceiverResultReg. ret := cogit genPrimReturn. jumpImm jmpTarget: cogit Label. jumpSI := self genJumpSmallInteger: ReceiverResultReg. jumpSI jmpTarget: ret. self genConvertCharacterToSmallIntegerInReg: ReceiverResultReg. cogit Jump: ret. jumpNotSet jmpTarget: cogit Label. "For non-behaviors we can call ceNewHash to assign a fresh hash. For behaviors we must fail into the interpreter primitive to enter the receiver into the class table." cogit getPrimitiveIndex = 75 ifFalse: [^0]. + cogit backEnd saveAndRestoreLinkRegAround: + [cogit CallRT: ceNewHashTrampoline]. + cogit genPrimReturn. - cogit - CallRT: ceNewHashTrampoline; - genPrimReturn. ^UnfailingPrimitive! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveIdentityHash (in category 'primitive generators') ----- genPrimitiveIdentityHash "Arguably we should fail for immediates, but so far no one has complained, so..." | jumpImm jumpNotSet jumpNotCharacter ret | <var: #jumpImm type: #'AbstractInstruction *'> <var: #jumpNotSet type: #'AbstractInstruction *'> <var: #jumpNotCharacter type: #'AbstractInstruction *'> jumpImm := self genJumpImmediate: ReceiverResultReg. "uses TstCqR" self genGetHashFieldNonImmOf: ReceiverResultReg asSmallIntegerInto: TempReg. cogit CmpCq: ConstZero R: TempReg. jumpNotSet := cogit JumpZero: 0. cogit MoveR: TempReg R: ReceiverResultReg. ret := cogit genPrimReturn. jumpImm jmpTarget: (cogit AndCq: objectMemory tagMask R: ReceiverResultReg R: TempReg). cogit CmpCq: objectMemory characterTag R: TempReg. jumpNotCharacter := cogit JumpNonZero: 0. self genConvertCharacterToSmallIntegerInReg: ReceiverResultReg. ret := cogit genPrimReturn. jumpNotCharacter jmpTarget: (cogit CmpCq: objectMemory smallFloatTag R: TempReg). cogit JumpNonZero: ret. self genConvertSmallFloatToSmallFloatHashAsIntegerInReg: ReceiverResultReg scratch: TempReg. cogit genPrimReturn. jumpNotSet jmpTarget: cogit Label. "For non-behaviors we can call ceNewHash to assign a fresh hash. For behaviors we must fail into the interpreter primitive to enter the receiver into the class table." cogit getPrimitiveIndex = 75 ifFalse: [^0]. + cogit backEnd saveAndRestoreLinkRegAround: + [cogit CallRT: ceNewHashTrampoline]. + cogit genPrimReturn. - cogit - CallRT: ceNewHashTrampoline; - genPrimReturn. ^UnfailingPrimitive!

1 0

Amazing ARM simulator experience
by Eliot Miranda 03 May '17

03 May '17

Hi All, just had to tell people about this morning's experience using the ARM simulator. I've been building Smalltalk VMs since 1983, so 33 years. My first on the Three Rivers PERQ was dog slow. My undergraduate project was done the the National Semiconductor 32016 based Whitechapel Computer Works workstation and its and 32032-based successor. This morning I was revamping register management in Cog's ARMv5/v6 back end, making more registers available by using two of the C argument registers for two of registers the Cogit assigns to various fixed tasks, and using store and load multiple instructions to save and restore concisely the registers around calls into the runtime. Remember the architecture here. The simulator generates ARM machine code into the ByteArray that re[resents the address space, holding all of generated machine code, a small C stack, and the Smalltalk heap. A plugin, derived from Gdb's ARM simulator written in C, interprets that machine code, running for a couple of milliseconds at a time in a loop, applying breakpoint calculations, and asserts on every call into the run-time, and that calls into the run-time and accesses of variables in the simulator is done by using illegal addresses in the generated machine code. Each illegal access causes the Gdb-derived machine code interpreter to return with an error, this error is turned into an exception, the handler for which maps the specific illegal address into a variable or message selector, accesses the variable or activates the message selector, providing the result, and allowing the execution to continue. In changing the register management I had a test case that worked, an image that prompted for an expression ands evaluated it, which worked both in the simulator and with the generated VM. But the real VM, crashed when used on a proper image. So to debug I started launching the real interactive image in the simulator. Well, the amazing experience is that that image, whose machine code is being _interpreted by a C program_ feels /faster/ than my 32016 based implementation back in 1984-ish. Quite amazing. I can open windows, type text, access source code (was playing with Message Names) etc. It's sluggish, but usable. Amazing how fast modern machines are. All on my 2012 vintage 2.2 Ghz Core i7 MacBook Pro. I'm blown away :-) _,,,^..^,,,_ best, Eliot

5 7

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2017