Branch: refs/heads/krono/highdpi-v2 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: ab162782ca1c21ee64ad49bbcf8288a4631beea7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ab162782ca1c21ee64a... Author: Tobias Pape tobias@netshed.de Date: 2017-06-14 (Wed, 14 Jun 2017)

Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m

Log Message: ----------- [osx/cg] fix bytesPerRow calculation

Commit: b2f1ff548b81b224e3c177a6cd3823e61e4b1bdf https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b2f1ff548b81b224e3c... Author: Tobias Pape tobias@netshed.de Date: 2017-06-14 (Wed, 14 Jun 2017)

Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXCGView.m

Log Message: ----------- [osx/cg] fix bytesPerRow calculation

Commit: 616711c42590a280a6abc6a8773a40cb2273ab09 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/616711c42590a280a6a... Author: Tobias Pape tobias@netshed.de Date: 2017-06-15 (Thu, 15 Jun 2017)

Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m

Log Message: ----------- [osx] avoid searching a string for os version info in attribute access

Commit: 8eb8143e33fdaf2b0d5b938b8386a1ecde00828c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8eb8143e33fdaf2b0d5... Author: Tobias Pape tobias@netshed.de Date: 2017-06-15 (Thu, 15 Jun 2017)

Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m

Log Message: ----------- Merge remote-tracking branch 'origin/Cog' into krono/highdpi-v2

* origin/Cog: [osx] avoid searching a string for os version info in attribute access [osx/cg] fix bytesPerRow calculation

Commit: db29f6214e325d97a245748aad27ff90b17e0e5c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/db29f6214e325d97a24... Author: Tobias Pape tobias@netshed.de Date: 2017-06-15 (Thu, 15 Jun 2017)

Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m

Log Message: ----------- [osx] fix guard, again

Commit: 3010e4465405f6ec7a289fc3a3d21eb324816a8f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3010e4465405f6ec7a2... Author: Eliot Miranda eliot.miranda@gmail.com Date: 2017-06-15 (Thu, 15 Jun 2017)

Changed paths: M build.macos64x64/squeak.sista.spur/Makefile 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/vm/sq.h 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/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/CroquetPlugin/CroquetPlugin.c M src/plugins/DSAPrims/DSAPrims.c M src/plugins/FFTPlugin/FFTPlugin.c M src/plugins/GeniePlugin/GeniePlugin.c M src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c M src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c M src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c M src/plugins/ScratchPlugin/ScratchPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/ZipPlugin/ZipPlugin.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.2243

StackInterpreter: Make statTenures, statAverageLivePagesWhenMapping & statMaxPageCountWhenMapping (parameters 11, 68 & 69) writable to allow easier profiling. Allow parameters expecting a float (statTenures, Sista CogCodeThreshold & statAverageLivePagesWhenMapping: 17, 55, 68) to take an int.

Slang: Fix a bug in inferTypesForImplicitlyTypedVariablesIn:. We cannot derive types from variables assigned to until all assignments are typed. So exclude variables assigned from as-yet-untyped methods. The old code would simply ignore the types from as-yet-untyped methods, hence leaving the variable with a chosen-at-random, unmerged type.

This fixes a number of cases. But there's still the weirdness that the return type of mapEndFor: in cogitX64SysV.c is correct (usqInt) but incorrect (sqInt) in cogitX64WIN64.c. Luckily this is benign, but still should be fixed asap.

Commit: f54456fc05c1846bb7e553c6ff5fec9f700abdae https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f54456fc05c1846bb7e... Author: Eliot Miranda eliot.miranda@gmail.com Date: 2017-06-21 (Wed, 21 Jun 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 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/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

Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2244

Spur: Fix regression in VMMaker.oscog-eem.2237. sufficientSpaceAfterGC: must compute heapSizePostGC using totalOldSpaceCapacity instead of the old broken segment-insensitive endOfMemory - nilObj, otherwise as soon as a segment is added it's quite possible that there will be a full GC after each scavenge.

Commit: 27f30ac001fff39a092b31c9d291f4dc3b4b3c9d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/27f30ac001fff39a092... Author: Eliot Miranda eliot.miranda@gmail.com Date: 2017-06-21 (Wed, 21 Jun 2017)

Changed paths: M platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m

Log Message: ----------- Fix premature termination of dir_Lookup enumeration on Mac OS X in prescence of .afpDeletedXXXXXXXX entries.

Commit: 249ce7858b81a2d7719648a0659afd63d84b9135 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/249ce7858b81a2d7719... Author: Eliot Miranda eliot.miranda@gmail.com Date: 2017-06-21 (Wed, 21 Jun 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 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/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/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: ----------- CogVm source as per VMMaker.oscog-eem.2245

Newspeak: For the Cadence debugger allow CompiledCode>>voidCogVMState to a) take an optional boolean which can be used to suppress the heap scan for contexts with machine code pcs into the receiver/method arg and b) function as a VMMirror primitive.

