Vm-dev July 2014

vm-dev@lists.squeakfoundation.org

22 participants
157 discussions

VM Maker: VMMaker.oscog-eem.799.mcz
by commits＠source.squeak.org 03 Jul '14

03 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.799.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.799 Author: eem Time: 3 July 2014, 6:33:32.969 am UUID: 6f964dbc-8fd4-4072-8fb1-c4fe44fb5e40 Ancestors: VMMaker.oscog-eem.798 Use a better variable name for the frameOfMarriedContext: temp to skirt an inlining bug. =============== Diff against VMMaker.oscog-eem.798 =============== Item was changed: ----- Method: StackInterpreter>>frameOfMarriedContext: (in category 'frame access') ----- frameOfMarriedContext: aContext + | senderOop | - | value | <inline: true> <returnTypeC: 'char *'> + senderOop := objectMemory fetchPointer: SenderIndex ofObject: aContext. + ^self withoutSmallIntegerTags: senderOop! - value := objectMemory fetchPointer: SenderIndex ofObject: aContext. - ^self withoutSmallIntegerTags: value!

1 0

VM Maker: VMMaker.oscog-eem.798.mcz
by commits＠source.squeak.org 03 Jul '14

03 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.798.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.798 Author: eem Time: 3 July 2014, 6:06:32.954 am UUID: f47e2c22-fea0-4762-b689-8b295a59d8ac Ancestors: VMMaker.oscog-eem.797 Sort VM methods by class first, selector second, to group by coarse functionality (e.g. scavenger methods) for the benefit of the VMProfiler. Access missOffset via a macro (very minor speedup). =============== Diff against VMMaker.oscog-eem.797 =============== Item was changed: ----- Method: CCodeGenerator>>sortMethods: (in category 'utilities') ----- sortMethods: aTMethodCollection "We need to define this since different Squeak versions answer different results + for asSortedCollection and if sort order changes, generated code changes too. + When generating VM code, use class name as major sort index as this groups + some methods by functionality (e.g. SpurGenerationScavenger) and that makes + the VMProfiler more useful." - for asSortedCollection and if sort order changes, generated code changes too." ^aTMethodCollection asSortedCollection: + (self isGeneratingPluginCode + ifTrue: + [[:a :b| a selector caseSensitiveLessOrEqual: b selector]] + ifFalse: + [[:a :b| + a definingClass = b definingClass + ifTrue: [a selector caseSensitiveLessOrEqual: b selector] + ifFalse: [a definingClass name caseSensitiveLessOrEqual: b definingClass name]]])! - [:a :b| a selector caseSensitiveLessOrEqual: b selector]! Item was changed: ----- Method: Cogit class>>mustBeGlobal: (in category 'translation') ----- mustBeGlobal: var "Answer if a variable must be global and exported. Used for inst vars that are accessed from VM support code. include cePositive32BitIntegerTrampoline as a hack to prevent it being inlined (it is only used outside of Cogit by the object representation). Include CFramePointer CStackPointer as a hack to get them declared at all." ^#('ceBaseFrameReturnTrampoline' 'ceCaptureCStackPointers' 'ceCheckForInterruptTrampoline' 'ceEnterCogCodePopReceiverReg' 'realCEEnterCogCodePopReceiverReg' 'ceEnterCogCodePopReceiverAndClassRegs' 'realCEEnterCogCodePopReceiverAndClassRegs' 'ceReturnToInterpreterTrampoline' 'ceCannotResumeTrampoline' 'ceTryLockVMOwner' 'ceUnlockVMOwner' + 'cmEntryOffset' 'cmNoCheckEntryOffset' 'cmDynSuperEntryOffset' 'missOffset' - 'cmEntryOffset' 'cmNoCheckEntryOffset' 'cmDynSuperEntryOffset' 'blockNoContextSwitchOffset' 'breakPC' 'CFramePointer' 'CStackPointer' 'cFramePointerInUse' 'ceGetSP' 'traceFlags' 'traceStores' 'debugPrimCallStackOffset') includes: var! Item was changed: ----- Method: Cogit>>interpretOffset (in category 'in-line cacheing') ----- interpretOffset <api> + <cmacro: '() missOffset'> ^missOffset!

1 0

[commit][3030] Go meta young lad! Generate the getGoodCog/SpurVM. sh scripts automatically
by commits＠squeakvm.org 03 Jul '14

03 Jul '14

