Vm-dev June 2014

vm-dev@lists.squeakfoundation.org

37 participants
268 discussions

CMakeProject update--in midst of major refactoring
by gettimothy 06 Jun '14

06 Jun '14

Hi All You will want to hold off testing until I get this re-factoring sweep done. The pharo configurations I ported do not adhere to the build requirements --assert, assert threaded heartbeat, debug, etc--that Eliot requires. I am in the process of implementing that now. While the configurations that existed prior to the refactoring sweep still work (although, their names have changed to protect the innocent) it is not inuitive to find them at the moment. I will send an update when its back to being user-friendly. cheers. tty

1 0

VM Maker: CMakeVMMakerSqueak-tty.31.mcz
by commits＠source.squeak.org 06 Jun '14

06 Jun '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.31.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.31 Author: tty Time: 5 June 2014, 7:53:28.36 pm UUID: cf5e67be-d8ac-48f1-aeef-0719ecbe67b2 Ancestors: CMakeVMMakerSqueak-tty.30 Start creating Builders and Configs to match flat build tree. =============== Diff against CMakeVMMakerSqueak-tty.30 =============== Item was changed: Linux32x86SqueakCogV3Config subclass: #Linux32x86SqueakCogV3NoGLConfig instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Linux32x86'! - category: 'CMakeVMMakerSqueak-Linuxx86_64-32Compatibility'! !Linux32x86SqueakCogV3NoGLConfig commentStamp: 'tty 5/23/2014 19:49' prior: 0! A slightly modified configuration, which avoids linking with openGL libraries. For more information, check the class comments of all the superclasses. Usage: SqueakCogUnixNoGLConfig generateWithSources. Or: SqueakCogUnixNoGLConfig generate! Item was changed: ----- Method: SqueakBSDCogV3Config>>buildDirName (in category 'as yet unclassified') ----- buildDirName + self subclassResponsibility! - ^ 'cmake_unixbuild/bld'! Item was added: + Object subclass: #SqueakBSDX86Builder + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Builder'! + + !SqueakBSDX86Builder commentStamp: '<historical>' prior: 0! + I serve as a facade to ease building Cog VM with CMakeVMMakerSqueak configs + + ! Item was added: + ----- Method: SqueakBSDX86Builder class>>buildBSD (in category 'building') ----- + buildBSD + ^ self new buildBSD! Item was added: + ----- Method: SqueakBSDX86Builder class>>buildDirNameForBSD (in category 'documentation') ----- + buildDirNameForBSD + ^ self new buildDirNameForBSD! Item was added: + ----- Method: SqueakBSDX86Builder>>buildBSD (in category 'building') ----- + buildBSD + SqueakFreeBSDCogV3Config new + addExternalPlugins: #( FT2Plugin ); + addInternalPlugins: #( UnixOSProcessPlugin ); + generateSources; generate. + ! Item was added: + ----- Method: SqueakBSDX86Builder>>buildDirNameForBSD (in category 'building') ----- + buildDirNameForBSD + ^SqueakFreeBSDCogV3Config new buildDirName + ! Item was added: + ----- Method: SqueakBSDX86Builder>>initialize (in category 'initialization') ----- + initialize + + "a stupid temporary hack to workaround initialization problems" + + Cogit allSubclassesDo: [ :each | each initializeWithOptions: (VMMaker new instVarNamed: 'optionsDictionary') ]! Item was removed: - Object subclass: #SqueakCogSpurBuilder - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Builder'! Item was removed: - ----- Method: SqueakCogSpurBuilder>>todo (in category 'as yet unclassified') ----- - todo - self flag:'tty' - "massive refactor this to support assert, debug, i-timer, mt and production builds"! Item was removed: - Object subclass: #SqueakCogV3Builder - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Builder'! - - !SqueakCogV3Builder commentStamp: 'tty 5/23/2014 17:56' prior: 0! - I serve as a facade to ease building Cog VM with CMakeVMMakerSqueak configs - - ! Item was removed: - ----- Method: SqueakCogV3Builder class>>build (in category 'building') ----- - build - " self build " - "build for platform we're currently running on" - | platform | - - platform := Smalltalk os platformName. - - platform = 'Win32' ifTrue: [ ^ self buildWin32 ]. - platform = 'Mac OS' ifTrue: [ ^ self buildMacOSX32 ]. - platform = 'unix' ifTrue: [ ^ self buildUnix32 ].! Item was removed: - ----- Method: SqueakCogV3Builder class>>buildMacOSX32 (in category 'building') ----- - buildMacOSX32 - ^ self new buildMacOSX32! Item was removed: - ----- Method: SqueakCogV3Builder class>>buildOnJenkins: (in category 'building') ----- - buildOnJenkins: aPlatformName - "entry point for jenkins build jobs. - currently we use following names: - win - mac - linux - - " - - aPlatformName = 'win' ifTrue: [ ^ self buildWin32 ]. - aPlatformName = 'mac' ifTrue: [ ^ self buildMacOSX32 ]. - aPlatformName = 'linux' ifTrue: [ ^ self buildUnix32 ]. - - self error: 'no suitable platform'! Item was removed: - ----- Method: SqueakCogV3Builder class>>buildUnix32 (in category 'building') ----- - buildUnix32 - ^ self new buildUnix32! Item was removed: - ----- Method: SqueakCogV3Builder class>>buildWin32 (in category 'building') ----- - buildWin32 - ^ self new buildWin32! Item was removed: - ----- Method: SqueakCogV3Builder>>buildMacOSX32 (in category 'building') ----- - buildMacOSX32 - - SqueakCocoaIOSCogV3MultiThreadedConfig new - generateForRelease; - "generateForDebug;" - addExternalPlugins: #( FT2Plugin ); - addInternalPlugins: #( UnixOSProcessPlugin ); - generateSources; generate. - ! Item was removed: - ----- Method: SqueakCogV3Builder>>buildUnix32 (in category 'building') ----- - buildUnix32 - - Linux32x86SqueakCogV3MultiThreadedConfig new - " addExternalPlugins: #( FT2Plugin SqueakSSLPlugin );" - addExternalPlugins: #( SqueakSSLPlugin ); - addInternalPlugins: #( UnixOSProcessPlugin ); - generateSources; generate. - ! Item was removed: - ----- Method: SqueakCogV3Builder>>buildWin32 (in category 'building') ----- - buildWin32 - - Win32x86SqueakCogV3MultiThreadedConfig new - - addExternalPlugins: #( FT2Plugin SqueakSSLPlugin ); - addInternalPlugins: #( Win32OSProcessPlugin ); - - generateSources; generate. - ! Item was removed: - ----- Method: SqueakCogV3Builder>>initialize (in category 'initialization') ----- - initialize - - "a stupid temporary hack to workaround initialization problems" - - Cogit allSubclassesDo: [ :each | each initializeWithOptions: (VMMaker new instVarNamed: 'optionsDictionary') ]! Item was removed: - ----- Method: SqueakCogV3Builder>>todo (in category 'as yet unclassified') ----- - todo - self flag:'tty' - "massive refactor this to support assert, debug, i-timer, mt and production builds"! Item was added: + ----- Method: SqueakFreeBSDCogV3Config>>buildDirName (in category 'as yet unclassified') ----- + buildDirName + ^ 'cmake_build.linux32x86/squeak.cog.v3/bld'! Item was added: + Object subclass: #SqueakLinuxARMBuilder + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Builder'! + + !SqueakLinuxARMBuilder commentStamp: '<historical>' prior: 0! + I serve as a facade to ease building Cog VM with CMakeVMMakerSqueak configs + + ! Item was added: + ----- Method: SqueakLinuxARMBuilder class>>buildDirNameForLinux32 (in category 'documentation') ----- + buildDirNameForLinux32 + ^ self new buildDirNameForLinux32! Item was added: + ----- Method: SqueakLinuxARMBuilder class>>buildLinux32 (in category 'building') ----- + buildLinux32 + ^ self new buildLinux32! Item was added: + ----- Method: SqueakLinuxARMBuilder>>buildDirNameForBSD32 (in category 'documentation') ----- + buildDirNameForBSD32 + ^SqueakFreeBSDCogV3Config new buildDirName + ! Item was added: + ----- Method: SqueakLinuxARMBuilder>>buildStackV3CrossRaspbian (in category 'building') ----- + buildStackV3CrossRaspbian + + Linux32ARMv6StackV3CrossRaspbianConfig new + generateForRelease; + "generateForDebug;" + addExternalPlugins: #( FT2Plugin ); + addInternalPlugins: #( UnixOSProcessPlugin ); + generateSources; generate. + ! Item was added: + ----- Method: SqueakLinuxARMBuilder>>initialize (in category 'initialization') ----- + initialize + + "a stupid temporary hack to workaround initialization problems" + + Cogit allSubclassesDo: [ :each | each initializeWithOptions: (VMMaker new instVarNamed: 'optionsDictionary') ]! Item was added: + Object subclass: #SqueakLinuxX86Builder + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Builder'! + + !SqueakLinuxX86Builder commentStamp: 'tty 5/23/2014 17:56' prior: 0! + I serve as a facade to ease building Cog VM with CMakeVMMakerSqueak configs + + ! Item was added: + ----- Method: SqueakLinuxX86Builder class>>buildDirNameForLinux32 (in category 'documentation') ----- + buildDirNameForLinux32 + ^ self new buildDirNameForLinux32! Item was added: + ----- Method: SqueakLinuxX86Builder class>>buildLinux32 (in category 'building') ----- + buildLinux32 + ^ self new buildLinux32! Item was added: + ----- Method: SqueakLinuxX86Builder>>buildBSD32 (in category 'building') ----- + buildBSD32 + + SqueakFreeBSDCogV3Config new + generateForRelease; + "generateForDebug;" + addExternalPlugins: #( FT2Plugin ); + addInternalPlugins: #( UnixOSProcessPlugin ); + generateSources; generate. + ! Item was added: + ----- Method: SqueakLinuxX86Builder>>buildDirNameForBSD32 (in category 'documentation') ----- + buildDirNameForBSD32 + ^SqueakFreeBSDCogV3Config new buildDirName + ! Item was added: + ----- Method: SqueakLinuxX86Builder>>initialize (in category 'initialization') ----- + initialize + + "a stupid temporary hack to workaround initialization problems" + + Cogit allSubclassesDo: [ :each | each initializeWithOptions: (VMMaker new instVarNamed: 'optionsDictionary') ]! Item was removed: - Object subclass: #SqueakStackSpurBuilder - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Builder'! Item was removed: - ----- Method: SqueakStackSpurBuilder>>todo (in category 'as yet unclassified') ----- - todo - self flag:'tty' - "massive refactor this to support assert, debug, i-timer, mt and production builds"! Item was removed: - Object subclass: #SqueakStackV3Builder - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Builder'! - - !SqueakStackV3Builder commentStamp: 'tty 5/15/2014 10:04' prior: 0! - I serve as a facade to ease building Stack VM.! Item was removed: - ----- Method: SqueakStackV3Builder class>>build (in category 'building') ----- - build - " self build " - "build for platform we're currently running on" - | platform | - - platform := Smalltalk os platformName. - - platform = 'Win32' ifTrue: [ ^ self buildWin32 ]. - platform = 'Mac OS' ifTrue: [ ^ self buildMacOSX32 ]. - platform = 'unix' ifTrue: [ ^ self buildUnix32 ].! Item was removed: - ----- Method: SqueakStackV3Builder class>>buildMacOSX32 (in category 'building') ----- - buildMacOSX32 - ^ self new buildMacOSX32! Item was removed: - ----- Method: SqueakStackV3Builder class>>buildOnJenkins: (in category 'building') ----- - buildOnJenkins: aPlatformName - "entry point for jenkins build jobs. - currently we use following names: - win - mac - linux - raspberrypi - " - - aPlatformName = 'win' ifTrue: [ ^ self buildWin32 ]. - aPlatformName = 'mac' ifTrue: [ ^ self buildMacOSX32 ]. - aPlatformName = 'linux' ifTrue: [ ^ self buildUnix32 ]. - aPlatformName = 'raspberrypi' ifTrue: [ ^ self buildRaspberryPi ]. - - self error: 'no suitable platform'! Item was removed: - ----- Method: SqueakStackV3Builder class>>buildRaspberryPi (in category 'building') ----- - buildRaspberryPi - ^ self new buildRaspberryPiFBB! Item was removed: - ----- Method: SqueakStackV3Builder class>>buildSlackwareUnix64w32Libs (in category 'building') ----- - buildSlackwareUnix64w32Libs - ^ self new buildSlackwareUnix64w32Libs! Item was removed: - ----- Method: SqueakStackV3Builder class>>buildSlackwareUnix64w32LibsNoGL (in category 'building') ----- - buildSlackwareUnix64w32LibsNoGL - ^ self new buildSlackwareUnix64w32LibsNoGL! Item was removed: - ----- Method: SqueakStackV3Builder class>>buildUnix32 (in category 'building') ----- - buildUnix32 - ^ self new buildUnix32! Item was removed: - ----- Method: SqueakStackV3Builder class>>buildWin32 (in category 'building') ----- - buildWin32 - ^ self new buildWin32! Item was removed: - ----- Method: SqueakStackV3Builder>>buildMacOSX32 (in category 'building') ----- - buildMacOSX32 - - PharoSOSXConfig new - generateForRelease; - "generateForDebug;" - addExternalPlugins: #( FT2Plugin ); - addInternalPlugins: #( UnixOSProcessPlugin ); - generateSources; generate. - ! Item was removed: - ----- Method: SqueakStackV3Builder>>buildRaspberryPi (in category 'building') ----- - buildRaspberryPi - StackCrossRaspbianConfig new - generateSources; generate. - - ! Item was removed: - ----- Method: SqueakStackV3Builder>>buildRaspberryPiFBB (in category 'building') ----- - buildRaspberryPiFBB - StackCrossRaspbianFastBltConfig new - generateSources; generate. - ! Item was removed: - ----- Method: SqueakStackV3Builder>>buildSlackwareUnix64w32Libs (in category 'building') ----- - buildSlackwareUnix64w32Libs - Linux32x86SqueakStackV3SlackwareConfig new - addExternalPlugins: #( SqueakSSLPlugin ); - addInternalPlugins: #( UnixOSProcessPlugin ); - generateSources; generate. - ! Item was removed: - ----- Method: SqueakStackV3Builder>>buildSlackwareUnix64w32LibsNoGL (in category 'building') ----- - buildSlackwareUnix64w32LibsNoGL - Linux32x86SqueakStackV3SlackwareNoGLConfig new - addExternalPlugins: #( SqueakSSLPlugin ); - addInternalPlugins: #( UnixOSProcessPlugin ); - generateSources; generate. - ! Item was removed: - ----- Method: SqueakStackV3Builder>>buildUnix32 (in category 'building') ----- - buildUnix32 - - Linux32x86SqueakStackV3SlackwareConfig new - addExternalPlugins: #( FT2Plugin SqueakSSLPlugin ); - addInternalPlugins: #( UnixOSProcessPlugin ); - generateSources; generate. - ! Item was removed: - ----- Method: SqueakStackV3Builder>>buildWin32 (in category 'building') ----- - buildWin32 - - PharoSWindowsConfig new - addExternalPlugins: #( FT2Plugin SqueakSSLPlugin ); - addInternalPlugins: #( Win32OSProcessPlugin ); - generateSources; generate. - ! Item was removed: - ----- Method: SqueakStackV3Builder>>generateCMakeFilesDevForRaspberryPi (in category 'as yet unclassified') ----- - generateCMakeFilesDevForRaspberryPi - StackRaspbianFastBltConfig new - generate.! Item was removed: - ----- Method: SqueakStackV3Builder>>generateCMakeFilesForRaspberryPi (in category 'building') ----- - generateCMakeFilesForRaspberryPi - StackRaspbianConfig new - generate.! Item was removed: - ----- Method: SqueakStackV3Builder>>generateCMakeFilesForRaspberryPiFBB (in category 'building') ----- - generateCMakeFilesForRaspberryPiFBB - StackRaspbianFastBltConfig new - generate.! Item was removed: - ----- Method: SqueakStackV3Builder>>generateSourcesForRaspberryPi (in category 'building') ----- - generateSourcesForRaspberryPi - StackRaspbianConfig new - generateSources.! Item was removed: - ----- Method: SqueakStackV3Builder>>initialize (in category 'initialization') ----- - initialize - - "a stupid temporary hack to workaround initialization problems" - - Cogit allSubclassesDo: [ :each | each initializeWithOptions: (VMMaker new instVarNamed: 'optionsDictionary') ]! Item was removed: - ----- Method: SqueakStackV3Builder>>todo (in category 'as yet unclassified') ----- - todo - self flag:'tty' - "massive refactor this to support assert, debug, i-timer, mt and production builds"!

