Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

[commit][3605] Add image/uploadspurimage.sh do do same.
by commits＠squeakvm.org 15 Feb '16

15 Feb '16

Revision: 3605 Author: eliot Date: 2016-02-15 11:28:01 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Add image/uploadspurimage.sh do do same. And previous commit updated the get vm scripts to use the 3602 VMs. Modified Paths: -------------- branches/Cog/image/getGoodCogVM.sh Added Paths: ----------- branches/Cog/image/uploadspurimage.sh Property Changed: ---------------- branches/Cog/image/ Property changes on: branches/Cog/image ___________________________________________________________________ Modified: svn:ignore - *.image *.changes *.tgz coglinux* cogwin Cog.app cogspurlinux* cogspurwin CogSpur.app Squeak-*-All-in-One.* SqueakDebug.log SqueakV41.sources __MACOSX crash.dmp package-cache prefs special-dirs + *.image *.changes *.sum *.tgz coglinux* cogwin Cog.app cogspurlinux* cogspurwin CogSpur.app Squeak-*-All-in-One.* SqueakDebug.log SqueakV41.sources __MACOSX crash.dmp package-cache prefs special-dirs Modified: branches/Cog/image/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh 2016-02-15 18:58:55 UTC (rev 3604) +++ branches/Cog/image/getGoodCogVM.sh 2016-02-15 19:28:01 UTC (rev 3605) @@ -11,21 +11,22 @@ case "$OS" in Darwin) get_vm_from_tar \ - Cog.app/Contents/MacOS/Squeak \ - Cog.app-$TAG.tgz VM=Cog.app/Contents/MacOS/Squeak;; + Cog.app/Contents/MacOS/Squeak 881a82bdab55694933114608c2e083f1 \ + Cog.app-$TAG.tgz e80c18e45b33f23dc17bedc5108385f9 + VM=Cog.app/Contents/MacOS/Squeak;; Linux) if expr $OSREL \> 2.6.12; then get_vm_from_tar \ coglinuxht/lib/squeak/$LCBINDIR/squeak \ - coglinuxht-$TAG.tgz 5067a62fde21ff4f39181619126b8380 + coglinuxht-$TAG.tgz 0122db0348fbf6ee27e0189d8c6101ab else get_vm_from_tar \ coglinux/lib/squeak/$LCBINDIR/squeak \ - coglinux-$TAG.tgz 60078d8c3f5d24ea8d8362ffb5bc7b3b + coglinux-$TAG.tgz 3dd2fc07aee66be652b7636bf2337090 fi;; CYGWIN*) get_vm_from_zip \ cogwin/SqueakConsole.exe 5a11b5d0fd2aa32e966cc76d85fd6876 \ - cogwin-$TAG.zip 4a0b12b67164b788aa615089b5e8cb81 + cogwin-$TAG.zip 71546e5fde965441ca6da248a2fd003f VM=cogwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Added: branches/Cog/image/uploadspurimage.sh =================================================================== --- branches/Cog/image/uploadspurimage.sh (rev 0) +++ branches/Cog/image/uploadspurimage.sh 2016-02-15 19:28:01 UTC (rev 3605) @@ -0,0 +1,29 @@ +#!/bin/sh +# Upload a trunk46-spur.image/.changes to mirandabanda.org +RemoteUser=eliotmiranda(a)highland-park.dreamhost.com +RemoteRoot=mirandabanda.org/files/Cog/SpurImages +IFS=" +" +DATE=`date +%Y-%m-%d` +BASENAME=trunk46-spur + +test "$1" = -here || cd `dirname $0` + +DIR=$RemoteRoot/$DATE +echo ssh -x $RemoteUser mkdir $DIR +ssh -x $RemoteUser mkdir $DIR +for BASENAME in "$@"; do + echo uploading $BASENAME from `pwd` + cksum $BASENAME.[ci]* >$BASENAME.sum + echo scp -p $BASENAME.image $BASENAME.changes $BASENAME.sum "$@" $RemoteUser:$DIR + scp -p $BASENAME.image $BASENAME.changes $BASENAME.sum "$@" $RemoteUser:$DIR +done + +echo ssh $RemoteUser chmod a-w $DIR/* \\\; ls -al $DIR +ssh $RemoteUser chmod a-w $DIR/* \; ls -al $DIR +echo ssh $RemoteUser rm -f $RemoteRoot/{*.image,*.changes,*.sum} +ssh $RemoteUser rm -f $RemoteRoot/{*.image,*.changes,*.sum} +echo ssh $RemoteUser cd $RemoteRoot \\\; ln -s $DATE/{*.image,*.changes,*.sum} . +ssh $RemoteUser cd $RemoteRoot \; ln -s $DATE/{*.image,*.changes,*.sum} . + +ssh $RemoteUser ls -l $RemoteRoot $RemoteRoot/$DATE Property changes on: branches/Cog/image/uploadspurimage.sh ___________________________________________________________________ Added: svn:executable + *

1 0

Re: [Pharo-dev] Improving Ghost proxies
by Eliot Miranda 15 Feb '16

15 Feb '16

On Mon, Feb 15, 2016 at 2:15 AM, Denis Kudriashov <dionisiydk(a)gmail.com> wrote: > Hello. > > I think it is important to get single proxy framework for Pharo. It should > provide required integration support for our tools. > > I want push Ghost in that direction. Debuggers and inspectors should work > correctly with proxies which based on Ghost. > > Now Ghost is stored in CAR team repository. Should we move it to Pharo? > > P.S. Ghost has one failed tests due to Spur problem 17536 > <https://pharo.fogbugz.com/f/cases/17536/VM-Crash-when-adding-an-iVar-to-a-s…> > . > Thanks Denis. I can reproduce this and am taking a look at this today. Best regards, > Denis > _,,,^..^,,,_ best, Eliot

2 1

[commit][3604] Fix mkcogvmarchives and use bash for all scripts containing echo -n.
by commits＠squeakvm.org 15 Feb '16

15 Feb '16

Revision: 3604 Author: eliot Date: 2016-02-15 10:58:55 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Fix mkcogvmarchives and use bash for all scripts containing echo -n. Modified Paths: -------------- branches/Cog/image/getGoodCogVM.sh branches/Cog/image/getGoodSpurVM.sh branches/Cog/image/makegetnsvmscripts.sh branches/Cog/image/makegetvmscripts.sh branches/Cog/scripts/mkARMstackvmarchives branches/Cog/scripts/mkcogvmarchives branches/Cog/scripts/mklinuxarchive branches/Cog/scripts/mksistaarchives branches/Cog/scripts/mkspur64vmarchives branches/Cog/scripts/mkspurvmarchives branches/Cog/scripts/mkvmarchives branches/Cog/scripts/printRevAndTag branches/Cog/scripts/svntouch branches/Cog/scripts/uploadARMvms branches/Cog/scripts/uploadvms Modified: branches/Cog/image/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/image/getGoodCogVM.sh 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,32 +1,31 @@ #!/bin/sh -# Sets the VM env var to the r3354 Cog VM for the current platform. +# Sets the VM env var to the r3602 Cog VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=15.20.3354 -REV=3354 -LCBINDIR=4.0-3354 +TAG=16.07.3602 +REV=3602 +LCBINDIR=4.0-3602 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - Cog.app/Contents/MacOS/Squeak a6f0ece7775772220e8bfe1e48524959 \ - Cog.app-$TAG.tgz 269ba0ef5e63aeaa52287834b6242966 - VM=Cog.app/Contents/MacOS/Squeak;; + Cog.app/Contents/MacOS/Squeak \ + Cog.app-$TAG.tgz VM=Cog.app/Contents/MacOS/Squeak;; Linux) if expr $OSREL \> 2.6.12; then get_vm_from_tar \ - coglinuxht/lib/squeak/$LCBINDIR/squeak 7ed115ceb484859c182ced6541137ce8 \ - coglinuxht-$TAG.tgz 9f50e0fa254d763fae635eeb98ecdeb0 + coglinuxht/lib/squeak/$LCBINDIR/squeak \ + coglinuxht-$TAG.tgz 5067a62fde21ff4f39181619126b8380 else get_vm_from_tar \ - coglinux/lib/squeak/$LCBINDIR/squeak 43804a192631dabba11f4051611475b0 \ - coglinux-$TAG.tgz 16b277420542af403be016dde6769c18 + coglinux/lib/squeak/$LCBINDIR/squeak \ + coglinux-$TAG.tgz 60078d8c3f5d24ea8d8362ffb5bc7b3b fi;; CYGWIN*) get_vm_from_zip \ - cogwin/SqueakConsole.exe f55a39e14e6d0228c718f7b868e70bbc \ - cogwin-$TAG.zip b5253c1675b9e0d3887d50bd050fd75d + cogwin/SqueakConsole.exe 5a11b5d0fd2aa32e966cc76d85fd6876 \ + cogwin-$TAG.zip 4a0b12b67164b788aa615089b5e8cb81 VM=cogwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/getGoodSpurVM.sh =================================================================== --- branches/Cog/image/getGoodSpurVM.sh 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/image/getGoodSpurVM.sh 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,26 +1,26 @@ #!/bin/sh -# Sets the VM env var to the r3427 Cog Spur VM for the current platform. +# Sets the VM env var to the r3602 Cog Spur VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=15.33.3427 -REV=3427 -LSBINDIR=5.0-3427 +TAG=16.07.3602 +REV=3602 +LSBINDIR=5.0-3602 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - CogSpur.app/Contents/MacOS/Squeak 2a6014096316edd4ad40d123300513b4 \ - CogSpur.app-$TAG.tgz be907df0efa93bf6be1a2b42a71a9f8c + CogSpur.app/Contents/MacOS/Squeak 3c4491f496e2d8cc4d46b65c6c26808a \ + CogSpur.app-$TAG.tgz 5a29a80a4492ac2a2cc7106e2a3157e1 VM=CogSpur.app/Contents/MacOS/Squeak;; Linux) get_vm_from_tar \ - cogspurlinuxht/lib/squeak/$LSBINDIR/squeak f41f0912d83dc51b772eb01e96fa4f86 \ - cogspurlinuxht-$TAG.tgz 3a5007971e3e4f24b4f8404e09a2a5c0 + cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 072645c861b7cf692373c6e0a7170e06 \ + cogspurlinuxht-$TAG.tgz c79a7e43dfa19a04ebb3a1d197f998dc VM=cogspurlinuxht/squeak;; CYGWIN*) get_vm_from_zip \ - cogspurwin/SqueakConsole.exe 91e6d35064ad7153011d36c9e9a81fe6 \ - cogspurwin-$TAG.zip 8aa98b6261cfe36258d1e09c54143a32 + cogspurwin/SqueakConsole.exe e802302bab1d7264eef1d5f7e99d938b \ + cogspurwin-$TAG.zip bc9a7078ef93bb357c5265d69ef66dae VM=cogspurwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/makegetnsvmscripts.sh =================================================================== --- branches/Cog/image/makegetnsvmscripts.sh 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/image/makegetnsvmscripts.sh 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Create the getGoodSpurNsvm.sh script. GetSpurScript=getGoodSpurNsvm.sh Modified: branches/Cog/image/makegetvmscripts.sh =================================================================== --- branches/Cog/image/makegetvmscripts.sh 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/image/makegetvmscripts.sh 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Create the getGoodCogVM.sh & getGoodSpurVM.sh scripts. GetCogScript=getGoodCogVM.sh GetSpurScript=getGoodSpurVM.sh Modified: branches/Cog/scripts/mkARMstackvmarchives =================================================================== --- branches/Cog/scripts/mkARMstackvmarchives 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/mkARMstackvmarchives 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Create the ARM Stack VM archives in products. Output a check of version numbers # etc to products/MASVALOG IFS=" Modified: branches/Cog/scripts/mkcogvmarchives =================================================================== --- branches/Cog/scripts/mkcogvmarchives 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/mkcogvmarchives 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,19 +1,14 @@ -#!/bin/sh +#!/bin/bash # Create the Cog VM archives in products. Output a check of version numbers # etc to products/MCVALOG IFS=" " cd `dirname $0`/../products -NSB=newspeak.cog.v3 SQB=squeak.cog.v3 REV= TAG= EXES= -# By default the Newspeak Cog VMs are not built; superceded by Spur. -NL= -NM= -NW= if [ $# = 0 ]; then CL=1 CM=1 @@ -26,20 +21,12 @@ CW= while [ -n "$1" ]; do case $1 in - -c) CL=1;CM=1;CW=1;; - -cl) CL=1;; - -cm) CM=1;; - -cw) CW=1;; - -n) NL=1;NM=1;NW=1;; - -nl) NL=1;; - -nm) NM=1;; - -nw) NW=1;; - -l) CL=1;NL=1;; - -m) CM=1;NM=1;; - -w) CW=1;NW=1;; - -r) shift;REV="$1";; - -t) shift;TAG="$1";; - -?|-h) echo usage: $0 [-c -n -l -m -w -c[lmw] -n[lmw] -r REV -t TAG] + -l) CL=1;; + -m) CM=1;; + -w) CW=1;; + -r) shift;REV="$1";; + -t) shift;TAG="$1";; + -?|-h) echo usage: $0 [-l -m -w -r REV -t TAG] exit 0 esac shift @@ -61,21 +48,8 @@ done) done fi -if [ -n "$NL" ]; then - for d in . assert debug; do - (cd $d - set -- nscoglinux nscoglinuxht - for archive in nsvmlinux nsvmlinuxht; do - rm -rf $archive-$TAG.tgz - echo $1 '=>' $archive-$TAG.tgz - COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $1 - EXES="$EXES $1/lib/nsvm/[0-9.-]*/nsvm" - shift - done) - done -fi if [ -n "$CM" ]; then - set -- Fast.app FastMT.app + set -- CocoaFast.app CocoaFastMT.app for app in Cog.app CogMT.app; do test -d $app || mkdir $app if [ -d ../build.macos32x86/$SQB/$1 ]; then @@ -91,23 +65,6 @@ shift done fi -if [ -n "$NM" ]; then - set -- Fast.app - for app in Newspeak\ Virtual\ Machine.app; do - test -d $app || mkdir $app - if [ -d ../build.macos32x86/$NSB/$1 ]; then - rm -rf $app/* $app-$TAG.tgz - echo build.macos32x86/$NSB/$1 '=>' $app '=>' $app-$TAG.tgz - (cd ../build.macos32x86/$NSB/$1 >/dev/null;tar cf - *) \ - | (cd $app;tar xf -) - tar czf $app-$TAG.tgz $app - EXES="$EXES $app/Contents/MacOS/Newspeak Virtual Machine" - else - echo build.macos32x86/$NSB/$1 is missing - fi - shift - done -fi if [ -n "$CW" ]; then set -- build/vm buildmt/vm for dir in cogwin cogmtwin; do @@ -128,24 +85,6 @@ shift done fi -if [ -n "$NW" ]; then - set -- build/vm - for dir in nsvmwin; do - test -d $dir || mkdir $dir - if [ -d ../build.win32x86/$NSB/$1 ]; then - rm -rf $dir/* $dir-$TAG.zip - echo build.win32x86/$NSB/$1 '=>' $dir '=>' $dir-$TAG.zip - (cd ../build.win32x86/$NSB/$1 >/dev/null; \ - tar cf - nsvm*.exe nsvm*.map nsvm*.exe.manifest ) \ - | (cd $dir;tar xf -) - zip -qr $dir-$TAG.zip $dir - EXES="$EXES $dir/nsvm.exe $dir/nsvmConsole.exe" - else - echo build.win32x86/$NSB/$1 is missing - fi - shift - done -fi for vm in $EXES do echo Modified: branches/Cog/scripts/mklinuxarchive =================================================================== --- branches/Cog/scripts/mklinuxarchive 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/mklinuxarchive 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Create one or more linux archives from VM trees in products. # Output a check of version numbers etc to products/MLALOG IFS=" Modified: branches/Cog/scripts/mksistaarchives =================================================================== --- branches/Cog/scripts/mksistaarchives 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/mksistaarchives 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Create the Sista Spur VM archives in products. Output a check of version # numbers etc to products/MIVALOG IFS=" Modified: branches/Cog/scripts/mkspur64vmarchives =================================================================== --- branches/Cog/scripts/mkspur64vmarchives 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/mkspur64vmarchives 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Create the 64-bit Spur VM archives in products. Output a check of version # numbers etc to products/MSVALOG IFS=" Modified: branches/Cog/scripts/mkspurvmarchives =================================================================== --- branches/Cog/scripts/mkspurvmarchives 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/mkspurvmarchives 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Create the Spur VM archives in products. Output a check of version numbers # etc to products/MSVALOG IFS=" Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/mkvmarchives 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Create the Cog VM archives in products. Check the log files in products for # agreement `dirname $0`/mkcogvmarchives $@ Modified: branches/Cog/scripts/printRevAndTag =================================================================== --- branches/Cog/scripts/printRevAndTag 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/printRevAndTag 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Print REV and TAG as defined in platforms/Cross/vm/sqSCCSVersion.h cd `dirname $0`/../products Modified: branches/Cog/scripts/svntouch =================================================================== --- branches/Cog/scripts/svntouch 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/svntouch 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Touch file(s) or all modified files in a directory back to the checkin date for f in "$@" do Modified: branches/Cog/scripts/uploadARMvms =================================================================== --- branches/Cog/scripts/uploadARMvms 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/uploadARMvms 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Upload archives from products to a web/ftp site via ssh. RemoteUser=eliotmiranda(a)highland-park.dreamhost.com RemoteRoot=mirandabanda.org/files/Cog/VM Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2016-02-15 18:21:31 UTC (rev 3603) +++ branches/Cog/scripts/uploadvms 2016-02-15 18:58:55 UTC (rev 3604) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Upload archives from products to a web/ftp site via ssh. RemoteUser=eliotmiranda(a)highland-park.dreamhost.com RemoteRoot=mirandabanda.org/files/Cog/VM