Revision: 3030 Author: eliot Date: 2014-07-03 05:46:14 -0700 (Thu, 03 Jul 2014) Log Message: ----------- Go meta young lad! Generate the getGoodCog/SpurVM.sh scripts automatically on uploading the VMs. Edit the various scripts to use these generic scripts. Modified Paths: -------------- branches/Cog/image/buildspurtrunkimage.sh branches/Cog/image/buildsqueak45vmmakerimage.sh branches/Cog/image/buildsqueaktrunkvmmakerimage.sh branches/Cog/image/envvars.sh branches/Cog/scripts/uploadvms Added Paths: ----------- branches/Cog/image/getGoodCogVM.sh branches/Cog/image/getGoodSpurVM.sh branches/Cog/image/makegetvmscripts.sh Removed Paths: ------------- branches/Cog/image/get3021spurvm.sh branches/Cog/image/get3021vm.sh Modified: branches/Cog/image/buildspurtrunkimage.sh =================================================================== --- branches/Cog/image/buildspurtrunkimage.sh 2014-07-03 02:52:10 UTC (rev 3029) +++ branches/Cog/image/buildspurtrunkimage.sh 2014-07-03 12:46:14 UTC (rev 3030) @@ -1,7 +1,7 @@ #!/bin/sh . ./envvars.sh ./getsqueak45.sh -. ./get3021vm.sh +. ./getGoodCogVM.sh cp -p $SQUEAK45.image trunk46forspur.image cp -p $SQUEAK45.changes trunk46forspur.changes @@ -20,7 +20,7 @@ for f in *VMMaker*spur.image; do if test -f "$f"; then IMAGE="$f" -. ./get3021spurvm.sh +. ./getGoodSpurVM.sh break 2 fi done @@ -28,7 +28,7 @@ for f in *VMMaker*.image; do if test -f "$f"; then IMAGE="$f" -. ./get3021vm.sh +. ./getGoodCogVM.sh break 2 fi done @@ -48,6 +48,6 @@ mv trunk46forspur-spur.changes trunk46-spur.changes # Now load the modified packages -. ./get3021spurvm.sh +. ./getGoodSpurVM.sh echo $VM trunk46-spur.image LoadSpurPackagesFromTempDir.st $VM trunk46-spur.image LoadSpurPackagesFromTempDir.st Modified: branches/Cog/image/buildsqueak45vmmakerimage.sh =================================================================== --- branches/Cog/image/buildsqueak45vmmakerimage.sh 2014-07-03 02:52:10 UTC (rev 3029) +++ branches/Cog/image/buildsqueak45vmmakerimage.sh 2014-07-03 12:46:14 UTC (rev 3030) @@ -1,7 +1,7 @@ #!/bin/bash . ./envvars.sh ./getsqueak45.sh -. ./get3021vm.sh +. ./getGoodCogVM.sh cp -p $SQUEAK45.image CogVMMaker.image cp -p $SQUEAK45.changes CogVMMaker.changes Modified: branches/Cog/image/buildsqueaktrunkvmmakerimage.sh =================================================================== --- branches/Cog/image/buildsqueaktrunkvmmakerimage.sh 2014-07-03 02:52:10 UTC (rev 3029) +++ branches/Cog/image/buildsqueaktrunkvmmakerimage.sh 2014-07-03 12:46:14 UTC (rev 3030) @@ -1,7 +1,7 @@ #!/bin/bash . ./envvars.sh ./getsqueak45.sh -. ./get3021vm.sh +. ./getGoodCogVM.sh cp -p $SQUEAK45.image CogVMMaker.image cp -p $SQUEAK45.changes CogVMMaker.changes Modified: branches/Cog/image/envvars.sh =================================================================== --- branches/Cog/image/envvars.sh 2014-07-03 02:52:10 UTC (rev 3029) +++ branches/Cog/image/envvars.sh 2014-07-03 12:46:14 UTC (rev 3030) @@ -19,8 +19,8 @@ OSREL=`uname -r | sed 's/$[0-9]*$\.$[0-9]*$\.$[0-9]*$.*$/\1.\2.\3/'` fi -test "$OS" = Darwin && function quietmd5 () { /sbin/md5 -q "$1"; } -test "$OS" = Darwin || function quietmd5 () { /usr/bin/md5sum "$1" | sed 's/ .*$//'; } +test "$OS" = Darwin && function quietmd5 () { /sbin/md5 -q "$1" 2>/dev/null; } +test "$OS" = Darwin || function quietmd5 () { /usr/bin/md5sum "$1" | sed 's/ .*$//' 2>/dev/null; } function get_vm_from_tar() # VM VMHASH VMARC VMARCHASH { VM="$1" Deleted: branches/Cog/image/get3021spurvm.sh =================================================================== --- branches/Cog/image/get3021spurvm.sh 2014-07-03 02:52:10 UTC (rev 3029) +++ branches/Cog/image/get3021spurvm.sh 2014-07-03 12:46:14 UTC (rev 3030) @@ -1,30 +0,0 @@ -#!/bin/sh -# Sets the VM env var to the r3021 Cog Spur VM for the current platform. -# will download and install the VM in this directory if necessary. -#set -v -. ./envvars.sh - -if wget --help >/dev/null; then - true -else - echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2 - exit 1 -fi - -URL=http://www.mirandabanda.org/files/Cog/VM/VM.r3021/ - -case "$OS" in -Darwin) get_vm_from_tar \ - CogSpur.app/Contents/MacOS/Squeak fb003318b8fbb7a50dc9f6d9dd82b454 \ - CogSpur.app-14.25.3021.tgz 6767d878f8331a0728ca3fb19cfd754e - VM=CogSpur.app/Contents/MacOS/Squeak;; -Linux) get_vm_from_tar \ - cogspurlinuxht/lib/squeak/4.0-3021/squeak e826b2307e1618ee3492de7fae0ae594 \ - cogspurlinuxht-14.25.3021.tgz ad01f54ae5d3c2c3b4d8e8f1d640fedd - VM=cogspurlinuxht/squeak;; -CYGWIN*) get_vm_from_zip \ - cogspurwin/SqueakConsole.exe 8d8a644ef1bf7e201862e49ce9358e11 \ - cogspurwin-14.25.3021.zip 407da5d8f34482be96eaa299907c51eb - VM=cogwin/SqueakConsole.exe;; -*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 -esac Deleted: branches/Cog/image/get3021vm.sh =================================================================== --- branches/Cog/image/get3021vm.sh 2014-07-03 02:52:10 UTC (rev 3029) +++ branches/Cog/image/get3021vm.sh 2014-07-03 12:46:14 UTC (rev 3030) @@ -1,38 +0,0 @@ -#!/bin/sh -# Sets the VM env var to the r3021 Cog VM for the current platform. -# will download and install the VM in this directory if necessary. -#set -v -. ./envvars.sh - -if wget --help >/dev/null ; then - true -else - echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2 - exit 1 -fi - -URL=http://www.mirandabanda.org/files/Cog/VM/VM.r3021/ - -case "$OS" in -Darwin) get_vm_from_tar \ - Cog.app/Contents/MacOS/Squeak 8f6f98f8bc7e79ceb19734286d0dbe1b \ - Cog.app-14.25.3021.tgz ac6a54d861cf6fb46d7b926f6d8baf50 - VM=Cog.app/Contents/MacOS/Squeak;; -Linux) - if expr $OSREL \> 2.6.12; then - get_vm_from_tar \ - coglinuxht/lib/squeak/4.0-3021/squeak de88791228cbb74925de35cb126f317b \ - coglinuxht-14.25.3021.tgz 3486b358193430d46094ea3abfe9a093 - VM=coglinuxht/lib/squeak/4.0-3021/squeak - else - get_vm_from_tar \ - coglinux/lib/squeak/4.0-3021/squeak 77b02e13a80bbea045fafc59a6f963ec \ - coglinux-14.25.3021.tgz 9c87dc67d7505be3b4c74497fa09f61c - VM=coglinux/lib/squeak/4.0-3021/squeak - fi;; -CYGWIN*) get_vm_from_zip \ - cogwin/SqueakConsole.exe c72e3239aa011374896361d08d184afc \ - cogwin-14.25.3021.zip e0189adc34a8c8f6f015ae621245c475 - 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/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh (rev 0) +++ branches/Cog/image/getGoodCogVM.sh 2014-07-03 12:46:14 UTC (rev 3030) @@ -0,0 +1,38 @@ +#!/bin/sh +# Sets the VM env var to the r3029 Cog VM for the current platform. +# will download and install the VM in this directory if necessary. + +TAG=14.26.3029 +REV=3029 +URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ + +. ./envvars.sh + +if wget --help >/dev/null ; then + true +else + echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2 + exit 1 +fi + +case "$OS" in +Darwin) get_vm_from_tar \ + Cog.app/Contents/MacOS/Squeak a8836be2d6d62bd5711dbfdd043757b4 \ + Cog.app-$TAG.tgz d7a301c471515ea90c69f62225a93555 + VM=Cog.app/Contents/MacOS/Squeak;; +Linux) + if expr $OSREL \> 2.6.12; then + get_vm_from_tar \ + coglinuxht/lib/squeak/4.0-$REV/squeak 9d0f27d9b71f1dacc31b8beafa4c3b6d \ + coglinuxht-$TAG.tgz 2300e4d895b26bfcc6a652841781ac90 + else + get_vm_from_tar \ + coglinux/lib/squeak/4.0-$REV/squeak eff9d1c4b5c64c23109dff0f0d634ae9 \ + coglinux-$TAG.tgz 655db6462a9d804983dffd3eda4d0531 + fi;; +CYGWIN*) get_vm_from_zip \ + cogwin/SqueakConsole.exe e6ebcb8a8c3f585cad66c7a54e47206f \ + cogwin-$TAG.zip cea244b795ac9cebc7b47ac94af6a5a2 + VM=cogwin/SqueakConsole.exe;; +*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 +esac Property changes on: branches/Cog/image/getGoodCogVM.sh ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/image/getGoodSpurVM.sh =================================================================== --- branches/Cog/image/getGoodSpurVM.sh (rev 0) +++ branches/Cog/image/getGoodSpurVM.sh 2014-07-03 12:46:14 UTC (rev 3030) @@ -0,0 +1,32 @@ +#!/bin/sh +# Sets the VM env var to the r3029 Cog Spur VM for the current platform. +# will download and install the VM in this directory if necessary. + +TAG=14.26.3029 +REV=3029 +URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ + +. ./envvars.sh + +if wget --help >/dev/null ; then + true +else + echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2 + exit 1 +fi + +case "$OS" in +Darwin) get_vm_from_tar \ + CogSpur.app/Contents/MacOS/Squeak 19a64f72acb1e2d3d6f2d47410e6e26a \ + CogSpur.app-$TAG.tgz bbf5edcee366fd4e0f0340ff9fbcfcb3 + VM=CogSpur.app/Contents/MacOS/Squeak;; +Linux) get_vm_from_tar \ + cogspurlinuxht/lib/squeak/4.0-$REV/squeak eb322de8e2bd4ce388573733f8f01405 \ + cogspurlinuxht-$TAG.tgz ae8abc7d0d4c7d7c4290a93d173179f3 + VM=cogspurlinuxht/squeak;; +CYGWIN*) get_vm_from_zip \ + cogspurwin/SqueakConsole.exe 4bc6353fa35fa60e7bd2dfc3ec2fa4a8 \ + cogspurwin-$TAG.zip b3d0fd96e0d17fdb79f9c9d31f816fde + VM=cogspurwin/SqueakConsole.exe;; +*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 +esac Property changes on: branches/Cog/image/getGoodSpurVM.sh ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/image/makegetvmscripts.sh =================================================================== --- branches/Cog/image/makegetvmscripts.sh (rev 0) +++ branches/Cog/image/makegetvmscripts.sh 2014-07-03 12:46:14 UTC (rev 3030) @@ -0,0 +1,138 @@ +#!/bin/sh +# Create the getGoodCogVM.sh & getGoodSpurVM.sh scripts. + +cd `dirname $0` +REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \ + | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` +TAG=`date +%g.%U.`$REV +echo REV=$REV TAG=$TAG + +. ./envvars.sh + +cat >getGoodCogVM.sh <<END +#!/bin/sh +# Sets the VM env var to the r$REV Cog VM for the current platform. +# will download and install the VM in this directory if necessary. + +TAG=$TAG +REV=$REV +URL=http://www.mirandabanda.org/files/Cog/VM/VM.r\$REV/ + +. ./envvars.sh + +if wget --help >/dev/null ; then + true +else + echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2 + exit 1 +fi + +case "\$OS" in +Darwin) get_vm_from_tar \\ +END + +echo -n ' Cog.app/Contents/MacOS/Squeak ' >>getGoodCogVM.sh +echo -n `quietmd5 ../products/Cog.app/Contents/MacOS/Squeak` >>getGoodCogVM.sh +echo ' \' >>getGoodCogVM.sh +echo -n ' Cog.app-$TAG.tgz ' >>getGoodCogVM.sh +quietmd5 ../products/Cog.app-$TAG.tgz >>getGoodCogVM.sh + +cat >>getGoodCogVM.sh <<END + VM=Cog.app/Contents/MacOS/Squeak;; +Linux) + if expr \$OSREL \\> 2.6.12; then + get_vm_from_tar \\ +END + +echo -n ' coglinuxht/lib/squeak/4.0-$REV/squeak ' >>getGoodCogVM.sh +echo -n `quietmd5 ../products/coglinuxht/lib/squeak/4.0-$REV/squeak` >>getGoodCogVM.sh +echo ' \' >>getGoodCogVM.sh +echo -n ' coglinuxht-$TAG.tgz ' >>getGoodCogVM.sh +quietmd5 ../products/coglinuxht-$TAG.tgz >>getGoodCogVM.sh + +cat >>getGoodCogVM.sh <<END + else + get_vm_from_tar \\ +END + +echo -n ' coglinux/lib/squeak/4.0-$REV/squeak ' >>getGoodCogVM.sh +echo -n `quietmd5 ../products/coglinux/lib/squeak/4.0-$REV/squeak` >>getGoodCogVM.sh +echo ' \' >>getGoodCogVM.sh +echo -n ' coglinux-$TAG.tgz ' >>getGoodCogVM.sh +quietmd5 ../products/coglinux-$TAG.tgz >>getGoodCogVM.sh +cat >>getGoodCogVM.sh <<END + fi;; +CYGWIN*) get_vm_from_zip \\ +END + +echo -n ' cogwin/SqueakConsole.exe ' >>getGoodCogVM.sh +echo -n `quietmd5 ../products/cogwin/SqueakConsole.exe` >>getGoodCogVM.sh +echo ' \' >>getGoodCogVM.sh +echo -n ' cogwin-$TAG.zip ' >>getGoodCogVM.sh +quietmd5 ../products/cogwin-$TAG.zip >>getGoodCogVM.sh + +cat >>getGoodCogVM.sh <<END + VM=cogwin/SqueakConsole.exe;; +*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 +esac +END + +chmod a+x getGoodCogVM.sh + +cat >getGoodSpurVM.sh <<END +#!/bin/sh +# Sets the VM env var to the r$REV Cog Spur VM for the current platform. +# will download and install the VM in this directory if necessary. + +TAG=$TAG +REV=$REV +URL=http://www.mirandabanda.org/files/Cog/VM/VM.r\$REV/ + +. ./envvars.sh + +if wget --help >/dev/null ; then + true +else + echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2 + exit 1 +fi + +case "\$OS" in +Darwin) get_vm_from_tar \\ +END + +echo -n ' CogSpur.app/Contents/MacOS/Squeak ' >>getGoodSpurVM.sh +echo -n `quietmd5 ../products/CogSpur.app/Contents/MacOS/Squeak` >>getGoodSpurVM.sh +echo ' \' >>getGoodSpurVM.sh +echo -n ' CogSpur.app-$TAG.tgz ' >>getGoodSpurVM.sh +quietmd5 ../products/CogSpur.app-$TAG.tgz >>getGoodSpurVM.sh + +cat >>getGoodSpurVM.sh <<END + VM=CogSpur.app/Contents/MacOS/Squeak;; +Linux) get_vm_from_tar \\ +END + +echo -n ' cogspurlinuxht/lib/squeak/4.0-$REV/squeak ' >>getGoodSpurVM.sh +echo -n `quietmd5 ../products/cogspurlinuxht/lib/squeak/4.0-$REV/squeak` >>getGoodSpurVM.sh +echo ' \' >>getGoodSpurVM.sh +echo -n ' cogspurlinuxht-$TAG.tgz ' >>getGoodSpurVM.sh +quietmd5 ../products/cogspurlinuxht-$TAG.tgz >>getGoodSpurVM.sh + +cat >>getGoodSpurVM.sh <<END + VM=cogspurlinuxht/squeak;; +CYGWIN*) get_vm_from_zip \\ +END + +echo -n ' cogspurwin/SqueakConsole.exe ' >>getGoodSpurVM.sh +echo -n `quietmd5 ../products/cogspurwin/SqueakConsole.exe` >>getGoodSpurVM.sh +echo ' \' >>getGoodSpurVM.sh +echo -n ' cogspurwin-$TAG.zip ' >>getGoodSpurVM.sh +quietmd5 ../products/cogspurwin-$TAG.zip >>getGoodSpurVM.sh + +cat >>getGoodSpurVM.sh <<END + VM=cogspurwin/SqueakConsole.exe;; +*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 +esac +END + +chmod a+x getGoodSpurVM.sh Property changes on: branches/Cog/image/makegetvmscripts.sh ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2014-07-03 02:52:10 UTC (rev 3029) +++ branches/Cog/scripts/uploadvms 2014-07-03 12:46:14 UTC (rev 3030) @@ -154,3 +154,5 @@ scp -p ChangeHistory ../history/README.$REV $ARCHIVES "$@" $RemoteUser:$RemoteRoot/VM.r$REV echo ssh $RemoteUser $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 + +test -x image/makegetvmscripts.sh && (image/makegetvmscripts.sh)

