Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 555e1b510e5b40049dba86cf4cf7a6a126906cb5 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/555e1b510e5b40049db... Author: Eliot Miranda eliot.miranda@gmail.com Date: 2017-08-31 (Thu, 31 Aug 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 platforms/win32/plugins/FT2Plugin/Makefile.plugin 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/SoundPlugin/SoundPlugin.c

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

Spur: Simplify cleverSwapHeaders:and:copyHashFlag: via xor. Fix the type of currentAllocatedBytes given the Slang changes below.

Slang: Fix a regression caused by the Slang fixes in VMMaker.oscog-eem.2243. Since inferTypesForImplicitlyTypedVariablesIn: no longer sets the types of locals as it goes along (which was incorrect) we can no longer default the types of untyped variables to sqInt for the purposes of returnTypeForSend:in:ifNil:. To allow returnTypeForSend:in:ifNil: to answer nil for arithmetic on untyped expressions typeForArithmetic:in: uses TParseNode>>typeOrNilFrom:in: instead of CCodeGenerator>>typeFor:in: to avoid the defaulting. returnTypeForSend:in:ifNil: has been refactored to use the more direct TParseNode>>typeFrom:in: instead of CCodeGenerator>>typeFor:in: for clarity.

The regression caused Slang to fail to infer the types of remembered1/2 & hash1/2 in cleverSwapHeaders:and:copyHashFlag:. The new code correctly infers the types of remembered & hashBits as sqLong.

Plugins: Eliminate a couple of warnings in the SoundPlugin by using 0 instead of NULL.

Fix paths in the win32 FT2Plugin makefile.

Commit: 1102de6e73c378a5f647f35b131ed0a1609bc0dc https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1102de6e73c378a5f64... Author: Eliot Miranda eliot.miranda@gmail.com Date: 2017-08-31 (Thu, 31 Aug 2017)

Changed paths: M .appveyor.yml M build.win32x86/squeak.cog.spur/plugins.ext M build.win32x86/squeak.cog.v3/plugins.ext M build.win32x86/squeak.sista.spur/plugins.ext M build.win32x86/squeak.stack.spur/plugins.ext M build.win32x86/squeak.stack.v3/plugins.ext M build.win64x64/squeak.cog.spur/plugins.ext M build.win64x64/squeak.stack.spur/plugins.ext M platforms/Cross/plugins/SqueakSSL/SqueakSSL.h M platforms/iOS/plugins/SqueakSSL/sqMacSSL.c M platforms/win32/plugins/SqueakSSL/sqWin32SSL.c M third-party/libpng.spec.win

Log Message: ----------- Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm into Cog (CogVM source as per VMMaker.oscog-eem.2266)

Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/7aaf2d605d03...110...