1 0

[commit][2948] Add -luuid to unix build LIBS where needed.
by commits＠squeakvm.org 06 Jun '14

06 Jun '14

Revision: 2948 Author: eliot Date: 2014-06-05 16:46:11 -0700 (Thu, 05 Jun 2014) Log Message: ----------- Add -luuid to unix build LIBS where needed. Modified Paths: -------------- branches/Cog/nsspurcogbuild/unixbuild/abld/mvm branches/Cog/nsspurcogbuild/unixbuild/abldt/mvm branches/Cog/nsspurcogbuild/unixbuild/bld/mvm branches/Cog/nsspurcogbuild/unixbuild/bldt/mvm branches/Cog/nsspurcogbuild/unixbuild/dbld/mvm branches/Cog/nsspurcogbuild/unixbuild/dbldt/mvm branches/Cog/spurcogbuild/unixbuild/abldt/mvm branches/Cog/spurcogbuild/unixbuild/bldt/mvm branches/Cog/spurcogbuild/unixbuild/dbldt/mvm branches/Cog/unixbuild/abld/mvm branches/Cog/unixbuild/abldt/mvm branches/Cog/unixbuild/bld/mvm branches/Cog/unixbuild/bldt/mvm branches/Cog/unixbuild/dbld/mvm branches/Cog/unixbuild/dbldt/mvm branches/Cog/unixbuild/mtbld/mvm branches/Cog/unixbuild/mtbldt/mvm Modified: branches/Cog/nsspurcogbuild/unixbuild/abld/mvm =================================================================== --- branches/Cog/nsspurcogbuild/unixbuild/abld/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/nsspurcogbuild/unixbuild/abld/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -18,7 +18,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g3 -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../../scripts/nukeversion rm -rf ../../../$INSTALLDIR Modified: branches/Cog/nsspurcogbuild/unixbuild/abldt/mvm =================================================================== --- branches/Cog/nsspurcogbuild/unixbuild/abldt/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/nsspurcogbuild/unixbuild/abldt/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -18,7 +18,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g3 -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../../scripts/nukeversion rm -rf ../../../$INSTALLDIR Modified: branches/Cog/nsspurcogbuild/unixbuild/bld/mvm =================================================================== --- branches/Cog/nsspurcogbuild/unixbuild/bld/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/nsspurcogbuild/unixbuild/bld/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -24,7 +24,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DCOGMTVM=0 -DITIMER_HEARTBEAT=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../../scripts/nukeversion rm -rf ../../../$INSTALLDIR Modified: branches/Cog/nsspurcogbuild/unixbuild/bldt/mvm =================================================================== --- branches/Cog/nsspurcogbuild/unixbuild/bldt/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/nsspurcogbuild/unixbuild/bldt/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -24,7 +24,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DCOGMTVM=0 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../../scripts/nukeversion rm -rf ../../../$INSTALLDIR Modified: branches/Cog/nsspurcogbuild/unixbuild/dbld/mvm =================================================================== --- branches/Cog/nsspurcogbuild/unixbuild/dbld/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/nsspurcogbuild/unixbuild/dbld/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -18,7 +18,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g3 -O0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=1" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../../scripts/nukeversion rm -rf ../../../$INSTALLDIR Modified: branches/Cog/nsspurcogbuild/unixbuild/dbldt/mvm =================================================================== --- branches/Cog/nsspurcogbuild/unixbuild/dbldt/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/nsspurcogbuild/unixbuild/dbldt/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -18,7 +18,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g3 -O0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=1" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../../scripts/nukeversion rm -rf ../../../$INSTALLDIR Modified: branches/Cog/spurcogbuild/unixbuild/abldt/mvm =================================================================== --- branches/Cog/spurcogbuild/unixbuild/abldt/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/spurcogbuild/unixbuild/abldt/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -13,7 +13,7 @@ test -f config.h || ../../../platforms/unix/config/configure --with-src=spursrc --with-plugins=src/plugins --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g3 -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../../scripts/nukeversion rm -rf ../../../$INSTALLDIR Modified: branches/Cog/spurcogbuild/unixbuild/bldt/mvm =================================================================== --- branches/Cog/spurcogbuild/unixbuild/bldt/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/spurcogbuild/unixbuild/bldt/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -19,7 +19,7 @@ test -f config.h || ../../../platforms/unix/config/configure --with-src=spursrc --with-plugins=src/plugins --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DCOGMTVM=0 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../../scripts/nukeversion rm -rf ../../../$INSTALLDIR Modified: branches/Cog/spurcogbuild/unixbuild/dbldt/mvm =================================================================== --- branches/Cog/spurcogbuild/unixbuild/dbldt/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/spurcogbuild/unixbuild/dbldt/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -13,7 +13,7 @@ test -f config.h || ../../../platforms/unix/config/configure --with-src=spursrc --with-plugins=src/plugins --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g3 -O0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DDEBUGVM=1" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../../scripts/nukeversion rm -rf ../../../$INSTALLDIR Modified: branches/Cog/unixbuild/abld/mvm =================================================================== --- branches/Cog/unixbuild/abld/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/unixbuild/abld/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -12,7 +12,7 @@ test -f config.h || ../../platforms/unix/config/configure --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g3 -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DCOGMTVM=0 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../scripts/nukeversion rm -rf ../../$INSTALLDIR Modified: branches/Cog/unixbuild/abldt/mvm =================================================================== --- branches/Cog/unixbuild/abldt/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/unixbuild/abldt/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -13,7 +13,7 @@ test -f config.h || ../../platforms/unix/config/configure --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g3 -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../scripts/nukeversion rm -rf ../../$INSTALLDIR Modified: branches/Cog/unixbuild/bld/mvm =================================================================== --- branches/Cog/unixbuild/bld/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/unixbuild/bld/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -18,7 +18,7 @@ test -f config.h || ../../platforms/unix/config/configure --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DCOGMTVM=0 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../scripts/nukeversion rm -rf ../../$INSTALLDIR Modified: branches/Cog/unixbuild/bldt/mvm =================================================================== --- branches/Cog/unixbuild/bldt/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/unixbuild/bldt/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -19,7 +19,7 @@ test -f config.h || ../../platforms/unix/config/configure --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DCOGMTVM=0 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../scripts/nukeversion rm -rf ../../$INSTALLDIR Modified: branches/Cog/unixbuild/dbld/mvm =================================================================== --- branches/Cog/unixbuild/dbld/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/unixbuild/dbld/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -12,7 +12,7 @@ test -f config.h || ../../platforms/unix/config/configure --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g3 -O0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DCOGMTVM=0 -DDEBUGVM=1" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../scripts/nukeversion rm -rf ../../$INSTALLDIR Modified: branches/Cog/unixbuild/dbldt/mvm =================================================================== --- branches/Cog/unixbuild/dbldt/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/unixbuild/dbldt/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -13,7 +13,7 @@ test -f config.h || ../../platforms/unix/config/configure --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g3 -O0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DDEBUGVM=1" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../scripts/nukeversion rm -rf ../../$INSTALLDIR Modified: branches/Cog/unixbuild/mtbld/mvm =================================================================== --- branches/Cog/unixbuild/mtbld/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/unixbuild/mtbld/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -19,7 +19,7 @@ --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DCOGMTVM=1 -DDEBUGVM=0 -DITIMER_HEARTBEAT=1" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../scripts/nukeversion rm -rf ../../$INSTALLDIR Modified: branches/Cog/unixbuild/mtbldt/mvm =================================================================== --- branches/Cog/unixbuild/mtbldt/mvm 2014-06-05 23:27:52 UTC (rev 2947) +++ branches/Cog/unixbuild/mtbldt/mvm 2014-06-05 23:46:11 UTC (rev 2948) @@ -19,7 +19,7 @@ --without-npsqueak \ CC="gcc -m32" \ CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DCOGMTVM=1 -DDEBUGVM=0" \ - LIBS=-lpthread \ + LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now ../../scripts/nukeversion rm -rf ../../$INSTALLDIR