1 0

New versions of primitives 186 and 187 with inverted logic?
by Denis Kudriashov 15 Feb '16

15 Feb '16

Hi. We already discuss it in another thread. And I want to make little conclusion. I propose new lock primitives #acquireLock and #tryAcquireLock. They should be based on existed ownership primitives 186 and 187 but with inverted logic. acquireLock should return true if lock was established by this call. It should return false if lock was already established by current process. tryAcquireLock should doing same as acquireLock. But if lock already acquired by another process primitive should return nil immediately without waiting. Eliot, do you already implemented it? if you have no time yet could you say me new primitive numbers? And I will try it myself. It will be nice to get new prims for Pharo5 release. Best regards, Denis

3 3

[commit][3603] Fix the upload scripts and set ignore props on the 64-bit mac installer.
by commits＠squeakvm.org 15 Feb '16

15 Feb '16

Revision: 3603 Author: eliot Date: 2016-02-15 10:21:31 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Fix the upload scripts and set ignore props on the 64-bit mac installer. Modified Paths: -------------- branches/Cog/scripts/mkspur64vmarchives branches/Cog/scripts/mkvmarchives branches/Cog/scripts/uploadvms Property Changed: ---------------- branches/Cog/build.macos64x64/newspeak.cog.spur/installer/ Property changes on: branches/Cog/build.macos64x64/newspeak.cog.spur/installer ___________________________________________________________________ Added: svn:ignore + *.app *.applescript *.dmg Modified: branches/Cog/scripts/mkspur64vmarchives =================================================================== --- branches/Cog/scripts/mkspur64vmarchives 2016-02-15 01:27:13 UTC (rev 3602) +++ branches/Cog/scripts/mkspur64vmarchives 2016-02-15 18:21:31 UTC (rev 3603) @@ -96,9 +96,9 @@ fi if [ -n "$NM" ]; then set -- CocoaFast.app CocoaAssert.app CocoaDebug.app - for app in Newspeak\ Spur\ Virtual\ Machine.app \ - assert/Newspeak\ Spur\ Virtual\ Machine.app\ - debug/Newspeak\ Spur\ Virtual\ Machine.app; do + for app in Newspeak\ Spur\ 64-bit\ Virtual\ Machine.app \ + assert/Newspeak\ Spur\ 64-bit\ Virtual\ Machine.app\ + debug/Newspeak\ Spur\ 64-bit\ Virtual\ Machine.app; do test -d $app || mkdir $app if [ -d ../build.macos64x64/$NSB/$1 ]; then rm -rf $app/* $app-$TAG.tgz Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2016-02-15 01:27:13 UTC (rev 3602) +++ branches/Cog/scripts/mkvmarchives 2016-02-15 18:21:31 UTC (rev 3603) @@ -1,8 +1,8 @@ #!/bin/sh # Create the Cog VM archives in products. Check the log files in products for # agreement -`dirname $0`/mkcogvmarchives -`dirname $0`/mkspurvmarchives -`dirname $0`/mkspur32vmarchives +`dirname $0`/mkcogvmarchives $@ +`dirname $0`/mkspurvmarchives $@ +`dirname $0`/mkspur64vmarchives $@ echo; echo "Version info:" cat `dirname $0`/../products/M*[CS]VALOG | egrep '\$Rev|VMMaker' | sort -u Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2016-02-15 01:27:13 UTC (rev 3602) +++ branches/Cog/scripts/uploadvms 2016-02-15 18:21:31 UTC (rev 3603) @@ -256,6 +256,11 @@ fi done fi +if [ -z "$ARCHIVES" ]; then + echo 'No archives have been specified. Use -all?' 1>&2 + exit 1 +fi + if [ "$T" = 1 ]; then SSH="echo ssh" SCP="echo scp" @@ -273,6 +278,9 @@ echo ssh $RemoteUser chmod a-w $RemoteRoot/VM.r$REV/* \\\; ls -al $RemoteRoot/VM.r$REV $SSH $RemoteUser chmod a-w $RemoteRoot/VM.r$REV/* \; ls -al $RemoteRoot/VM.r$REV +echo $SSH $RemoteUser rm $RemoteRoot/latest \; ln -s VM.r$REV $RemoteRoot/latest +$SSH $RemoteUser rm $RemoteRoot/latest \; ln -s VM.r$REV $RemoteRoot/latest + if [ "$T" != 1 ]; then test -x image/makegetvmscripts.sh && (image/makegetvmscripts.sh) fi

1 0

temporary lock up in Cocoa VM
by Eliot Miranda 15 Feb '16

15 Feb '16

Hi John, returning to my laptop this morning I found the VM locked showing the spinning rainbow meatball cursor. This VM uses the platforms/iOS platform code. I started up lldb to find out where it was locked and found out it was in Apple code. here's the back trace. Luckily when I quit lldb the VM unlocked!! :-). Anyway, HTH (lldb) thread backtrace * thread #1: tid = 0x870252, 0x9a759f7a libsystem_kernel.dylib`mach_msg_trap + 10, queue = 'com.apple.main-thread', stop reason = signal SIGSTOP * frame #0: 0x9a759f7a libsystem_kernel.dylib`mach_msg_trap + 10 frame #1: 0x9a75916c libsystem_kernel.dylib`mach_msg + 68 frame #2: 0x9265e57a CoreGraphics`_CGSReenableUpdateForConnection + 119 frame #3: 0x9265e28d CoreGraphics`CGSUpdateManager::enable_update(unsigned long long) + 379 frame #4: 0x9265e0e0 CoreGraphics`CGSReenableUpdateToken + 66 frame #5: 0x901686d1 AppKit`NSPerformWithScreenUpdatesDisabled + 130 frame #6: 0x9018e10f AppKit`-[NSWindow(NSWindowSharedFirstResponder) _changeAllAttachmentsKeyState] + 82 frame #7: 0x90189ae1 AppKit`-[NSWindow _setFrameNeedsDisplay:] + 200 frame #8: 0x9018f33a AppKit`-[NSWindow(NSWindow_Theme) acquireMainAppearance] + 198 frame #9: 0x9018f1d5 AppKit`-[NSWindow becomeMainWindow] + 39 frame #10: 0x90358b94 AppKit`_NXShowKeyAndMain + 206 frame #11: 0x90248397 AppKit`-[NSWindow sendEvent:] + 10155 frame #12: 0x901e491d AppKit`-[NSApplication sendEvent:] + 4034 frame #13: 0x0012ca24 Squeak frame #14: 0x0012e604 Squeak frame #15: 0x0012e6a2 Squeak frame #16: 0x00138f40 Squeak frame #17: 0x00138f94 Squeak frame #18: 0x000d3498 Squeak frame #19: 0x000d4a66 Squeak frame #20: 0x0451bafb frame #21: 0x000c7a8a Squeak frame #22: 0x0013bc44 Squeak frame #23: 0x9bd42f70 Foundation`__NSFirePerformWithOrder + 419 frame #24: 0x9b0862be CoreFoundation`__CFRUNLOOP_IS_CALLING_OUT_TO_AN_OBSERVER_CALLBACK_FUNCTION__ + 30 frame #25: 0x9b08620f CoreFoundation`__CFRunLoopDoObservers + 399 frame #26: 0x9b07702e CoreFoundation`__CFRunLoopRun + 974 frame #27: 0x9b0769ea CoreFoundation`CFRunLoopRunSpecific + 394 frame #28: 0x9b07684b CoreFoundation`CFRunLoopRunInMode + 123 frame #29: 0x90eccb5d HIToolbox`RunCurrentEventLoopInMode + 259 frame #30: 0x90ecc777 HIToolbox`ReceiveNextEventCommon + 163 frame #31: 0x90ecc6bd HIToolbox`_BlockUntilNextEventMatchingListInModeWithFilter + 92 frame #32: 0x90037349 AppKit`_DPSNextEvent + 1602 frame #33: 0x90036870 AppKit`-[NSApplication nextEventMatchingMask:untilDate:inMode:dequeue:] + 119 frame #34: 0x9002915c AppKit`-[NSApplication run] + 727 frame #35: 0x90011ff8 AppKit`NSApplicationMain + 1165 frame #36: 0x99a40701 libdyld.dylib`start + 1 _,,,^..^,,,_ best, Eliot

1 0

Re: [Pharo-dev] Proxy DNU vs CannotInterpret. (Ghost related)
by Eliot Miranda 15 Feb '16

15 Feb '16

Hi Denis, > On Feb 15, 2016, at 6:53 AM, Denis Kudriashov <dionisiydk(a)gmail.com> wrote: > > > 2016-02-15 15:32 GMT+01:00 Mariano Martinez Peck <marianopeck(a)gmail.com>: >> As far as I can remember (this was about 4 years ago) The use of #cannotInterpret: was the only way to be able to intercept everything without breaking the system. Subclassing from ProtoObject make your proxy to understand some messages. Subclassing from nil was technically possible, but I found out the system would simply crash as it didn't know at all how to handle other subclasses of nil. Even with the debugging support I added as you can read in the paper. Maybe things have changed. >> >> If subclassing from nil does not break the system and you can still inspect, debug proxies, then sure, you can give a try to Ghost using #dnu rather than #cannotInterpret:. In fact, I would like to have a dnu-based approeach that is as reliable as it was #cannotInterpret: in the sense of how much I can intercept. With #cannotInterpret I could trap EVERYTHING (everything but #==) and then decide what to do. Subclassing from nil would get you there too if you make it work. > > Actually I already implemented it many yeas ago for Mocketry. But subclassing from nil works correctly only in VW. I got problems when porting it to Squeak (at that time). > Now I want to give DNU another chance. It will simplify logic very much. It will remove strange hierarchy of proxies which is needed for trick but raises many questions. In principle there's no reason why

2 1

VM Maker: VMMaker.oscog-tfel.1680.mcz
by commits＠source.squeak.org 15 Feb '16

15 Feb '16

Tim Felgentreff uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tfel.1680.mcz ==================== Summary ==================== Name: VMMaker.oscog-tfel.1680 Author: tfel Time: 15 February 2016, 12:46:35.512 pm UUID: 55139d69-7f8f-7849-95ca-900810aadddc Ancestors: VMMaker.oscog-tfel.1677, VMMaker.oscog-eem.1679 merge =============== Diff against VMMaker.oscog-tfel.1677 =============== Item was changed: ----- Method: CCodeGenerator>>addConstantForBinding: (in category 'public') ----- addConstantForBinding: variableBinding "Add the pool variable to the code base as a constant." | node val | val := variableBinding value. node := (useSymbolicConstants and: [self isCLiteral: val]) ifTrue:[TDefineNode new + setName: variableBinding key - setName: variableBinding key asString value: variableBinding value] ifFalse:[TConstantNode new setValue: variableBinding value]. + constants at: variableBinding key put: node! - constants at: variableBinding key asString put: node! Item was changed: ----- Method: CCodeGenerator>>addPoolVarsFor: (in category 'public') ----- addPoolVarsFor: aClass "Add the pool variables for the given class to the code base as constants." (aClass sharedPools reject: [:pool| pools includes: pool]) do: [:pool | pools add: pool. + pool bindingsDo: + [:binding | + self addConstantForBinding: binding]]! - pool bindingsDo: [:assoc | | val node | - val := assoc value. - node := (useSymbolicConstants and:[self isCLiteral: val]) - ifTrue:[TDefineNode new setName: assoc key asString value: assoc value] - ifFalse:[TConstantNode new setValue: assoc value]. - constants at: assoc key asString put: node]].! Item was changed: ----- Method: CCodeGenerator>>checkClassForNameConflicts: (in category 'error notification') ----- checkClassForNameConflicts: aClass "Verify that the given class does not have constant, variable, or method names that conflict with those of previously added classes. Raise an error if a conflict is found, otherwise just return." "check for constant name collisions in class pools" aClass classPool associationsDo: [:assoc | + (constants includesKey: assoc key) ifTrue: - (constants includesKey: assoc key asString) ifTrue: [self error: 'Constant ', assoc key, ' was defined in a previously added class']]. "and in shared pools" (aClass sharedPools reject: [:pool| pools includes: pool]) do: [:pool | pool bindingsDo: [:assoc | + (constants includesKey: assoc key) ifTrue: - (constants includesKey: assoc key asString) ifTrue: [self error: 'Constant ', assoc key, ' was defined in a previously added class']]]. "check for instance variable name collisions" (aClass inheritsFrom: VMStructType) ifFalse: [(self instVarNamesForClass: aClass) do: [:varName | (variables includes: varName) ifTrue: [self error: 'Instance variable ', varName, ' was defined in a previously added class']]]. "check for method name collisions" aClass selectors do: [:sel | | tmeth meth | ((self shouldIncludeMethodFor: aClass selector: sel) and: [(tmeth := methods at: sel ifAbsent: nil) notNil and: [(aClass isStructClass and: [(aClass isAccessor: sel) and: [(methods at: sel) isStructAccessor]]) not and: [(meth := aClass >> sel) isSubclassResponsibility not and: [(aClass includesBehavior: tmeth definingClass) not]]]]) ifTrue: [((aClass >>sel) pragmaAt: #option:) ifNil: [self error: 'Method ', sel, ' was defined in a previously added class.'] ifNotNil: [logger ensureCr; show: 'warning, method ', aClass name, '>>', sel storeString, ' overrides ', tmeth definingClass, '>>', sel storeString; cr]]]! Item was changed: ----- Method: CCodeGenerator>>const:declareC: (in category 'public') ----- const: constName declareC: declarationString "Record the given C declaration for a constant." constants + at: constName - at: constName asString put: (TDefineNode new + setName: constName - setName: constName asString value: declarationString)! Item was changed: ----- Method: CCodeGenerator>>emitCConstants:on: (in category 'C code generator') ----- emitCConstants: constList on: aStream "Store the global variable declarations on the given stream." constList isEmpty ifTrue: [^self]. aStream cr; nextPutAll: '/*** Constants ***/'; cr. (self sortStrings: constList) do: [:varName| | node default value conditional | node := constants at: varName. node name isEmpty ifFalse: ["If the definition includes a C comment, take it as is, otherwise convert the value from Smalltalk to C. Allow the class to provide an alternative definition, either of just the value or the whole shebang." default := (node value isString and: [node value includesSubString: '/*']) ifTrue: [node value] ifFalse: [self cLiteralFor: node value name: varName]. default = #undefined ifTrue: [aStream nextPutAll: '#undef '; nextPutAll: node name; cr] ifFalse: + [conditional := VMBasicConstants defineAtCompileTime: node name. + conditional ifTrue: - [conditional := VMBasicConstants namesDefinedAtCompileTime includes: node name. - conditional ifTrue: [aStream nextPutAll: '#if !!defined('; nextPutAll: node name; nextPutAll: ') /* Allow this to be overridden on the compiler command line */'; cr]. + value := vmClass - value := vmClass ifNotNil: [(vmClass specialValueForConstant: node name default: default) ifNotNil: [:specialDef| specialDef] ifNil: [default]] ifNil: [default]. value first ~= $# ifTrue: + [aStream nextPutAll: (conditional ifTrue: ['# define '] ifFalse: ['#define ']); nextPutAll: node name; space]. - [aStream nextPutAll: '#define '; nextPutAll: node name; space]. aStream nextPutAll: value; cr. conditional ifTrue: [aStream nextPutAll: '#endif'; cr]]]]. aStream cr! Item was changed: ----- Method: CCodeGenerator>>emitCFunctionPrototypes:on: (in category 'C code generator') ----- emitCFunctionPrototypes: methodList on: aStream "Store prototype declarations for all non-inlined methods on the given stream. Add a define for a NoDbgRegParms attribute for static functions used for debugging. gcc and other compilers will use non-standard calling conventions for static functions when optimizing. The optimization can render the functions unusable in gdb. The sqConfig.h file for the platform should define PlatformNoDbgRegParms suitably for the platform's compiler, if the compiler can be persuaded not to generate such functions. Add a define for a NeverInline attribute that tells the compiler never to inline functions with the attribute. We mark functions we want to observe in a profiler as NeverInline. The sqConfig.h file for the platform should define NeverInline suitably for the platform's compiler, if the compiler can be persuaded not to inline certain functions." aStream cr; nextPutAll: '/*** Function Prototypes ***/'; cr. vmClass ifNotNil: [NoRegParmsInAssertVMs ifTrue: [aStream nextPutAll: '\\#if !!PRODUCTION && defined(PlatformNoDbgRegParms)\# define NoDbgRegParms PlatformNoDbgRegParms\#endif' withCRs. aStream nextPutAll: '\\#if !!defined(NoDbgRegParms)\# define NoDbgRegParms /*empty*/\#endif\\' withCRs]. aStream nextPutAll: '\\#if !!defined(NeverInline)\# define NeverInline /*empty*/\#endif\\' withCRs]. (methodList select: [:m| m isRealMethod and: [self shouldGenerateMethod: m]]) do: [:m | vmClass ifNotNil: [(NoRegParmsInAssertVMs and: [m export not and: [m isStatic and: [m args notEmpty]]]) ifTrue: [m addFunctionAttribute: 'NoDbgRegParms']. m inline == #never ifTrue: [m addFunctionAttribute: 'NeverInline']]. + m emitCFunctionPrototype: aStream generator: self]. - m emitCFunctionPrototype: aStream generator: self. - aStream nextPut: $; ; cr]. aStream cr! Item was changed: ----- Method: CCodeGenerator>>emitExportsNamed:pluginName:on: (in category 'C code generator') ----- emitExportsNamed: exportsNamePrefix pluginName: pluginName on: aStream "Store all the exported primitives in the form used by the internal named prim system." | nilVMClass excludeDepth | + (nilVMClass := vmClass isNil) ifTrue: "We need a vmClass temporarily to compute accessor depths." - (nilVMClass := vmClass isNil) ifTrue: [vmClass := StackInterpreter]. "Don't include the depth in the vm's named primitives if the vm is non-Spur." excludeDepth := exportsNamePrefix = 'vm' and: [pluginName isEmpty and: [vmClass objectMemoryClass hasSpurMemoryManagerAPI not]]. + aStream cr; cr; nextPutAll: 'void* '; nextPutAll: exportsNamePrefix; nextPutAll: '_exports[][3] = {'; cr. + ((methods select: [:m| m export]) asSortedCollection: [:a :b| a selector caseSensitiveLessOrEqual: b selector]) do: + [:method| | compileTimeOptionPragmas primName | + (compileTimeOptionPragmas := method compileTimeOptionPragmas) notEmpty ifTrue: + [method outputConditionalDefineFor: compileTimeOptionPragmas on: aStream]. + primName := self cFunctionNameFor: method selector. + aStream tab; nextPutAll: '{"'; nextPutAll: pluginName; nextPutAll: '", "'; nextPutAll: primName. - aStream cr; cr; nextPutAll: 'void* '; nextPutAll: exportsNamePrefix; nextPutAll: '_exports[][3] = {'. - (self sortStrings: self exportedPrimitiveNames) do: - [:primName| - aStream cr; tab; - nextPutAll: '{"'; - nextPutAll: pluginName; - nextPutAll: '", "'; - nextPutAll: primName. excludeDepth ifFalse: [(self accessorDepthForSelector: primName asSymbol) ifNotNil: [:depth| "store the accessor depth in a hidden byte immediately after the primName" self assert: depth < 128. aStream nextPutAll: '\000\'; nextPutAll: ((depth bitAnd: 255) printStringBase: 8 nDigits: 3)]]. + aStream nextPutAll: '", (void*)'; nextPutAll: primName; nextPutAll: '},'; cr. + method terminateConditionalDefineFor: compileTimeOptionPragmas on: aStream]. + aStream tab; nextPutAll: '{NULL, NULL, NULL}'; cr; nextPutAll: '};'; cr. - aStream - nextPutAll: '", (void*)'; - nextPutAll: primName; - nextPutAll: '},']. - aStream cr; tab; nextPutAll: '{NULL, NULL, NULL}'; cr; nextPutAll: '};'; cr. nilVMClass ifTrue: [vmClass := nil]! Item was changed: ----- Method: CCodeGenerator>>exportedPrimitiveNames (in category 'public') ----- exportedPrimitiveNames "Return an array of all exported primitives" + ^methods select:[:m| m export] thenCollect:[:m| self cFunctionNameFor: m selector]. - ^methods select:[:m| m export] thenCollect:[:m| m selector copyWithout: $:]. ! Item was changed: ----- Method: CCodeGenerator>>isConstantNode:valueInto: (in category 'utilities') ----- isConstantNode: aNode valueInto: aBlock "Answer if aNode evaluates to a constant, and if so, evaluate aBlock with the value of that constant." aNode isConstant ifTrue: [(aNode isDefine + and: [VMBasicConstants defineAtCompileTime: aNode name]) ifTrue: - and: [VMBasicConstants namesDefinedAtCompileTime includes: aNode name]) ifTrue: [^false]. aBlock value: aNode value. ^true]. (aNode isVariable and: [aNode name = #nil]) ifTrue: [aBlock value: nil. ^true]. aNode isSend ifFalse: [^false]. (self anyMethodNamed: aNode selector) ifNil: [(VMBasicConstants valueOfBasicSelector: aNode selector) ifNotNil: [:value| aBlock value: value. ^true]] ifNotNil: [:m| (m statements size = 1 and: [m statements last isReturn]) ifTrue: [^self isConstantNode: m statements last expression valueInto: aBlock]]. ^false! Item was changed: ----- Method: CCodeGenerator>>nilOrBooleanConditionFor: (in category 'utilities') ----- nilOrBooleanConditionFor: nodeOrNil "If nodeOrNil is one of the conditional sends for which we do translation-time dead code elimination (i.e. cppIf:ifTrue: et al or ifTrue: et al) and the conditional does evaluate to a translation-time boolean constant, answer that constant, otherwise answer nil. Used to prune dead code, + either for code generaton or dead variable elimination." + generateDeadCode ifTrue: [^nil]. - either for code egenraton or dead variable elimination." nodeOrNil ifNil: [^nil]. nodeOrNil isSend ifFalse: [^nil]. (#(cppIf:ifTrue: cppIf:ifTrue:ifFalse:) includes: nodeOrNil selector) ifTrue: + [(vmClass notNil + and: [nodeOrNil args first isConstant + and: [nodeOrNil args first value isSymbol + and: [(VMBasicConstants defineAtCompileTime: nodeOrNil args first value) not + and: [(vmClass bindingOf: nodeOrNil args first value) notNil]]]]) ifTrue: + [self logger + nextPutAll: 'Warning: cppIf: reference to '; + store: nodeOrNil args first value; + nextPutAll: ' when variable of same name exists.'; cr]. + + ^(optionsDictionary notNil - [^(optionsDictionary notNil and: [nodeOrNil args first isConstant and: [#(true false) includes: (optionsDictionary at: nodeOrNil args first name ifAbsent: [nil])]]) ifTrue: [optionsDictionary at: nodeOrNil args first name]]. ^(#(ifTrue: ifFalse: ifTrue:ifFalse: ifFalse:ifTrue:) includes: nodeOrNil selector) ifTrue: [self nilOrBooleanConstantReceiverOf: nodeOrNil]! Item was changed: ----- Method: CCodeGenerator>>optionIsTrue:in: (in category 'utilities') ----- optionIsTrue: pragma in: aClass "Answer whether an option: or notOption: pragma is true in the context of aClass. The argument to the option: pragma is interpreted as either a Cogit class name or a class variable name or a variable name in VMBasicConstants." | key | key := pragma argumentAt: 1. + + "If the option is one to be defined at compile time we'll generate a + conditional around its declaration and definition." + (VMBasicConstants defineAtCompileTime: key) ifTrue: + [^true]. + "If the option is the name of a subclass of Cogit, include it if it inherits from the Cogit class." (Smalltalk classNamed: key) ifNotNil: [:optionClass| aClass cogitClass ifNotNil: [:cogitClass| (optionClass includesBehavior: Cogit) ifTrue: [^cogitClass includesBehavior: optionClass]]. aClass objectMemoryClass ifNotNil: [:objectMemoryClass| ((optionClass includesBehavior: ObjectMemory) or: [optionClass includesBehavior: SpurMemoryManager]) ifTrue: [^objectMemoryClass includesBehavior: optionClass]]]. "Lookup options in options, class variables of the defining class, VMBasicConstants, the interpreterClass and the objectMemoryClass" {aClass initializationOptions. aClass. VMBasicConstants. aClass interpreterClass. aClass objectMemoryClass} do: [:scopeOrNil| scopeOrNil ifNotNil: [:scope| (scope bindingOf: key) ifNotNil: [:binding| binding value ~~ false ifTrue: [^true]]]]. ^false! Item was changed: ----- Method: CoInterpreter>>findNewMethodInClassTag: (in category 'message sending') ----- findNewMethodInClassTag: classTagArg "Find the compiled method to be run when the current messageSelector is sent to the given classTag, setting the values of newMethod and primitiveIndex." | ok classTag | <inline: false> ok := self lookupInMethodCacheSel: messageSelector classTag: classTagArg. ok ifTrue: [self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector] ifFalse: ["entry was not found in the cache; perhaps soemthing was forwarded." classTag := classTagArg. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: classTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: classTag) ifTrue: [classTag := self handleForwardedSendFaultForTag: classTag]. ok := self lookupInMethodCacheSel: messageSelector classTag: classTag. ok ifTrue: [^self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector]]. "entry was not found in the cache; look it up the hard way " lkupClass := objectMemory classForClassTag: classTag. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [self lookupOrdinarySend] ifFalse: [self lookupMethodInClass: lkupClass]. self addNewMethodToCache: lkupClass]! Item was changed: ----- Method: CoInterpreter>>lookupMNU:receiver: (in category 'cog jit support') ----- lookupMNU: selector receiver: rcvr <api> "Lookup selector in rcvr, without doing MNU processing, and answer either a method or an error code if the message was not understood. Used to populate closed PICs." | classTag inCache erridx | "self printFrame: stackPage headFP WithSP: stackPage headSP" "self printStringOf: selector" classTag := objectMemory fetchClassTagOf: rcvr. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: + [inCache := self + inlineLookupInNSMethodCacheSel: selector + classTag: classTag + method: 0 + lookupRule: LookupRuleMNU] - [inCache := (self - inlineLookupInNSMethodCacheSel: selector - classTag: classTag - method: 0 - lookupRule: LookupRuleMNU)] ifFalse: [inCache := self lookupInMethodCacheSel: selector classTag: classTag]. inCache ifFalse: [messageSelector := selector. erridx := self lookupMNUInClass: (objectMemory classForClassTag: classTag). erridx ~= 0 ifTrue: [self assert: erridx <= self maxLookupNoMNUErrorCode. ^erridx]]. ^newMethod! Item was changed: ----- Method: Cogit>>maybeAllocAndInitIRCs (in category 'newspeak support') ----- maybeAllocAndInitIRCs "If this is the Newspeak VM and the objectRepresentation supports pinning then allocate space for the implicit receiver caches on the heap." + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [indexOfIRC := theIRCs := 0. (objectRepresentation canPinObjects and: [numIRCs > 0]) ifTrue: [self assert: (self noAssertMethodClassAssociationOf: methodObj) ~= objectMemory nilObject. theIRCs := objectRepresentation allocateNPinnedSlots: numIRCs * NumOopsPerNSC. ^theIRCs ~= 0]. ^true] ifFalse: [^true]! Item was changed: ----- Method: Cogit>>maybeMarkIRCsIn: (in category 'newspeak support') ----- maybeMarkIRCsIn: cogMethod <inline: true> + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [objectRepresentation canPinObjects ifTrue: [objectRepresentation markIfIRC: cogMethod nextMethodOrIRCs]]! Item was changed: ----- Method: Cogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates - if it contans an unknown bytecode Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. + self cppIf: NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]]. ^numBlocks! Item was changed: ----- Method: InterpreterPrimitives>>primitiveGetImmutability (in category 'object access primitives') ----- primitiveGetImmutability + self cppIf: #IMMUTABILITY + ifTrue: + [| rcvr | + rcvr := self stackValue: 0. + self pop: argumentCount + 1 thenPushBool: (objectMemory isOopImmutable: rcvr)] + ifFalse: + [self primitiveFailFor: PrimErrUnsupported]! - <option: #IMMUTABILITY> - | rcvr bool | - rcvr := self stackValue: 0. - bool := (objectMemory isOopImmutable: rcvr) - ifTrue: [ TrueObject ] - ifFalse: [ FalseObject ]. - self pop: argumentCount + 1 thenPush: (objectMemory splObj: bool)! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSetImmutability (in category 'object access primitives') ----- primitiveSetImmutability + self cppIf: #IMMUTABILITY + ifTrue: + [| rcvr wasImmutable | + rcvr := self stackValue: 1. + (objectMemory isImmediate: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. + wasImmutable := objectMemory isObjImmutable: rcvr. + self stackTop = objectMemory trueObject + ifTrue: + [(self canBeImmutable: rcvr) ifFalse: + [^self primitiveFailFor: PrimErrInappropriate]. + objectMemory setIsImmutableOf: rcvr to: true] + ifFalse: [ + self stackTop = objectMemory falseObject + ifTrue: [objectMemory setIsImmutableOf: rcvr to: false] + ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]]. + self pop: argumentCount + 1 thenPushBool: wasImmutable] + ifFalse: + [self primitiveFailFor: PrimErrUnsupported]! - <option: #IMMUTABILITY> - | rcvr boolean wasImmutable | - rcvr := self stackValue: 1. - (objectMemory isImmediate: rcvr) ifTrue: - [^self primitiveFailFor: PrimErrBadReceiver]. - boolean := self booleanValueOf: self stackTop. - self successful ifFalse: - [^self primitiveFailFor: PrimErrBadArgument]. - boolean ifTrue: - [(self canBeImmutable: rcvr) ifFalse: - [^self primitiveFailFor: PrimErrInappropriate]]. - wasImmutable := objectMemory booleanObjectOf: (objectMemory isOopImmutable: rcvr). - objectMemory setIsImmutableOf: rcvr to: boolean. - self pop: argumentCount + 1 thenPush: wasImmutable! Item was changed: ----- Method: SimpleStackBasedCogit>>compileFrameBuild (in category 'compile abstract instructions') ----- compileFrameBuild "Build a frame for a CogMethod activation. See CoInterpreter class>>initializeFrameIndices. receiver (in ReceiverResultReg) arg0 ... argN caller's saved ip/this stackPage (for a base frame) fp-> saved fp method context (uninitialized?) receiver first temp ... sp-> Nth temp If there is a primitive and an error code the Nth temp is the error code. Ensure SendNumArgsReg is set early on (incidentally to nilObj) because it is the flag determining whether context switch is allowed on stack-overflow." | jumpSkip | <inline: false> <var: #jumpSkip type: #'AbstractInstruction *'> needsFrame ifFalse: [^self]. backEnd hasLinkRegister ifTrue: [self PushR: LinkReg]. self PushR: FPReg. self MoveR: SPReg R: FPReg. methodLabel addDependent: (self annotateAbsolutePCRef: (self PushCw: methodLabel asInteger)). "method" self genMoveConstant: objectMemory nilObject R: SendNumArgsReg. self PushR: SendNumArgsReg. "context" self PushR: ReceiverResultReg. methodOrBlockNumArgs + 1 to: (coInterpreter temporaryCountOfMethodHeader: methodHeader) do: [:i| self PushR: SendNumArgsReg]. (self methodUsesPrimitiveErrorCode: methodObj header: methodHeader) ifTrue: [self compileGetErrorCode]. self MoveAw: coInterpreter stackLimitAddress R: TempReg. self CmpR: TempReg R: SPReg. "N.B. FLAGS := SPReg - TempReg" "If we can't context switch for this method, use a slightly slower overflow check that clears SendNumArgsReg." (coInterpreter canContextSwitchIfActivating: methodObj header: methodHeader) ifTrue: [self JumpBelow: stackOverflowCall. stackCheckLabel := self Label] ifFalse: [jumpSkip := self JumpAboveOrEqual: 0. self MoveCq: 0 R: SendNumArgsReg. self Jump: stackOverflowCall. jumpSkip jmpTarget: (stackCheckLabel := self Label)]. self annotateBytecode: stackCheckLabel. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [numIRCs > 0 ifTrue: [self PrefetchAw: theIRCs]]! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>compileBlockBodies (in category 'compile abstract instructions') ----- compileBlockBodies "override to maintain counterIndex when recompiling blocks; sigh." <inline: false> | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs savedNumTemps initialStackPtr initialOpcodeIndex initialCounterIndex initialIndexOfIRC | <var: #blockStart type: #'BlockStart *'> self assert: blockCount > 0. "scanBlock: in compileBlockEntry: sets both of these appropriately for each block." savedNeedsFrame := needsFrame. savedNumArgs := methodOrBlockNumArgs. savedNumTemps := methodOrBlockNumTemps. inBlock := true. compiledBlocksCount := 0. [compiledBlocksCount < blockCount] whileTrue: [blockStart := self blockStartAt: compiledBlocksCount. self scanBlock: blockStart. initialOpcodeIndex := opcodeIndex. initialCounterIndex := counterIndex. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [initialIndexOfIRC := indexOfIRC]. [self compileBlockEntry: blockStart. initialStackPtr := simStackPtr. (result := self compileAbstractInstructionsFrom: blockStart startpc + (self pushNilSize: methodObj numInitialNils: blockStart numInitialNils) through: blockStart startpc + blockStart span - 1) < 0 ifTrue: [^result]. "If the final simStackPtr is less than the initial simStackPtr then scanBlock: over- estimated the number of initial nils (because it assumed one or more pushNils to produce an operand were pushNils to initialize temps. This is very rare, so compensate by checking, adjusting numInitialNils and recompiling the block body. N.B. No need to reinitialize the literalsManager because it answers existing literals." initialStackPtr = simStackPtr] whileFalse: [self assert: initialStackPtr > simStackPtr. blockStart numInitialNils: blockStart numInitialNils + simStackPtr - initialStackPtr. blockStart fakeHeader dependent: nil. self reinitializeFixupsFrom: blockStart startpc + blockStart numInitialNils through: blockStart startpc + blockStart span - 1. self cCode: 'bzero(abstractOpcodes + initialOpcodeIndex, (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction))' inSmalltalk: [initialOpcodeIndex to: opcodeIndex - 1 do: [:i| abstractOpcodes at: i put: (CogCompilerClass for: self)]]. opcodeIndex := initialOpcodeIndex. counterIndex := initialCounterIndex. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [indexOfIRC := initialIndexOfIRC]]. compiledBlocksCount := compiledBlocksCount + 1]. needsFrame := savedNeedsFrame. methodOrBlockNumArgs := savedNumArgs. methodOrBlockNumTemps := savedNumTemps. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates - how many counters it needs/conditional branches it contains Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. prevBCDescriptor := nil. numCounters := 0. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC. (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: [numCounters := numCounters + 1]]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks! Item was changed: ----- Method: StackInterpreter>>findNewMethodInClassTag: (in category 'message sending') ----- findNewMethodInClassTag: classTagArg "Find the compiled method to be run when the current messageSelector is sent to the given class, setting the values of 'newMethod' and 'primitiveIndex'." | ok classTag | <inline: false> ok := self lookupInMethodCacheSel: messageSelector classTag: classTagArg. ok ifFalse: "entry was not found in the cache; look it up the hard way " [classTag := classTagArg. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: classTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: classTag) ifTrue: [classTag := self handleForwardedSendFaultForTag: classTag]. ok := self lookupInMethodCacheSel: messageSelector classTag: classTag. ok ifTrue: [^nil]]. lkupClass := objectMemory classForClassTag: classTag. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [self lookupOrdinarySend] ifFalse: [self lookupMethodInClass: lkupClass]. self addNewMethodToCache: lkupClass]! Item was changed: ----- Method: StackInterpreter>>lookupMNUInClass: (in category 'message sending') ----- lookupMNUInClass: class "Lookup messageSelector in class. Answer 0 on success. Answer the splObj: index for the error selector to use on failure rather than performing MNU processing etc." | currentClass dictionary found | <inline: false> currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: [lkupClass := self superclassOf: currentClass. ^SelectorCannotInterpret]. found := self lookupMethodInDictionary: dictionary. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [found ifTrue: [lkupClass := class. self addNewMethodToNSCache: LookupRuleMNU. ^0]] ifFalse: [found ifTrue: [self addNewMethodToCache: class. ^0]]. currentClass := self superclassOf: currentClass]. lkupClass := class. ^SelectorDoesNotUnderstand! Item was changed: ----- Method: StackInterpreter>>lookupOrdinaryNoMNUEtcInClass: (in category 'message sending') ----- lookupOrdinaryNoMNUEtcInClass: class "Lookup messageSelector in class. Answer 0 on success. Answer the splObj: index for the error selector to use on failure rather than performing MNU processing etc." | currentClass dictionary found | <inline: false> currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: [lkupClass := self superclassOf: currentClass. ^SelectorCannotInterpret]. found := self lookupMethodInDictionary: dictionary. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [found ifTrue: [(self isPublicMethod: newMethod) ifTrue: [self addNewMethodToCache: class. ^0]. (self isProtectedMethod: newMethod) ifTrue: [lkupClass := class. ^SelectorDoesNotUnderstand]]] ifFalse: [found ifTrue: [self addNewMethodToCache: class. ^0]]. currentClass := self superclassOf: currentClass]. lkupClass := class. ^SelectorDoesNotUnderstand! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileBlockBodies (in category 'compile abstract instructions') ----- compileBlockBodies <inline: false> | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs savedNumTemps initialStackPtr initialOpcodeIndex initialIndexOfIRC | <var: #blockStart type: #'BlockStart *'> self assert: blockCount > 0. "scanBlock: in compileBlockEntry: sets both of these appropriately for each block." savedNeedsFrame := needsFrame. savedNumArgs := methodOrBlockNumArgs. savedNumTemps := methodOrBlockNumTemps. inBlock := true. compiledBlocksCount := 0. [compiledBlocksCount < blockCount] whileTrue: [blockStart := self blockStartAt: compiledBlocksCount. self scanBlock: blockStart. initialOpcodeIndex := opcodeIndex. literalsManager saveForBlockCompile. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [initialIndexOfIRC := indexOfIRC]. [self compileBlockEntry: blockStart. initialStackPtr := simStackPtr. (result := self compileAbstractInstructionsFrom: blockStart startpc + (self pushNilSize: methodObj numInitialNils: blockStart numInitialNils) through: blockStart startpc + blockStart span - 1) < 0 ifTrue: [^result]. "If the final simStackPtr is less than the initial simStackPtr then scanBlock: over- estimated the number of initial nils (because it assumed one or more pushNils to produce an operand were pushNils to initialize temps. This is very rare, so compensate by checking, adjusting numInitialNils and recompiling the block body. N.B. No need to reinitialize the literalsManager because it answers existing literals." initialStackPtr = simStackPtr] whileFalse: [self assert: initialStackPtr > simStackPtr. blockStart numInitialNils: blockStart numInitialNils + simStackPtr - initialStackPtr. blockStart fakeHeader dependent: nil. self reinitializeFixupsFrom: blockStart startpc + blockStart numInitialNils through: blockStart startpc + blockStart span - 1. self cCode: 'bzero(abstractOpcodes + initialOpcodeIndex, (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction))' inSmalltalk: [initialOpcodeIndex to: opcodeIndex - 1 do: [:i| abstractOpcodes at: i put: (CogCompilerClass for: self)]]. opcodeIndex := initialOpcodeIndex. literalsManager resetForBlockCompile. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [indexOfIRC := initialIndexOfIRC]]. compiledBlocksCount := compiledBlocksCount + 1]. needsFrame := savedNeedsFrame. methodOrBlockNumArgs := savedNumArgs. methodOrBlockNumTemps := savedNumTemps. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. prevBCDescriptor := nil. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks! Item was changed: ----- Method: TDefineNode>>name (in category 'accessing') ----- name + ^name! - ^name asString! Item was added: + ----- Method: TMethod>>compileTimeOptionPragmas (in category 'accessing') ----- + compileTimeOptionPragmas + "Answer the (possibly empty) sequence of option: or notOption: pragmas + whose arguments are values to be defined at compile time." + ^self compiledMethod pragmas select: + [:pragma| + (#option: == pragma keyword or: [#notOption: == pragma keyword]) + and: [VMBasicConstants defineAtCompileTime: (pragma argumentAt: 1)]]! Item was changed: ----- Method: TMethod>>compiledMethod (in category 'accessing') ----- compiledMethod + ^definingClass + compiledMethodAt: selector + ifAbsent: [definingClass compiledMethodAt: properties selector]! - ^definingClass >> selector! Item was changed: ----- Method: TMethod>>emitCCodeOn:generator: (in category 'C code generation') ----- emitCCodeOn: aStream generator: aCodeGen "Emit C code for this method onto the given stream. All calls to inlined methods should already have been expanded." + | conditional | aCodeGen currentMethod: self. self emitCCommentOn: aStream. "place method comment and method name before function." aStream crtab; nextPutAll: '/* '; nextPutAll: self definingClass name; nextPutAll: '>>#'; nextPutAll: self smalltalkSelector; nextPutAll: ' */'. aStream cr. + conditional := self emitCFunctionPrototype: aStream generator: aCodeGen isPrototype: false. - self emitCFunctionPrototype: aStream generator: aCodeGen isPrototype: false. aStream cr; nextPut: ${. self emitCLocalsOn: aStream generator: aCodeGen. aCodeGen pushScope: declarations while: [parseTree emitCCodeOn: aStream level: 1 generator: aCodeGen]. + aStream nextPut: $}; cr. + conditional ifTrue: + [self terminateConditionalDefineFor: self compileTimeOptionPragmas on: aStream]! - aStream nextPut: $}; cr! Item was changed: ----- Method: TMethod>>emitCFunctionPrototype:generator: (in category 'C code generation') ----- emitCFunctionPrototype: aStream generator: aCodeGen "Emit a C function header for this method onto the given stream." properties ifNotNil: [(properties at: #api: ifAbsent: []) ifNotNil: [:pragma| + aStream + nextPutAll: (pragma argumentAt: 1); + nextPut: $;; + cr. - aStream nextPutAll: (pragma argumentAt: 1). ^self]]. self emitCFunctionPrototype: aStream generator: aCodeGen isPrototype: true! Item was changed: ----- Method: TMethod>>emitCFunctionPrototype:generator:isPrototype: (in category 'C code generation') ----- emitCFunctionPrototype: aStream generator: aCodeGen isPrototype: isPrototype "<Boolean>" + "Emit a C function header for this method onto the given stream. + Answer if the method has any compileTimeOptionPragmas" + | compileTimeOptionPragmas returnTypeIsFunctionPointer | + (compileTimeOptionPragmas := self compileTimeOptionPragmas) notEmpty ifTrue: + [self outputConditionalDefineFor: compileTimeOptionPragmas on: aStream]. - "Emit a C function header for this method onto the given stream." - | returnTypeIsFunctionPointer | returnTypeIsFunctionPointer := returnType last = $) and: [returnType includesSubString: (aCodeGen cFunctionNameFor: selector)]. export ifTrue: [aStream nextPutAll: 'EXPORT('; nextPutAll: returnType; nextPut: $)] ifFalse: [self isStatic ifTrue: [aStream nextPutAll: 'static '] ifFalse: [isPrototype ifTrue: [aStream nextPutAll: 'extern ']]. (isPrototype or: [inline ~~ #always]) ifFalse: [aStream nextPutAll: 'inline ']. aStream nextPutAll: returnType]. (functionAttributes isNil or: [returnTypeIsFunctionPointer]) ifFalse: [aStream space; nextPutAll: functionAttributes]. isPrototype ifTrue: [aStream space] ifFalse: [aStream cr]. returnTypeIsFunctionPointer ifFalse: [aStream nextPutAll: (aCodeGen cFunctionNameFor: selector); nextPut: $(. args isEmpty ifTrue: [aStream nextPutAll: #void] ifFalse: [args do: [:arg| aStream nextPutAll: (self declarationAt: arg)] separatedBy: [aStream nextPutAll: ', ']]. + aStream nextPut: $)]. + isPrototype ifTrue: + [aStream nextPut: $;; cr. + self terminateConditionalDefineFor: compileTimeOptionPragmas on: aStream]. + ^compileTimeOptionPragmas notEmpty! - aStream nextPut: $)]! Item was added: + ----- Method: TMethod>>outputConditionalDefineFor:on: (in category 'C code generation') ----- + outputConditionalDefineFor: compileTimeOptionPragmas on: aStream + aStream nextPutAll: '#if '. + compileTimeOptionPragmas + do: [:pragma| + pragma keyword = #notOption: ifTrue: + [aStream nextPut: $!!]. + aStream nextPutAll: (pragma argumentAt: 1)] + separatedBy: [aStream nextPutAll: ' && ']. + aStream cr! Item was added: + ----- Method: TMethod>>terminateConditionalDefineFor:on: (in category 'C code generation') ----- + terminateConditionalDefineFor: compileTimeOptionPragmas on: aStream + compileTimeOptionPragmas ifEmpty: [^self]. + aStream nextPutAll: '#endif /* '. + compileTimeOptionPragmas + do: [:pragma| + pragma keyword = #notOption: ifTrue: + [aStream nextPut: $!!]. + aStream nextPutAll: (pragma argumentAt: 1)] + separatedBy: [aStream nextPutAll: ' && ']. + aStream nextPutAll: ' */'; cr! Item was added: + ----- Method: VMBasicConstants class>>defineAtCompileTime: (in category 'C translation') ----- + defineAtCompileTime: anObject + ^anObject isSymbol + and: [self namesDefinedAtCompileTime includes: anObject]! Item was changed: ----- Method: VMClass class>>shouldIncludeMethodForSelector: (in category 'translation') ----- shouldIncludeMethodForSelector: selector "Answer whether a primitive method should be translated. Emit a warning to the transcript if the method doesn't exist." ^(self whichClassIncludesSelector: selector) ifNotNil: [:c| (c >> selector pragmaAt: #option:) ifNotNil: [:pragma| + (VMBasicConstants defineAtCompileTime: pragma arguments first) + or: [initializationOptions + at: pragma arguments first + ifAbsent: [(self bindingOf: pragma arguments first) + ifNil: [false] + ifNotNil: [:binding| binding value ~~ #undefined]]]] - initializationOptions - at: pragma arguments first - ifAbsent: [(self bindingOf: pragma arguments first) - ifNil: [false] - ifNotNil: [:binding| binding value ~~ #undefined]]] ifNil: [true]] ifNil: [Transcript nextPutAll: 'Cannot find implementation of '; nextPutAll: selector; nextPutAll: ' in hierarchy of '; print: self; cr; flush. false]! Item was changed: ----- Method: VMPluginCodeGenerator>>generateInterpreterProxyFunctionDeference:on:indent: (in category 'C translation') ----- generateInterpreterProxyFunctionDeference: aNode on: aStream indent: anInteger | pluginsToClone | (pluginsToClone := self pluginFunctionsToClone) isEmpty ifTrue: [^self]. + aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. - aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'. pluginsToClone do: [:s| | cs | cs := self cFunctionNameFor: s. self withOptionalVerbiageFor: s on: aStream + do: [aStream tab: anInteger; nextPutAll: cs; nextPutAll: ' = interpreterProxy->'; nextPutAll: cs; nextPut: $;; cr] + ifOptionalDo: [aStream + nextPutAll: '# if !!defined('; nextPutAll: cs; nextPut: $); + crtab: anInteger; nextPutAll: cs; nextPutAll: ' = 0;'; + cr; nextPutAll: '# endif'; cr]]. + aStream nextPutAll: '#endif /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'.! - do: [aStream crtab: anInteger; nextPutAll: cs; nextPutAll: ' = interpreterProxy->'; nextPutAll: cs; nextPut: $;]]. - aStream cr; nextPutAll: '#endif /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'.! Item was changed: ----- Method: VMPluginCodeGenerator>>preDeclareInterpreterProxyOn: (in category 'C code generator') ----- preDeclareInterpreterProxyOn: aStream "Put the necessary #defines needed before interpreterProxy. Basically internal plugins use the VM's interpreterProxy variable and external plugins use their own. Override to keep local copies of all functions in external prims, and link directly in internal plugins." "| pcc | pcc := self new. (InterpreterProxy selectors reject: [:s| #(initialize private) includes: (InterpreterProxy whichCategoryIncludesSelector: s)]) do: [:s| pcc noteUsedPluginFunction: s]. pcc preDeclareInterpreterProxyOn: Transcript. Transcript flush" | pluginFuncs interpreterClass objectMemoryClass | (pluginFuncs := self pluginFunctionsToClone) isEmpty ifTrue: [^super preDeclareInterpreterProxyOn: aStream]. aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. interpreterClass := self referenceInterpreterClass. objectMemoryClass := self referenceObjectMemoryClass. pluginFuncs := pluginFuncs collect: [:selector| | reference actual | reference := self compileToTMethodSelector: selector in: ((interpreterClass whichClassIncludesSelector: selector) ifNil: [(objectMemoryClass whichClassIncludesSelector: selector) ifNil: [InterpreterProxy]]). actual := self compileToTMethodSelector: selector in: InterpreterProxy. (reference returnType ~= actual returnType or: [(1 to: reference args size) anySatisfy: [:i| (reference typeFor: (reference args at: i) in: self) ~= (actual typeFor: (actual args at: i) in: self)]]) ifTrue: [self logger nextPutAll: 'warning, signature of InterpreterProxy>>'; nextPutAll: selector; nextPutAll: ' does not match reference implementation.'; cr]. actual]. pluginFuncs do: [:tMethod| tMethod recordDeclarationsIn: self. tMethod returnType ifNil: [tMethod inferReturnTypeIn: self]]. - pluginFuncs do: + [:tMethod| | functionName | + functionName := self cFunctionNameFor: tMethod selector. + aStream nextPutAll: + ((String streamContents: + [:s| + tMethod + static: true; + emitCFunctionPrototype: s generator: self]) + copyReplaceAll: functionName + with: '(*', functionName, ')' + tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]])]. + aStream nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'; cr. - [:tMethod| self preDeclareStaticFunction: tMethod on: aStream]. - aStream cr; nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'. pluginFuncs do: + [:tMethod| + self withOptionalVerbiageFor: tMethod selector + on: aStream + do: [tMethod static: false; export: false; emitCFunctionPrototype: aStream generator: self] + ifOptionalDo: + [aStream nextPutAll: '# define '. + (TSendNode new + setSelector: tMethod selector + receiver: (TVariableNode new setName: 'interpreterProxy') + arguments: (tMethod args collect: [:a| TVariableNode new setName: a])) + emitCCodeAsArgumentOn: aStream + level: 0 + generator: self. + aStream nextPutAll: ' 0'; cr]]. + aStream nextPutAll: 'extern'; cr; nextPutAll: '#endif'; cr! - [:tMethod| self preDeclareExternFunction: tMethod on: aStream ]. - aStream cr; nextPutAll: 'extern'. - aStream cr; nextPutAll: '#endif'; cr! Item was changed: ----- Method: VMPluginCodeGenerator>>storeVirtualMachineProxyImplementation:on: (in category 'private') ----- storeVirtualMachineProxyImplementation: categoryList on: fileName "Store the interpreter definitions on the given file" | stream | stream := FileStream newFileNamed: fileName. stream nextPutAll:' #include <math.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #include "sqVirtualMachine.h"'; cr;cr. stream nextPutAll:'/*** Function prototypes ***/'. categoryList do:[:assoc| stream cr; cr; nextPutAll:'/* InterpreterProxy methodsFor: ''',assoc key, ''' */'; cr. (self sortStrings: assoc value) do:[:sel| + (methods at: sel) emitCFunctionPrototype: stream generator: self]]. - (methods at: sel) emitCFunctionPrototype: stream generator: self. - stream nextPut: $;; cr]]. stream cr; nextPutAll:'struct VirtualMachine *VM = NULL;'; cr. stream cr; nextPutAll: 'static int majorVersion(void) { return VM_PROXY_MAJOR; } static int minorVersion(void) { return VM_PROXY_MINOR; } struct VirtualMachine* sqGetInterpreterProxy(void) { if(VM) return VM; VM = (struct VirtualMachine *) calloc(1, sizeof(VirtualMachine)); /* Initialize Function pointers */ VM->majorVersion = majorVersion; VM->minorVersion = minorVersion; '. categoryList do:[:assoc| stream cr; crtab; nextPutAll:'/* InterpreterProxy methodsFor: ''',assoc key, ''' */'; crtab. assoc value asSortedCollection do:[:sel| stream nextPutAll:'VM->'; nextPutAll: (self cFunctionNameFor: sel); nextPutAll:' = '; nextPutAll: (self cFunctionNameFor: sel); nextPutAll:';'; crtab]]. stream cr; crtab; nextPutAll:'return VM;'; cr; nextPutAll:'}'; cr. stream close.! Item was changed: ----- Method: VMPluginCodeGenerator>>withOptionalVerbiageFor:on:do:ifOptionalDo: (in category 'C translation') ----- withOptionalVerbiageFor: selector on: aStream do: mainBlock ifOptionalDo: optionalBlock (InterpreterProxy >> selector pragmaAt: #option:) ifNil: [mainBlock value] ifNotNil: [:pragma| - aStream cr. self emitIfdefForPluginFunctionOption: pragma arguments first on: aStream. + aStream cr. mainBlock value. + aStream nextPutAll: '#else'; cr. + optionalBlock value. + aStream nextPutAll: '#endif'; cr]! - optionalBlock ifNotNil: - [aStream cr; nextPutAll: '#else'. - optionalBlock value]. - aStream cr; nextPutAll: '#endif']!