Hence extract the body of primitiveFlushCacheByMethod to flushMethodCacheForMethod:.

Commit: c85743b3259b5c1f6907250ccb28d4edff58d809 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c85743b3259b5c1f690... Author: Tobias Pape tobias@netshed.de Date: 2017-06-23 (Fri, 23 Jun 2017)

Changed paths: M build.macos32x86/common/Makefile.app M build.macos32x86/common/Makefile.app.squeak M build.macos32x86/pharo.cog.spur.lowcode/Makefile M build.macos32x86/pharo.cog.spur/Makefile M build.macos32x86/pharo.stack.spur.lowcode/Makefile M build.macos32x86/pharo.stack.spur/Makefile M build.macos64x64/common/Makefile.app M build.macos64x64/common/Makefile.app.squeak M build.macos64x64/pharo.cog.spur.lowcode/Makefile M build.macos64x64/pharo.cog.spur/Makefile M build.macos64x64/pharo.stack.spur.lowcode/Makefile M build.macos64x64/pharo.stack.spur/Makefile M platforms/iOS/vm/OSX/Squeak-Info.plist

Log Message: ----------- [iOS] rewrite the vm bundle identifier in common plist rewrite step

Commit: 54740ace432ae3eec1d1f114b4a5bdf4e960d900 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/54740ace432ae3eec1d... Author: Tobias Pape tobias@netshed.de Date: 2017-06-23 (Fri, 23 Jun 2017)

Changed paths: M build.macos32x86/common/Makefile.app M build.macos32x86/common/Makefile.plugin M build.macos64x64/common/Makefile.app

Log Message: ----------- [iOS] re-inline sed commands for plist rewrite

- necessary as var assignment is evaluate early in make, possibly before `getversion` has been built - should be safer than before the extraction tho - also, _actually_ rewrite VM_IDENTIFIER

Commit: 798fada5dce44afd5210ed8806327c937855cc71 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/798fada5dce44afd521... Author: Tobias Pape tobias@netshed.de Date: 2017-06-23 (Fri, 23 Jun 2017)

Changed paths: M build.macos32x86/common/Makefile.app M build.macos32x86/common/Makefile.app.squeak M build.macos32x86/common/Makefile.plugin M build.macos32x86/pharo.cog.spur.lowcode/Makefile M build.macos32x86/pharo.cog.spur/Makefile M build.macos32x86/pharo.stack.spur.lowcode/Makefile M build.macos32x86/pharo.stack.spur/Makefile M build.macos64x64/common/Makefile.app M build.macos64x64/common/Makefile.app.squeak M build.macos64x64/pharo.cog.spur.lowcode/Makefile M build.macos64x64/pharo.cog.spur/Makefile M build.macos64x64/pharo.stack.spur.lowcode/Makefile M build.macos64x64/pharo.stack.spur/Makefile M build.macos64x64/squeak.sista.spur/Makefile 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/vm/sq.h M platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m M platforms/iOS/vm/OSX/Squeak-Info.plist M platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m 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/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/CroquetPlugin/CroquetPlugin.c M src/plugins/DSAPrims/DSAPrims.c M src/plugins/FFTPlugin/FFTPlugin.c M src/plugins/GeniePlugin/GeniePlugin.c M src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c M src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c M src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c M src/plugins/ScratchPlugin/ScratchPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/ZipPlugin/ZipPlugin.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: ----------- Merge remote-tracking branch 'origin/Cog' into krono/highdpi-v2

* origin/Cog: [iOS] re-inline sed commands for plist rewrite [iOS] rewrite the vm bundle identifier in common plist rewrite step CogVm source as per VMMaker.oscog-eem.2245 Fix premature termination of dir_Lookup enumeration on Mac OS X in prescence of .afpDeletedXXXXXXXX entries. CogVM source as per VMMaker.oscog-eem.2244 CogVM source as per VMMaker.oscog-eem.2243 [osx] fix guard, again

Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/32f200b6d35d...798...