1 0

[commit][2947] Fix the location of the mkNamedPrims. h script in the Unix makefile.
by commits＠squeakvm.org 06 Jun '14

06 Jun '14

Revision: 2947 Author: eliot Date: 2014-06-05 16:27:52 -0700 (Thu, 05 Jun 2014) Log Message: ----------- Fix the location of the mkNamedPrims.h script in the Unix makefile. It assumed it was in root/unixbuild, and that might not necessarily be checked-out. Instead assume it is in $(blddir)/.. which is where it exists currently. Eventually it may end up somewhere common between the builds. Modified Paths: -------------- branches/Cog/platforms/unix/vm/Makefile.in Modified: branches/Cog/platforms/unix/vm/Makefile.in =================================================================== --- branches/Cog/platforms/unix/vm/Makefile.in 2014-06-05 22:24:37 UTC (rev 2946) +++ branches/Cog/platforms/unix/vm/Makefile.in 2014-06-05 23:27:52 UTC (rev 2947) @@ -63,7 +63,7 @@ $(RANLIB) $(TARGET) $(blddir)/sqNamedPrims.h: $(vmmcfg)/plugins.int - $(topdir)/unixbuild/mkNamedPrims.sh $(vmmcfg)/plugins.int >$(blddir)/sqNamedPrims.h + $(blddir)/../mkNamedPrims.sh $(vmmcfg)/plugins.int >$(blddir)/sqNamedPrims.h # rebuild sqNamedPrims.o if sqNamedPrims.h changes