1 0

New Cog VMs available
by Eliot Miranda 03 Jul '14

03 Jul '14

...at http://www.mirandabanda.org/files/Cog/VM/VM.r3029/. I've taken down the 3021 and 3024 VMs as their LargeIntegers code was badly broken. That's fixed now. The major changes are that Spur now correctly handles forwarding in primitives invoked from machine code, and that sends to Characters have the expected performance. CogVM binaries as per VMMaker.oscog-eem.797/r3029 Fix mixup of old & young spaces in primitiveVMParameter, and comment some new parameters. Fix return types for positive[64/32]BitValueOf:. positive32BitValueOf: must answer a usqInt, positive64BitValueOf: must answer a usqLong. Use positiveMachineIntegerValueOf: to decode arg in primitiveNewWithArg and ensure positiveMachineIntegerValueOf: is inlined there-in. Spur: Fix inline cache for Characters in Spur. Existing code failed all machine code sends to characters, creating PICs at those send sites which failed back to the interpreter. Implement forwarder following on primitive failure for all primitive calls from machine code. Allow the JIT to not compile primitiveDoNamedPrimitiveWithArgs to avoid any potential complications. Have spur's fetchClassOfNonImm: answer nilObj for forwarders to avoid assert fails. Fix assert fails in updateStateOfSpouseContextForFrame:WithSP: and elsewhere with forwarders. Add read barriers to primitiveSuspend and synchronousSignal:'s myList access, because the process list manipulation routines do no checking. Add assert checks for forwarders in the process list manipulation routines. Fix StackInterpreter>>actuallyFollowNecessaryForwardingInMethod:literalCount: so that it no longer corrupts the methodClassAssociation. Rewrite all the semaphore installing primitives to fail if the semaphore arg is neither a semaphore or nil instead of assuming if its not a semaphore it must be nil, so as to fail and retry when semaphores are forwarded (as they are when Semaphore is redefined). Implement isSemaphoreOop:/Obj: in the object memories to abstract away the code. Base Spur's on the class index of splObj: ClassSemaphore, avoiding the table lookup to derive the class. Make checkForEventsMayContextSwitch: treat all its semaphores consistently. These changes allow Cog Spur to redefine Process and/or Semaphore and not hang. Fix sign and overflow issues in instantiating larger objects and determining the size of large instances. Fix some freeChunk accesses that used fetchPointer:ofObject:. Make sure forwarders have accurate slot counts, bumping it to 1 if it was zero. Plugins: Fix LargeIntegersPlugin>>isNormalized: for forwarders, no longer assuming that if its arg isn't a SmallInteger it must be a large integer. Squash an assert fail in lengthOf:format: on forwarders by using numSlotsOfAny:. Fix the shift for divide issues in the LargeIntegersPlugin. Change the SmartSyntaxPluginCodeGenerator to generate code that ifdefs out the remapOop:in: rigmarole on Spur. Windows: Set the IMAGE_FILE_LARGE_ADDRESS_AWARE flag in the image header of the Windows executables to allow e.g. Spur to allocate more than 2Gb. Slang: Rip out the UseRightShiftForDivide optimization. It gets unsigned division wrong, and C compilers can and will optimize this correctly themselves. -- best, Eliot

1 0

[commit][3029] CogVM source as per VMMaker.oscog-eem.797
by commits＠squeakvm.org 03 Jul '14

03 Jul '14

