Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2172.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.2172
Author: eem
Time: 20 March 2017, 10:12:21.670216 am
UUID: 645291b4-9730-4d8f-aba0-ef17ec4f03dd
Ancestors: VMMaker.oscog-eem.2171
Cogit:
Make the selection criterion
#if SysVABI && (...)
#elif WIN64ABI && (...)
instead of the weaker #if defined(SysV) && (...).
=============== Diff against VMMaker.oscog-eem.2171 ===============
Item was changed:
----- Method: Cogit class>>generateCodeStringForCogitDotC (in category 'translation') -----
generateCodeStringForCogitDotC
"Generate a skeletal cogit.c that includes the relevant cogitFOO.c
for the appropriate subclasses of CogAbstractInstruction."
^String streamContents:
[:s|
s nextPutAll: '/* Automatically generated by\ ' withCRs.
s nextPutAll: (CCodeGenerator monticelloDescriptionFor: self).
s cr; nextPutAll: ' */'.
s cr; cr; nextPut: $#.
self translateableInstructionSubclassesAndInstalledOptionsDo:
[:class | | abi |
s nextPutAll: 'if '.
(abi := initializationOptions at: #ABI ifAbsent: []) ifNotNil:
+ [s nextPutAll: abi; nextPutAll: 'ABI && ('].
- [s nextPutAll: 'defined('; nextPutAll: abi; nextPutAll: ') && ('].
class identifyingPredefinedMacros
do: [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPut: $)]
separatedBy: [s nextPutAll: ' || '].
abi ifNotNil: [s nextPut: $)].
s cr; cr; nextPutAll: '# include "'; nextPutAll: class moduleName; nextPutAll: '.c"'.
s cr; cr; nextPutAll: '#el'].
s nextPutAll: 'se'.
#( 'As yet no Cogit implementation appears to exist for your platform.'
'Consider implementing it, starting by adding a subclass of CogAbstractInstruction.') do:
[:msg| s cr; nextPutAll: '# error '; nextPutAll: msg].
s cr; nextPutAll: '#endif'; cr]!
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2170.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.2170
Author: eem
Time: 20 March 2017, 9:48:01.637419 am
UUID: 452a2719-74af-4669-b228-3ad41ad1342d
Ancestors: VMMaker.oscog-eem.2169
Cogit:
And don't get hung up if no #ABI is defined.
=============== Diff against VMMaker.oscog-eem.2169 ===============
Item was changed:
----- Method: Cogit class>>generateCodeStringForCogitDotC (in category 'translation') -----
generateCodeStringForCogitDotC
"Generate a skeletal cogit.c that includes the relevant cogitFOO.c
for the appropriate subclasses of CogAbstractInstruction."
^String streamContents:
[:s|
s nextPutAll: '/* Automatically generated by\ ' withCRs.
s nextPutAll: (CCodeGenerator monticelloDescriptionFor: self).
s cr; nextPutAll: ' */'.
s cr; cr; nextPut: $#.
self translateableInstructionSubclassesAndInstalledOptionsDo:
[:class | | abi |
s nextPutAll: 'if '.
+ (abi := initializationOptions at: #ABI ifAbsent: []) ifNotNil:
- (abi := initializationOptions at: #ABI) ifNotNil:
[s nextPutAll: 'defined('; nextPutAll: abi; nextPutAll: ') && ('].
class identifyingPredefinedMacros
do: [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPut: $)]
separatedBy: [s nextPutAll: ' || '].
abi ifNotNil: [s nextPut: $)].
s cr; cr; nextPutAll: '# include "'; nextPutAll: class moduleName; nextPutAll: '.c"'.
s cr; cr; nextPutAll: '#el'].
s nextPutAll: 'se'.
#( 'As yet no Cogit implementation appears to exist for your platform.'
'Consider implementing it, starting by adding a subclass of CogAbstractInstruction.') do:
[:msg| s cr; nextPutAll: '# error '; nextPutAll: msg].
s cr; nextPutAll: '#endif'; cr]!
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2169.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.2169
Author: eem
Time: 20 March 2017, 9:45:05.711372 am
UUID: a16519ac-b854-4fbe-8526-8b6ce4df6d1d
Ancestors: VMMaker.oscog-eem.2168
Cogit:
Remember to test the ABI before including the relevant API-specific cogit file.
=============== Diff against VMMaker.oscog-eem.2168 ===============
Item was changed:
----- Method: Cogit class>>generateCodeStringForCogitDotC (in category 'translation') -----
generateCodeStringForCogitDotC
"Generate a skeletal cogit.c that includes the relevant cogitFOO.c
for the appropriate subclasses of CogAbstractInstruction."
^String streamContents:
[:s|
s nextPutAll: '/* Automatically generated by\ ' withCRs.
s nextPutAll: (CCodeGenerator monticelloDescriptionFor: self).
s cr; nextPutAll: ' */'.
s cr; cr; nextPut: $#.
self translateableInstructionSubclassesAndInstalledOptionsDo:
+ [:class | | abi |
- [:class |
s nextPutAll: 'if '.
+ (abi := initializationOptions at: #ABI) ifNotNil:
+ [s nextPutAll: 'defined('; nextPutAll: abi; nextPutAll: ') && ('].
class identifyingPredefinedMacros
do: [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPut: $)]
separatedBy: [s nextPutAll: ' || '].
+ abi ifNotNil: [s nextPut: $)].
s cr; cr; nextPutAll: '# include "'; nextPutAll: class moduleName; nextPutAll: '.c"'.
s cr; cr; nextPutAll: '#el'].
s nextPutAll: 'se'.
#( 'As yet no Cogit implementation appears to exist for your platform.'
'Consider implementing it, starting by adding a subclass of CogAbstractInstruction.') do:
[:msg| s cr; nextPutAll: '# error '; nextPutAll: msg].
s cr; nextPutAll: '#endif'; cr]!
Branch: refs/heads/Cog
Home: https://github.com/OpenSmalltalk/opensmalltalk-vm
Commit: 2e46c8cc2f9300af05e131829f3f5669c33570f4
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2e46c8cc2f9300af05…
Author: Eliot Miranda <eliot.miranda(a)gmail.com>
Date: 2017-03-19 (Sun, 19 Mar 2017)
Changed paths:
M platforms/unix/vm/aio.c
M platforms/unix/vm/sqaio.h
Log Message:
-----------
addIdleUsecs must be defined local to aio.h to avoid conflicts
with the sq.h define in other fils that include sqaio.h.
Branch: refs/heads/Cog
Home: https://github.com/OpenSmalltalk/opensmalltalk-vm
Commit: db76be5eca9b3de7279bf64092b8a7e8463fcb41
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/db76be5eca9b3de727…
Author: Eliot Miranda <eliot.miranda(a)gmail.com>
Date: 2017-03-19 (Sun, 19 Mar 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 platforms/unix/vm/aio.c
M platforms/win32/vm/sqWin32Window.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.2167
StackInterpreter:
Add the statIdleUsecs parameter to track time in the internals of
ioRelinquishProcessorForMicroseconds and hence allow the system reporter to
render the GC times meaningful. Platform code invokes addIdleUsecs to tally
idle time.
Commit: 04a5b2e626ad27e0e0577860697ba067bb6a8c37
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/04a5b2e626ad27e0e0…
Author: Eliot Miranda <eliot.miranda(a)gmail.com>
Date: 2017-03-19 (Sun, 19 Mar 2017)
Changed paths:
M .appveyor.yml
M .travis_build.sh
M build.linux32ARMv6/editpharoinstall.sh
R build.linux32ARMv6/mkNamedPrims.sh
M build.linux32ARMv6/pharo.cog.spur/build.assert/mvm
M build.linux32ARMv6/pharo.cog.spur/build.debug/mvm
M build.linux32ARMv6/pharo.cog.spur/build/mvm
R build.linux32ARMv7/mkNamedPrims.sh
M build.linux32x86/editpharoinstall.sh
R build.linux32x86/mkNamedPrims.sh
M build.linux32x86/pharo.cog.spur/build.assert.itimerheartbeat/mvm
M build.linux32x86/pharo.cog.spur/build.assert/mvm
M build.linux32x86/pharo.cog.spur/build.debug.itimerheartbeat/mvm
M build.linux32x86/pharo.cog.spur/build.debug/mvm
M build.linux32x86/pharo.cog.spur/build.itimerheartbeat/mvm
M build.linux32x86/pharo.cog.spur/build/mvm
M build.linux32x86/third-party/Makefile.libgit2
M build.linux32x86/third-party/Makefile.libssh2
A build.linux32x86/third-party/Makefile.openssl
M build.linux64x64/editpharoinstall.sh
R build.linux64x64/mkNamedPrims.sh
M build.linux64x64/pharo.cog.spur/build.assert.itimerheartbeat/mvm
M build.linux64x64/pharo.cog.spur/build.assert/mvm
M build.linux64x64/pharo.cog.spur/build.debug.itimerheartbeat/mvm
M build.linux64x64/pharo.cog.spur/build.debug/mvm
M build.linux64x64/pharo.cog.spur/build.itimerheartbeat/mvm
M build.linux64x64/pharo.cog.spur/build/mvm
A build.linux64x64/third-party/Makefile.openssl
M build.win32x86/common/Makefile.lib.extra
M build.win32x86/pharo.cog.spur.lowcode/Makefile
M build.win32x86/pharo.cog.spur.lowcode/Pharo.exe.manifest
M build.win32x86/pharo.cog.spur.lowcode/Pharo.rc
M build.win32x86/pharo.cog.spur.lowcode/mvm
M build.win32x86/pharo.cog.spur/Makefile
M build.win32x86/pharo.cog.spur/mvm
M build.win32x86/third-party/Makefile.cairo
M build.win32x86/third-party/Makefile.freetype2
M build.win32x86/third-party/Makefile.libgcc
M build.win32x86/third-party/Makefile.libgit2
M build.win32x86/third-party/Makefile.libpng
M build.win32x86/third-party/Makefile.libsdl2
M build.win32x86/third-party/Makefile.libssh2
M build.win32x86/third-party/Makefile.openssl
M build.win32x86/third-party/Makefile.pixman
M build.win32x86/third-party/Makefile.pkgconfig
M build.win32x86/third-party/Makefile.zlib
A build.win32x86/third-party/Toolchain-cross-mingw32-cygwin.cmake
M build.win64x64/common/Makefile
A build.win64x64/common/Makefile.lib.extra
M build.win64x64/common/Makefile.tools
A build.win64x64/pharo.stack.spur/Makefile
A build.win64x64/pharo.stack.spur/Pharo.def.in
A build.win64x64/pharo.stack.spur/Pharo.exe.manifest
A build.win64x64/pharo.stack.spur/Pharo.ico
A build.win64x64/pharo.stack.spur/Pharo.rc
A build.win64x64/pharo.stack.spur/mvm
A build.win64x64/pharo.stack.spur/plugins.ext
A build.win64x64/pharo.stack.spur/plugins.int
A build.win64x64/third-party/Makefile.cairo
A build.win64x64/third-party/Makefile.freetype2
A build.win64x64/third-party/Makefile.libgcc
A build.win64x64/third-party/Makefile.libgit2
A build.win64x64/third-party/Makefile.libpng
A build.win64x64/third-party/Makefile.libsdl2
A build.win64x64/third-party/Makefile.libssh2
A build.win64x64/third-party/Makefile.openssl
A build.win64x64/third-party/Makefile.pixman
A build.win64x64/third-party/Makefile.pkgconfig
A build.win64x64/third-party/Makefile.zlib
A build.win64x64/third-party/Toolchain-cross-mingw32-cygwin.cmake
M platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m
M platforms/unix/plugins/SecurityPlugin/sqUnixSecurity.c
M platforms/unix/vm/Makefile.in
M platforms/unix/vm/sqUnixHeartbeat.c
M platforms/win32/plugins/Mpeg3Plugin/Makefile.win32
M platforms/win32/plugins/SqueakSSL/Makefile
M platforms/win32/plugins/SqueakSSL/Makefile.plugin
M third-party/cairo.spec
M third-party/freetype2.spec
M third-party/libpng.spec.win
M third-party/libsdl2.spec
M third-party/libssh2.spec
M third-party/openssl.spec
M third-party/zlib.spec
Log Message:
-----------
Merge branches 'Cog' and 'Cog' of http://www.github.com/opensmalltalk/vm into Cog
Commit: 2f5db6f37680611c0aea049d9998ded218a97c80
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2f5db6f37680611c0a…
Author: Eliot Miranda <eliot.miranda(a)gmail.com>
Date: 2017-03-19 (Sun, 19 Mar 2017)
Changed paths:
M platforms/Cross/vm/sq.h
M platforms/unix/vm/sqaio.h
Log Message:
-----------
And delare addIdleUsecs.
Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/5e12763cb759...2f…