2 1

[commit][2946] Add missing plugins.int for the newspeak spur builds ( temporarily using the old
by commits＠squeakvm.org 06 Jun '14

06 Jun '14

Revision: 2946 Author: eliot Date: 2014-06-05 15:24:37 -0700 (Thu, 05 Jun 2014) Log Message: ----------- Add missing plugins.int for the newspeak spur builds (temporarily using the old build structure to quickly get builds going at Cadence). Added Paths: ----------- branches/Cog/nsspurcogbuild/unixbuild/abld/plugins.int branches/Cog/nsspurcogbuild/unixbuild/bld/plugins.int branches/Cog/nsspurcogbuild/unixbuild/dbld/plugins.int Added: branches/Cog/nsspurcogbuild/unixbuild/abld/plugins.int =================================================================== --- branches/Cog/nsspurcogbuild/unixbuild/abld/plugins.int (rev 0) +++ branches/Cog/nsspurcogbuild/unixbuild/abld/plugins.int 2014-06-05 22:24:37 UTC (rev 2946) @@ -0,0 +1,26 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int +INTERNAL_PLUGINS = \ +AsynchFilePlugin \ +BMPReadWriterPlugin \ +B2DPlugin \ +BitBltPlugin \ +DSAPrims \ +DropPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +ZipPlugin \ +JPEGReadWriter2Plugin \ +JPEGReaderPlugin \ +LargeIntegers \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +IA32ABI \ +RePlugin \ +SecurityPlugin \ +SocketPlugin \ +SurfacePlugin \ +UUIDPlugin \ +UnixOSProcessPlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/nsspurcogbuild/unixbuild/bld/plugins.int =================================================================== --- branches/Cog/nsspurcogbuild/unixbuild/bld/plugins.int (rev 0) +++ branches/Cog/nsspurcogbuild/unixbuild/bld/plugins.int 2014-06-05 22:24:37 UTC (rev 2946) @@ -0,0 +1,26 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int +INTERNAL_PLUGINS = \ +AsynchFilePlugin \ +BMPReadWriterPlugin \ +B2DPlugin \ +BitBltPlugin \ +DSAPrims \ +DropPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +ZipPlugin \ +JPEGReadWriter2Plugin \ +JPEGReaderPlugin \ +LargeIntegers \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +IA32ABI \ +RePlugin \ +SecurityPlugin \ +SocketPlugin \ +SurfacePlugin \ +UUIDPlugin \ +UnixOSProcessPlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/nsspurcogbuild/unixbuild/dbld/plugins.int =================================================================== --- branches/Cog/nsspurcogbuild/unixbuild/dbld/plugins.int (rev 0) +++ branches/Cog/nsspurcogbuild/unixbuild/dbld/plugins.int 2014-06-05 22:24:37 UTC (rev 2946) @@ -0,0 +1,26 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int +INTERNAL_PLUGINS = \ +AsynchFilePlugin \ +BMPReadWriterPlugin \ +B2DPlugin \ +BitBltPlugin \ +DSAPrims \ +DropPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +ZipPlugin \ +JPEGReadWriter2Plugin \ +JPEGReaderPlugin \ +LargeIntegers \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +IA32ABI \ +RePlugin \ +SecurityPlugin \ +SocketPlugin \ +SurfacePlugin \ +UUIDPlugin \ +UnixOSProcessPlugin \ +VMProfileLinuxSupportPlugin

1 0

VM Maker: CMakeVMMakerSqueak-tty.30.mcz
by commits＠source.squeak.org 05 Jun '14

05 Jun '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.30.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.30 Author: tty Time: 5 June 2014, 2:37:21.37 pm UUID: 5c2854c4-b3ce-4eac-b070-d12d1a870a39 Ancestors: CMakeVMMakerSqueak-tty.29 Added plugins per Cog SVN Revision: 2944 =============== Diff against CMakeVMMakerSqueak-tty.29 =============== Item was added: + ----- Method: Linux32x86SqueakCogSpurConfig>>defaultExternalPlugins (in category 'as yet unclassified') ----- + defaultExternalPlugins + ^ #(#B3DAcceleratorPlugin + #BochsIA32Plugin + #SqueakFFIPrims + #SqueakSSL + #LocalePlugin + #UnixOSProcessPlugin + #UUIDPlugin)! Item was added: + ----- Method: Linux32x86SqueakCogSpurConfig>>defaultInternalPlugins (in category 'as yet unclassified') ----- + defaultInternalPlugins + ^ #(#AsynchFilePlugin + #BMPReadWriterPlugin + #B2DPlugin + #BitBltPlugin + #DSAPrims + #DropPlugin + #FileCopyPlugin + #FilePlugin + #FloatArrayPlugin + #FloatMathPlugin + #ZipPlugin + #JPEGReadWriter2Plugin + #JPEGReaderPlugin + #LargeIntegers + #Matrix2x3Plugin + #MiscPrimitivePlugin + #IA32ABI + #RePlugin + #SecurityPlugin + #SocketPlugin + #SurfacePlugin + #UUIDPlugin + #UnixOSProcessPlugin + #VMProfileLinuxSupportPlugin)!

1 0

VM Maker: VMMaker.oscog-eem.758.mcz
by commits＠source.squeak.org 05 Jun '14

05 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.758.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.758 Author: eem Time: 5 June 2014, 11:04:57.241 am UUID: 3bc64804-8b12-4805-88ce-04abe88bde24 Ancestors: VMMaker.oscog-eem.757 Add link reg pushing code to the PIC aborts that matches that in the method abort. =============== Diff against VMMaker.oscog-eem.757 =============== Item was changed: CogClass subclass: #Cogit + instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent usesMethodClass primitiveIndex backEnd callerSavedRegMask postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss sendMissCall missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset mnuCall interpretCall interpretLabel endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxMethodBefore maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceEnterCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCEEnterCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB' - instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent usesMethodClass primitiveIndex backEnd callerSavedRegMask postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss sendMissCall missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset mnuCall interpretCall endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxMethodBefore maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceEnterCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCEEnterCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB' classVariableNames: 'AltBlockCreationBytecodeSize AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumSendTrampolines NumTrampolines ProcessorClass UnimplementedPrimitive YoungSelectorInPIC' poolDictionaries: 'CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 2/13/2013 15:37' prior: 0! I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib) I have concrete subclasses that implement different levels of optimization: SimpleStackBasedCogit is the simplest code generator. StackToRegisterMappingCogit is the current production code generator It defers pushing operands to the stack until necessary and implements a register-based calling convention for low-arity sends. StackToRegisterMappingCogit is an experimental code generator with support for counting conditional branches, intended to support adaptive optimization. coInterpreter <CoInterpreterSimulator> the VM's interpreter with which I cooperate methodZoneManager <CogMethodZoneManager> the manager of the machine code zone objectRepresentation <CogObjectRepresentation> the object used to generate object accesses processor <BochsIA32Alien|?> the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk simulatedTrampolines <Dictionary of Integer -> MessageSend> the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time. simulatedVariableGetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time. simulatedVariableSetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time. printRegisters printInstructions clickConfirm <Boolean> flags controlling debug printing and code simulation breakPC <Integer> machine code pc breakpoint cFramePointer cStackPointer <Integer> the variables representing the C stack & frame pointers, which must change on FFI callback and return selectorOop <sqInt> the oop of the methodObj being compiled methodObj <sqInt> the bytecode method being compiled initialPC endPC <Integer> the start and end pcs of the methodObj being compiled methodOrBlockNumArgs <Integer> argument count of current method or block being compiled needsFrame <Boolean> whether methodObj or block needs a frame to execute primitiveIndex <Integer> primitive index of current method being compiled methodLabel <CogAbstractOpcode> label for the method header blockEntryLabel <CogAbstractOpcode> label for the start of the block dispatch code stackOverflowCall <CogAbstractOpcode> label for the call of ceStackOverflow in the method prolog sendMissCall <CogAbstractOpcode> label for the call of ceSICMiss in the method prolog entryOffset <Integer> offset of method entry code from start (header) of method entry <CogAbstractOpcode> label for the first instruction of the method entry code noCheckEntryOffset <Integer> offset of the start of a method proper (after the method entry code) from start (header) of method noCheckEntry <CogAbstractOpcode> label for the first instruction of start of a method proper fixups <Array of <AbstractOpcode Label | nil>> the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode abstractOpcodes <Array of <AbstractOpcode>> the code generated when compiling methodObj byte0 byte1 byte2 byte3 <Integer> individual bytes of current bytecode being compiled in methodObj bytecodePointer <Integer> bytecode pc (same as Smalltalk) of the current bytecode being compiled opcodeIndex <Integer> the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist) numAbstractOpcodes <Integer> the number of elements in abstractOpcocdes blockStarts <Array of <BlockStart>> the starts of blocks in the current method blockCount the index into blockStarts as they are being noted, and hence eventuakly teh total number of blocks in the current method labelCounter <Integer> a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about ceStackOverflowTrampoline <Integer> ceSend0ArgsTrampoline <Integer> ceSend1ArgsTrampoline <Integer> ceSend2ArgsTrampoline <Integer> ceSendNArgsTrampoline <Integer> ceSendSuper0ArgsTrampoline <Integer> ceSendSuper1ArgsTrampoline <Integer> ceSendSuper2ArgsTrampoline <Integer> ceSendSuperNArgsTrampoline <Integer> ceSICMissTrampoline <Integer> ceCPICMissTrampoline <Integer> ceStoreCheckTrampoline <Integer> ceReturnToInterpreterTrampoline <Integer> ceBaseFrameReturnTrampoline <Integer> ceSendMustBeBooleanTrampoline <Integer> ceClosureCopyTrampoline <Integer> the various trampolines (system-call-like jumps from machine code to the run-time). See Cogit>>generateTrampolines for the mapping from trampoline to run-time routine and then read the run-time routine for a funcitonal description. ceEnterCogCodePopReceiverReg <Integer> the enilopmart (jump from run-time to machine-code) methodZoneBase <Integer> ! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! Item was changed: ----- Method: Cogit>>compileCPIC:Case0:Case1Method:tag:isMNUCase:numArgs: (in category 'in-line cacheing') ----- compileCPIC: cPIC Case0: case0CogMethod Case1Method: case1Method tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs "Compile the code for a two-case PIC for case0CogMethod and case1Method,case1Tag. The tag for case0CogMethod is at the send site and so doesn't need to be generated. case1Method may be any of - a Cog method; jump to its unchecked entry-point - a CompiledMethod; jump to the ceInterpretFromPIC trampoline - nil; call ceMNUFromPIC" <var: #cPIC type: #'CogMethod *'> | operand targetEntry jumpNext | <var: #case0CogMethod type: #'CogMethod *'> <var: #targetEntry type: #'void *'> <var: #jumpNext type: #'AbstractInstruction *'> self assert: case1Method notNil. self compilePICProlog: numArgs. self assert: (objectRepresentation inlineCacheTagIsYoung: case1Tag) not. (isMNUCase not and: [coInterpreter methodHasCogMethod: case1Method]) ifTrue: [operand := 0. targetEntry := ((coInterpreter cogMethodOf: case1Method) asInteger + cmNoCheckEntryOffset) asVoidPointer] ifFalse: [self assert: (case1Method isNil or: [(objectMemory isYoungObject: case1Method) not]). operand := case1Method. + targetEntry := case1Method isNil ifTrue: [mnuCall] ifFalse: [interpretLabel]]. - targetEntry := case1Method isNil ifTrue: [mnuCall] ifFalse: [interpretCall]]. jumpNext := self compileCPICEntry. self MoveCw: 0 R: SendNumArgsReg. self JumpLong: case0CogMethod asInteger + cmNoCheckEntryOffset. endCPICCase0 := self CmpCw: case1Tag R: TempReg. jumpNext jmpTarget: endCPICCase0. self MoveCw: operand R: SendNumArgsReg. self JumpLongZero: (isMNUCase ifTrue: [mnuCall] ifFalse: [targetEntry]) asInteger. endCPICCase1 := self MoveCw: cPIC asInteger R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: numArgs). ^0 ! Item was changed: ----- Method: Cogit>>compilePICProlog: (in category 'in-line cacheing') ----- compilePICProlog: numArgs "The start of a PIC has a call to a run-time abort routine that either handles a dispatch to an interpreted method or a dispatch of an MNU case. The routine selects the path depending on ClassReg; if zero it takes the MNU path; if nonzero the dispatch to interpreter path. Neither of these paths returns. The abort routine must be called; In the callee the PIC is located by adding the relevant offset to the return address of the call." mnuCall := self MoveCq: 0 R: ClassReg. + backEnd hasLinkRegister + ifTrue: + [interpretLabel := self PushR: LinkReg. + interpretCall := self Call: (self picAbortTrampolineFor: numArgs)] + ifFalse: + [interpretLabel := + interpretCall := self Call: (self picAbortTrampolineFor: numArgs)]. - interpretCall := self Call: (self picAbortTrampolineFor: numArgs). ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') ----- compileOpenPIC: selector numArgs: numArgs "Compile the code for an open PIC. Perform a probe of the first-level method lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails." | jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod routine | <var: #jumpSelectorMiss type: #'AbstractInstruction *'> <var: #jumpClassMiss type: #'AbstractInstruction *'> <var: #itsAHit type: #'AbstractInstruction *'> <var: #jumpBCMethod type: #'AbstractInstruction *'> self compilePICProlog: numArgs. self cppIf: NewspeakVM ifTrue: [self Nop. "1st nop differentiates dynSuperEntry from no-check entry if using nextMethod" dynSuperEntry := self Nop]. entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg. "Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:" self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:" self MoveR: ClassReg R: SendNumArgsReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: ShiftForWord R: ClassReg. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. jumpClassMiss := self JumpNonZero: 0. itsAHit := self Label. "Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg" self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << ShiftForWord) r: ClassReg R: SendNumArgsReg. "If the method is compiled jump to its unchecked entry-point, otherwise interpret it." objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg. self MoveR: TempReg R: ClassReg. jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg. + jumpBCMethod jmpTarget: interpretLabel. - jumpBCMethod jmpTarget: interpretCall. self AddCq: cmNoCheckEntryOffset R: ClassReg. self JumpR: ClassReg. "First probe missed. Do second of three probes. Shift hash right one and retry." jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label). self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Second probe missed. Do last probe. Shift hash right two and retry." jumpSelectorMiss jmpTarget: self Label. self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. ShiftForWord > 2 ifTrue: [self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg]. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup." jumpSelectorMiss jmpTarget: self Label. self genSaveStackPointers. self genLoadCStackPointers. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)). cStackAlignment > BytesPerWord ifTrue: [backEnd genAlignCStackSavingRegisters: false numArgs: 1 wordAlignment: cStackAlignment / BytesPerWord]. backEnd genPassReg: SendNumArgsReg asArgument: 0. routine := self cCode: '(sqInt)ceSendFromInLineCacheMiss' inSmalltalk: [self simulatedAddressFor: #ceSendFromInLineCacheMiss:]. self annotateCall: (self Call: routine) "Note that this call does not return."! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') ----- compileOpenPIC: selector numArgs: numArgs "Compile the code for an open PIC. Perform a probe of the first-level method lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails. Override to push the register args when calling ceSendFromInLineCacheMiss:" | jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod routine | <var: #jumpSelectorMiss type: #'AbstractInstruction *'> <var: #jumpClassMiss type: #'AbstractInstruction *'> <var: #itsAHit type: #'AbstractInstruction *'> <var: #jumpBCMethod type: #'AbstractInstruction *'> self compilePICProlog: numArgs. self cppIf: NewspeakVM ifTrue: [self Nop. "1st nop differentiates dynSuperEntry from no-check entry if using nextMethod" dynSuperEntry := self Nop]. entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg. "Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:" self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:" self MoveR: ClassReg R: SendNumArgsReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: ShiftForWord R: ClassReg. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. jumpClassMiss := self JumpNonZero: 0. itsAHit := self Label. "Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg" self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << ShiftForWord) r: ClassReg R: SendNumArgsReg. "If the method is compiled jump to its unchecked entry-point, otherwise interpret it." objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg. self MoveR: TempReg R: ClassReg. jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg. + jumpBCMethod jmpTarget: interpretLabel. - jumpBCMethod jmpTarget: interpretCall. self AddCq: cmNoCheckEntryOffset R: ClassReg. self JumpR: ClassReg. "First probe missed. Do second of three probes. Shift hash right one and retry." jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label). self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Second probe missed. Do last probe. Shift hash right two and retry." jumpSelectorMiss jmpTarget: self Label. self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. ShiftForWord > 2 ifTrue: [self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg]. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup." jumpSelectorMiss jmpTarget: self Label. backEnd genPushRegisterArgsForNumArgs: numArgs. self genSmalltalkToCStackSwitch. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)). cStackAlignment > BytesPerWord ifTrue: [backEnd genAlignCStackSavingRegisters: false numArgs: 1 wordAlignment: cStackAlignment / BytesPerWord]. backEnd genPassReg: SendNumArgsReg asArgument: 0. routine := self cCode: '(sqInt)ceSendFromInLineCacheMiss' inSmalltalk: [self simulatedAddressFor: #ceSendFromInLineCacheMiss:]. self annotateCall: (self Call: routine) "Note that this call does not return."!

1 0

[commit][2945] CogVM source as per VMMaker.oscog-eem.757
by commits＠squeakvm.org 05 Jun '14

05 Jun '14

Revision: 2945 Author: eliot Date: 2014-06-05 10:44:38 -0700 (Thu, 05 Jun 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.757 Fix a stupid slip in genSpecialSelectorEqualsEquals. The constant evaluation must remember to pop the simulation stack before it pushes the boolean result. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 from - StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -16092,6 +16092,7 @@ BytecodeDescriptor *primDescriptor; sqInt quickConstant; sqInt rcvrReg; + sqInt result; sqInt targetBytecodePC; sqInt unforwardArg; sqInt unforwardRcvr; @@ -16103,9 +16104,11 @@ if (((((ssTop())->type)) == SSConstant) && ((((ssValue(1))->type)) == SSConstant)) { assert(!((primDescriptor->isMapped))); - return ssPushConstant(((((ssTop())->constant)) == (((ssValue(1))->constant)) + result = ((((ssTop())->constant)) == (((ssValue(1))->constant)) ? trueObject() - : falseObject())); + : falseObject()); + ssPop(2); + return ssPushConstant(result); } nextPC = bytecodePC + ((primDescriptor->numBytes)); nExts = 0; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 from - StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -17752,6 +17752,7 @@ BytecodeDescriptor *primDescriptor; sqInt quickConstant; sqInt rcvrReg; + sqInt result; sqInt targetBytecodePC; sqInt unforwardArg; sqInt unforwardRcvr; @@ -17763,9 +17764,11 @@ if (((((ssTop())->type)) == SSConstant) && ((((ssValue(1))->type)) == SSConstant)) { assert(!((primDescriptor->isMapped))); - return ssPushConstant(((((ssTop())->constant)) == (((ssValue(1))->constant)) + result = ((((ssTop())->constant)) == (((ssValue(1))->constant)) ? trueObject() - : falseObject())); + : falseObject()); + ssPop(2); + return ssPushConstant(result); } nextPC = bytecodePC + ((primDescriptor->numBytes)); nExts = 0; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jun 4 17:44:20 PDT 2014 + Thu Jun 5 10:44:17 PDT 2014 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/sistasrc/vm/cogit.c 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/sistasrc/vm/cogit.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ Modified: branches/Cog/sistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/sistasrc/vm/cogmethod.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/sistasrc/vm/cogmethod.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ typedef struct { Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ Modified: branches/Cog/spursistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursistasrc/vm/cogmethod.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/spursistasrc/vm/cogmethod.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ typedef struct { Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/spursrc/vm/cogit.c 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 from - StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -16102,6 +16102,7 @@ BytecodeDescriptor *primDescriptor; sqInt quickConstant; sqInt rcvrReg; + sqInt result; sqInt targetBytecodePC; sqInt unforwardArg; sqInt unforwardRcvr; @@ -16113,9 +16114,11 @@ if (((((ssTop())->type)) == SSConstant) && ((((ssValue(1))->type)) == SSConstant)) { assert(!((primDescriptor->isMapped))); - return ssPushConstant(((((ssTop())->constant)) == (((ssValue(1))->constant)) + result = ((((ssTop())->constant)) == (((ssValue(1))->constant)) ? trueObject() - : falseObject())); + : falseObject()); + ssPop(2); + return ssPushConstant(result); } nextPC = bytecodePC + ((primDescriptor->numBytes)); nExts = 0; Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/spursrc/vm/cogit.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ Modified: branches/Cog/spursrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursrc/vm/cogmethod.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/spursrc/vm/cogmethod.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ typedef struct { Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/src/vm/cogit.c 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 from - StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -14869,6 +14869,7 @@ BytecodeDescriptor *primDescriptor; sqInt quickConstant; sqInt rcvrReg; + sqInt result; sqInt targetBytecodePC; sqInt unforwardArg; sqInt unforwardRcvr; @@ -14880,9 +14881,11 @@ if (((((ssTop())->type)) == SSConstant) && ((((ssValue(1))->type)) == SSConstant)) { assert(!((primDescriptor->isMapped))); - return ssPushConstant(((((ssTop())->constant)) == (((ssValue(1))->constant)) + result = ((((ssTop())->constant)) == (((ssValue(1))->constant)) ? trueObject() - : falseObject())); + : falseObject()); + ssPop(2); + return ssPushConstant(result); } nextPC = bytecodePC + ((primDescriptor->numBytes)); nExts = 0; Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/src/vm/cogit.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2014-06-05 00:45:11 UTC (rev 2944) +++ branches/Cog/src/vm/cogmethod.h 2014-06-05 17:44:38 UTC (rev 2945) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 + CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 */ typedef struct {

1 0

VM Maker: VMMaker.oscog-eem.757.mcz
by commits＠source.squeak.org 05 Jun '14

05 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.757.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.757 Author: eem Time: 5 June 2014, 10:38:06.398 am UUID: c4908baa-712c-4cb6-a606-5bde992e9582 Ancestors: VMMaker.oscog-eem.756 Fix a stupid slip in genSpecialSelectorEqualsEquals. The constant evaluation must remember to pop the simulation stack before it pushes the boolean result. =============== Diff against VMMaker.oscog-eem.756 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>genSpecialSelectorEqualsEquals (in category 'bytecode generators') ----- genSpecialSelectorEqualsEquals | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor nExts + unforwardArg unforwardRcvr jumpEqual jumpNotEqual rcvrReg argReg result | - unforwardArg unforwardRcvr jumpEqual jumpNotEqual rcvrReg argReg | <var: #jumpEqual type: #'AbstractInstruction *'> <var: #jumpNotEqual type: #'AbstractInstruction *'> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> primDescriptor := self generatorAt: byte0. "forwarders have been followed in cog:selector:" (self ssTop type = SSConstant and: [(self ssValue: 1) type = SSConstant]) ifTrue: [self assert: primDescriptor isMapped not. + result := self ssTop constant = (self ssValue: 1) constant - ^self ssPushConstant: (self ssTop constant = (self ssValue: 1) constant ifTrue: [objectMemory trueObject] + ifFalse: [objectMemory falseObject]. + self ssPop: 2. + ^self ssPushConstant: result]. - ifFalse: [objectMemory falseObject])]. nextPC := bytecodePC + primDescriptor numBytes. nExts := 0. [branchDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + (byte0 bitAnd: 256). branchDescriptor isExtension] whileTrue: [nExts := nExts + 1. nextPC := nextPC + branchDescriptor numBytes]. "If branching the stack must be flushed for the merge" (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifTrue: [self ssFlushTo: simStackPtr - 2]. unforwardRcvr := (self ssValue: 1) type ~= SSConstant or: [objectRepresentation shouldAnnotateObjectReference: (self ssValue: 1) constant]. unforwardArg := self ssTop type ~= SSConstant or: [objectRepresentation shouldAnnotateObjectReference: self ssTop constant]. "Don't use ReceiverResultReg for receiver to keep ReceiverResultReg live. Optimize e.g. rcvr == nil, the common case for ifNil: et al." needsFrame ifTrue: [unforwardArg ifTrue: [self ssAllocateRequiredReg: (argReg := Arg0Reg) upThrough: simStackPtr - 1]. self ssAllocateRequiredReg: (rcvrReg := Arg1Reg) upThrough: simStackPtr - 2] ifFalse: [unforwardArg ifTrue: [argReg := self ssAllocatePreferredReg: ClassReg]. rcvrReg := self ssAllocatePreferredReg: SendNumArgsReg]. unforwardArg ifTrue: [self ssTop popToReg: argReg. objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg. (self ssValue: 1) popToReg: rcvrReg. unforwardRcvr ifTrue: [objectRepresentation genEnsureOopInRegNotForwarded: rcvrReg scratchReg: TempReg]. self CmpR: argReg R: rcvrReg] ifFalse: [(self ssValue: 1) popToReg: rcvrReg. unforwardRcvr ifTrue: [objectRepresentation genEnsureOopInRegNotForwarded: rcvrReg scratchReg: TempReg]. self CmpCq: self ssTop constant R: rcvrReg]. self ssPop: 2. "If not followed by a branch, resolve to true or false." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [jumpNotEqual := self JumpNonZero: 0. self annotate: (self MoveCw: objectMemory trueObject R: rcvrReg) objRef: objectMemory trueObject. jumpEqual := self Jump: 0. jumpNotEqual jmpTarget: (self annotate: (self MoveCw: objectMemory falseObject R: rcvrReg) objRef: objectMemory falseObject). jumpEqual jmpTarget: self Label. self ssPushRegister: rcvrReg. ^0]. "Further since there is a following conditional jump bytecode, define non-merge fixups and leave the cond bytecode to set the mergeness." targetBytecodePC := nextPC + branchDescriptor numBytes + (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj). postBranchPC := nextPC + branchDescriptor numBytes. (self fixupAt: nextPC - initialPC) targetInstruction = 0 ifTrue: "The next instruction is dead. we can skip it." [deadCode := true. self ensureFixupAt: targetBytecodePC - initialPC. self ensureFixupAt: postBranchPC - initialPC] ifFalse: [self ssPushConstant: objectMemory trueObject]. "dummy value" self gen: (branchDescriptor isBranchTrue ifTrue: [JumpZero] ifFalse: [JumpNonZero]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). ^0!

1 0

Re: can't start Squeak on one Ubuntu system anymore
by Bert Freudenberg 05 Jun '14

05 Jun '14

> If I hadn't had access to the working laptop, I don't know what I > would have done. Hopefully we'll be able to improve Squeak's > accessibility someday.. Doesn't get much easier than apt-get install squeak-vm If that doesn't work, file a bug report. That won't get you Cog at the moment. But it could, if someone put in the effort. Tim's new Scratch release would be a fine incentive if it was packaged to require either a Cog or Stack VM. This worked for Etoys, which I packaged to require a Squeak VM package. That's why a Squeak VM is now in every major Linux distro. Of course, that plan would require to get two new packages into all distros, which isn't exactly easy. Another plan would be to package the interpreter and cog in a single source package and just call that the new release. Then this would be picked up almost automatically by the distro maintainers. Long-term this might even be the better plan because then the user wouldn't have to worry which VM to use for which image. We might even be able to consolidate the VMs into a single executable which chooses a pluggable execution engine and object memory at runtime. So, basically this just requires some effort on making nice source packages for distro maintainers. David and lately tty have been working towards that, and maybe someone else can join in (and be it just testing and commenting in what they produce). - Bert -

3 3

← Newer
1
...
19
20
21
22
23
24
25
26
27
Older →

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 June 2014