1 0

[commit][3602] Fix errors in the Newspeak Mac installer genrators.
by commits＠squeakvm.org 15 Feb '16

15 Feb '16

Revision: 3602 Author: eliot Date: 2016-02-14 17:27:13 -0800 (Sun, 14 Feb 2016) Log Message: ----------- Fix errors in the Newspeak Mac installer genrators. Fix a slip in platforms/Cross/vm/sqCogStackAlignment.h for the ARM's getsp. Eliminate non-spur and stack VMs from the ARM builds (it builds veerry slowly) Include 64-bit and Mac Pharo VMs in archives and uploads. Modified Paths: -------------- branches/Cog/build.linux32ARM/makeproduct branches/Cog/build.linux32ARM/makeproductclean branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile branches/Cog/build.macos64x64/newspeak.cog.spur/installer/branding.gmk branches/Cog/platforms/Cross/vm/sqCogStackAlignment.h branches/Cog/scripts/mkspurvmarchives branches/Cog/scripts/mkvmarchives branches/Cog/scripts/uploadvms Added Paths: ----------- branches/Cog/scripts/mkspur64vmarchives Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32ARM/makeproduct =================================================================== --- branches/Cog/build.linux32ARM/makeproduct 2016-02-14 23:01:48 UTC (rev 3601) +++ branches/Cog/build.linux32ARM/makeproduct 2016-02-15 01:27:13 UTC (rev 3602) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -for d in newspeak.cog.spur squeak.cog.spur squeak.cog.v3 squeak.stack.spur squeak.stack.v3; do +for d in newspeak.cog.spur squeak.cog.spur; do if test -d "$d"; then (cd ./$d;./makealldirty "$@") else Modified: branches/Cog/build.linux32ARM/makeproductclean =================================================================== --- branches/Cog/build.linux32ARM/makeproductclean 2016-02-14 23:01:48 UTC (rev 3601) +++ branches/Cog/build.linux32ARM/makeproductclean 2016-02-15 01:27:13 UTC (rev 3602) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -for d in newspeak.cog.spur squeak.cog.spur squeak.cog.v3 squeak.stack.spur squeak.stack.v3; do +for d in newspeak.cog.spur squeak.cog.spur; do if test -d "$d"; then (cd ./$d;./makeallclean "$@") else Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile 2016-02-14 23:01:48 UTC (rev 3601) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile 2016-02-15 01:27:13 UTC (rev 3602) @@ -21,7 +21,7 @@ $(VM_LOCALIZED_NAME_ESC).app: ../CocoaFast.app rm -rf $(VM_LOCALIZED_NAME_ESC).app cp -R ../CocoaFast.app $(VM_LOCALIZED_NAME_ESC).app - test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources/$(SOURCEFILENAME1) || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources + test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources/$(notdir $(SOURCEFILENAME1)) || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources # Cab contents: VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk 2016-02-14 23:01:48 UTC (rev 3601) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk 2016-02-15 01:27:13 UTC (rev 3602) @@ -4,7 +4,7 @@ # For Cog would like to use YY.MMDD.SVN where SVN is the Subversion checkin # id taken from platforms/Cross/vm/sqSCCSVersion.h. But that doesn't fit # the 0-255 field. So use YY.WW.SVN where WW is the week number. -SVNREV := $(shell grep '\$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$Rev: $[0-9][0-9]*$.*/\1/' ) +SVNREV := $(shell grep '$$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$$Rev: $[0-9][0-9]*$.*/\1/' ) VERSION := $(shell date +%y.%U.$(SVNREV)) # Base name of the executable (.exe is appended on Windows) Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile 2016-02-14 23:01:48 UTC (rev 3601) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile 2016-02-15 01:27:13 UTC (rev 3602) @@ -21,7 +21,7 @@ $(VM_LOCALIZED_NAME_ESC).app: ../CocoaFast.app rm -rf $(VM_LOCALIZED_NAME_ESC).app cp -R ../CocoaFast.app $(VM_LOCALIZED_NAME_ESC).app - test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources/$(SOURCEFILENAME1) || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources + test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources/$(notdir $(SOURCEFILENAME1)) || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources # Cab contents: VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/installer/branding.gmk =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/installer/branding.gmk 2016-02-14 23:01:48 UTC (rev 3601) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/installer/branding.gmk 2016-02-15 01:27:13 UTC (rev 3602) @@ -4,7 +4,7 @@ # For Cog would like to use YY.MMDD.SVN where SVN is the Subversion checkin # id taken from platforms/Cross/vm/sqSCCSVersion.h. But that doesn't fit # the 0-255 field. So use YY.WW.SVN where WW is the week number. -SVNREV := $(shell grep '\$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$Rev: $[0-9][0-9]*$.*/\1/' ) +SVNREV := $(shell grep '$$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$$Rev: $[0-9][0-9]*$.*/\1/' ) VERSION := $(shell date +%y.%U.$(SVNREV)) # Base name of the executable (.exe is appended on Windows) @@ -14,7 +14,7 @@ # Product name as compiled into the executable and installers ifndef PRODUCT_NAME -PRODUCT_NAME := Newspeak Spur Virtual Machine +PRODUCT_NAME := Newspeak Spur 64-bit Virtual Machine endif # Used for Desktop/menubar shortcuts Modified: branches/Cog/platforms/Cross/vm/sqCogStackAlignment.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqCogStackAlignment.h 2016-02-14 23:01:48 UTC (rev 3601) +++ branches/Cog/platforms/Cross/vm/sqCogStackAlignment.h 2016-02-15 01:27:13 UTC (rev 3602) @@ -79,7 +79,7 @@ # define getfp() ({ unsigned long fp; \ asm volatile ("mov %0, %%fp" : "=r"(fp) : ); \ fp; }) -# define getsp() ({ unsigned long fp; \ +# define getsp() ({ unsigned long sp; \ asm volatile ("mov %0, %%sp" : "=r"(sp) : ); \ sp; }) # endif Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Feb 14 15:00:23 PST 2016 + Sun Feb 14 17:24:40 PST 2016 Copied: branches/Cog/scripts/mkspur64vmarchives (from rev 3589, branches/Cog/scripts/mkspurvmarchives) =================================================================== --- branches/Cog/scripts/mkspur64vmarchives (rev 0) +++ branches/Cog/scripts/mkspur64vmarchives 2016-02-15 01:27:13 UTC (rev 3602) @@ -0,0 +1,179 @@ +#!/bin/sh +# Create the 64-bit Spur VM archives in products. Output a check of version +# numbers etc to products/MSVALOG +IFS=" +" +cd `dirname $0`/../products +NSB=newspeak.cog.spur +SQB=squeak.cog.spur +PHB=pharo.cog.spur + +if [ $# = 0 ]; then +CL=1 +CM=1 +CW=1 +NL=1 +NM=1 +NW=1 +PM=1 + +else + +CL= +CM= +CW= +NL= +NM= +NW= +PM= + while [ -n "$1" ]; do + case $1 in + -c) CL=1;CM=1;CW=1;; + -cl) CL=1;; + -cm) CM=1;; + -cw) CW=1;; + -n) NL=1;NM=1;NW=1;; + -nl) NL=1;; + -nm) NM=1;; + -nw) NW=1;; + -pw) PW=1;; + -l) CL=1;NL=1;; + -m) CM=1;NM=1;PM=1;; + -w) CW=1;NW=1;; + -r) shift;REV="$1";; + -t) shift;TAG="$1";; + -?|-h) echo usage: $0 [-c -n -l -m -w -c[lmw] -n[lmw] -pm -r REV -t TAG] + exit 0 + esac + shift + done +fi +test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \ + | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` +test -n "$TAG" || TAG=`date +%y.%U.`$REV +echo REV=$REV TAG=$TAG + +if [ -n "$CL" ]; then + for d in . assert debug; do + (cd $d + for archive in cogspur64linux cogspur64linuxht cogspur64linuxhtARM; do + rm -rf $archive-$TAG.tgz + echo $archive '=>' $archive-$TAG.tgz + COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $archive + EXES="$EXES $archive/lib/squeak/[0-9.-]*/squeak" + done) + done +fi +if [ -n "$NL" ]; then + for d in . assert debug; do + (cd $d + set -- nscogspur64linux nscogspur64linuxht nscogspur64linuxhtARM + for archive in nsvmspurlinux nsvmspurlinuxht nsvmspurlinuxhtARM; do + rm -rf $archive-$TAG.tgz + echo $1 '=>' $archive-$TAG.tgz + COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $1 + EXES="$EXES $1/lib/nsvm/[0-9.-]*/nsvm" + shift + done) + done +fi +if [ -n "$CM" ]; then + set -- CocoaFast.app CocoaAssert.app CocoaDebug.app + for app in CogSpur64.app assert/CogSpur64.app debug/CogSpur64.app; do + test -d $app || mkdir $app + if [ -d ../build.macos64x64/$SQB/$1 ]; then + rm -rf $app/* $app-$TAG.tgz + echo build.macos64x64/$SQB/$1 '=>' $app '=>' $app-$TAG.tgz + (cd ../build.macos64x64/$SQB/$1 >/dev/null;tar cf - *) \ + | (cd $app;tar xf -) + tar czf $app-$TAG.tgz $app + EXES="$EXES $app/Contents/MacOS/Squeak" + else + echo build.macos64x64/$SQB/$1 is missing + fi + shift + done +fi +if [ -n "$NM" ]; then + set -- CocoaFast.app CocoaAssert.app CocoaDebug.app + for app in Newspeak\ Spur\ Virtual\ Machine.app \ + assert/Newspeak\ Spur\ Virtual\ Machine.app\ + debug/Newspeak\ Spur\ Virtual\ Machine.app; do + test -d $app || mkdir $app + if [ -d ../build.macos64x64/$NSB/$1 ]; then + rm -rf $app/* $app-$TAG.tgz + echo build.macos64x64/$NSB/$1 '=>' $app '=>' $app-$TAG.tgz + (cd ../build.macos64x64/$NSB/$1 >/dev/null;tar cf - *) \ + | (cd $app;tar xf -) + tar czf $app-$TAG.tgz $app + EXES="$EXES $app/Contents/MacOS/Newspeak Virtual Machine" + else + echo build.macos64x64/$NSB/$1 is missing + fi + shift + done +fi +if [ -n "$PM" ]; then + set -- CocoaFast.app CocoaAssert.app CocoaDebug.app + for app in CogPharoSpur64.app assert/CogPharoSpur64.app debug/CogPharoSpur64.app; do + test -d $app || mkdir $app + if [ -d ../build.macos64x64/$PHB/$1 ]; then + rm -rf $app/* $app-$TAG.tgz + echo build.macos64x64/$PHB/$1 '=>' $app '=>' $app-$TAG.tgz + (cd ../build.macos64x64/$PHB/$1 >/dev/null;tar cf - *) \ + | (cd $app;tar xf -) + tar czf $app-$TAG.tgz $app + EXES="$EXES $app/Contents/MacOS/Squeak" + else + echo build.macos64x64/$PHB/$1 is missing + fi + shift + done +fi +if [ -n "$CW" ]; then + set -- build/vm buildast/vm builddbg/vm + for dir in cogspur64win assert/cogspur64win debug/cogspur64win; do + test -d $dir || mkdir $dir + if [ -d ../build.win64x64/$SQB/$1 ]; then + rm -rf $dir/* $dir-$TAG.zip + echo build.win64x64/$SQB/$1 '=>' $dir '=>' $dir-$TAG.zip + (cd ../build.win64x64/$SQB/$1 >/dev/null; \ + tar cf - Squeak.exe Squeak.map Squeak.exe.manifest \ + SqueakConsole.exe SqueakConsole.map SqueakConsole.exe.manifest \ + *.dll) \ + | (cd $dir;tar xf -) + zip -qr $dir-$TAG.zip $dir + EXES="$EXES $dir/Squeak.exe $dir/SqueakConsole.exe" + else + echo build.win64x64/$SQB/$1 is missing + fi + shift + done +fi +if [ -n "$NW" ]; then + set -- build/vm buildast/vm builddbg/vm + for dir in nsvmspurwin assert/nsvmspurwin debug/nsvmspurwin; do + test -d $dir || mkdir $dir + if [ -d ../build.win64x64/$NSB/$1 ]; then + rm -rf $dir/* $dir-$TAG.zip + echo build.win64x64/$NSB/$1 '=>' $dir '=>' $dir-$TAG.zip + (cd ../build.win64x64/$NSB/$1 >/dev/null; \ + tar cf - nsvm*.exe nsvm*.map nsvm*.exe.manifest ) \ + | (cd $dir;tar xf -) + zip -qr $dir-$TAG.zip $dir + EXES="$EXES $dir/nsvm.exe $dir/nsvmConsole.exe" + else + echo build.win64x64/$NSB/$1 is missing + fi + shift + done +fi +for vm in $EXES +do + echo + echo checking $vm version +# strings - $vm | egrep '\$Rev: |Interp.*VMMaker|Cogit.*VMMaker| built on ' | grep -v 'Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__' | sed 's/ uuid:.*//' + strings - $vm | egrep '\$Rev: |Interp.*VMMaker|Cogit.*VMMaker| built on ' | sed 's/ uuid:.*//' + echo checking $vm for asserts + strings - $vm | grep "assert[^0-9]*[0-9][0-9][0-9]" +done 2>&1 | tee MSVALOG Modified: branches/Cog/scripts/mkspurvmarchives =================================================================== --- branches/Cog/scripts/mkspurvmarchives 2016-02-14 23:01:48 UTC (rev 3601) +++ branches/Cog/scripts/mkspurvmarchives 2016-02-15 01:27:13 UTC (rev 3602) @@ -6,6 +6,7 @@ cd `dirname $0`/../products NSB=newspeak.cog.spur SQB=squeak.cog.spur +PHB=pharo.cog.spur if [ $# = 0 ]; then CL=1 @@ -14,6 +15,7 @@ NL=1 NM=1 NW=1 +PM=1 else @@ -23,6 +25,7 @@ NL= NM= NW= +PM= while [ -n "$1" ]; do case $1 in -c) CL=1;CM=1;CW=1;; @@ -33,12 +36,13 @@ -nl) NL=1;; -nm) NM=1;; -nw) NW=1;; + -pm) PM=1;; -l) CL=1;NL=1;; - -m) CM=1;NM=1;; + -m) CM=1;NM=1;PM=1;; -w) CW=1;NW=1;; -r) shift;REV="$1";; -t) shift;TAG="$1";; - -?|-h) echo usage: $0 [-c -n -l -m -w -c[lmw] -n[lmw] -r REV -t TAG] + -?|-h) echo usage: $0 [-c -n -l -m -w -c[lmw] -n[lmw] -pm -r REV -t TAG] exit 0 esac shift @@ -74,7 +78,7 @@ done fi if [ -n "$CM" ]; then - set -- Fast.app Assert.app Debug.app + set -- CocoaFast.app CocoaAssert.app CocoaDebug.app for app in CogSpur.app assert/CogSpur.app debug/CogSpur.app; do test -d $app || mkdir $app if [ -d ../build.macos32x86/$SQB/$1 ]; then @@ -91,7 +95,7 @@ done fi if [ -n "$NM" ]; then - set -- Fast.app Assert.app Debug.app + set -- CocoaFast.app CocoaAssert.app CocoaDebug.app for app in Newspeak\ Spur\ Virtual\ Machine.app \ assert/Newspeak\ Spur\ Virtual\ Machine.app\ debug/Newspeak\ Spur\ Virtual\ Machine.app; do @@ -109,6 +113,23 @@ shift done fi +if [ -n "$PM" ]; then + set -- CocoaFast.app CocoaAssert.app CocoaDebug.app + for app in CogPharoSpur.app assert/CogPharoSpur.app debug/CogPharoSpur.app; do + test -d $app || mkdir $app + if [ -d ../build.macos32x86/$PHB/$1 ]; then + rm -rf $app/* $app-$TAG.tgz + echo build.macos32x86/$PHB/$1 '=>' $app '=>' $app-$TAG.tgz + (cd ../build.macos32x86/$PHB/$1 >/dev/null;tar cf - *) \ + | (cd $app;tar xf -) + tar czf $app-$TAG.tgz $app + EXES="$EXES $app/Contents/MacOS/Squeak" + else + echo build.macos32x86/$PHB/$1 is missing + fi + shift + done +fi if [ -n "$CW" ]; then set -- build/vm buildast/vm builddbg/vm for dir in cogspurwin assert/cogspurwin debug/cogspurwin; do Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2016-02-14 23:01:48 UTC (rev 3601) +++ branches/Cog/scripts/mkvmarchives 2016-02-15 01:27:13 UTC (rev 3602) @@ -3,6 +3,6 @@ # agreement `dirname $0`/mkcogvmarchives `dirname $0`/mkspurvmarchives -`dirname $0`/mkARMstackvmarchives +`dirname $0`/mkspur32vmarchives echo; echo "Version info:" cat `dirname $0`/../products/M*[CS]VALOG | egrep '\$Rev|VMMaker' | sort -u Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2016-02-14 23:01:48 UTC (rev 3601) +++ branches/Cog/scripts/uploadvms 2016-02-15 01:27:13 UTC (rev 3602) @@ -9,28 +9,30 @@ LCOG= LTCOG= LSPUR= +LSPUR64= LTSPUR= LASPUR= MCOG= MTCOG= MSPUR= +MSPUR64= +MPSPUR= +MPSPUR64= MTSPUR= WCOG= WTCOG= WSPUR= WTSPUR= -LNSCOG= LNSSPUR= -MNSCOG= MNSSPUR= -WNSCOG= WNSSPUR= +LNSSPUR64= +MNSSPUR64= cd `dirname $0`/../products VERBOSE= JustUpload= -# By default the Newspeak Cog VMs are not built; superceded by Spur. function all () { CheckDMG=1 CheckMSI=1 @@ -43,12 +45,15 @@ MSPUR=1 WCOG=1 WSPUR=1 -# LNSCOG=1 + MPSPUR=1 LNSSPUR=1 -# MNSCOG=1 MNSSPUR=1 -# WNSCOG=1 WNSSPUR=1 + LSPUR64=1 + MSPUR64=1 + MPSPUR64=1 + LNSSPUR64=1 + MNSSPUR64=1 } if [ $# = 0 ]; then @@ -61,7 +66,8 @@ -archives) JustUpload=JustUpload;; -all) all;; -spur) CheckDMG=1;CheckMSI=1; - LSPUR=1;LASPUR=1;MSPUR=1;WSPUR=1;LNSSPUR=1;MNSSPUR=1;WNSSPUR=1;; + LSPUR=1;LASPUR=1;MSPUR=1;WSPUR=1;LNSSPUR=1;MNSSPUR=1;WNSSPUR=1; + LSPUR64=1;MSPUR64=1;MPSPUR64=1;LNSSPUR64=1;MNSSPUR64=1;; -c) LCOG=1;LTCOG=1;MCOG=1;MTCOG=1;WCOG=1;WMTCOG=1; LSPUR=1;LASPUR=1;MSPUR=1;WSPUR=1;; -cl) LCOG=1;LTCOG=1;LSPUR=1;LASPUR=1;; @@ -70,24 +76,25 @@ -ctl) LTCOG=1;; -ctm) MTCOG=1;; -ctw) WTCOG=1;; - -nl) LNSCOG=1;LNSSPUR=1;; - -nm) MNSCOG=1;MNSSPUR=1; + -nl) LNSSPUR=1;; + -nm) MNSSPUR=1; CheckDMG=1;; - -nw) WNSCOG=1;WNSSPUR=1; + -nw) WNSSPUR=1; CheckMSI=1;; - -n) LNSCOG=1;LNSSPUR=1;MNSCOG=1;MNSSPUR=1;WNSCOG=1;WNSSPUR=1; + -n) LNSSPUR=1;MNSSPUR=1;WNSSPUR=1;LNSSPUR64=1;MNSSPUR64=1; CheckDMG=1;CheckMSI=1;; - -l) LCOG=1;LTCOG=1;LSPUR=1;LASPUR=1;LNSCOG=1;LNSSPUR=1;; - -m) MCOG=1;MTCOG=1;MSPUR=1;MNSCOG=1;MNSSPUR=1; + -p) MPSPUR=1;MPSPUR64=1;; + -l) LCOG=1;LTCOG=1;LSPUR=1;LASPUR=1;LNSSPUR=1;; + -m) MCOG=1;MTCOG=1;MSPUR=1;MNSSPUR=1;MSPUR64=1;MPSPUR=1;MPSPUR64=1; CheckDMG=1;; - -w) WCOG=1;WTCOG=1;WSPUR=1;WNSCOG=1;WNSSPUR=1; + -w) WCOG=1;WTCOG=1;WSPUR=1;WNSSPUR=1; CheckMSI=1;CheckDMG=1;; -v) VERBOSE=1;; -r) shift;REV="$1";; -t) shift;TAG="$1";; -T) TEST=1;; - -?|-h) echo usage: $0 [-all -l -m -w -c -n -cl -cm -cw -ctl -ctm -ctw -nl -nm -nw -archives -r REV -t TAG -T]; exit 0;; - *) echo usage: $0 [-all -l -m -w -c -n -cl -cm -cw -ctl -ctm -ctw -nl -nm -nw -archives -r REV -t TAG -T]; exit 1;; + -?|-h) echo usage: $0 [-all -l -m -w -c -n -p -cl -cm -cw -ctl -ctm -ctw -nl -nm -nw -archives -r REV -t TAG -T]; exit 0;; + *) echo usage: $0 [-all -l -m -w -c -n -p -cl -cm -cw -ctl -ctm -ctw -nl -nm -nw -archives -r REV -t TAG -T]; exit 1;; esac shift done @@ -120,35 +127,25 @@ test -n "$MCOG" && ARCHIVES="$ARCHIVES Cog.app-$TAG.tgz CogSpur.app-$TAG.tgz" test -n "$MTCOG" && ARCHIVES="$ARCHIVES CogMT.app-$TAG.tgz" test -n "$MSPUR" && ARCHIVES="$ARCHIVES CogSpur.app-$TAG.tgz" +test -n "$MSPUR64" && ARCHIVES="$ARCHIVES CogSpur64.app-$TAG.tgz" test -n "$MTSPUR" && ARCHIVES="$ARCHIVES CogMTSpur.app-$TAG.tgz" +test -n "$MPSPUR" && ARCHIVES="$ARCHIVES CogPharoSpur.app-$TAG.tgz" +test -n "$MPSPUR64" && ARCHIVES="$ARCHIVES CogPharoSpur64.app-$TAG.tgz" test -n "$WCOG" && ARCHIVES="$ARCHIVES cogwin-$TAG.zip" test -n "$WTCOG" && ARCHIVES="$ARCHIVES cogmtwin-$TAG.zip" test -n "$WSPUR" && ARCHIVES="$ARCHIVES cogspurwin-$TAG.zip" test -n "$WTSPUR" && ARCHIVES="$ARCHIVES cogspurmtwin-$TAG.zip" -test -n "$LNSCOG" && ARCHIVES="$ARCHIVES nsvmlinux-$TAG.tgz nsvmlinuxht-$TAG.tgz" test -n "$LNSSPUR" && ARCHIVES="$ARCHIVES nsvmspurlinux-$TAG.tgz nsvmspurlinuxht-$TAG.tgz nsvmspurlinuxhtARM-$TAG.tgz" -test -n "$MNSCOG" && ARCHIVES="$ARCHIVES Newspeak Virtual Machine-$TAG.dmg Newspeak Virtual Machine.app-$TAG.tgz" test -n "$MNSSPUR" && ARCHIVES="$ARCHIVES Newspeak Spur Virtual Machine-$TAG.dmg Newspeak Spur Virtual Machine.app-$TAG.tgz" -test -n "$WNSCOG" && ARCHIVES="$ARCHIVES nsvmwin-$TAG.zip nsvm-$TAG.msi" test -n "$WNSSPUR" && ARCHIVES="$ARCHIVES nsvmspurwin-$TAG.zip nsvm-spur-$TAG.msi" +test -n "$MNSSPUR64" && ARCHIVES="$ARCHIVES Newspeak Spur 64-bit Virtual Machine-$TAG.dmg Newspeak Spur 64-bit Virtual Machine.app-$TAG.tgz" if [ -n "$VERBOSE" ]; then for a in $ARCHIVES; do echo upload $a done fi -if [ -n "$CheckDMG" -a -n "$MNSCOG" -a ! -f "Newspeak Virtual Machine-$TAG.dmg" ]; then - NMID=../build.macos32x86/newspeak.cog.v3/installer - if [ -f "Newspeak Virtual Machine-$TAG.dmg" ]; then - true - elif [ -f "$NMID/Newspeak Virtual Machine-$TAG.dmg" ]; then - ln "$NMID/Newspeak Virtual Machine-$TAG.dmg" . - else - echo Newspeak Virtual Machine-$TAG.dmg is missing 1>&2 - exit 1 - fi -fi if [ -n "$CheckDMG" -a -n "$MNSSPUR" -a ! -f "Newspeak Spur Virtual Machine-$TAG.dmg" ]; then NMID=../build.macos32x86/newspeak.cog.spur/installer if [ -f "Newspeak Spur Virtual Machine-$TAG.dmg" ]; then @@ -160,14 +157,14 @@ exit 1 fi fi -if [ -n "$CheckMSI" -a -n "$WNSCOG" -a ! -f nsvm-$TAG.msi ]; then - NMID=../build.win32x86/newspeak.cog.v3/installer - if [ -f nsvm-$TAG.msi ]; then +if [ -n "$CheckDMG" -a -n "$MNSSPUR64" -a ! -f "Newspeak Spur 64-bit Virtual Machine-$TAG.dmg" ]; then + NMID=../build.macos64x64/newspeak.cog.spur/installer + if [ -f "Newspeak Spur 64-bit Virtual Machine-$TAG.dmg" ]; then true - elif [ -f "$NWID/nsvm-$TAG.msi" ]; then - ln "$NWID/nsvm-$TAG.msi" . + elif [ -f "$NMID/Newspeak Spur 64-bit Virtual Machine-$TAG.dmg" ]; then + ln "$NMID/Newspeak Spur 64-bit Virtual Machine-$TAG.dmg" . else - echo nsvm-$TAG.msi is missing 1>&2 + echo Newspeak Spur 64-bit Virtual Machine-$TAG.dmg is missing 1>&2 exit 1 fi fi @@ -192,8 +189,12 @@ non-blocking FFI calls. The archives containing "Spur" or "spur" are VMs using the new Spur object representation and garbage collector and should be used with Spur-format Squeak/Pharo/Croquet or Newspeak images. - Squeak V5 and Newspeak have moved to Spur. + Squeak V5, Newspeak and the upcoming Pharo release have moved to Spur. + Archives whose names include "64" are 64-bit Spur VMs. They should be + used with 64-bit Spur images. Sample 64-bit images can be found at + http://www.mirandabanda.org/files/Cog/SpurImages + Linux There are two variants of the Linux VMs; those ending in "ht" have a heartbeat thread, while those that don't use an interval timer for the