Revision: 3029 Author: eliot Date: 2014-07-02 19:52:10 -0700 (Wed, 02 Jul 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.797 Nuke a halt from testing the simulator... Modified Paths: -------------- branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 from - CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2283,7 +2283,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.795"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.797"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -18946,7 +18946,6 @@ && ((((GIV(newMethod) & 3) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) { - halt(); /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-03 02:52:10 UTC (rev 3029) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 from - CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2286,7 +2286,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.795"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.797"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -18955,7 +18955,6 @@ && ((((GIV(newMethod) & 3) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) { - halt(); /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); Modified: branches/Cog/nsspursrc/vm/interp.h =================================================================== --- branches/Cog/nsspursrc/vm/interp.h 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/nsspursrc/vm/interp.h 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspursrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspursrc/vm/vmCallback.h 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jul 2 19:14:44 PDT 2014 + Wed Jul 2 19:52:06 PDT 2014 Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 from - CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2278,7 +2278,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.795]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.797]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -14349,7 +14349,6 @@ && ((((GIV(newMethod) & 3) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) { - halt(); /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-07-03 02:52:10 UTC (rev 3029) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 from - CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2281,7 +2281,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.795]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.797]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -14358,7 +14358,6 @@ && ((((GIV(newMethod) & 3) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) { - halt(); /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); Modified: branches/Cog/spursistasrc/vm/interp.h =================================================================== --- branches/Cog/spursistasrc/vm/interp.h 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/spursistasrc/vm/interp.h 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursistasrc/vm/vmCallback.h 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/spursrc/vm/cointerp.c 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 from - CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2273,7 +2273,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.795]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.797]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -14345,7 +14345,6 @@ && ((((GIV(newMethod) & 3) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) { - halt(); /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/spursrc/vm/cointerp.h 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-07-03 02:52:10 UTC (rev 3029) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 from - CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2276,7 +2276,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.795]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.797]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -14354,7 +14354,6 @@ && ((((GIV(newMethod) & 3) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) { - halt(); /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/spursrc/vm/interp.h 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2014-07-03 02:16:19 UTC (rev 3028) +++ branches/Cog/spursrc/vm/vmCallback.h 2014-07-03 02:52:10 UTC (rev 3029) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.797.mcz
by commits＠source.squeak.org 03 Jul '14

03 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.797.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.797 Author: eem Time: 2 July 2014, 7:49:19.914 pm UUID: 28e6fe82-fa68-4b73-a714-e2481f350031 Ancestors: VMMaker.oscog-eem.796 Nuke a halt from testing the simulator... =============== Diff against VMMaker.oscog-eem.796 =============== Item was changed: ----- Method: CoInterpreter>>ceActivateFailingPrimitiveMethod: (in category 'enilopmarts') ----- ceActivateFailingPrimitiveMethod: aPrimitiveMethod "An external call or FFI primitive has failed. Build the frame and activate as appropriate. Enter either the interpreter or machine code depending on whether aPrimitiveMethod has been or is still cogged. Note that we could always interpret but want the efficiency of executing machine code if it is available." <api> | methodHeader | self assert: primFailCode ~= 0. self assert: newMethod = aPrimitiveMethod. "If we're on Spur, check for forwarders and retry, returning if successful the second time around." (objectMemory hasSpurMemoryManagerAPI and: [(objectMemory isOopCompiledMethod: newMethod) and: [self checkForAndFollowForwardedPrimitiveState]]) ifTrue: + [self initPrimCall. - [self halt; initPrimCall. self cCode: [self dispatchFunctionPointer: primitiveFunctionPointer] inSmalltalk: [| evaluable | evaluable := primitiveFunctionPointer isInteger ifTrue: [cogit simulatedTrampolines at: primitiveFunctionPointer] ifFalse: [primitiveFunctionPointer]. evaluable isMessageSend ifTrue: [self assert: evaluable receiver == self] ifFalse: [self assert: evaluable isBlock]. evaluable value]. self successful ifTrue: [^self]]. methodHeader := self rawHeaderOf: aPrimitiveMethod. (self isCogMethodReference: methodHeader) ifTrue: [self activateCoggedNewMethod: false] ifFalse: [self activateNewMethod]!

1 0

Re: [squeak-dev] Re: [Vm-dev] New Cog VMs available...
by Eliot Miranda 03 Jul '14

03 Jul '14

Hi Nicolas, On Wed, Jul 2, 2014 at 2:51 PM, Nicolas Cellier < nicolas.cellier.aka.nice(a)gmail.com> wrote: > > > > 2014-07-02 23:32 GMT+02:00 Frank Shearar <frank.shearar(a)gmail.com>: > > On 2 July 2014 22:19, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: >> > >> > >> > >> > On Wed, Jul 2, 2014 at 1:45 PM, Frank Shearar <frank.shearar(a)gmail.com> >> > wrote: >> >> >> >> On 1 July 2014 18:03, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: >> >> > >> >> > at http://www.mirandabanda.org/files/Cog/VM/VM.r3024/. >> >> >> >> CI updated accordingly! For Spur: >> >> http://build.squeak.org/job/SqueakTrunkOnSpur/29/console >> > >> > >> > and I'm working on the large integer failures right now. that should >> fix >> > most of the errors. >> >> Excellent! That will end the streak of red in the SqueakTrunk build >> history. >> >> Thanks! >> >> > I've got a working solution ready for large int plugin. > digitDiv and montgomery are broken due to the same bug // 256... > I can publish if you want. > Forgive me but I went ahead and fixed it. I just figured out that I could have the code generator output asserts at every divide by a power of two to check that the results agreed with signed shifts and hence easily caught all the places where there was a bug. I've also realised that I can have the code generator output #if #else #endif code for remapOop:in: and so not incur any overhead in Spur, which doesn't GC during primitives. -- best, Eliot

3 9

[commit][3028] CogVM source as per VMMaker.oscog-eem.796
by commits＠squeakvm.org 03 Jul '14

03 Jul '14

Revision: 3028 Author: eliot Date: 2014-07-02 19:16:19 -0700 (Wed, 02 Jul 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.796 Spur: Implement forwarder following on primitive failure for sideways calls from machine code. Fix LargeIntegersPlugin>>isNormalized: for forwarders, no longer assuming that if its arg isn't a SmallInteger it must be a large integer. Squash an assert fail in lengthOf:format: on forwarders by using numSlotsOfAny:. Make sure a forwarder has an accurate slot count, bumping it to 1 if it was zero. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2014-07-03 02:16:19 UTC (rev 3028) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.796 uuid: 037e61a6-d81c-42e5-bbcb-62adbd938f38 from - LargeIntegersPlugin VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + LargeIntegersPlugin VMMaker.oscog-eem.796 uuid: 037e61a6-d81c-42e5-bbcb-62adbd938f38 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.796 uuid: 037e61a6-d81c-42e5-bbcb-62adbd938f38 " __DATE__ ; @@ -37,6 +37,7 @@ /*** Constants ***/ +#define PrimErrBadArgument 3 /*** Function Prototypes ***/ @@ -53,14 +54,14 @@ static int cBytesReplacefromtowithstartingAt(unsigned char * pTo, sqInt start, sqInt stop, unsigned char * pFrom, sqInt repStart); static sqInt cCopyIntValtoBytes(sqInt val, sqInt bytes); static sqInt cCoreBytesRshiftCountnfbytesfromlentolen(sqInt count, sqInt n, sqInt f, sqInt b, unsigned char * pFrom, sqInt fromLen, unsigned char * pTo, sqInt toLen); -static sqInt cCoreDigitDivDivlenremlenquolen(unsigned char * pDiv, sqInt divLen, unsigned char * pRem, sqInt remLen, unsigned char * pQuo, sqInt quoLen); +static sqInt cCoreDigitDivDivlenremlenquolen(unsigned char *pDiv, sqInt divLen, unsigned char *pRem, sqInt remLen, unsigned char *pQuo, sqInt quoLen); static unsigned char cDigitAddlenwithleninto(unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); static sqInt cDigitComparewithlen(unsigned char * pFirst, unsigned char * pSecond, sqInt len); static sqInt cDigitLengthOfCSI(sqInt csi); static unsigned char cDigitMultiplylenwithleninto(unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); static sqInt cDigitOfCSIat(sqInt csi, sqInt ix); -static sqInt cDigitSublenwithleninto(unsigned char * pByteSmall, sqInt smallLen, unsigned char * pByteLarge, sqInt largeLen, unsigned char * pByteRes); -static sqInt cdigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char * pBytesFirst, sqInt firstLen, unsigned char * pBytesSecond, sqInt secondLen, unsigned char * pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char * pBytesRes); +static sqInt cDigitSublenwithleninto(unsigned char *pByteSmall, sqInt smallLen, unsigned char *pByteLarge, sqInt largeLen, unsigned char *pByteRes); +static sqInt cdigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char *pBytesFirst, sqInt firstLen, unsigned char *pBytesSecond, sqInt secondLen, unsigned char *pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char *pBytesRes); static sqInt cHighBit(sqInt uint); static sqInt createLargeFromSmallInteger(sqInt anOop); static sqInt digitAddLargewith(sqInt firstInteger, sqInt secondInteger); @@ -135,6 +136,7 @@ static sqInt (*popthenPush)(sqInt nItems, sqInt oop); static sqInt (*popRemappableOop)(void); static sqInt (*primitiveFail)(void); +static sqInt (*primitiveFailFor)(sqInt reasonCode); static sqInt (*pushRemappableOop)(sqInt oop); static sqInt (*slotSizeOf)(sqInt oop); static sqInt (*stObjectatput)(sqInt array, sqInt index, sqInt value); @@ -160,6 +162,7 @@ extern sqInt popthenPush(sqInt nItems, sqInt oop); extern sqInt popRemappableOop(void); extern sqInt primitiveFail(void); +extern sqInt primitiveFailFor(sqInt reasonCode); extern sqInt pushRemappableOop(sqInt oop); extern sqInt slotSizeOf(sqInt oop); extern sqInt stObjectatput(sqInt array, sqInt index, sqInt value); @@ -172,9 +175,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.790 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.796 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.790 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.796 (e)" #endif ; static const int orOpIndex = 1; @@ -300,9 +303,16 @@ sqInt newBytes; sqInt oldLen; - pushRemappableOop(aBytesObject); + +#if SPURVM newBytes = instantiateClassindexableSize(fetchClassOf(aBytesObject), newLen); - aBytesObject = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(aBytesObject); + newBytes = instantiateClassindexableSize(fetchClassOf(aBytesObject), newLen); + aBytesObject = popRemappableOop() +#endif /* SPURVM */ +; oldLen = slotSizeOf(aBytesObject); if (oldLen < newLen) { copyLen = oldLen; @@ -342,9 +352,16 @@ return integerObjectOf(0); } newLen = ((highBit + shiftCount) + 7) / 8; - pushRemappableOop(aBytesOop); + +#if SPURVM newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); - aBytesOop = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(aBytesOop); + newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); + aBytesOop = popRemappableOop() +#endif /* SPURVM */ +; /* begin cBytesLshift:from:len:to:len: */ pFrom = firstIndexableField(aBytesOop); pTo = firstIndexableField(newBytes); @@ -452,9 +469,16 @@ } oldLen = slotSizeOf(aBytesOop); newLen = i - b; - pushRemappableOop(aBytesOop); + +#if SPURVM newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); - aBytesOop = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(aBytesOop); + newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); + aBytesOop = popRemappableOop() +#endif /* SPURVM */ +; /* begin cCoreBytesRshiftCount:n:f:bytes:from:len:to:len: */ pFrom = firstIndexableField(aBytesOop); pTo = firstIndexableField(newBytes); @@ -683,7 +707,7 @@ } static sqInt -cCoreDigitDivDivlenremlenquolen(unsigned char * pDiv, sqInt divLen, unsigned char * pRem, sqInt remLen, unsigned char * pQuo, sqInt quoLen) +cCoreDigitDivDivlenremlenquolen(unsigned char *pDiv, sqInt divLen, unsigned char *pRem, sqInt remLen, unsigned char *pQuo, sqInt quoLen) { sqInt a; sqInt cond; @@ -709,12 +733,9 @@ dl = divLen - 1; ql = quoLen; dh = pDiv[dl - 1]; - if (dl == 1) { - dnh = 0; - } - else { - dnh = pDiv[dl - 2]; - } + dnh = (dl == 1 + ? 0 + : pDiv[dl - 2]); for (k = 1; k <= ql; k += 1) { /* maintain quo*arg+rem=self */ @@ -783,13 +804,9 @@ a = 0; for (i = 1; i <= divLen; i += 1) { hi = (pDiv[i - 1]) * (((usqInt) q >> 8)); - - /* pRem at: l - 1 put: lo - (lo // 256 * 256). */ - /* sign-tolerant form of (lo bitAnd: 255) -> obsolete... */ - lo = (a + (pRem[l - 1])) - ((pDiv[i - 1]) * (q & 0xFF)); - pRem[l - 1] = (lo & 0xFF); - a = (lo / 256) - hi; + pRem[l - 1] = lo; + a = (((signed)lo >> 8)) - hi; l += 1; } if (a < 0) { @@ -801,7 +818,7 @@ a = 0; for (i = 1; i <= divLen; i += 1) { a = ((((usqInt) a >> 8)) + (pRem[l - 1])) + (pDiv[i - 1]); - pRem[l - 1] = (a & 0xFF); + pRem[l - 1] = a; l += 1; } } @@ -947,7 +964,7 @@ } static sqInt -cDigitSublenwithleninto(unsigned char * pByteSmall, sqInt smallLen, unsigned char * pByteLarge, sqInt largeLen, unsigned char * pByteRes) +cDigitSublenwithleninto(unsigned char *pByteSmall, sqInt smallLen, unsigned char *pByteLarge, sqInt largeLen, unsigned char *pByteRes) { sqInt i; sqInt z; @@ -958,27 +975,27 @@ z = 0; for (i = 0; i < smallLen; i += 1) { z = (z + (pByteLarge[i])) - (pByteSmall[i]); - pByteRes[i] = (z - ((z / 256) * 256)); + pByteRes[i] = z; z = ((signed)z >> 8); } for (i = smallLen; i < largeLen; i += 1) { z += pByteLarge[i]; - pByteRes[i] = (z - ((z / 256) * 256)); + pByteRes[i] = z; z = ((signed)z >> 8); } } static sqInt -cdigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char * pBytesFirst, sqInt firstLen, unsigned char * pBytesSecond, sqInt secondLen, unsigned char * pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char * pBytesRes) +cdigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char *pBytesFirst, sqInt firstLen, unsigned char *pBytesSecond, sqInt secondLen, unsigned char *pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char *pBytesRes) { - usqInt accum; + usqInt accum; sqInt i; sqInt k; - unsigned char lastByte; + unsigned char lastByte; sqInt limit1; sqInt limit2; sqInt limit3; - unsigned char u; + unsigned char u; limit1 = firstLen - 1; limit2 = secondLen - 1; @@ -1020,8 +1037,8 @@ accum = 0; for (i = 0; i <= limit3; i += 1) { accum = (accum + (pBytesRes[i])) - (pBytesThird[i]); - pBytesRes[i] = (accum - ((accum / 256) * 256)); - accum = accum / 256; + pBytesRes[i] = accum; + accum = ((signed)accum >> 8); } } } @@ -1146,11 +1163,18 @@ longInt = firstInteger; longLen = firstLen; } - pushRemappableOop(shortInt); + +#if SPURVM + sum = instantiateClassindexableSize(resClass, longLen); + +#else /* SPURVM */ +pushRemappableOop(shortInt); pushRemappableOop(longInt); sum = instantiateClassindexableSize(resClass, longLen); longInt = popRemappableOop(); - shortInt = popRemappableOop(); + shortInt = popRemappableOop() +#endif /* SPURVM */ +; /* begin cDigitAdd:len:with:len:into: */ pByteShort = firstIndexableField(shortInt); pByteLong = firstIndexableField(longInt); @@ -1171,9 +1195,16 @@ /* sum := sum growby: 1. */ - pushRemappableOop(sum); + +#if SPURVM newSum = instantiateClassindexableSize(resClass, longLen + 1); - sum = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(sum); + newSum = instantiateClassindexableSize(resClass, longLen + 1); + sum = popRemappableOop() +#endif /* SPURVM */ +; cBytesCopyFromtolen(firstIndexableField(sum), firstIndexableField(newSum), longLen); /* C index! */ @@ -1210,9 +1241,16 @@ if ((integerValueOf(firstInteger)) < 0) { return primitiveFail(); } - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { if ((fetchClassOf(firstInteger)) == (classLargeNegativeInteger())) { @@ -1224,9 +1262,16 @@ if ((integerValueOf(secondInteger)) < 0) { return primitiveFail(); } - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { if ((fetchClassOf(secondInteger)) == (classLargeNegativeInteger())) { @@ -1248,11 +1293,18 @@ longLen = firstLen; longLarge = firstLarge; } - pushRemappableOop(shortLarge); + +#if SPURVM + result = instantiateClassindexableSize(classLargePositiveInteger(), longLen); + +#else /* SPURVM */ +pushRemappableOop(shortLarge); pushRemappableOop(longLarge); result = instantiateClassindexableSize(classLargePositiveInteger(), longLen); longLarge = popRemappableOop(); - shortLarge = popRemappableOop(); + shortLarge = popRemappableOop() +#endif /* SPURVM */ +; /* begin cByteOp:short:len:long:len:into: */ pByteShort = firstIndexableField(shortLarge); pByteLong = firstIndexableField(longLarge); @@ -1346,10 +1398,10 @@ sqInt l1; sqInt lo; sqInt mul; - unsigned char * pDiv; + unsigned char *pDiv; unsigned char *pointer; - unsigned char * pQuo; - unsigned char * pRem; + unsigned char *pQuo; + unsigned char *pRem; sqInt q; sqInt ql; sqInt quo; @@ -1373,29 +1425,61 @@ } l = (firstLen - secondLen) + 1; if (l <= 0) { - pushRemappableOop(firstInteger); + +#if SPURVM result = instantiateClassindexableSize(classArray(), 2); - firstInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstInteger); + result = instantiateClassindexableSize(classArray(), 2); + firstInteger = popRemappableOop() +#endif /* SPURVM */ +; stObjectatput(result,1,(integerObjectOf(0))); stObjectatput(result,2,firstInteger); return result; } d = 8 - (cHighBit(((pointer = firstIndexableField(secondInteger)))[secondLen - 1])); - pushRemappableOop(firstInteger); + +#if SPURVM div = bytesLshift(secondInteger, d); div = bytesOrIntgrowTo(div, (digitLength(div)) + 1); - firstInteger = popRemappableOop(); - pushRemappableOop(div); + +#else /* SPURVM */ +pushRemappableOop(firstInteger); + div = bytesLshift(secondInteger, d); + div = bytesOrIntgrowTo(div, (digitLength(div)) + 1); + firstInteger = popRemappableOop() +#endif /* SPURVM */ +; + +#if SPURVM rem = bytesLshift(firstInteger, d); if ((digitLength(rem)) == firstLen) { rem = bytesOrIntgrowTo(rem, firstLen + 1); } - div = popRemappableOop(); - pushRemappableOop(div); + +#else /* SPURVM */ +pushRemappableOop(div); + rem = bytesLshift(firstInteger, d); + if ((digitLength(rem)) == firstLen) { + rem = bytesOrIntgrowTo(rem, firstLen + 1); + } + div = popRemappableOop() +#endif /* SPURVM */ +; + +#if SPURVM + quo = instantiateClassindexableSize(resultClass, l); + +#else /* SPURVM */ +pushRemappableOop(div); pushRemappableOop(rem); quo = instantiateClassindexableSize(resultClass, l); rem = popRemappableOop(); - div = popRemappableOop(); + div = popRemappableOop() +#endif /* SPURVM */ +; /* begin cCoreDigitDivDiv:len:rem:len:quo:len: */ pDiv = firstIndexableField(div); /* begin digitLength: */ @@ -1484,12 +1568,9 @@ dl = divLen - 1; ql = quoLen; dh = pDiv[dl - 1]; - if (dl == 1) { - dnh = 0; - } - else { - dnh = pDiv[dl - 2]; - } + dnh = (dl == 1 + ? 0 + : pDiv[dl - 2]); for (k = 1; k <= ql; k += 1) { /* maintain quo*arg+rem=self */ @@ -1558,13 +1639,9 @@ a = 0; for (i = 1; i <= divLen; i += 1) { hi = (pDiv[i - 1]) * (((usqInt) q >> 8)); - - /* pRem at: l - 1 put: lo - (lo // 256 * 256). */ - /* sign-tolerant form of (lo bitAnd: 255) -> obsolete... */ - lo = (a + (pRem[l1 - 1])) - ((pDiv[i - 1]) * (q & 0xFF)); - pRem[l1 - 1] = (lo & 0xFF); - a = (lo / 256) - hi; + pRem[l1 - 1] = lo; + a = (((signed)lo >> 8)) - hi; l1 += 1; } if (a < 0) { @@ -1576,20 +1653,34 @@ a = 0; for (i = 1; i <= divLen; i += 1) { a = ((((usqInt) a >> 8)) + (pRem[l1 - 1])) + (pDiv[i - 1]); - pRem[l1 - 1] = (a & 0xFF); + pRem[l1 - 1] = a; l1 += 1; } } pQuo[quoLen - k] = q; } - pushRemappableOop(quo); + +#if SPURVM rem = bytesRshiftbyteslookfirst(rem, d, 0, (digitLength(div)) - 1); - quo = popRemappableOop(); - pushRemappableOop(quo); + +#else /* SPURVM */ +pushRemappableOop(quo); + rem = bytesRshiftbyteslookfirst(rem, d, 0, (digitLength(div)) - 1); + quo = popRemappableOop() +#endif /* SPURVM */ +; + +#if SPURVM + result = instantiateClassindexableSize(classArray(), 2); + +#else /* SPURVM */ +pushRemappableOop(quo); pushRemappableOop(rem); result = instantiateClassindexableSize(classArray(), 2); rem = popRemappableOop(); - quo = popRemappableOop(); + quo = popRemappableOop() +#endif /* SPURVM */ +; stObjectatput(result,1,quo); stObjectatput(result,2,rem); return result; @@ -1622,22 +1713,22 @@ static sqInt digitMontgomerytimesmodulomInvModB(sqInt firstLarge, sqInt secondLarge, sqInt thirdLarge, sqInt mInv) { - usqInt accum; + usqInt accum; sqInt firstLen; sqInt i; sqInt k; - unsigned char lastByte; + unsigned char lastByte; sqInt limit1; sqInt limit2; sqInt limit3; - unsigned char * pBytesFirst; - unsigned char * pBytesRes; - unsigned char * pBytesSecond; - unsigned char * pBytesThird; + unsigned char *pBytesFirst; + unsigned char *pBytesRes; + unsigned char *pBytesSecond; + unsigned char *pBytesThird; sqInt prod; sqInt secondLen; sqInt thirdLen; - unsigned char u; + unsigned char u; firstLen = slotSizeOf(firstLarge); secondLen = slotSizeOf(secondLarge); @@ -1652,13 +1743,20 @@ && (mInv <= 0xFF))) { return primitiveFail(); } - pushRemappableOop(firstLarge); + +#if SPURVM + prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); pushRemappableOop(secondLarge); pushRemappableOop(thirdLarge); prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); thirdLarge = popRemappableOop(); secondLarge = popRemappableOop(); - firstLarge = popRemappableOop(); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; /* begin cdigitMontgomery:len:times:len:modulo:len:mInvModB:into: */ pBytesFirst = firstIndexableField(firstLarge); pBytesSecond = firstIndexableField(secondLarge); @@ -1704,8 +1802,8 @@ accum = 0; for (i = 0; i <= limit3; i += 1) { accum = (accum + (pBytesRes[i])) - (pBytesThird[i]); - pBytesRes[i] = (accum - ((accum / 256) * 256)); - accum = accum / 256; + pBytesRes[i] = accum; + accum = ((signed)accum >> 8); } } return normalizePositive(prod); @@ -1757,11 +1855,18 @@ else { resultClass = classLargePositiveInteger(); } - pushRemappableOop(shortInt); + +#if SPURVM + prod = instantiateClassindexableSize(resultClass, longLen + shortLen); + +#else /* SPURVM */ +pushRemappableOop(shortInt); pushRemappableOop(longInt); prod = instantiateClassindexableSize(resultClass, longLen + shortLen); longInt = popRemappableOop(); - shortInt = popRemappableOop(); + shortInt = popRemappableOop() +#endif /* SPURVM */ +; /* begin cDigitMultiply:len:with:len:into: */ pByteShort = firstIndexableField(shortInt); pByteLong = firstIndexableField(longInt); @@ -1854,9 +1959,9 @@ sqInt larger; sqInt largerLen; sqInt neg; - unsigned char * pByteLarge; - unsigned char * pByteRes; - unsigned char * pByteSmall; + unsigned char *pByteLarge; + unsigned char *pByteRes; + unsigned char *pByteSmall; sqInt res; sqInt resLen; sqInt secondLen; @@ -1891,13 +1996,22 @@ neg = firstNeg; } resLen = largerLen; - pushRemappableOop(smaller); + +#if SPURVM + res = instantiateClassindexableSize((neg + ? classLargeNegativeInteger() + : classLargePositiveInteger()), resLen); + +#else /* SPURVM */ +pushRemappableOop(smaller); pushRemappableOop(larger); res = instantiateClassindexableSize((neg ? classLargeNegativeInteger() : classLargePositiveInteger()), resLen); larger = popRemappableOop(); - smaller = popRemappableOop(); + smaller = popRemappableOop() +#endif /* SPURVM */ +; /* begin cDigitSub:len:with:len:into: */ pByteSmall = firstIndexableField(smaller); pByteLarge = firstIndexableField(larger); @@ -1908,12 +2022,12 @@ z = 0; for (i = 0; i < smallerLen; i += 1) { z = (z + (pByteLarge[i])) - (pByteSmall[i]); - pByteRes[i] = (z - ((z / 256) * 256)); + pByteRes[i] = z; z = ((signed)z >> 8); } for (i = smallerLen; i < largerLen; i += 1) { z += pByteLarge[i]; - pByteRes[i] = (z - ((z / 256) * 256)); + pByteRes[i] = z; z = ((signed)z >> 8); } return (neg @@ -1972,6 +2086,7 @@ static sqInt isNormalized(sqInt anInteger) { + sqInt class; sqInt ix; sqInt len; sqInt maxVal; @@ -1980,11 +2095,19 @@ unsigned char *pointer1; unsigned char *pointer2; unsigned char *pointer3; + sqInt positive; sqInt sLen; if (isIntegerObject(anInteger)) { return 1; } + class = fetchClassOf(anInteger); + if (!((positive = class == (classLargePositiveInteger())))) { + if (!(class == (classLargeNegativeInteger()))) { + primitiveFailFor(PrimErrBadArgument); + return 0; + } + } /* begin digitLength: */ if (isIntegerObject(anInteger)) { /* begin cDigitLengthOfCSI: */ @@ -2027,7 +2150,7 @@ if (len < sLen) { return 0; } - if ((fetchClassOf(anInteger)) == (classLargePositiveInteger())) { + if (positive) { /* SmallInteger maxVal */ /* all bytes of maxVal but the highest one are just FF's */ @@ -2044,15 +2167,9 @@ if ((((pointer2 = firstIndexableField(anInteger)))[sLen - 1]) < (cDigitOfCSIat(minVal, sLen))) { return 0; } - else { - - /* if just one digit differs, then anInteger < minval (the corresponding digit byte is greater!) - and therefore a LargeNegativeInteger */ - - for (ix = 1; ix <= sLen; ix += 1) { - if (!((((pointer3 = firstIndexableField(anInteger)))[ix - 1]) == (cDigitOfCSIat(minVal, ix)))) { - return 1; - } + for (ix = 1; ix <= sLen; ix += 1) { + if (!((((pointer3 = firstIndexableField(anInteger)))[ix - 1]) == (cDigitOfCSIat(minVal, ix)))) { + return 1; } } } @@ -2322,9 +2439,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -2333,9 +2457,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -2369,9 +2500,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -2380,9 +2518,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -2842,9 +2987,16 @@ /* convert to LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstAsLargeInteger = firstInteger; @@ -2857,9 +3009,16 @@ primitiveFail(); return null; } - pushRemappableOop(firstAsLargeInteger); + +#if SPURVM secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); - firstAsLargeInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstAsLargeInteger); + secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); + firstAsLargeInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { secondAsLargeInteger = secondInteger; @@ -2899,9 +3058,16 @@ /* convert to LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstAsLargeInteger = firstInteger; @@ -2914,9 +3080,16 @@ primitiveFail(); return null; } - pushRemappableOop(firstAsLargeInteger); + +#if SPURVM secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); - firstAsLargeInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstAsLargeInteger); + secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); + firstAsLargeInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { secondAsLargeInteger = secondInteger; @@ -2952,9 +3125,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -2963,9 +3143,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -3001,9 +3188,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -3012,9 +3206,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -3048,9 +3249,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -3059,9 +3267,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -3095,9 +3310,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -3106,9 +3328,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -3149,20 +3378,20 @@ EXPORT(sqInt) primMontgomeryTimesModulo(void) { - usqInt accum; + usqInt accum; sqInt firstInteger; sqInt firstLarge; sqInt firstLen; sqInt i; sqInt k; - unsigned char lastByte; + unsigned char lastByte; sqInt limit1; sqInt limit2; sqInt limit3; - unsigned char * pBytesFirst; - unsigned char * pBytesRes; - unsigned char * pBytesSecond; - unsigned char * pBytesThird; + unsigned char *pBytesFirst; + unsigned char *pBytesRes; + unsigned char *pBytesSecond; + unsigned char *pBytesThird; sqInt prod; sqInt secondLarge; sqInt secondLen; @@ -3171,7 +3400,7 @@ sqInt thirdLarge; sqInt thirdLen; sqInt thirdModuloInteger; - unsigned char u; + unsigned char u; sqInt _return_value; success(isKindOf(stackValue(2), "Integer")); @@ -3189,11 +3418,18 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondOperandInteger); + +#if SPURVM + firstLarge = createLargeFromSmallInteger(firstInteger); + +#else /* SPURVM */ +pushRemappableOop(secondOperandInteger); pushRemappableOop(thirdModuloInteger); firstLarge = createLargeFromSmallInteger(firstInteger); thirdModuloInteger = popRemappableOop(); - secondOperandInteger = popRemappableOop(); + secondOperandInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -3202,11 +3438,18 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM + secondLarge = createLargeFromSmallInteger(secondOperandInteger); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); pushRemappableOop(thirdModuloInteger); secondLarge = createLargeFromSmallInteger(secondOperandInteger); thirdModuloInteger = popRemappableOop(); - firstLarge = popRemappableOop(); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondOperandInteger; @@ -3215,11 +3458,18 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM + thirdLarge = createLargeFromSmallInteger(thirdModuloInteger); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); pushRemappableOop(secondLarge); thirdLarge = createLargeFromSmallInteger(thirdModuloInteger); secondLarge = popRemappableOop(); - firstLarge = popRemappableOop(); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { thirdLarge = thirdModuloInteger; @@ -3241,13 +3491,20 @@ _return_value = primitiveFail(); goto l1; } - pushRemappableOop(firstLarge); + +#if SPURVM + prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); pushRemappableOop(secondLarge); pushRemappableOop(thirdLarge); prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); thirdLarge = popRemappableOop(); secondLarge = popRemappableOop(); - firstLarge = popRemappableOop(); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; /* begin cdigitMontgomery:len:times:len:modulo:len:mInvModB:into: */ pBytesFirst = firstIndexableField(firstLarge); pBytesSecond = firstIndexableField(secondLarge); @@ -3293,8 +3550,8 @@ accum = 0; for (i = 0; i <= limit3; i += 1) { accum = (accum + (pBytesRes[i])) - (pBytesThird[i]); - pBytesRes[i] = (accum - ((accum / 256) * 256)); - accum = accum / 256; + pBytesRes[i] = accum; + accum = ((signed)accum >> 8); } } _return_value = normalizePositive(prod); @@ -3417,6 +3674,7 @@ popthenPush = interpreterProxy->popthenPush; popRemappableOop = interpreterProxy->popRemappableOop; primitiveFail = interpreterProxy->primitiveFail; + primitiveFailFor = interpreterProxy->primitiveFailFor; pushRemappableOop = interpreterProxy->pushRemappableOop; slotSizeOf = interpreterProxy->slotSizeOf; stObjectatput = interpreterProxy->stObjectatput; Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-07-03 02:16:19 UTC (rev 3028) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 from - StackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + StackToRegisterMappingCogit VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -956,7 +956,7 @@ static void marshallSendArguments(sqInt numArgs) NoDbgRegParms; usqInt maxCogMethodAddress(void); static void maybeCompileAllocFillerCheck(void); -static void maybeCompileRetryonPrimitiveFail(sqInt retryInst, sqInt primIndex) NoDbgRegParms; +static void maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) NoDbgRegParms; static sqInt maybeFreeCogMethodDoesntLookKosher(CogMethod *cogMethod) NoDbgRegParms; static sqInt maybeGenerateCheckFeatures(void); static sqInt maybeGenerateICacheFlush(void); @@ -5028,7 +5028,10 @@ if (flags & PrimCallMayCallBack) { /* Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode. */ + /* On Spur ceActivateFailingPrimitiveMethod: would like to retry if forwarders + are found. So insist on PrimCallNeedsPrimitiveFunction being set too. */ + assert(flags & PrimCallNeedsPrimitiveFunction); /* begin genSubstituteReturnAddress: */ retpc = (flags & PrimCallCollectsProfileSamples ? cePrimReturnEnterCogCodeProfiling @@ -14776,9 +14779,11 @@ sqInt address4; sqInt address5; sqInt address6; + sqInt address7; AbstractInstruction *continuePostSample; AbstractInstruction *jmpFail; AbstractInstruction *jmpSample; + sqInt reg; opcodeIndex = 0; if (profiling) { @@ -14825,6 +14830,19 @@ address6 = cStackPointerAddress(); genoperandoperand(MoveAwR, address6, SPReg); compileCallFornumArgsargargargargresultRegsaveRegs(ceActivateFailingPrimitiveMethod, 1, SendNumArgsReg, null, null, null, null, 0); + /* begin MoveAw:R: */ + address7 = instructionPointerAddress(); + reg = ClassReg; + genoperandoperand(MoveAwR, address7, reg); + genLoadStackPointers(backEnd); + /* begin MoveMw:r:R: */ + genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, ReceiverResultReg); + /* begin PushR: */ + genoperand(PushR, ClassReg); + + flag("currently caller pushes result"); + /* begin RetN: */ + genoperand(RetN, BytesPerWord); if (profiling) { /* Call ceCheckProfileTick: to record sample and then continue. newMethod @@ -18997,7 +19015,7 @@ By default do nothing. */ static void -maybeCompileRetryonPrimitiveFail(sqInt retryInst, sqInt primIndex) +maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) { } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-07-03 02:16:19 UTC (rev 3028) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-07-03 02:16:19 UTC (rev 3028) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-07-03 02:16:19 UTC (rev 3028) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 from - CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c + CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1175,7 +1175,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms; static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2064,7 +2064,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.791"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.795"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -15033,7 +15033,9 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt methodHeader; + assert(GIV(primFailCode) != 0); assert(GIV(newMethod) == aPrimitiveMethod); + methodHeader = longAt((aPrimitiveMethod + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { activateCoggedNewMethod(0); @@ -23987,17 +23989,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -24008,21 +24008,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -24037,7 +24023,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -24091,18 +24077,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -50905,7 +50891,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-07-03 02:16:19 UTC (rev 3028) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-07-03 02:16:19 UTC (rev 3028) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 from - CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c + CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1178,7 +1178,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms; static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2067,7 +2067,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.791"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.795"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -15042,7 +15042,9 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt methodHeader; + assert(GIV(primFailCode) != 0); assert(GIV(newMethod) == aPrimitiveMethod); + methodHeader = longAt((aPrimitiveMethod + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { activateCoggedNewMethod(0); @@ -23996,17 +23998,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -24017,21 +24017,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -24046,7 +24032,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -24100,18 +24086,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -50914,7 +50900,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nscogsrc/vm/interp.h 2014-07-03 02:16:19 UTC (rev 3028) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-07-03 02:16:19 UTC (rev 3028) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-07-03 02:16:19 UTC (rev 3028) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 + CCodeGenerator VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 from - StackToRegisterMappingCogit VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 + StackToRegisterMappingCogit VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -962,7 +962,7 @@ static void marshallSendArguments(sqInt numArgs) NoDbgRegParms; usqInt maxCogMethodAddress(void); static void maybeCompileAllocFillerCheck(void); -static sqInt maybeCompileRetryonPrimitiveFail(sqInt retryInst, sqInt primIndex) NoDbgRegParms; +static sqInt maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) NoDbgRegParms; static sqInt maybeFreeCogMethodDoesntLookKosher(CogMethod *cogMethod) NoDbgRegParms; static sqInt maybeGenerateCheckFeatures(void); static sqInt maybeGenerateICacheFlush(void); @@ -4968,7 +4968,10 @@ if (flags & PrimCallMayCallBack) { /* Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode. */ + /* On Spur ceActivateFailingPrimitiveMethod: would like to retry if forwarders + are found. So insist on PrimCallNeedsPrimitiveFunction being set too. */ + assert(flags & PrimCallNeedsPrimitiveFunction); /* begin genSubstituteReturnAddress: */ retpc = (flags & PrimCallCollectsProfileSamples ? cePrimReturnEnterCogCodeProfiling @@ -16414,9 +16417,11 @@ sqInt address4; sqInt address5; sqInt address6; + sqInt address7; AbstractInstruction *continuePostSample; AbstractInstruction *jmpFail; AbstractInstruction *jmpSample; + sqInt reg; opcodeIndex = 0; if (profiling) { @@ -16463,6 +16468,19 @@ address6 = cStackPointerAddress(); genoperandoperand(MoveAwR, address6, SPReg); compileCallFornumArgsargargargargresultRegsaveRegs(ceActivateFailingPrimitiveMethod, 1, SendNumArgsReg, null, null, null, null, 0); + /* begin MoveAw:R: */ + address7 = instructionPointerAddress(); + reg = ClassReg; + genoperandoperand(MoveAwR, address7, reg); + genLoadStackPointers(backEnd); + /* begin MoveMw:r:R: */ + genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, ReceiverResultReg); + /* begin PushR: */ + genoperand(PushR, ClassReg); + + flag("currently caller pushes result"); + /* begin RetN: */ + genoperand(RetN, BytesPerWord); if (profiling) { /* Call ceCheckProfileTick: to record sample and then continue. newMethod @@ -20371,7 +20389,7 @@ true, retry the primitive. */ static sqInt -maybeCompileRetryonPrimitiveFail(sqInt retryInst, sqInt primIndex) +maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) { sqInt accessorDepth; sqInt address; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-07-03 00:26:26 UTC (rev 3027) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-07-03 02:16:19 UTC (rev 3028) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.796.mcz
by commits＠source.squeak.org 03 Jul '14

03 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.796.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.796 Author: eem Time: 2 July 2014, 7:07:10.109 pm UUID: 037e61a6-d81c-42e5-bbcb-62adbd938f38 Ancestors: VMMaker.oscog-eem.795 And make sure isSmartSyntaxPluginSimulator is marked as a simulation-only method. Sigh... =============== Diff against VMMaker.oscog-eem.795 =============== Item was changed: ----- Method: InterpreterPlugin>>isSmartSyntaxPluginSimulator (in category 'accessing') ----- isSmartSyntaxPluginSimulator + <doNotGenerate> ^false! Item was changed: ----- Method: SmartSyntaxPluginSimulator>>isSmartSyntaxPluginSimulator (in category 'accessing') ----- isSmartSyntaxPluginSimulator + <doNotGenerate> ^true!

1 0

VM Maker: VMMaker.oscog-eem.795.mcz
by commits＠source.squeak.org 03 Jul '14

03 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.795.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.795 Author: eem Time: 2 July 2014, 6:48:03.822 pm UUID: d77a504d-28ea-407a-9df0-097e6dbaaf06 Ancestors: VMMaker.oscog-eem.794 Spur: Implement forwarder following on primitive failure for side- ways calls from mahcine code. Fix LargeIntegersPlugin>>isNormalized: for forwarders, no longer assuming that if its arg isn't a SmallInteger it must be a large integer. Squash an assert fail in lengthOf:format: on forwarders by using numSlotsOfAny:. Make sure a forwarder has an accurate slot count, bumping it to 1 if it was zero. Simulator: Fix Spur simulation of SmartSyntaxInterpreterPlugins with no explicit simulator subclass. =============== Diff against VMMaker.oscog-eem.794 =============== Item was changed: ----- Method: CoInterpreter>>ceActivateFailingPrimitiveMethod: (in category 'enilopmarts') ----- ceActivateFailingPrimitiveMethod: aPrimitiveMethod "An external call or FFI primitive has failed. Build the frame and activate as appropriate. Enter either the interpreter or machine code depending on whether aPrimitiveMethod has been or is still cogged. Note that we could always interpret but want the efficiency of executing machine code if it is available." <api> | methodHeader | + self assert: primFailCode ~= 0. self assert: newMethod = aPrimitiveMethod. + "If we're on Spur, check for forwarders and retry, + returning if successful the second time around." + (objectMemory hasSpurMemoryManagerAPI + and: [(objectMemory isOopCompiledMethod: newMethod) + and: [self checkForAndFollowForwardedPrimitiveState]]) ifTrue: + [self halt; initPrimCall. + self cCode: [self dispatchFunctionPointer: primitiveFunctionPointer] + inSmalltalk: + [| evaluable | + evaluable := primitiveFunctionPointer isInteger + ifTrue: [cogit simulatedTrampolines at: primitiveFunctionPointer] + ifFalse: [primitiveFunctionPointer]. + evaluable isMessageSend + ifTrue: [self assert: evaluable receiver == self] + ifFalse: [self assert: evaluable isBlock]. + evaluable value]. + self successful ifTrue: + [^self]]. methodHeader := self rawHeaderOf: aPrimitiveMethod. (self isCogMethodReference: methodHeader) ifTrue: [self activateCoggedNewMethod: false] ifFalse: [self activateNewMethod]! Item was added: + ----- Method: Cogit>>simulatedTrampolines (in category 'initialization') ----- + simulatedTrampolines + <doNotGenerate> + ^simulatedTrampolines! Item was added: + ----- Method: InterpreterPlugin>>isSmartSyntaxPluginSimulator (in category 'accessing') ----- + isSmartSyntaxPluginSimulator + ^false! Item was changed: ----- Method: LargeIntegersPlugin>>isNormalized: (in category 'oop functions') ----- isNormalized: anInteger + | len maxVal minVal sLen class positive | + (interpreterProxy isIntegerObject: anInteger) ifTrue: + [^ true]. + class := interpreterProxy fetchClassOf: anInteger. + (positive := class = interpreterProxy classLargePositiveInteger) ifFalse: + [class = interpreterProxy classLargeNegativeInteger ifFalse: + [interpreterProxy primitiveFailFor: PrimErrBadArgument. + ^false]]. - | len maxVal minVal sLen | - (interpreterProxy isIntegerObject: anInteger) - ifTrue: [^ true]. "Check for leading zero of LargeInteger" len := self digitLength: anInteger. + len = 0 ifTrue: + [^ false]. + (self unsafeByteOf: anInteger at: len) = 0 ifTrue: + [^ false]. - len = 0 - ifTrue: [^ false]. - (self unsafeByteOf: anInteger at: len) - = 0 - ifTrue: [^ false]. "no leading zero, now check if anInteger is in SmallInteger range or not" sLen := 4. "maximal digitLength of aSmallInteger" + len > sLen ifTrue: + [^ true]. + len < sLen ifTrue: + [^ false]. - len > sLen - ifTrue: [^ true]. - len < sLen - ifTrue: [^ false]. "len = sLen" + positive - (interpreterProxy fetchClassOf: anInteger) - = interpreterProxy classLargePositiveInteger ifTrue: [maxVal := 1073741823. "SmallInteger maxVal" "all bytes of maxVal but the highest one are just FF's" ^ (self unsafeByteOf: anInteger at: sLen) > (self cDigitOfCSI: maxVal at: sLen)] ifFalse: [minVal := -1073741824. "SmallInteger minVal" "all bytes of minVal but the highest one are just 00's" + (self unsafeByteOf: anInteger at: sLen) < (self cDigitOfCSI: minVal at: sLen) ifTrue: + [^ false]. + "if just one digit differs, then anInteger < minval (the corresponding digit byte is greater!!) + and therefore a LargeNegativeInteger" + 1 + to: sLen + do: [:ix | + (self unsafeByteOf: anInteger at: ix) = (self cDigitOfCSI: minVal at: ix) ifFalse: + [^ true]]]. - (self unsafeByteOf: anInteger at: sLen) - < (self cDigitOfCSI: minVal at: sLen) - ifTrue: [^ false] - ifFalse: ["if just one digit differs, then anInteger < minval (the corresponding digit byte is greater!!) - and therefore a LargeNegativeInteger" - 1 - to: sLen - do: [:ix | (self unsafeByteOf: anInteger at: ix) - = (self cDigitOfCSI: minVal at: ix) - ifFalse: [^ true]]]]. ^ false! Item was changed: ----- Method: SimpleStackBasedCogit>>compileInterpreterPrimitive: (in category 'primitive generators') ----- compileInterpreterPrimitive: primitiveRoutine "Compile a call to an interpreter primitive. Call the C routine with the usual stack-switching dance, test the primFailCode and then either return on success or continue to the method body." <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> | flags jmp jmpSamplePrim retry continuePostSamplePrim jmpSampleNonPrim continuePostSampleNonPrim | <var: #jmp type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> <var: #jmpSamplePrim type: #'AbstractInstruction *'> <var: #continuePostSamplePrim type: #'AbstractInstruction *'> <var: #jmpSampleNonPrim type: #'AbstractInstruction *'> <var: #continuePostSampleNonPrim type: #'AbstractInstruction *'> "Save processor fp, sp and return pc in the interpreter's frame stack and instruction pointers" self genExternalizePointersForPrimitiveCall. "Switch to the C stack." self genLoadCStackPointersForPrimCall. flags := coInterpreter primitivePropertyFlags: primitiveIndex. (flags anyMask: PrimCallDoNotJIT) ifTrue: [^ShouldNotJIT]. (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: ["Test nextProfileTick for being non-zero and call checkProfileTick if so" BytesPerWord = 4 ifTrue: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self MoveAw: coInterpreter nextProfileTickAddress + BytesPerWord R: ClassReg. self OrR: TempReg R: ClassReg] ifFalse: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self CmpCq: 0 R: TempReg]. "If set, jump to record sample call." jmpSampleNonPrim := self JumpNonZero: 0. continuePostSampleNonPrim := self Label]. "Old full prim trace is in VMMaker-eem.550 and prior" self recordPrimTrace ifTrue: [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg]. "Clear the primFailCode and set argumentCount" retry := self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: [self MoveCq: methodOrBlockNumArgs R: TempReg]. self MoveR: TempReg Aw: coInterpreter argumentCountAddress. "If required, set primitiveFunctionPointer and newMethod" (flags anyMask: PrimCallNeedsPrimitiveFunction) ifTrue: [self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress]. (flags anyMask: PrimCallNeedsNewMethod+PrimCallMayCallBack) ifTrue: ["The ceActivateFailingPrimitiveMethod: machinery can't handle framelessness." (flags anyMask: PrimCallMayCallBack) ifTrue: [needsFrame := true]. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress]. "Invoke the primitive" self PrefetchAw: coInterpreter primFailCodeAddress. (flags anyMask: PrimCallMayCallBack) ifTrue: "Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode." + ["On Spur ceActivateFailingPrimitiveMethod: would like to retry if forwarders + are found. So insist on PrimCallNeedsPrimitiveFunction being set too." + self assert: (flags anyMask: PrimCallNeedsPrimitiveFunction). + backEnd genSubstituteReturnAddress: - [backEnd genSubstituteReturnAddress: ((flags anyMask: PrimCallCollectsProfileSamples) ifTrue: [cePrimReturnEnterCogCodeProfiling] ifFalse: [cePrimReturnEnterCogCode]). self JumpRT: primitiveRoutine asInteger. primInvokeLabel := self Label. jmp := jmpSamplePrim := continuePostSamplePrim := nil] ifFalse: ["Call the C primitive routine." self CallRT: primitiveRoutine asInteger. primInvokeLabel := self Label. (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: [self assert: (flags anyMask: PrimCallNeedsNewMethod). "Test nextProfileTick for being non-zero and call checkProfileTick if so" BytesPerWord = 4 ifTrue: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self MoveAw: coInterpreter nextProfileTickAddress + BytesPerWord R: ClassReg. self OrR: TempReg R: ClassReg] ifFalse: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self CmpCq: 0 R: TempReg]. "If set, jump to record sample call." jmpSamplePrim := self JumpNonZero: 0. continuePostSamplePrim := self Label]. objectRepresentation maybeCompileRetry: retry onPrimitiveFail: primitiveIndex. self maybeCompileAllocFillerCheck. "Switch back to the Smalltalk stack. Stack better be in either of these two states: + success: stackPointer -> result (was receiver) - success: stackPointer -> result (was receiver) arg1 ... argN return pc failure: receiver arg1 ... + stackPointer -> argN - stackPointer -> argN return pc In either case we can push the instructionPointer or load it into the LinkRegister to reestablish the return pc" self MoveAw: coInterpreter instructionPointerAddress R: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [ClassReg]). backEnd genLoadStackPointers. "Test primitive failure" self MoveAw: coInterpreter primFailCodeAddress R: TempReg. backEnd hasLinkRegister ifFalse: [self PushR: ClassReg]. "Restore return pc on CISCs" self flag: 'ask concrete code gen if move sets condition codes?'. self CmpCq: 0 R: TempReg. jmp := self JumpNonZero: 0. "Fetch result from stack" self MoveMw: BytesPerWord r: SPReg R: ReceiverResultReg. self flag: 'currently caller pushes result'. + self RetN: BytesPerWord]. "return to caller, popping receiver" - self RetN: BytesPerWord]. (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: ["The sample is collected by cePrimReturnEnterCogCode for external calls" jmpSamplePrim notNil ifTrue: ["Call ceCheckProfileTick: to record sample and then continue." jmpSamplePrim jmpTarget: self Label. self assert: (flags anyMask: PrimCallNeedsNewMethod). self CallRT: (self cCode: [#ceCheckProfileTick asUnsignedLong] inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]). "reenter the post-primitive call flow" self Jump: continuePostSamplePrim]. "Null newMethod and call ceCheckProfileTick: to record sample and then continue. ceCheckProfileTick will map null/0 to coInterpreter nilObject" jmpSampleNonPrim jmpTarget: self Label. self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress. self CallRT: (self cCode: [#ceCheckProfileTick asUnsignedLong] inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]). "reenter the post-primitive call flow" self Jump: continuePostSampleNonPrim]. jmp notNil ifTrue: ["Jump to restore of receiver reg and proceed to frame build for failure." jmp jmpTarget: self Label. "Restore receiver reg from stack. If on RISCs ret pc is in LinkReg, if on CISCs ret pc is on stack." self MoveMw: BytesPerWord * (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1])) r: SPReg R: ReceiverResultReg]. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimReturnEnterCogCodeEnilopmart: (in category 'initialization') ----- genPrimReturnEnterCogCodeEnilopmart: profiling "Generate the substitute return code for an external or FFI primitive call. On success simply return, extracting numArgs from newMethod. On primitive failure call ceActivateFailingPrimitiveMethod: newMethod." | jmpSample continuePostSample jmpFail | <var: #jmpSample type: #'AbstractInstruction *'> <var: #continuePostSample type: #'AbstractInstruction *'> <var: #jmpFail type: #'AbstractInstruction *'> opcodeIndex := 0. profiling ifTrue: ["Test nextProfileTick for being non-zero and call checkProfileTick: if so. N.B. nextProfileTick is 64-bits so 32-bit systems need to test both halves." BytesPerWord = 4 ifTrue: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self MoveAw: coInterpreter nextProfileTickAddress + BytesPerWord R: ClassReg. self OrR: TempReg R: ClassReg] ifFalse: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self CmpCq: 0 R: TempReg]. "If set, jump to record sample call." jmpSample := self JumpNonZero: 0. continuePostSample := self Label]. self maybeCompileAllocFillerCheck. "Test primitive failure" self MoveAw: coInterpreter primFailCodeAddress R: TempReg. self flag: 'ask concrete code gen if move sets condition codes?'. self CmpCq: 0 R: TempReg. jmpFail := self JumpNonZero: 0. "Switch back to the Smalltalk stack. Stack better be in either of these two states: success: stackPointer -> result (was receiver) arg1 ... argN return pc failure: receiver arg1 ... stackPointer -> argN return pc We push the instructionPointer to reestablish the return pc in the success case, but leave it to ceActivateFailingPrimitiveMethod: to do so in the failure case." backEnd hasLinkRegister ifTrue: [backEnd genLoadStackPointers. "Switch back to Smalltalk stack." self MoveMw: 0 r: SPReg R: ReceiverResultReg. "Fetch result from stack" self MoveAw: coInterpreter instructionPointerAddress R: LinkReg. "Get and restore ret pc" self RetN: BytesPerWord] "Return, popping result from stack" ifFalse: [self MoveAw: coInterpreter instructionPointerAddress R: ClassReg. "Get return pc" backEnd genLoadStackPointers. "Switch back to Smalltalk stack." self MoveMw: 0 r: SPReg R: ReceiverResultReg. "Fetch result from stack" self MoveR: ClassReg Mw: 0 r: SPReg. "Restore return pc" self RetN: 0]. "Return, popping result from stack" "Primitive failed. Invoke C code to build the frame and continue." jmpFail jmpTarget: (self MoveAw: coInterpreter newMethodAddress R: SendNumArgsReg). "Reload sp with CStackPointer; easier than popping args of checkProfileTick." self MoveAw: self cStackPointerAddress R: SPReg. self compileCallFor: #ceActivateFailingPrimitiveMethod: numArgs: 1 arg: SendNumArgsReg arg: nil arg: nil arg: nil resultReg: nil saveRegs: false. + "On Spur ceActivateFailingPrimitiveMethod: may retry the primitive and return if successful. + So continue by returning to the caller. + Switch back to the Smalltalk stack. Stack should be in this state: + success: stackPointer -> result (was receiver) + arg1 + ... + argN + return pc + We can push the instructionPointer or load it into the LinkRegister to reestablish the return pc" + self MoveAw: coInterpreter instructionPointerAddress + R: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [ClassReg]). + backEnd genLoadStackPointers. + backEnd hasLinkRegister + ifTrue: + [self MoveMw: 0 r: SPReg R: ReceiverResultReg] "Fetch result from stack" + ifFalse: + [self MoveMw: BytesPerWord r: SPReg R: ReceiverResultReg. "Fetch result from stack" + self PushR: ClassReg]. "Restore return pc on CISCs" + self flag: 'currently caller pushes result'. + self RetN: BytesPerWord. "return to caller, popping receiver" + profiling ifTrue: ["Call ceCheckProfileTick: to record sample and then continue. newMethod should be up-to-date. Need to save and restore the link reg around this call." jmpSample jmpTarget: self Label. backEnd hasLinkRegister ifTrue: [self PushR: LinkReg]. self CallRT: (self cCode: '(unsigned long)ceCheckProfileTick' inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]). backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. self Jump: continuePostSample]! Item was added: + ----- Method: SmartSyntaxPluginSimulator>>isPluginClass (in category 'simulation') ----- + isPluginClass + "This stands in for SmartSyntaxInterpreterPlugin classes during simulation." + ^true! Item was added: + ----- Method: SmartSyntaxPluginSimulator>>isSmartSyntaxPluginSimulator (in category 'accessing') ----- + isSmartSyntaxPluginSimulator + ^true! Item was changed: ----- Method: SpurMemoryManager>>forward:to: (in category 'become implementation') ----- forward: obj1 to: obj2 self set: obj1 classIndexTo: self isForwardedObjectClassIndexPun formatTo: self forwardedFormat. + self storePointer: 0 ofForwarder: obj1 withValue: obj2. + "For safety make sure the forwarder has a slot count that includes its contents." + (self rawNumSlotsOf: obj1) = 0 ifTrue: + [self setRawNumSlotsOf: obj1 to: 1]! - self storePointer: 0 ofForwarder: obj1 withValue: obj2! Item was changed: ----- Method: SpurMemoryManager>>lengthOf:format: (in category 'object access') ----- lengthOf: objOop format: fmt "Answer the number of indexable units in the given object. For a CompiledMethod, the size of the method header (in bytes) should be subtracted from the result of this method." | numSlots | <inline: true> <asmLabel: false> + numSlots := self numSlotsOfAny: objOop. "don't let forwarders freak us out..." - numSlots := self numSlotsOf: objOop. fmt <= self sixtyFourBitIndexableFormat ifTrue: [^numSlots]. fmt >= self firstByteFormat ifTrue: "bytes, including CompiledMethod" [^numSlots << self shiftForWord - (fmt bitAnd: 7)]. fmt >= self firstShortFormat ifTrue: [^numSlots << (self shiftForWord - 1) - (fmt bitAnd: 3)]. "fmt >= self firstLongFormat" ^numSlots << (self shiftForWord - 2) - (fmt bitAnd: 1)! Item was changed: ----- Method: StackInterpreter>>tryLoadNewPlugin:pluginEntries: (in category 'primitive support') ----- tryLoadNewPlugin: pluginString pluginEntries: pluginEntries "Load the plugin and if on Spur, populate pluginEntries with the prmitives in the plugin." <doNotGenerate> + | plugin realPluginClass plugins simulatorClasses | - | plugin plugins simulatorClasses | self transcript cr; show: 'Looking for module ', pluginString. "Defeat loading of the FloatArrayPlugin & Matrix2x3Plugin since complications with 32-bit float support prevent simulation. If you feel up to tackling this start by implementing cCoerce: value to: cType ^cType = 'float' ifTrue: [value asIEEE32BitWord] ifFalse: [value] in FloatArrayPlugin & Matrix2x3Plugin and then address the issues in the BalloonEnginePlugin. See http://forum.world.st/Simulating-the-BalloonEnginePlugin-FloatArrayPlugin-a…" (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: pluginString) ifTrue: [self transcript show: ' ... defeated'. ^nil]. pluginString isEmpty ifTrue: [plugin := self] ifFalse: [plugins := InterpreterPlugin allSubclasses select: [:psc| psc moduleName asString = pluginString asString]. simulatorClasses := (plugins select: [:psc| psc simulatorClass notNil] thenCollect: [:psc| psc simulatorClass]) asSet. simulatorClasses isEmpty ifTrue: [self transcript show: ' ... not found'. ^nil]. simulatorClasses size > 1 ifTrue: [^self error: 'This won''t work...']. plugins size > 1 ifTrue: [self transcript show: '...multiple plugin classes; choosing ', plugins last name]. + realPluginClass := plugins last. "hopefully lowest in the hierarchy..." + plugin := simulatorClasses anyOne newFor: realPluginClass. - plugin := simulatorClasses anyOne newFor: plugins last. "hopefully lowest in the hierarchy..." plugin setInterpreter: objectMemory. "Ignore return value from setInterpreter" (plugin respondsTo: #initialiseModule) ifTrue: [plugin initialiseModule ifFalse: [self transcript show: ' ... initialiser failed'. ^nil]]]. "module initialiser failed" self transcript show: ' ... loaded'. objectMemory hasSpurMemoryManagerAPI ifTrue: [| realPlugin cg | self transcript show: '...computing accessor depths'. plugin class isPluginClass ifTrue: + [realPlugin := (plugin isSmartSyntaxPluginSimulator + ifTrue: [realPluginClass] + ifFalse: [plugin class]) + withAllSuperclasses detect: [:class| class shouldBeTranslated]. - [realPlugin := plugin class withAllSuperclasses detect: [:class| class shouldBeTranslated]. cg := realPlugin buildCodeGeneratorUpTo: realPlugin] ifFalse: [cg := self codeGeneratorToComputeAccessorDepth. primitiveTable withIndexDo: [:prim :index| | depth | prim isSymbol ifTrue: [depth := cg accessorDepthForSelector: prim. self assert: depth isInteger. primitiveAccessorDepthTable at: index - 1 put: depth]]]. cg exportedPrimitiveNames do: [:primName| | fnSymbol | fnSymbol := primName asSymbol. pluginEntries addLast: {plugin. fnSymbol. [plugin perform: fnSymbol. self]. cg accessorDepthForSelector: fnSymbol}]. self transcript show: '...done']. ^pluginString asString -> plugin! Item was changed: ----- Method: StackInterpreterSimulator>>ioLoadFunction:From:AccessorDepthInto: (in category 'plugin support') ----- ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr "Load and return the requested function from a module. Assign the accessor depth through accessorDepthPtr. N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" | firstTime plugin fnSymbol | firstTime := false. fnSymbol := functionString asSymbol. transcript cr; show: '(', byteCount printString, ') Looking for ', functionString, ' in ', (pluginString isEmpty ifTrue:['vm'] ifFalse:[pluginString]). + (breakSelector notNil + and: [(self str: functionString n: breakSelector cmp: functionString size) = 0]) ifTrue: + [self halt: functionString]. - breakSelector ifNotNil: - [(self str: functionString n: breakSelector cmp: functionString size) = 0 ifTrue: - [self halt: functionString]]. plugin := pluginList detect: [:any| any key = pluginString asString] ifNone: [firstTime := true. self loadNewPlugin: pluginString]. plugin ifNil: [firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0]. plugin := plugin value. - "mappedPluginEntries select: [:tuple| tuple first = plugin] an OrderedCollection({an UnixOSProcessPlugin . #getModuleName . [closure] in [] in StackInterpreterSimulatorLSB(StackInterpreter)>>tryLoadNewPlugin:pluginEntries: . nil} {an UnixOSProcessPlugin . #setInterpreter . [closure] in [] in StackInterpreterSimulatorLSB(StackInterpreter)>>tryLoadNewPlugin:pluginEntries: . nil})" mappedPluginEntries doWithIndex: [:pluginAndName :index| ((pluginAndName at: 1) == plugin and:[(pluginAndName at: 2) == fnSymbol]) ifTrue: [firstTime ifTrue: [transcript show: ' ... okay'; cr]. accessorDepthPtr at: 0 put: (pluginAndName at: 4). ^index]]. firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. + transcript cr. ^0!

1 0

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