1 0

[commit][3601] Get the 64-bit Mac OS plugin list right.
by commits＠squeakvm.org 15 Feb '16

15 Feb '16

Revision: 3601 Author: eliot Date: 2016-02-14 15:01:48 -0800 (Sun, 14 Feb 2016) Log Message: ----------- Get the 64-bit Mac OS plugin list right. Tweak the linux ARM HowToBuild. Modified Paths: -------------- branches/Cog/build.linux32ARM/HowToBuild branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32ARM/HowToBuild =================================================================== --- branches/Cog/build.linux32ARM/HowToBuild 2016-02-14 23:00:54 UTC (rev 3600) +++ branches/Cog/build.linux32ARM/HowToBuild 2016-02-14 23:01:48 UTC (rev 3601) @@ -253,6 +253,7 @@ sudo apt-get install libpango1.0-dev Raspbian +sudo apt-get update sudo apt-get install libcairo2-dev sudo apt-get install libpango1.0-dev sudo apt-get install libssl-dev Modified: branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-02-14 23:00:54 UTC (rev 3600) +++ branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-02-14 23:01:48 UTC (rev 3601) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,4 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-02-14 23:00:54 UTC (rev 3600) +++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-02-14 23:01:48 UTC (rev 3601) @@ -5,6 +5,6 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ -SqueakFFIPrims \ SqueakSSL \ -UnixOSProcessPlugin +UnixOSProcessPlugin \ +# SqueakFFIPrims Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-02-14 23:00:54 UTC (rev 3600) +++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-02-14 23:01:48 UTC (rev 3601) @@ -3,7 +3,6 @@ ADPCMCodecPlugin \ AioPlugin \ AsynchFilePlugin \ -B3DAcceleratorPlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -14,7 +13,6 @@ FilePlugin \ HostWindowPlugin \ IA32ABI \ -InternetConfigPlugin \ JPEGReaderPlugin \ JPEGReadWriter2Plugin \ Klatt \ @@ -25,7 +23,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -34,5 +31,8 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ +# B3DAcceleratorPlugin \ +# InternetConfigPlugin \ # JoystickTabletPlugin \ -# MIDIPlugin +# MIDIPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext 2016-02-14 23:00:54 UTC (rev 3600) +++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext 2016-02-14 23:01:48 UTC (rev 3601) @@ -5,6 +5,6 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ -SqueakFFIPrims \ SqueakSSL \ -UnixOSProcessPlugin +UnixOSProcessPlugin \ +# SqueakFFIPrims Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-02-14 23:00:54 UTC (rev 3600) +++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-02-14 23:01:48 UTC (rev 3601) @@ -3,7 +3,6 @@ ADPCMCodecPlugin \ AioPlugin \ AsynchFilePlugin \ -B3DAcceleratorPlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -14,7 +13,6 @@ FilePlugin \ HostWindowPlugin \ IA32ABI \ -InternetConfigPlugin \ JPEGReaderPlugin \ JPEGReadWriter2Plugin \ Klatt \ @@ -25,7 +23,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -34,5 +31,8 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ +# B3DAcceleratorPlugin \ +# InternetConfigPlugin \ # JoystickTabletPlugin \ -# MIDIPlugin +# MIDIPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext 2016-02-14 23:00:54 UTC (rev 3600) +++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext 2016-02-14 23:01:48 UTC (rev 3601) @@ -5,6 +5,6 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ -SqueakFFIPrims \ SqueakSSL \ -UnixOSProcessPlugin +UnixOSProcessPlugin \ +# SqueakFFIPrims Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-02-14 23:00:54 UTC (rev 3600) +++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-02-14 23:01:48 UTC (rev 3601) @@ -3,7 +3,6 @@ ADPCMCodecPlugin \ AioPlugin \ AsynchFilePlugin \ -B3DAcceleratorPlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -14,7 +13,6 @@ FilePlugin \ HostWindowPlugin \ IA32ABI \ -InternetConfigPlugin \ JPEGReaderPlugin \ JPEGReadWriter2Plugin \ Klatt \ @@ -25,7 +23,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -34,5 +31,8 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ +# B3DAcceleratorPlugin \ +# InternetConfigPlugin \ # JoystickTabletPlugin \ -# MIDIPlugin +# MIDIPlugin \ +# SerialPlugin Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Feb 14 13:22:13 PST 2016 + Sun Feb 14 15:00:23 PST 2016

1 0

← Newer
1
...
7
8
9
10
11
12
13
14
15
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 February 2016