Vm-dev June 2014

vm-dev@lists.squeakfoundation.org

37 participants
268 discussions

[commit][3022] Update the Spur image buld scripts to the branched forms of the Monticello
by commits＠squeakvm.org 29 Jun '14

29 Jun '14

Revision: 3022 Author: eliot Date: 2014-06-28 23:02:05 -0700 (Sat, 28 Jun 2014) Log Message: ----------- Update the Spur image buld scripts to the branched forms of the Monticello packages (no spur repository). Use the 3021 VMs. Make functions out of the "extract VM from tar" & "extract VM from zip" sequences. Modified Paths: -------------- branches/Cog/image/buildspurtrunkimage.sh branches/Cog/image/buildsqueak45vmmakerimage.sh branches/Cog/image/buildsqueaktrunkvmmakerimage.sh branches/Cog/image/envvars.sh Added Paths: ----------- branches/Cog/image/get3021spurvm.sh branches/Cog/image/get3021vm.sh Removed Paths: ------------- branches/Cog/image/ChangeUpdateStreamToSpur.st branches/Cog/image/get2897spurvm.sh branches/Cog/image/get2897vm.sh Deleted: branches/Cog/image/ChangeUpdateStreamToSpur.st =================================================================== --- branches/Cog/image/ChangeUpdateStreamToSpur.st 2014-06-29 02:57:50 UTC (rev 3021) +++ branches/Cog/image/ChangeUpdateStreamToSpur.st 2014-06-29 06:02:05 UTC (rev 3022) @@ -1,3 +0,0 @@ -"Change the update stream to spur but don't update." -MCMcmUpdater defaultUpdateURL: 'http://source.squeak.org/spur'. -Smalltalk snapshot: true andQuit: true Modified: branches/Cog/image/buildspurtrunkimage.sh =================================================================== --- branches/Cog/image/buildspurtrunkimage.sh 2014-06-29 02:57:50 UTC (rev 3021) +++ branches/Cog/image/buildspurtrunkimage.sh 2014-06-29 06:02:05 UTC (rev 3022) @@ -1,7 +1,7 @@ #!/bin/sh . ./envvars.sh ./getsqueak45.sh -. ./get2897vm.sh +. ./get3021vm.sh cp -p $SQUEAK45.image trunk46forspur.image cp -p $SQUEAK45.changes trunk46forspur.changes @@ -9,8 +9,6 @@ rm -f temp-spur-repository/* temp-v3-repository/* echo $VM trunk46forspur.image BuildSqueakTrunkImage.st $VM trunk46forspur.image BuildSqueakTrunkImage.st -echo $VM trunk46forspur.image ChangeUpdateStreamToSpur.st -$VM trunk46forspur.image ChangeUpdateStreamToSpur.st echo $VM trunk46forspur.image WriteSpurPackagesToTempDir.st $VM trunk46forspur.image WriteSpurPackagesToTempDir.st @@ -22,7 +20,7 @@ for f in *VMMaker*spur.image; do if test -f "$f"; then IMAGE="$f" -. ./get2897spurvm.sh +. ./get3021spurvm.sh break 2 fi done @@ -30,7 +28,7 @@ for f in *VMMaker*.image; do if test -f "$f"; then IMAGE="$f" -. ./get2897vm.sh +. ./get3021vm.sh break 2 fi done @@ -50,6 +48,6 @@ mv trunk46forspur-spur.changes trunk46-spur.changes # Now load the modified packages -. ./get2897spurvm.sh +. ./get3021spurvm.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-06-29 02:57:50 UTC (rev 3021) +++ branches/Cog/image/buildsqueak45vmmakerimage.sh 2014-06-29 06:02:05 UTC (rev 3022) @@ -1,7 +1,7 @@ #!/bin/bash . ./envvars.sh ./getsqueak45.sh -. ./get2897vm.sh +. ./get3021vm.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-06-29 02:57:50 UTC (rev 3021) +++ branches/Cog/image/buildsqueaktrunkvmmakerimage.sh 2014-06-29 06:02:05 UTC (rev 3022) @@ -1,7 +1,7 @@ #!/bin/bash . ./envvars.sh ./getsqueak45.sh -. ./get2897vm.sh +. ./get3021vm.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-06-29 02:57:50 UTC (rev 3021) +++ branches/Cog/image/envvars.sh 2014-06-29 06:02:05 UTC (rev 3022) @@ -21,3 +21,47 @@ test "$OS" = Darwin && function quietmd5 () { /sbin/md5 -q "$1"; } test "$OS" = Darwin || function quietmd5 () { /usr/bin/md5sum "$1" | sed 's/ .*$//'; } + +function get_vm_from_tar() # VM VMHASH VMARC VMARCHASH +{ VM="$1" + VMDIR=`echo $VM | sed 's/\/.*//'` + VMHASH="$2" + if [ ! -d $VMDIR -o "`quietmd5 "$VM"`" != $VMHASH ]; then + VMARC="$3" + ARCHASH="$4" + if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then + wget -c "$URL/$VMARC" + if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then + echo failed to get $VMARC \; file corrupted\? 1>&2 + exit 2 + fi + fi + tar xzf "$VMARC" + if [ ! -d $VMDIR -o "`quietmd5 "$VM"`" != $VMHASH ]; then + echo failed to correctly extract $VMDIR from $VMARC 1>&2 + exit 3 + fi + fi +} + +function get_vm_from_zip() # VM VMHASH VMARC VMARCHASH +{ VM="$1" + VMDIR=`echo $VM | sed 's/\/.*//'` + VMHASH="$2" + VMARC="$3" + ARCHASH="$4" + if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then + if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then + wget -c "$URL/$VMARC" + if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then + echo failed to get $VMARC \; file corrupted\? 1>&2 + exit 2 + fi + fi + unzip -q "$VMARC" + if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then + echo failed to correctly extract "`dirname $VM`" from $VMARC 1>&2 + exit 3 + fi + fi +} Deleted: branches/Cog/image/get2897spurvm.sh =================================================================== --- branches/Cog/image/get2897spurvm.sh 2014-06-29 02:57:50 UTC (rev 3021) +++ branches/Cog/image/get2897spurvm.sh 2014-06-29 06:02:05 UTC (rev 3022) @@ -1,84 +0,0 @@ -#!/bin/sh -# Sets the VM env var to the r2987 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.r2987/ - -case "$OS" in -Darwin) - VM=CogSpur.app/Contents/MacOS/Squeak - VMHASH=8d2bbd946a70e3992cca0fbc125d2f19 - if [ ! -d CogSpur.app -o "`/sbin/md5 -q $VM`" != $VMHASH ]; then - VMARC=CogSpur.app-14.23.2987.tgz - ARCHASH=16fef44f099f1f89e6fcd1d53ea58b02 - if [ ! -f "$VMARC" -o "`/sbin/md5 -q "$VMARC"`" != $ARCHASH ]; then - wget -c "$URL/$VMARC" - if [ ! -f "$VMARC" -o "`/sbin/md5 -q "$VMARC"`" != $ARCHASH ]; then - echo failed to get $VMARC \; file corrupted\? 1>&2 - exit 2 - fi - fi - tar xzf "$VMARC" - if [ ! -d CogSpur.app -o "`/sbin/md5 -q $VM`" != $VMHASH ]; then - echo failed to correctly extract CogSpur.app from $VMARC 1>&2 - exit 3 - fi - fi;; -Linux) - VM=cogspurlinuxht/lib/squeak/4.0-2987/squeak - VMHASH=c2787117cf634c4561c7f7a22d748221 - VMARC=cogspurlinuxht-14.23.2987.tgz - ARCHASH=40b943c9ab0dcc472b952167579b994f - if [ ! -d "`dirname $VM`" -o \ - "`/usr/bin/md5sum "$VM" | sed 's/ .*$//'`" != $VMHASH ]; then - if [ ! -f "$VMARC" \ - -o "`/usr/bin/md5sum "$VMARC" | sed 's/ .*$//'`" != $ARCHASH ]; then - wget -c "$URL/$VMARC" - if [ ! -f "$VMARC" \ - -o "`/usr/bin/md5sum "$VMARC" | sed 's/ .*$//'`" != $ARCHASH ]; then - echo failed to get $VMARC \; file corrupted\? 1>&2 - exit 2 - fi - fi - tar xzf "$VMARC" - if [ ! -d "`dirname $VM`" \ - -o "`/usr/bin/md5sum $VM | sed 's/ .*$//'`" != $VMHASH ]; then - echo failed to correctly extract "`dirname $VM`" from $VMARC 1>&2 - exit 3 - fi - fi - VM="cogspurlinuxht/squeak";; -CYGWIN*) - VM=cogwin/SqueakConsole.exe - VMHASH=a68a3eab7db6713bed9f1560759f73ae - VMARC=cogwin-14.23.2987.zip - ARCHASH=acd8291859bfe10a52d6ecb28271a673 - if [ ! -d "`dirname $VM`" \ - -o "`/usr/bin/md5sum "$VM" | sed 's/ .*$//'`" != $VMHASH ]; then - if [ ! -f "$VMARC" \ - -o "`/usr/bin/md5sum "$VMARC" | sed 's/ .*$//'`" != $ARCHASH ]; then - wget -c "$URL/$VMARC" - if [ ! -f "$VMARC" \ - -o "`/usr/bin/md5sum "$VMARC" | sed 's/ .*$//'`" != $ARCHASH ]; then - echo failed to get $VMARC \; file corrupted\? 1>&2 - exit 2 - fi - fi - unzip -q "$VMARC" - if [ ! -d "`dirname $VM`" \ - -o "`/usr/bin/md5sum $VM | sed 's/ .*$//'`" != $VMHASH ]; then - echo failed to correctly extract "`dirname $VM`" from $VMARC 1>&2 - exit 3 - fi - fi;; -*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 -esac Deleted: branches/Cog/image/get2897vm.sh =================================================================== --- branches/Cog/image/get2897vm.sh 2014-06-29 02:57:50 UTC (rev 3021) +++ branches/Cog/image/get2897vm.sh 2014-06-29 06:02:05 UTC (rev 3022) @@ -1,87 +0,0 @@ -#!/bin/sh -# Sets the VM env var to the r2987 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.r2987/ - -case "$OS" in -Darwin) - VM=Cog.app/Contents/MacOS/Squeak - VMHASH=ec2962db9518aaea4fee1bc92007e635 - if [ ! -d Cog.app -o "`quientmd5 $VM`" != $VMHASH ]; then - VMARC=Cog.app-14.23.2987.tgz - ARCHASH=0f84cf23e98ea03ee7e87ccc8ba756ec - if [ ! -f "$VMARC" -o "`quietmd5 $VMARC`" != $ARCHASH ]; then - wget -c "$URL/$VMARC" - if [ ! -f "$VMARC" -o "`quietmd5 $VMARC`" != $ARCHASH ]; then - echo failed to get $VMARC \; file corrupted\? 1>&2 - exit 2 - fi - fi - tar xzf "$VMARC" - if [ ! -d Cog.app -o "`quietmd5 $VM`" != $VMHASH ]; then - echo failed to correctly extract Cog.app from $VMARC 1>&2 - exit 3 - fi - fi;; -Linux) - if expr $OSREL \> 2.6.12; then - VM=coglinuxht/lib/squeak/4.0-2987/squeak - VMHASH=6dc8912ed01875df67331d6cf592ac4b - VMARC=coglinuxht-14.23.2987.tgz - ARCHASH=e580c191aecce7c56fbe1900a5df2984 - else - VM=coglinux/lib/squeak/4.0-2987/squeak - VMHASH=8afd4020caca229b8bba4bd6a79d6d83 - VMARC=coglinux-14.23.2987.tgz - ARCHASH=19d9c28860758db4e2f25642837de3c3 - fi - if [ ! -d "`dirname $VM`" -o "`quietmd5 $VM`" != $VMHASH ]; then - if [ ! -f "$VMARC" -o "`quietmd5 $VMARC`" != $ARCHASH ]; then - wget -c "$URL/$VMARC" - if [ ! -f "$VMARC" -o "`quietmd5 $VMARC`" != $ARCHASH ]; then - echo failed to get $VMARC \; file corrupted\? 1>&2 - exit 2 - fi - fi - tar xzf "$VMARC" - if [ ! -d "`dirname $VM`" -o "`quietmd5 $VM`" != $VMHASH ]; then - echo failed to correctly extract "`dirname $VM`" from $VMARC 1>&2 - exit 3 - fi - fi - if expr $OSREL \> 2.6.12; then - VM="coglinuxht/squeak" - else - VM="coglinux/squeak" - fi;; -CYGWIN*) - VM=cogwin/SqueakConsole.exe - VMHASH=a68a3eab7db6713bed9f1560759f73ae - VMARC=cogwin-14.23.2987.zip - ARCHASH=acd8291859bfe10a52d6ecb28271a673 - if [ ! -d "`dirname $VM`" -o "`quietmd5 $VM`" != $VMHASH ]; then - if [ ! -f "$VMARC" -o "`quietmd5 $VMARC`" != $ARCHASH ]; then - wget -c "$URL/$VMARC" - if [ ! -f "$VMARC" -o "`quietmd5 $VMARC`" != $ARCHASH ]; then - echo failed to get $VMARC \; file corrupted\? 1>&2 - exit 2 - fi - fi - unzip -q "$VMARC" - if [ ! -d "`dirname $VM`" -o "`quietmd5 $VM`" != $VMHASH ]; then - echo failed to correctly extract "`dirname $VM`" from $VMARC 1>&2 - exit 3 - fi - fi;; -*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 -esac Added: branches/Cog/image/get3021spurvm.sh =================================================================== --- branches/Cog/image/get3021spurvm.sh (rev 0) +++ branches/Cog/image/get3021spurvm.sh 2014-06-29 06:02:05 UTC (rev 3022) @@ -0,0 +1,30 @@ +#!/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 Property changes on: branches/Cog/image/get3021spurvm.sh ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/image/get3021vm.sh =================================================================== --- branches/Cog/image/get3021vm.sh (rev 0) +++ branches/Cog/image/get3021vm.sh 2014-06-29 06:02:05 UTC (rev 3022) @@ -0,0 +1,38 @@ +#!/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 Property changes on: branches/Cog/image/get3021vm.sh ___________________________________________________________________ Added: svn:executable + *

1 0

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

29 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.788.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.788 Author: eem Time: 28 June 2014, 10:48:12.786 pm UUID: 487e7744-7e06-4f41-a34d-f1c65b104594 Ancestors: VMMaker.oscog-eem.787 The sender checking in is[Non]IntegerObject: has served out its useful life. It now gets in the way... =============== Diff against VMMaker.oscog-eem.787 =============== Item was changed: ----- Method: Spur32BitMMLECoSimulator>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop "This list records the valid senders of isIntegerObject: as we replace uses of isIntegerObject: by isImmediate: where appropriate." + "| sel | - | sel | sel := thisContext sender method selector. (#( DoIt DoItIn: baseFrameReturn bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf: bytecodePrimAt bytecodePrimAtPut bytesOrInt:growTo: ceBaseFrameReturn: checkIsStillMarriedContext:currentFP: checkedIntegerValueOf: cogMethodDoesntLookKosher: commonAt: commonAtPut: commonVariable:at:put:cacheIndex: compare31or32Bits:equal: digitBitLogic:with:opIndex: digitLength: displayBitsOf:Left:Top:Right:Bottom: ensureContextHasBytecodePC: externalInstVar:ofContext: fetchIntOrFloat:ofObject: fetchIntOrFloat:ofObject:ifNil: fetchStackPointerOf: fileValueOf: frameOfMarriedContext: functionForPrimitiveExternalCall: genSpecialSelectorArithmetic genSpecialSelectorComparison inlineCacheTagForInstance: instVar:ofContext: isCogMethodReference: isLiveContext: isMarriedOrWidowedContext: isNegativeIntegerValueOf: isNormalized: loadBitBltDestForm loadBitBltSourceForm loadFloatOrIntFrom: loadPoint:from: magnitude64BitValueOf: makeBaseFrameFor: numPointerSlotsOf: objCouldBeClassObj: + on:do: ""from the debugger"" - on:do: "from the debugger" positive32BitValueOf: positive64BitValueOf: primDigitAdd: primDigitBitShiftMagnitude: primDigitCompare: primDigitDiv:negative: primDigitMultiply:negative: primDigitSubtract: primitiveAllInstances primitiveAsCharacter primitiveContextAt primitiveContextAtPut primitiveExternalCall primitiveFileSetPosition primitiveFileTruncate DoIt primitiveForwardSignalToSemaphore primitiveGrowMemoryByAtLeast primitiveInputSemaphore primitiveMakePoint primitiveNewMethod primitiveObjectAtPut primitiveSizeInBytesOfInstance primitiveVMParameter printContext: quickFetchInteger:ofObject: shortPrint: shortPrintOop: signed32BitValueOf: signed64BitValueOf: subscript:with:storing:format: unlockSurfaces + establishFrameForContextToReturnTo: + positiveMachineIntegerValueOf:) includes: sel) ifFalse: + [self halt]." - establishFrameForContextToReturnTo:) includes: sel) ifFalse: - [self halt]. ^super isIntegerObject: oop! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>isNonIntegerObject: (in category 'object testing') ----- isNonIntegerObject: oop "This list records the valid senders of isNonIntegerObject: as we replace uses of isNonIntegerObject: by isNonImmediate: where appropriate." + "(#( on:do: ""from the debugger"" - (#( on:do: "from the dbeugger" reverseDisplayFrom:to: primitiveObjectAtPut isCogMethodReference:) includes: thisContext sender method selector) ifFalse: + [self halt]." - [self halt]. ^super isNonIntegerObject: oop! Item was changed: ----- Method: Spur32BitMMLESimulator>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop "This list records the valid senders of isIntegerObject: as we replace uses of isIntegerObject: by isImmediate: where appropriate." + "| sel | - | sel | sel := thisContext sender method selector. (#( DoIt DoItIn: baseFrameReturn bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf: bytecodePrimAt bytecodePrimAtPut bytesOrInt:growTo: ceBaseFrameReturn: checkIsStillMarriedContext:currentFP: checkedIntegerValueOf: cogMethodDoesntLookKosher: commonAt: commonAtPut: commonVariable:at:put:cacheIndex: compare31or32Bits:equal: digitBitLogic:with:opIndex: digitLength: displayBitsOf:Left:Top:Right:Bottom: ensureContextHasBytecodePC: externalInstVar:ofContext: fetchIntOrFloat:ofObject: fetchIntOrFloat:ofObject:ifNil: fetchStackPointerOf: fileValueOf: frameOfMarriedContext: functionForPrimitiveExternalCall: genSpecialSelectorArithmetic genSpecialSelectorComparison inlineCacheTagForInstance: instVar:ofContext: isCogMethodReference: isLiveContext: isMarriedOrWidowedContext: isNegativeIntegerValueOf: isNormalized: loadBitBltDestForm loadBitBltSourceForm loadFloatOrIntFrom: loadPoint:from: magnitude64BitValueOf: makeBaseFrameFor: numPointerSlotsOf: objCouldBeClassObj: + on:do: ""from the debugger"" - on:do: "from the debugger" positive32BitValueOf: positive64BitValueOf: primDigitAdd: primDigitBitShiftMagnitude: primDigitCompare: primDigitDiv:negative: primDigitMultiply:negative: primDigitSubtract: primitiveAllInstances primitiveAsCharacter primitiveContextAt primitiveContextAtPut primitiveExternalCall primitiveFileSetPosition primitiveFileTruncate DoIt primitiveForwardSignalToSemaphore primitiveGrowMemoryByAtLeast primitiveInputSemaphore primitiveMakePoint primitiveNewMethod primitiveObjectAtPut primitiveSizeInBytesOfInstance primitiveVMParameter printContext: quickFetchInteger:ofObject: shortPrint: shortPrintOop: signed32BitValueOf: signed64BitValueOf: subscript:with:storing:format: unlockSurfaces + establishFrameForContextToReturnTo: + positiveMachineIntegerValueOf:) includes: sel) ifFalse: + [self halt]." - establishFrameForContextToReturnTo:) includes: sel) ifFalse: - [self halt]. ^super isIntegerObject: oop! Item was changed: ----- Method: Spur32BitMMLESimulator>>isNonIntegerObject: (in category 'object testing') ----- isNonIntegerObject: oop "This list records the valid senders of isNonIntegerObject: as we replace uses of isNonIntegerObject: by isNonImmediate: where appropriate." + "(#( on:do: ""from the debugger"" - (#( on:do: "from the dbeugger" reverseDisplayFrom:to: primitiveObjectAtPut isCogMethodReference:) includes: thisContext sender method selector) ifFalse: + [self halt]." - [self halt]. ^super isNonIntegerObject: oop!

1 0

[commit][3021] CogVM source as per VMMaker.oscog-eem.787
by commits＠squeakvm.org 29 Jun '14

29 Jun '14

Revision: 3021 Author: eliot Date: 2014-06-28 19:57:50 -0700 (Sat, 28 Jun 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.787 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 sign and overflow issues in instantiating larger objects and determining the size of large instances. Fix some freeChunk accesses that used fetchPointer:ofObject:. Cog ARM: Fix prim return for compileInterpreterPrimitive: on RISCs. On return from interpreter prim, ret pc is in instructionPointer and must return to whence it came, which is the stack on CISC and the LinkReg on RISC. Hence restoring the receiver reg requires different offsets in the two cases. Rework the rotatable quick constant logic a little and clean up users. Fix concretizeMoveRXbrR to do byte not word loads. Fix concretizeConditionalJumpLong: to actually be conditional. Oops. Correct mistaken callersaved reg stuff for ARM Fix concretizedRetN to not over-bump the SP The method abort trampolines shouldn't pop anything, especially now we have the pushLinkreg: arg to manage the LinkReg more easily. Slang: Rip out the UseRightShiftForDivide optimization. It gets unsigned division wrong, and C compilers can and will optimize this correctly themselves. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.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/platforms/Cross/vm/sqVirtualMachine.c branches/Cog/platforms/Cross/vm/sqVirtualMachine.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/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/Klatt/Klatt.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.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/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2014-06-26 17:29:55 UTC (rev 3020) +++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2014-06-29 02:57:50 UTC (rev 3021) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + VMPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 from - BalloonEnginePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + BalloonEnginePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; @@ -773,7 +773,7 @@ static sqInt (*popthenPush)(sqInt nItems, sqInt oop); static sqInt (*popRemappableOop)(void); static sqInt (*positive32BitIntegerFor)(sqInt integerValue); -static sqInt (*positive32BitValueOf)(sqInt oop); +static usqInt (*positive32BitValueOf)(sqInt oop); static sqInt (*primitiveFail)(void); static sqInt (*primitiveFailFor)(sqInt reasonCode); static sqInt (*push)(sqInt object); @@ -819,7 +819,7 @@ extern sqInt popthenPush(sqInt nItems, sqInt oop); extern sqInt popRemappableOop(void); extern sqInt positive32BitIntegerFor(sqInt integerValue); -extern sqInt positive32BitValueOf(sqInt oop); +extern usqInt positive32BitValueOf(sqInt oop); extern sqInt primitiveFail(void); extern sqInt primitiveFailFor(sqInt reasonCode); extern sqInt push(sqInt object); @@ -839,9 +839,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.706 (i)" + "B2DPlugin VMMaker.oscog-eem.787 (i)" #else - "B2DPlugin VMMaker.oscog-eem.706 (e)" + "B2DPlugin VMMaker.oscog-eem.787 (e)" #endif ; static int* objBuffer; @@ -1096,7 +1096,7 @@ yEntry = objBuffer[line + GLWideEntry]; yExit = objBuffer[line + GLWideExit]; baseWidth = objBuffer[line + GLWideExtent]; - lineOffset = ((sqInt) baseWidth >> 1); + lineOffset = baseWidth / 2; lineWidth = objBuffer[line + GLWideWidth]; xDir = objBuffer[line + GLXDirection]; @@ -2165,18 +2165,18 @@ /* Compute intermediate points */ endY = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 5)]; - leftViaX += ((sqInt) (viaX - startX) >> 1); - leftViaY += ((sqInt) (viaY - startY) >> 1); - sharedX = (rightViaX += ((sqInt) (endX - viaX) >> 1)); + leftViaX += (viaX - startX) / 2; + leftViaY += (viaY - startY) / 2; + sharedX = (rightViaX += (endX - viaX) / 2); /* Compute new shared point */ - sharedY = (rightViaY += ((sqInt) (endY - viaY) >> 1)); - sharedX += ((sqInt) (leftViaX - rightViaX) >> 1); + sharedY = (rightViaY += (endY - viaY) / 2); + sharedX += (leftViaX - rightViaX) / 2; /* Store the first part back */ - sharedY += ((sqInt) (leftViaY - rightViaY) >> 1); + sharedY += (leftViaY - rightViaY) / 2; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 2)] = leftViaX; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 3)] = leftViaY; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 4)] = sharedX; @@ -2317,8 +2317,8 @@ sqInt rightX; sqInt temp; - leftX = ((sqInt) ((bezierUpdateDataOf(bezier))[GBUpdateX]) >> 8); - rightX = ((sqInt) ((wideBezierUpdateDataOf(bezier))[GBUpdateX]) >> 8); + leftX = ((bezierUpdateDataOf(bezier))[GBUpdateX]) / 256; + rightX = ((wideBezierUpdateDataOf(bezier))[GBUpdateX]) / 256; if (leftX > rightX) { temp = leftX; leftX = rightX; @@ -2695,10 +2695,10 @@ absDy = 0 - deltaY; } if (absDx > absDy) { - return absDx + (((sqInt) absDy >> 1)); + return absDx + (absDy / 2); } else { - return absDy + (((sqInt) absDx >> 1)); + return absDy + (absDx / 2); } } @@ -2915,8 +2915,8 @@ } dt = newDelta1; } - xp = ((sqInt) ds >> 16); - yp = ((sqInt) dt >> 16); + xp = ds / 65536; + yp = dt / 65536; if (!tileFlag) { /* begin clampValue:max: */ if (xp < 0) { @@ -3039,8 +3039,8 @@ } dt = newDelta3; } - xp = ((sqInt) ds >> 16); - yp = ((sqInt) dt >> 16); + xp = ds / 65536; + yp = dt / 65536; if (!tileFlag) { /* begin clampValue:max: */ if (xp < 0) { @@ -3163,8 +3163,8 @@ } dt = newDelta5; } - xp = ((sqInt) ds >> 16); - yp = ((sqInt) dt >> 16); + xp = ds / 65536; + yp = dt / 65536; if (!tileFlag) { /* begin clampValue:max: */ if (xp < 0) { @@ -3395,8 +3395,8 @@ } dt = newDelta1; } - xp = ((sqInt) ds >> 16); - yp = ((sqInt) dt >> 16); + xp = ds / 65536; + yp = dt / 65536; if (!tileFlag) { /* begin clampValue:max: */ if (xp < 0) { @@ -3655,7 +3655,7 @@ rampSize = objBuffer[fill + GFRampLength]; ds = deltaS; x = leftX; - rampIndex = ((sqInt) ds >> 16); + rampIndex = ds / 65536; /* begin aaFirstPixelFrom:to: */ firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & (~((workBuffer[GWAALevel]) - 1)); if (firstPixel1 > rightX) { @@ -3682,13 +3682,13 @@ rampValue = ((usqInt) (rampValue & colorMask)) >> colorShift; while ((x < firstPixel) - && ((((sqInt) ds >> 16)) == rampIndex)) { + && ((ds / 65536) == rampIndex)) { idx = ((usqInt) x) >> baseShift; spanBuffer[idx] = ((spanBuffer[idx]) + rampValue); x += 1; ds += dsX; } - rampIndex = ((sqInt) ds >> 16); + rampIndex = ds / 65536; } colorMask = (((usqInt) (workBuffer[GWAAColorMask])) >> (workBuffer[GWAAShift])) | 4042322160UL; colorShift = workBuffer[GWAAShift]; @@ -3701,13 +3701,13 @@ rampValue = ((usqInt) (rampValue & colorMask)) >> colorShift; while ((x < lastPixel) - && ((((sqInt) ds >> 16)) == rampIndex)) { + && ((ds / 65536) == rampIndex)) { idx = ((usqInt) x) >> baseShift; spanBuffer[idx] = ((spanBuffer[idx]) + rampValue); x += aaLevel; ds += dsX << colorShift; } - rampIndex = ((sqInt) ds >> 16); + rampIndex = ds / 65536; } colorMask = workBuffer[GWAAColorMask]; colorShift = workBuffer[GWAAColorShift]; @@ -3720,13 +3720,13 @@ rampValue = ((usqInt) (rampValue & colorMask)) >> colorShift; while ((x < rightX) - && ((((sqInt) ds >> 16)) == rampIndex)) { + && ((ds / 65536) == rampIndex)) { idx = ((usqInt) x) >> baseShift; spanBuffer[idx] = ((spanBuffer[idx]) + rampValue); x += 1; ds += dsX; } - rampIndex = ((sqInt) ds >> 16); + rampIndex = ds / 65536; } return x; } @@ -3761,7 +3761,7 @@ /* Part one: Fill everything outside the left boundary */ x1 = rightX; - while (((((rampIndex = ((sqInt) ds >> 16))) < 0) + while (((((rampIndex = ds / 65536)) < 0) || (rampIndex >= rampSize)) && (x < x1)) { x += 1; @@ -3801,7 +3801,7 @@ /* Fast version w/o anti-aliasing */ - while (((((rampIndex = ((sqInt) ds >> 16))) < rampSize) + while (((((rampIndex = ds / 65536)) < rampSize) && (rampIndex >= 0)) && (x < x1)) { spanBuffer[x] = (ramp[rampIndex]); @@ -3991,7 +3991,7 @@ dt = (((int*) deltaST))[1]; aaLevel = workBuffer[GWAALevel]; baseShift = workBuffer[GWAAShift]; - rampIndex = accurateLengthOfwith(((sqInt) ds >> 16), ((sqInt) dt >> 16)); + rampIndex = accurateLengthOfwith(ds / 65536, dt / 65536); length2 = (rampIndex - 1) * (rampIndex - 1); x = leftX; x1 = objBuffer[fill + GFOriginX]; @@ -4023,14 +4023,14 @@ /* Try to copy the current value more than just once */ while ((x < firstPixel) - && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) >= length2)) { + && ((((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536))) >= length2)) { index = ((usqInt) x) >> baseShift; spanBuffer[index] = ((spanBuffer[index]) + rampValue); x += 1; ds += dsX; dt += dtX; } - nextLength = ((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16))); + nextLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); while (nextLength < length2) { rampIndex -= 1; rampValue = (((int *) ramp))[rampIndex]; @@ -4049,14 +4049,14 @@ /* Try to copy the current value more than just once */ while ((x < lastPixel) - && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) >= length2)) { + && ((((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536))) >= length2)) { index = ((usqInt) x) >> baseShift; spanBuffer[index] = ((spanBuffer[index]) + rampValue); x += aaLevel; ds += dsX << colorShift; dt += dtX << colorShift; } - nextLength = ((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16))); + nextLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); while (nextLength < length2) { rampIndex -= 1; rampValue = (((int *) ramp))[rampIndex]; @@ -4075,14 +4075,14 @@ /* Try to copy the current value more than just once */ while ((x < x1) - && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) >= length2)) { + && ((((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536))) >= length2)) { index = ((usqInt) x) >> baseShift; spanBuffer[index] = ((spanBuffer[index]) + rampValue); x += 1; ds += dsX; dt += dtX; } - nextLength = ((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16))); + nextLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); while (nextLength < length2) { rampIndex -= 1; rampValue = (((int *) ramp))[rampIndex]; @@ -4113,7 +4113,7 @@ ds = (((int*) deltaST))[0]; dt = (((int*) deltaST))[1]; - rampIndex = accurateLengthOfwith(((sqInt) ds >> 16), ((sqInt) dt >> 16)); + rampIndex = accurateLengthOfwith(ds / 65536, dt / 65536); rampValue = (((int *) ramp))[rampIndex]; length2 = (rampIndex - 1) * (rampIndex - 1); x = leftX; @@ -4126,13 +4126,13 @@ /* Try to copy the current value more than just once */ while ((x < x1) - && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) >= length2)) { + && ((((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536))) >= length2)) { spanBuffer[x] = rampValue; x += 1; ds += dsX; dt += dtX; } - nextLength = ((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16))); + nextLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); while (nextLength < length2) { rampIndex -= 1; rampValue = (((int *) ramp))[rampIndex]; @@ -4210,7 +4210,7 @@ /* This is the upper bound */ length2 = (rampSize - 1) * (rampSize - 1); - while (((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) >= length2) + while (((((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536))) >= length2) && (x < x1)) { x += 1; ds += dsX; @@ -4252,7 +4252,7 @@ /* begin fillRadialDecreasing:ramp:deltaST:dsX:dtX:from:to: */ ds1 = (((int*) deltaST))[0]; dt1 = (((int*) deltaST))[1]; - rampIndex = accurateLengthOfwith(((sqInt) ds1 >> 16), ((sqInt) dt1 >> 16)); + rampIndex = accurateLengthOfwith(ds1 / 65536, dt1 / 65536); rampValue = (((int *) ramp))[rampIndex]; length21 = (rampIndex - 1) * (rampIndex - 1); x2 = x; @@ -4265,13 +4265,13 @@ /* Try to copy the current value more than just once */ while ((x2 < x12) - && ((((((sqInt) ds1 >> 16)) * (((sqInt) ds1 >> 16))) + ((((sqInt) dt1 >> 16)) * (((sqInt) dt1 >> 16)))) >= length21)) { + && ((((ds1 / 65536) * (ds1 / 65536)) + ((dt1 / 65536) * (dt1 / 65536))) >= length21)) { spanBuffer[x2] = rampValue; x2 += 1; ds1 += dsX; dt1 += dtX; } - nextLength = ((((sqInt) ds1 >> 16)) * (((sqInt) ds1 >> 16))) + ((((sqInt) dt1 >> 16)) * (((sqInt) dt1 >> 16))); + nextLength = ((ds1 / 65536) * (ds1 / 65536)) + ((dt1 / 65536) * (dt1 / 65536)); while (nextLength < length21) { rampIndex -= 1; rampValue = (((int *) ramp))[rampIndex]; @@ -4294,7 +4294,7 @@ /* begin fillRadialIncreasing:ramp:deltaST:dsX:dtX:from:to: */ ds2 = (((int*) deltaST))[0]; dt2 = (((int*) deltaST))[1]; - rampIndex1 = accurateLengthOfwith(((sqInt) ds2 >> 16), ((sqInt) dt2 >> 16)); + rampIndex1 = accurateLengthOfwith(ds2 / 65536, dt2 / 65536); rampValue1 = (((int *) ramp))[rampIndex1]; rampSize1 = objBuffer[fill + GFRampLength]; @@ -4302,7 +4302,7 @@ length22 = (rampSize1 - 1) * (rampSize1 - 1); nextLength1 = (rampIndex1 + 1) * (rampIndex1 + 1); - lastLength = ((((sqInt) ds2 >> 16)) * (((sqInt) ds2 >> 16))) + ((((sqInt) dt2 >> 16)) * (((sqInt) dt2 >> 16))); + lastLength = ((ds2 / 65536) * (ds2 / 65536)) + ((dt2 / 65536) * (dt2 / 65536)); x3 = x; x14 = x1; while ((x3 < x14) @@ -4311,13 +4311,13 @@ /* Try to copy the current value more than once */ while ((x3 < x14) - && ((((((sqInt) ds2 >> 16)) * (((sqInt) ds2 >> 16))) + ((((sqInt) dt2 >> 16)) * (((sqInt) dt2 >> 16)))) <= nextLength1)) { + && ((((ds2 / 65536) * (ds2 / 65536)) + ((dt2 / 65536) * (dt2 / 65536))) <= nextLength1)) { spanBuffer[x3] = rampValue1; x3 += 1; ds2 += dsX; dt2 += dtX; } - lastLength = ((((sqInt) ds2 >> 16)) * (((sqInt) ds2 >> 16))) + ((((sqInt) dt2 >> 16)) * (((sqInt) dt2 >> 16))); + lastLength = ((ds2 / 65536) * (ds2 / 65536)) + ((dt2 / 65536) * (dt2 / 65536)); while (lastLength > nextLength1) { rampIndex1 += 1; rampValue1 = (((int *) ramp))[rampIndex1]; @@ -4386,14 +4386,14 @@ dt = (((int*) deltaST))[1]; aaLevel = workBuffer[GWAALevel]; baseShift = workBuffer[GWAAShift]; - rampIndex = accurateLengthOfwith(((sqInt) ds >> 16), ((sqInt) dt >> 16)); + rampIndex = accurateLengthOfwith(ds / 65536, dt / 65536); rampSize = objBuffer[fill + GFRampLength]; /* This is the upper bound */ length2 = (rampSize - 1) * (rampSize - 1); nextLength = (rampIndex + 1) * (rampIndex + 1); - lastLength = ((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16))); + lastLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); x = leftX; /* begin aaFirstPixelFrom:to: */ firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & (~((workBuffer[GWAALevel]) - 1)); @@ -4422,14 +4422,14 @@ /* Try to copy the current value more than once */ while ((x < firstPixel) - && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) <= nextLength)) { + && ((((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536))) <= nextLength)) { index = ((usqInt) x) >> baseShift; spanBuffer[index] = ((spanBuffer[index]) + rampValue); x += 1; ds += dsX; dt += dtX; } - lastLength = ((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16))); + lastLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); while (lastLength > nextLength) { rampIndex += 1; rampValue = (((int *) ramp))[rampIndex]; @@ -4450,14 +4450,14 @@ /* Try to copy the current value more than once */ while ((x < lastPixel) - && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) <= nextLength)) { + && ((((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536))) <= nextLength)) { index = ((usqInt) x) >> baseShift; spanBuffer[index] = ((spanBuffer[index]) + rampValue); x += aaLevel; ds += dsX << colorShift; dt += dtX << colorShift; } - lastLength = ((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16))); + lastLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); while (lastLength > nextLength) { rampIndex += 1; rampValue = (((int *) ramp))[rampIndex]; @@ -4478,14 +4478,14 @@ /* Try to copy the current value more than once */ while ((x < rightX) - && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) <= nextLength)) { + && ((((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536))) <= nextLength)) { index = ((usqInt) x) >> baseShift; spanBuffer[index] = ((spanBuffer[index]) + rampValue); x += 1; ds += dsX; dt += dtX; } - lastLength = ((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16))); + lastLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); while (lastLength > nextLength) { rampIndex += 1; rampValue = (((int *) ramp))[rampIndex]; @@ -4518,7 +4518,7 @@ ds = (((int*) deltaST))[0]; dt = (((int*) deltaST))[1]; - rampIndex = accurateLengthOfwith(((sqInt) ds >> 16), ((sqInt) dt >> 16)); + rampIndex = accurateLengthOfwith(ds / 65536, dt / 65536); rampValue = (((int *) ramp))[rampIndex]; rampSize = objBuffer[fill + GFRampLength]; @@ -4526,7 +4526,7 @@ length2 = (rampSize - 1) * (rampSize - 1); nextLength = (rampIndex + 1) * (rampIndex + 1); - lastLength = ((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16))); + lastLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); x = leftX; x1 = rightX; while ((x < x1) @@ -4535,13 +4535,13 @@ /* Try to copy the current value more than once */ while ((x < x1) - && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) <= nextLength)) { + && ((((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536))) <= nextLength)) { spanBuffer[x] = rampValue; x += 1; ds += dsX; dt += dtX; } - lastLength = ((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16))); + lastLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); while (lastLength > nextLength) { rampIndex += 1; rampValue = (((int *) ramp))[rampIndex]; @@ -7342,8 +7342,8 @@ and not yet the control point (which is OFF the curve) */ y1 = ((sqInt)((((circleSinTable())[(seg * 2) + 1]) * (((double) h ))) + cy)); - x1 = (x1 * 2) - (((sqInt) (x0 + x2) >> 1)); - y1 = (y1 * 2) - (((sqInt) (y0 + y2) >> 1)); + x1 = (x1 * 2) - ((x0 + x2) / 2); + y1 = (y1 * 2) - ((y0 + y2) / 2); (point2Get())[0] = x1; (point2Get())[1] = y1; } @@ -7377,10 +7377,10 @@ sqInt y2; sqInt y3; - w = ((sqInt) (((point2Get())[0]) - ((point1Get())[0])) >> 1); - h = ((sqInt) (((point2Get())[1]) - ((point1Get())[1])) >> 1); - cx = ((sqInt) (((point2Get())[0]) + ((point1Get())[0])) >> 1); - cy = ((sqInt) (((point2Get())[1]) + ((point1Get())[1])) >> 1); + w = (((point2Get())[0]) - ((point1Get())[0])) / 2; + h = (((point2Get())[1]) - ((point1Get())[1])) / 2; + cx = (((point2Get())[0]) + ((point1Get())[0])) / 2; + cy = (((point2Get())[1]) + ((point1Get())[1])) / 2; for (i = 0; i <= 15; i += 1) { loadOvalSegmentwhcxcy(i, w, h, cx, cy); /* begin transformPoints: */ @@ -8161,7 +8161,7 @@ } else { wide = 1; - offset = ((sqInt) lineWidth >> 1); + offset = lineWidth / 2; } index = nSegments * 6; while (index > 0) { @@ -8251,7 +8251,7 @@ objBuffer[line2 + GEObjectLength] = GLWideSize; line = line2; l2: /* end allocateWideLine */; - offset = ((sqInt) lineWidth >> 1); + offset = lineWidth / 2; } if (engineStopped) { return 0; @@ -8521,7 +8521,7 @@ static sqInt offsetFromWidth(sqInt lineWidth) { - return ((sqInt) lineWidth >> 1); + return lineWidth / 2; } static int * @@ -11540,7 +11540,7 @@ /* ij is the midpoint of i and j. */ - ij = ((sqInt) (i + j) >> 1); + ij = (i + j) / 2; /* Sort di,dij,dj. Make dij be their median. */ @@ -12089,13 +12089,13 @@ squaredStepSize = ((usqInt) (((((usqInt) (((unsigned) (word1 * word1))) >> 16)) + ((word1 * word2) * 2)) + (((usqInt) (word2 * word2) << 16))) >> 8); fwDx = fwX1 * scaledStepSize; fwDDx = (fwX2 * squaredStepSize) * 2; - fwDx += ((sqInt) fwDDx >> 1); + fwDx += fwDDx / 2; fwDy = fwY1 * scaledStepSize; fwDDy = (fwY2 * squaredStepSize) * 2; /* Store the values */ - fwDy += ((sqInt) fwDDy >> 1); + fwDy += fwDDy / 2; objBuffer[bezier + GENumLines] = deltaY; /* begin bezierUpdateDataOf: */ updateData = (objBuffer + bezier) + GBUpdateData; @@ -12123,8 +12123,8 @@ minY = yValue * 256; while ((minY > lastY) && (fwDy1 >= 0)) { - lastX += ((sqInt) (fwDx1 + 32768) >> 16); - lastY += ((sqInt) (fwDy1 + 32768) >> 16); + lastX += (fwDx1 + 32768) / 65536; + lastY += (fwDy1 + 32768) / 65536; fwDx1 += (((int*) updateData1))[GBUpdateDDX]; fwDy1 += (((int*) updateData1))[GBUpdateDDY]; } @@ -12132,7 +12132,7 @@ (((int*) updateData1))[GBUpdateY] = lastY; (((int*) updateData1))[GBUpdateDX] = fwDx1; (((int*) updateData1))[GBUpdateDY] = fwDy1; - xValue = ((sqInt) lastX >> 8); + xValue = lastX / 256; objBuffer[bezier + GEXValue] = xValue; objBuffer[bezier + GENumLines] = (deltaY - (yValue - startY)); } @@ -12272,7 +12272,7 @@ /* Compute the incremental values of the bezier */ - lineOffset = ((sqInt) lineWidth >> 1); + lineOffset = lineWidth / 2; endX = objBuffer[bezier + GBEndX]; startY = objBuffer[bezier + GEYValue]; stepToFirstBezierInat(bezier, startY); @@ -12374,7 +12374,7 @@ /* Compute the incremental values of the line */ - lineOffset = ((sqInt) lineWidth >> 1); + lineOffset = lineWidth / 2; startX = objBuffer[line + GEXValue]; startY = objBuffer[line + GEYValue]; stepToFirstLineInat(line, startY); @@ -12417,7 +12417,7 @@ objBuffer[line + GLWideEntry] = yEntry1; objBuffer[line + GLWideExit] = yExit1; lineWidth1 = objBuffer[line + GLWideExtent]; - lineOffset1 = ((sqInt) lineWidth1 >> 1); + lineOffset1 = lineWidth1 / 2; if (yEntry1 >= lineOffset1) { objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & (~GEEdgeFillsInvalid)); } @@ -12481,8 +12481,8 @@ minY = (workBuffer[GWCurrentY]) * 256; while ((minY > lastY) && (fwDy >= 0)) { - lastX += ((sqInt) (fwDx + 32768) >> 16); - lastY += ((sqInt) (fwDy + 32768) >> 16); + lastX += (fwDx + 32768) / 65536; + lastY += (fwDy + 32768) / 65536; fwDx += (((int*) updateData))[GBUpdateDDX]; fwDy += (((int*) updateData))[GBUpdateDDY]; } @@ -12490,7 +12490,7 @@ (((int*) updateData))[GBUpdateY] = lastY; (((int*) updateData))[GBUpdateDX] = fwDx; (((int*) updateData))[GBUpdateDY] = fwDy; - xValue = ((sqInt) lastX >> 8); + xValue = lastX / 256; objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEXValue] = xValue; return null; } @@ -12522,8 +12522,8 @@ minY = yValue * 256; while ((minY > lastY) && (fwDy >= 0)) { - lastX += ((sqInt) (fwDx + 32768) >> 16); - lastY += ((sqInt) (fwDy + 32768) >> 16); + lastX += (fwDx + 32768) / 65536; + lastY += (fwDy + 32768) / 65536; fwDx += (((int*) updateData))[GBUpdateDDX]; fwDy += (((int*) updateData))[GBUpdateDDY]; } @@ -12531,7 +12531,7 @@ (((int*) updateData))[GBUpdateY] = lastY; (((int*) updateData))[GBUpdateDX] = fwDx; (((int*) updateData))[GBUpdateDY] = fwDy; - return ((sqInt) lastX >> 8); + return lastX / 256; } @@ -12564,8 +12564,8 @@ minY = yValue * 256; while ((minY > lastY) && (fwDy >= 0)) { - lastX += ((sqInt) (fwDx + 32768) >> 16); - lastY += ((sqInt) (fwDy + 32768) >> 16); + lastX += (fwDx + 32768) / 65536; + lastY += (fwDy + 32768) / 65536; fwDx += (((int*) updateData))[GBUpdateDDX]; fwDy += (((int*) updateData))[GBUpdateDDY]; } @@ -12573,7 +12573,7 @@ (((int*) updateData))[GBUpdateY] = lastY; (((int*) updateData))[GBUpdateDX] = fwDx; (((int*) updateData))[GBUpdateDY] = fwDy; - xValue = ((sqInt) lastX >> 8); + xValue = lastX / 256; objBuffer[bezier + GEXValue] = xValue; } @@ -12655,7 +12655,7 @@ /* Don't inline this */ lineWidth = objBuffer[bezier + GBWideExtent]; - lineOffset = ((sqInt) lineWidth >> 1); + lineOffset = lineWidth / 2; yEntry = (objBuffer[bezier + GBWideEntry]) + 1; yExit = (objBuffer[bezier + GBWideExit]) + 1; objBuffer[bezier + GBWideEntry] = yEntry; @@ -12683,8 +12683,8 @@ minY = yValue * 256; while ((minY > lastY) && (fwDy >= 0)) { - lastX += ((sqInt) (fwDx + 32768) >> 16); - lastY += ((sqInt) (fwDy + 32768) >> 16); + lastX += (fwDx + 32768) / 65536; + lastY += (fwDy + 32768) / 65536; fwDx += (((int*) updateData))[GBUpdateDDX]; fwDy += (((int*) updateData))[GBUpdateDDY]; } @@ -12692,7 +12692,7 @@ (((int*) updateData))[GBUpdateY] = lastY; (((int*) updateData))[GBUpdateDX] = fwDx; (((int*) updateData))[GBUpdateDY] = fwDy; - ((sqInt) lastX >> 8); + lastX / 256; } else { @@ -12716,8 +12716,8 @@ minY1 = yValue * 256; while ((minY1 > lastY1) && (fwDy1 >= 0)) { - lastX1 += ((sqInt) (fwDx1 + 32768) >> 16); - lastY1 += ((sqInt) (fwDy1 + 32768) >> 16); + lastX1 += (fwDx1 + 32768) / 65536; + lastY1 += (fwDy1 + 32768) / 65536; fwDx1 += (((int*) updateData1))[GBUpdateDDX]; fwDy1 += (((int*) updateData1))[GBUpdateDDY]; } @@ -12725,7 +12725,7 @@ (((int*) updateData1))[GBUpdateY] = lastY1; (((int*) updateData1))[GBUpdateDX] = fwDx1; (((int*) updateData1))[GBUpdateDY] = fwDy1; - ((sqInt) lastX1 >> 8); + lastX1 / 256; computeFinalWideBezierValueswidth(bezier, lineWidth); } @@ -12750,7 +12750,7 @@ objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLWideEntry] = yEntry; objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLWideExit] = yExit; lineWidth = objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLWideExtent]; - lineOffset = ((sqInt) lineWidth >> 1); + lineOffset = lineWidth / 2; if (yEntry >= lineOffset) { objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType] = (((objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType]) & GEPrimitiveTypeMask) & (~GEEdgeFillsInvalid)); } @@ -12804,7 +12804,7 @@ objBuffer[line + GLWideEntry] = yEntry; objBuffer[line + GLWideExit] = yExit; lineWidth = objBuffer[line + GLWideExtent]; - lineOffset = ((sqInt) lineWidth >> 1); + lineOffset = lineWidth / 2; if (yEntry >= lineOffset) { objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & (~GEEdgeFillsInvalid)); } @@ -13706,10 +13706,10 @@ } deltaX = ((double) (((point2Get())[0]) - ((point1Get())[0])) ); deltaY = ((double) (((point2Get())[1]) - ((point1Get())[1])) ); - dstWidth = ((sqInt) ((((sqInt)(sqrt((deltaX * deltaX) + (deltaY * deltaY))))) + 128) >> 8); + dstWidth = ((((sqInt)(sqrt((deltaX * deltaX) + (deltaY * deltaY))))) + 128) / 256; deltaX = ((double) (((point3Get())[0]) - ((point1Get())[0])) ); deltaY = ((double) (((point3Get())[1]) - ((point1Get())[1])) ); - dstWidth2 = ((sqInt) ((((sqInt)(sqrt((deltaX * deltaX) + (deltaY * deltaY))))) + 128) >> 8); + dstWidth2 = ((((sqInt)(sqrt((deltaX * deltaX) + (deltaY * deltaY))))) + 128) / 256; if (dstWidth2 < dstWidth) { dstWidth = dstWidth2; } Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2014-06-26 17:29:55 UTC (rev 3020) +++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2014-06-29 02:57:50 UTC (rev 3021) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.655 uuid: d6c00552-e909-49e0-a838-d6c3225dedda + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 from - BitBltSimulation VMMaker.oscog-eem.655 uuid: d6c00552-e909-49e0-a838-d6c3225dedda + BitBltSimulation VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.655 uuid: d6c00552-e909-49e0-a838-d6c3225dedda " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; @@ -344,9 +344,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.655 (i)" + "BitBltPlugin VMMaker.oscog-eem.787 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.655 (e)" + "BitBltPlugin VMMaker.oscog-eem.787 (e)" #endif ; static sqInt noHalftone; @@ -659,7 +659,7 @@ mask1 = 0xFFFF << (16 - srcShift); while (((deltaY -= 1)) != 0) { srcIndex = (sourceBits + (srcY * sourcePitch)) + (sx * 4); - dstIndex = (destBits + (dstY * destPitch)) + ((((sqInt) dx >> 1)) * 4); + dstIndex = (destBits + (dstY * destPitch)) + ((dx / 2) * 4); ditherBase = (dstY & 3) * 4; /* For pre-increment */ @@ -950,7 +950,7 @@ while (((deltaY -= 1)) != 0) { adjust = adjust ^ 522133279; srcIndex = (sourceBits + (srcY * sourcePitch)) + (sx * 4); - dstIndex = (destBits + (dstY * destPitch)) + ((((sqInt) dx >> 2)) * 4); + dstIndex = (destBits + (dstY * destPitch)) + ((dx / 4) * 4); /* So we can pre-decrement */ @@ -2669,7 +2669,7 @@ /* more horizontal */ - P = ((sqInt) py >> 1); + P = py / 2; for (i = 1; i <= py; i += 1) { destX += dx1; if (((P -= px)) < 0) { @@ -2714,7 +2714,7 @@ /* more vertical */ - P = ((sqInt) px >> 1); + P = px / 2; for (i = 1; i <= px; i += 1) { destY += dy1; if (((P -= py)) < 0) { @@ -5025,7 +5025,7 @@ if (destPPW <= 2) { return result; } - for (i = 2; i <= (((sqInt) destPPW >> 1)); i += 1) { + for (i = 2; i <= (destPPW / 2); i += 1) { lowMask = lowMask << destDepth; highMask = ((usqInt) highMask) >> destDepth; shift -= destDepth * 2; @@ -5268,7 +5268,7 @@ /* more horizontal */ - P = ((sqInt) py >> 1); + P = py / 2; for (i = 1; i <= py; i += 1) { destX += dx1; if (((P -= px)) < 0) { @@ -5314,7 +5314,7 @@ /* more vertical */ - P = ((sqInt) px >> 1); + P = px / 2; for (i = 1; i <= px; i += 1) { destY += dy1; if (((P -= py)) < 0) { @@ -5708,7 +5708,7 @@ mask1 = 0xFFFF << (16 - srcShift); while (((deltaY -= 1)) != 0) { srcIndex = (sourceBits + (srcY * sourcePitch)) + (sx * 4); - dstIndex = (destBits + (dstY * destPitch)) + ((((sqInt) dx >> 1)) * 4); + dstIndex = (destBits + (dstY * destPitch)) + ((dx / 2) * 4); ditherBase = (dstY & 3) * 4; /* For pre-increment */ @@ -6070,7 +6070,7 @@ while (((deltaY -= 1)) != 0) { adjust = adjust ^ 522133279; srcIndex = (sourceBits + (srcY * sourcePitch)) + (sx * 4); - dstIndex = (destBits + (dstY * destPitch)) + ((((sqInt) dx >> 2)) * 4); + dstIndex = (destBits + (dstY * destPitch)) + ((dx / 4) * 4); /* So we can pre-decrement */ @@ -7854,10 +7854,10 @@ /* Try avoiding divides for most common n (divide by 2 is generated as shift) */ - xdh = ((sqInt) xDeltah >> 1); - ydh = ((sqInt) yDeltah >> 1); - xdv = ((sqInt) xDeltav >> 1); - ydv = ((sqInt) yDeltav >> 1); + xdh = xDeltah / 2; + ydh = yDeltah / 2; + xdv = xDeltav / 2; + ydv = yDeltav / 2; } else { xdh = xDeltah / n; @@ -7936,7 +7936,7 @@ } while(!(((j -= 1)) == 0)); if ((nPix == 0) || ((combinationRule == 25) - && (nPix < (((sqInt) (n * n) >> 1))))) { + && (nPix < ((n * n) / 2)))) { /* All pixels were 0, or most were transparent */ Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2014-06-26 17:29:55 UTC (rev 3020) +++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2014-06-29 02:57:50 UTC (rev 3021) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + VMPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 from - FilePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + FilePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; @@ -116,9 +116,9 @@ static sqInt (*popthenPush)(sqInt nItems, sqInt oop); static sqInt (*popRemappableOop)(void); static sqInt (*positive32BitIntegerFor)(sqInt integerValue); -static sqInt (*positive32BitValueOf)(sqInt oop); +static usqInt (*positive32BitValueOf)(sqInt oop); static sqInt (*positive64BitIntegerFor)(sqLong integerValue); -static sqLong (*positive64BitValueOf)(sqInt oop); +static usqLong (*positive64BitValueOf)(sqInt oop); static sqInt (*primitiveFail)(void); static sqInt (*primitiveFailFor)(sqInt reasonCode); static sqInt (*primitiveFailureCode)(void); @@ -160,9 +160,9 @@ extern sqInt popthenPush(sqInt nItems, sqInt oop); extern sqInt popRemappableOop(void); extern sqInt positive32BitIntegerFor(sqInt integerValue); -extern sqInt positive32BitValueOf(sqInt oop); +extern usqInt positive32BitValueOf(sqInt oop); extern sqInt positive64BitIntegerFor(sqLong integerValue); -extern sqLong positive64BitValueOf(sqInt oop); +extern usqLong positive64BitValueOf(sqInt oop); extern sqInt primitiveFail(void); extern sqInt primitiveFailFor(sqInt reasonCode); extern sqInt primitiveFailureCode(void); @@ -180,9 +180,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.706 (i)" + "FilePlugin VMMaker.oscog-eem.787 (i)" #else - "FilePlugin VMMaker.oscog-eem.706 (e)" + "FilePlugin VMMaker.oscog-eem.787 (e)" #endif ; static void * sCCPfn; Modified: branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c =================================================================== --- branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2014-06-26 17:29:55 UTC (rev 3020) +++ branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2014-06-29 02:57:50 UTC (rev 3021) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + VMPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 from - NewsqueakIA32ABIPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + NewsqueakIA32ABIPlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 */ -static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 " __DATE__ ; +static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; @@ -153,9 +153,9 @@ static sqInt (*pop)(sqInt nItems); static sqInt (*popthenPush)(sqInt nItems, sqInt oop); static sqInt (*positive32BitIntegerFor)(sqInt integerValue); -static sqInt (*positive32BitValueOf)(sqInt oop); +static usqInt (*positive32BitValueOf)(sqInt oop); static sqInt (*positive64BitIntegerFor)(sqLong integerValue); -static sqLong (*positive64BitValueOf)(sqInt oop); +static usqLong (*positive64BitValueOf)(sqInt oop); static sqInt (*primitiveFailFor)(sqInt reasonCode); static sqInt (*pushFloat)(double f); static sqInt (*returnAsThroughCallbackContext)(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); @@ -198,9 +198,9 @@ extern sqInt pop(sqInt nItems); extern sqInt popthenPush(sqInt nItems, sqInt oop); extern sqInt positive32BitIntegerFor(sqInt integerValue); -extern sqInt positive32BitValueOf(sqInt oop); +extern usqInt positive32BitValueOf(sqInt oop); extern sqInt positive64BitIntegerFor(sqLong integerValue); -extern sqLong positive64BitValueOf(sqInt oop); +extern usqLong positive64BitValueOf(sqInt oop); extern sqInt primitiveFailFor(sqInt reasonCode); extern sqInt pushFloat(double f); extern sqInt returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); @@ -220,9 +220,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32ABI VMMaker.oscog-eem.580 (i)" + "IA32ABI VMMaker.oscog-eem.787 (i)" #else - "IA32ABI VMMaker.oscog-eem.580 (e)" + "IA32ABI VMMaker.oscog-eem.787 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2014-06-26 17:29:55 UTC (rev 3020) +++ branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2014-06-29 02:57:50 UTC (rev 3021) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.597 uuid: c9a71dd4-c394-4a8f-aa4d-a6d4dc3ff220 + VMPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 from - JPEGReaderPlugin VMMaker.oscog-eem.597 uuid: c9a71dd4-c394-4a8f-aa4d-a6d4dc3ff220 + JPEGReaderPlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.597 uuid: c9a71dd4-c394-4a8f-aa4d-a6d4dc3ff220 " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; @@ -178,9 +178,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin VMMaker.oscog-eem.597 (i)" + "JPEGReaderPlugin VMMaker.oscog-eem.787 (i)" #else - "JPEGReaderPlugin VMMaker.oscog-eem.597 (e)" + "JPEGReaderPlugin VMMaker.oscog-eem.787 (e)" #endif ; static int *residuals; @@ -408,19 +408,19 @@ } cr = sample2; cr -= SampleOffset; - red = (y + (((sqInt) (FIXn1n40200 * cr) >> 16))) + (residuals[RedIndex]); + red = (y + ((FIXn1n40200 * cr) / 65536)) + (residuals[RedIndex]); red = ((red < MaxSample) ? red : MaxSample); red = ((red < 0) ? 0 : red); residuals[RedIndex] = (red & ditherMask); red = red & (MaxSample - ditherMask); red = ((red < 1) ? 1 : red); - green = ((y - (((sqInt) (FIXn0n34414 * cb) >> 16))) - (((sqInt) (FIXn0n71414 * cr) >> 16))) + (residuals[GreenIndex]); + green = ((y - ((FIXn0n34414 * cb) / 65536)) - ((FIXn0n71414 * cr) / 65536)) + (residuals[GreenIndex]); green = ((green < MaxSample) ? green : MaxSample); green = ((green < 0) ? 0 : green); residuals[GreenIndex] = (green & ditherMask); green = green & (MaxSample - ditherMask); green = ((green < 1) ? 1 : green); - blue = (y + (((sqInt) (FIXn1n77200 * cb) >> 16))) + (residuals[BlueIndex]); + blue = (y + ((FIXn1n77200 * cb) / 65536)) + (residuals[BlueIndex]); blue = ((blue < MaxSample) ? blue : MaxSample); blue = ((blue < 0) ? 0 : blue); residuals[BlueIndex] = (blue & ditherMask); @@ -758,14 +758,14 @@ t1 = (t1 + z2) + z4; t2 = (t2 + z2) + z3; t3 = (t3 + z1) + z4; - ws[i] = (((sqInt) (t10 + t3) >> 11)); - ws[(DCTSize * 7) + i] = (((sqInt) (t10 - t3) >> 11)); - ws[(DCTSize * 1) + i] = (((sqInt) (t11 + t2) >> 11)); - ws[(DCTSize * 6) + i] = (((sqInt) (t11 - t2) >> 11)); - ws[(DCTSize * 2) + i] = (((sqInt) (t12 + t1) >> 11)); - ws[(DCTSize * 5) + i] = (((sqInt) (t12 - t1) >> 11)); - ws[(DCTSize * 3) + i] = (((sqInt) (t13 + t0) >> 11)); - ws[(DCTSize * 4) + i] = (((sqInt) (t13 - t0) >> 11)); + ws[i] = ((t10 + t3) / Pass1Div); + ws[(DCTSize * 7) + i] = ((t10 - t3) / Pass1Div); + ws[(DCTSize * 1) + i] = ((t11 + t2) / Pass1Div); + ws[(DCTSize * 6) + i] = ((t11 - t2) / Pass1Div); + ws[(DCTSize * 2) + i] = ((t12 + t1) / Pass1Div); + ws[(DCTSize * 5) + i] = ((t12 - t1) / Pass1Div); + ws[(DCTSize * 3) + i] = ((t13 + t0) / Pass1Div); + ws[(DCTSize * 4) + i] = ((t13 - t0) / Pass1Div); } } for (i = 0; i <= (DCTSize2 - DCTSize); i += DCTSize) { @@ -803,35 +803,35 @@ t1 = (t1 + z2) + z4; t2 = (t2 + z2) + z3; t3 = (t3 + z1) + z4; - v = (((sqInt) (t10 + t3) >> 18)) + SampleOffset; + v = ((t10 + t3) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i] = v; - v = (((sqInt) (t10 - t3) >> 18)) + SampleOffset; + v = ((t10 - t3) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 7] = v; - v = (((sqInt) (t11 + t2) >> 18)) + SampleOffset; + v = ((t11 + t2) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 1] = v; - v = (((sqInt) (t11 - t2) >> 18)) + SampleOffset; + v = ((t11 - t2) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 6] = v; - v = (((sqInt) (t12 + t1) >> 18)) + SampleOffset; + v = ((t12 + t1) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 2] = v; - v = (((sqInt) (t12 - t1) >> 18)) + SampleOffset; + v = ((t12 - t1) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 5] = v; - v = (((sqInt) (t13 + t0) >> 18)) + SampleOffset; + v = ((t13 + t0) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 3] = v; - v = (((sqInt) (t13 - t0) >> 18)) + SampleOffset; + v = ((t13 - t0) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 4] = v; @@ -1362,19 +1362,19 @@ } cr = sample2; cr -= SampleOffset; - red = (y + (((sqInt) (FIXn1n40200 * cr) >> 16))) + (residuals[RedIndex]); + red = (y + ((FIXn1n40200 * cr) / 65536)) + (residuals[RedIndex]); red = ((red < MaxSample) ? red : MaxSample); red = ((red < 0) ? 0 : red); residuals[RedIndex] = (red & ditherMask); red = red & (MaxSample - ditherMask); red = ((red < 1) ? 1 : red); - green = ((y - (((sqInt) (FIXn0n34414 * cb) >> 16))) - (((sqInt) (FIXn0n71414 * cr) >> 16))) + (residuals[GreenIndex]); + green = ((y - ((FIXn0n34414 * cb) / 65536)) - ((FIXn0n71414 * cr) / 65536)) + (residuals[GreenIndex]); green = ((green < MaxSample) ? green : MaxSample); green = ((green < 0) ? 0 : green); residuals[GreenIndex] = (green & ditherMask); green = green & (MaxSample - ditherMask); green = ((green < 1) ? 1 : green); - blue = (y + (((sqInt) (FIXn1n77200 * cb) >> 16))) + (residuals[BlueIndex]); + blue = (y + ((FIXn1n77200 * cb) / 65536)) + (residuals[BlueIndex]); blue = ((blue < MaxSample) ? blue : MaxSample); blue = ((blue < 0) ? 0 : blue); residuals[BlueIndex] = (blue & ditherMask); @@ -1719,14 +1719,14 @@ t1 = (t1 + z2) + z4; t2 = (t2 + z2) + z3; t3 = (t3 + z1) + z4; - ws[i] = (((sqInt) (t10 + t3) >> 11)); - ws[(DCTSize * 7) + i] = (((sqInt) (t10 - t3) >> 11)); - ws[(DCTSize * 1) + i] = (((sqInt) (t11 + t2) >> 11)); - ws[(DCTSize * 6) + i] = (((sqInt) (t11 - t2) >> 11)); - ws[(DCTSize * 2) + i] = (((sqInt) (t12 + t1) >> 11)); - ws[(DCTSize * 5) + i] = (((sqInt) (t12 - t1) >> 11)); - ws[(DCTSize * 3) + i] = (((sqInt) (t13 + t0) >> 11)); - ws[(DCTSize * 4) + i] = (((sqInt) (t13 - t0) >> 11)); + ws[i] = ((t10 + t3) / Pass1Div); + ws[(DCTSize * 7) + i] = ((t10 - t3) / Pass1Div); + ws[(DCTSize * 1) + i] = ((t11 + t2) / Pass1Div); + ws[(DCTSize * 6) + i] = ((t11 - t2) / Pass1Div); + ws[(DCTSize * 2) + i] = ((t12 + t1) / Pass1Div); + ws[(DCTSize * 5) + i] = ((t12 - t1) / Pass1Div); + ws[(DCTSize * 3) + i] = ((t13 + t0) / Pass1Div); + ws[(DCTSize * 4) + i] = ((t13 - t0) / Pass1Div); } } for (i = 0; i <= (DCTSize2 - DCTSize); i += DCTSize) { @@ -1764,35 +1764,35 @@ t1 = (t1 + z2) + z4; t2 = (t2 + z2) + z3; t3 = (t3 + z1) + z4; - v = (((sqInt) (t10 + t3) >> 18)) + SampleOffset; + v = ((t10 + t3) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i] = v; - v = (((sqInt) (t10 - t3) >> 18)) + SampleOffset; + v = ((t10 - t3) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 7] = v; - v = (((sqInt) (t11 + t2) >> 18)) + SampleOffset; + v = ((t11 + t2) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 1] = v; - v = (((sqInt) (t11 - t2) >> 18)) + SampleOffset; + v = ((t11 - t2) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 6] = v; - v = (((sqInt) (t12 + t1) >> 18)) + SampleOffset; + v = ((t12 + t1) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 2] = v; - v = (((sqInt) (t12 - t1) >> 18)) + SampleOffset; + v = ((t12 - t1) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 5] = v; - v = (((sqInt) (t13 + t0) >> 18)) + SampleOffset; + v = ((t13 + t0) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 3] = v; - v = (((sqInt) (t13 - t0) >> 18)) + SampleOffset; + v = ((t13 - t0) / Pass2Div) + SampleOffset; v = ((v < MaxSample) ? v : MaxSample); v = ((v < 0) ? 0 : v); anArray[i + 4] = v; Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2014-06-26 17:29:55 UTC (rev 3020) +++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2014-06-29 02:57:50 UTC (rev 3021) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 from - LargeIntegersPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + LargeIntegersPlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; @@ -172,9 +172,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.580 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.787 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.580 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.787 (e)" #endif ; static const int orOpIndex = 1; @@ -208,8 +208,8 @@ if (start > stop) { return 0; } - firstByteIx = (((sqInt) (start - 1) >> 3)) + 1; - lastByteIx = (((sqInt) (stop - 1) >> 3)) + 1; + firstByteIx = ((start - 1) / 8) + 1; + lastByteIx = ((stop - 1) / 8) + 1; rightShift = (start - 1) % 8; leftShift = 7 - ((stop - 1) % 8); if (firstByteIx == lastByteIx) { @@ -341,14 +341,14 @@ if (((highBit = cBytesHighBitlen(firstIndexableField(aBytesOop), oldLen))) == 0) { return integerObjectOf(0); } - newLen = ((sqInt) ((highBit + shiftCount) + 7) >> 3); + newLen = ((highBit + shiftCount) + 7) / 8; pushRemappableOop(aBytesOop); newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); aBytesOop = popRemappableOop(); /* begin cBytesLshift:from:len:to:len: */ pFrom = firstIndexableField(aBytesOop); pTo = firstIndexableField(newBytes); - byteShift = ((sqInt) shiftCount >> 3); + byteShift = shiftCount / 8; bitShift = shiftCount % 8; if (bitShift == 0) { @@ -584,7 +584,7 @@ sqInt lastIx; sqInt limit; - byteShift = ((sqInt) shiftCount >> 3); + byteShift = shiftCount / 8; bitShift = shiftCount % 8; if (bitShift == 0) { @@ -789,7 +789,7 @@ lo = (a + (pRem[l - 1])) - ((pDiv[i - 1]) * (q & 0xFF)); pRem[l - 1] = (lo & 0xFF); - a = (((sqInt) lo >> 8)) - hi; + a = (lo / 256) - hi; l += 1; } if (a < 0) { @@ -960,14 +960,14 @@ limit = smallLen - 1; for (i = 0; i <= limit; i += 1) { z = (z + (pByteLarge[i])) - (pByteSmall[i]); - pByteRes[i] = (z - ((((sqInt) z >> 8)) * 256)); - z = ((sqInt) z >> 8); + pByteRes[i] = (z - ((z / 256) * 256)); + z = z / 256; } limit = largeLen - 1; for (i = smallLen; i <= limit; i += 1) { z += pByteLarge[i]; - pByteRes[i] = (z - ((((sqInt) z >> 8)) * 256)); - z = ((sqInt) z >> 8); + pByteRes[i] = (z - ((z / 256) * 256)); + z = z / 256; } } @@ -1023,8 +1023,8 @@ accum = 0; for (i = 0; i <= limit3; i += 1) { accum = (accum + (pBytesRes[i])) - (pBytesThird[i]); - pBytesRes[i] = (accum - ((((sqInt) accum >> 8)) * 256)); - accum = ((sqInt) accum >> 8); + pBytesRes[i] = (accum - ((accum / 256) * 256)); + accum = accum / 256; } } } @@ -1567,7 +1567,7 @@ lo = (a + (pRem[l1 - 1])) - ((pDiv[i - 1]) * (q & 0xFF)); pRem[l1 - 1] = (lo & 0xFF); - a = (((sqInt) lo >> 8)) - hi; + a = (lo / 256) - hi; l1 += 1; } if (a < 0) { @@ -1707,8 +1707,8 @@ accum = 0; for (i = 0; i <= limit3; i += 1) { accum = (accum + (pBytesRes[i])) - (pBytesThird[i]); - pBytesRes[i] = (accum - ((((sqInt) accum >> 8)) * 256)); - accum = ((sqInt) accum >> 8); + pBytesRes[i] = (accum - ((accum / 256) * 256)); + accum = accum / 256; } } return normalizePositive(prod); @@ -1913,14 +1913,14 @@ limit = smallerLen - 1; for (i = 0; i <= limit; i += 1) { z = (z + (pByteLarge[i])) - (pByteSmall[i]); - pByteRes[i] = (z - ((((sqInt) z >> 8)) * 256)); - z = ((sqInt) z >> 8); + pByteRes[i] = (z - ((z / 256) * 256)); + z = z / 256; } limit = largerLen - 1; for (i = smallerLen; i <= limit; i += 1) { z += pByteLarge[i]; - pByteRes[i] = (z - ((((sqInt) z >> 8)) * 256)); - z = ((sqInt) z >> 8); + pByteRes[i] = (z - ((z / 256) * 256)); + z = z / 256; } return (neg ? normalizeNegative(res) @@ -3299,8 +3299,8 @@ accum = 0; for (i = 0; i <= limit3; i += 1) { accum = (accum + (pBytesRes[i])) - (pBytesThird[i]); - pBytesRes[i] = (accum - ((((sqInt) accum >> 8)) * 256)); - accum = ((sqInt) accum >> 8); + pBytesRes[i] = (accum - ((accum / 256) * 256)); + accum = accum / 256; } } _return_value = normalizePositive(prod); Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2014-06-26 17:29:55 UTC (rev 3020) +++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2014-06-29 02:57:50 UTC (rev 3021) @@ -1,16 +1,16 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + VMPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 from - MiscPrimitivePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 - Bitmap Graphics-nice.289 uuid: e809bcbf-53e1-420b-846a-9e86e0dd1f06 @@ Diff output truncated at 50000 characters. @@

1 0

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

29 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.787.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.787 Author: eem Time: 28 June 2014, 7:45:07.557 pm UUID: 4b38ebc1-339f-4523-a9fc-047923108211 Ancestors: VMMaker.oscog-eem.786 Fix return types for positive[64/32]BitValueOf: in InterpreterProxy (& hence in sqVirtualMachine.[ch] soon). Use positiveMachineIntegerValueOf: to decode arg in primitiveNewWithArg and ensure positiveMachineIntegerValueOf: is inlined there-in. =============== Diff against VMMaker.oscog-eem.786 =============== Item was changed: ----- Method: InterpreterPrimitives>>positiveMachineIntegerValueOf: (in category 'primitive support') ----- positiveMachineIntegerValueOf: oop "Answer a value of an integer in address range, i.e up to the size of a machine word. The object may be either a positive SmallInteger or a LargePositiveInteger of size <= word size." <returnTypeC: #'unsigned long'> + <inline: true> "only two callers & one is primitiveNewWithArg" | value bs ok | (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop. value < 0 ifTrue: [^self primitiveFail]. ^value]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. (ok and: [(bs := objectMemory lengthOf: oop) <= (self sizeof: #'unsigned long')]) ifFalse: [^self primitiveFail]. ((self sizeof: #'unsigned long') = 8 and: [bs > 4]) ifTrue: [^ (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24) + ((objectMemory fetchByte: 4 ofObject: oop) << 32) + ((objectMemory fetchByte: 5 ofObject: oop) << 40) + ((objectMemory fetchByte: 6 ofObject: oop) << 48) + ((objectMemory fetchByte: 7 ofObject: oop) << 56)]. ^ (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24)! Item was changed: ----- Method: InterpreterPrimitives>>primitiveNewWithArg (in category 'object access primitives') ----- primitiveNewWithArg "Allocate a new indexable instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. May cause a GC." | size spaceOkay | + size := self positiveMachineIntegerValueOf: self stackTop. - size := self positive32BitValueOf: self stackTop. self cppIf: NewspeakVM ifTrue: "For the mirror prims check that the class obj is actually a valid class." [(argumentCount < 2 or: [self addressCouldBeClassObj: (self stackValue: 1)]) ifFalse: [self primitiveFailFor: PrimErrBadArgument]]. + self successful "positiveMachineIntegerValueOf: succeeds only for non-negative integers." - self successful "positive32BitValueOf: succeds only for non-negative integers < 2^32" ifTrue: [objectMemory hasSpurMemoryManagerAPI ifTrue: [(objectMemory instantiateClass: (self stackValue: 1) indexableSize: size) ifNotNil: [:obj| self pop: argumentCount + 1 thenPush: obj] ifNil: [self primitiveFailFor: PrimErrNoMemory]] ifFalse: [spaceOkay := objectMemory sufficientSpaceToInstantiate: (self stackValue: 1) indexableSize: size. spaceOkay ifTrue: [self pop: argumentCount + 1 thenPush: (objectMemory instantiateClass: (self stackValue: 1) indexableSize: size)] ifFalse: [self primitiveFailFor: PrimErrNoMemory]]] ifFalse: [self primitiveFailFor: PrimErrBadArgument]! Item was changed: ----- Method: InterpreterProxy>>positive32BitValueOf: (in category 'converting') ----- positive32BitValueOf: oop + <returnTypeC: #usqInt> oop isInteger ifFalse:[self error:'Not an integer object']. oop < 0 ifTrue:[self primitiveFail. ^0] ifFalse:[^oop]! Item was changed: ----- Method: InterpreterProxy>>positive64BitValueOf: (in category 'converting') ----- positive64BitValueOf: oop + <returnTypeC: #usqLong> - <returnTypeC: #sqLong> oop isInteger ifFalse:[self error:'Not an integer object']. oop < 0 ifTrue:[self primitiveFail. ^0] ifFalse:[^oop]!

1 0

VM Maker: Fix VMMaker.oscog-eem.787.mcz
by commits＠source.squeak.org 29 Jun '14

29 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/Fix VMMaker.oscog-eem.787.mcz ==================== Summary ==================== Name: Fix VMMaker.oscog-eem.787 Author: eem Time: 28 June 2014, 7:19:54.984 pm UUID: a9fe951c-7914-49b0-a008-20c39417cae0 Ancestors: VMMaker.oscog-eem.786 Fix return types for positive[64/32]BitValueOf: in InterpreterProxy (& hence in sqVirtualMachine.[ch] soon). Use positiveMachineIntegerValueOf: to decode arg in primitiveNewWithArg and ensure positiveMachineIntegerValueOf: is inlined there-in. =============== Diff against VMMaker.oscog-eem.786 =============== Item was changed: ----- Method: InterpreterPrimitives>>positiveMachineIntegerValueOf: (in category 'primitive support') ----- positiveMachineIntegerValueOf: oop "Answer a value of an integer in address range, i.e up to the size of a machine word. The object may be either a positive SmallInteger or a LargePositiveInteger of size <= word size." <returnTypeC: #'unsigned long'> + <inline: true> "only two callers & one is primitiveNewWithArg" | value bs ok | (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop. value < 0 ifTrue: [^self primitiveFail]. ^value]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. (ok and: [(bs := objectMemory lengthOf: oop) <= (self sizeof: #'unsigned long')]) ifFalse: [^self primitiveFail]. ((self sizeof: #'unsigned long') = 8 and: [bs > 4]) ifTrue: [^ (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24) + ((objectMemory fetchByte: 4 ofObject: oop) << 32) + ((objectMemory fetchByte: 5 ofObject: oop) << 40) + ((objectMemory fetchByte: 6 ofObject: oop) << 48) + ((objectMemory fetchByte: 7 ofObject: oop) << 56)]. ^ (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24)! Item was changed: ----- Method: InterpreterPrimitives>>primitiveNewWithArg (in category 'object access primitives') ----- primitiveNewWithArg "Allocate a new indexable instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. May cause a GC." | size spaceOkay | + size := self positiveMachineIntegerValueOf: self stackTop. - size := self positive32BitValueOf: self stackTop. self cppIf: NewspeakVM ifTrue: "For the mirror prims check that the class obj is actually a valid class." [(argumentCount < 2 or: [self addressCouldBeClassObj: (self stackValue: 1)]) ifFalse: [self primitiveFailFor: PrimErrBadArgument]]. + self successful "positiveMachineIntegerValueOf: succeeds only for non-negative integers." - self successful "positive32BitValueOf: succeds only for non-negative integers < 2^32" ifTrue: [objectMemory hasSpurMemoryManagerAPI ifTrue: [(objectMemory instantiateClass: (self stackValue: 1) indexableSize: size) ifNotNil: [:obj| self pop: argumentCount + 1 thenPush: obj] ifNil: [self primitiveFailFor: PrimErrNoMemory]] ifFalse: [spaceOkay := objectMemory sufficientSpaceToInstantiate: (self stackValue: 1) indexableSize: size. spaceOkay ifTrue: [self pop: argumentCount + 1 thenPush: (objectMemory instantiateClass: (self stackValue: 1) indexableSize: size)] ifFalse: [self primitiveFailFor: PrimErrNoMemory]]] ifFalse: [self primitiveFailFor: PrimErrBadArgument]! Item was changed: ----- Method: InterpreterProxy>>positive32BitValueOf: (in category 'converting') ----- positive32BitValueOf: oop + <returnTypeC: #usqInt> oop isInteger ifFalse:[self error:'Not an integer object']. oop < 0 ifTrue:[self primitiveFail. ^0] ifFalse:[^oop]! Item was changed: ----- Method: InterpreterProxy>>positive64BitValueOf: (in category 'converting') ----- positive64BitValueOf: oop + <returnTypeC: #usqLong> - <returnTypeC: #sqLong> oop isInteger ifFalse:[self error:'Not an integer object']. oop < 0 ifTrue:[self primitiveFail. ^0] ifFalse:[^oop]!

1 0

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

29 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.786.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.786 Author: eem Time: 28 June 2014, 6:39:52.884 pm UUID: 425c25e8-f3f6-4f06-b2eb-392c5da0ed44 Ancestors: VMMaker.oscog-eem.785 Fix prim return for compileInterpreterPrimitive: on RISCs. On return from interpreter prim, ret pc is in instructionPointer and must return to whence it came, which is the stack on CISC and the LinkReg on RISC. Hence restoring the receiver reg requires different offsets in the two cases. =============== Diff against VMMaker.oscog-eem.785 =============== 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 continuePostSamplePrim jmpSampleNonPrim continuePostSampleNonPrim | <var: #jmp 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 bitAnd: PrimCallCollectsProfileSamples) ~= 0 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]. "Clear the primFailCode and set argumentCount" 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. (flags bitAnd: PrimCallNeedsPrimitiveFunction) ~= 0 ifTrue: [self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress]. "Old full prim trace is in VMMaker-eem.550 and prior" self recordPrimTrace ifTrue: [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg]. ((flags bitAnd: PrimCallNeedsNewMethod+PrimCallMayCallBack) ~= 0) ifTrue: ["The ceActivateFailingPrimitiveMethod: machinery can't handle framelessness." (flags bitAnd: PrimCallMayCallBack) ~= 0 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]. self PrefetchAw: coInterpreter primFailCodeAddress. (flags bitAnd: PrimCallMayCallBack) ~= 0 ifTrue: "Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode." [backEnd genSubstituteReturnAddress: ((flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 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 bitAnd: PrimCallCollectsProfileSamples) ~= 0 ifTrue: [self assert: (flags bitAnd: PrimCallNeedsNewMethod) ~= 0. "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]. self maybeCompileAllocFillerCheck. "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 + 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]). - In either case we can push the instructionPointer to reestablish the return pc" - self MoveAw: coInterpreter instructionPointerAddress R: ClassReg. backEnd genLoadStackPointers. "Test primitive failure" self MoveAw: coInterpreter primFailCodeAddress R: TempReg. + backEnd hasLinkRegister ifFalse: [self PushR: ClassReg]. "Restore return pc on CISCs" - self PushR: ClassReg. "Restore return pc" 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]. (flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 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 bitAnd: PrimCallNeedsNewMethod) ~= 0. self CallRT: (self cCode: '(unsigned long)ceCheckProfileTick' 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: '(unsigned long)ceCheckProfileTick' 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]. - "Restore receiver reg from stack." - self MoveMw: BytesPerWord * (methodOrBlockNumArgs + 1) r: SPReg R: ReceiverResultReg]. ^0!

1 0

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

29 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.785.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.785 Author: eem Time: 28 June 2014, 6:17:27.821 pm UUID: 39cb6f17-fd6b-4794-a7a2-91779a6fcee2 Ancestors: VMMaker.oscog-tpr.784 Fix sign and overflow issues in instantiating larger objects and determining the size of large instances. Rip out the UseRightShiftForDivide optimization. It gets unsigned division wrong, and C compilers can and will optimize this correctly. positive32BitValueOf: must answer a usqInt, positive64BitValueOf: must answer a usqLong. Fix some freeChunk accesses that used fetchPointer:ofObject:. =============== Diff against VMMaker.oscog-tpr.784 =============== Item was changed: Object subclass: #CCodeGenerator instanceVariableNames: 'vmClass structClasses translationDict asArgumentTranslationDict inlineList constants variables variableDeclarations scopeStack methods macros apiMethods kernelReturnTypes currentMethod headerFiles globalVariableUsage useSymbolicConstants generateDeadCode requiredSelectors logger suppressAsmLabels asmLabelCounts pools selectorTranslations optionsDictionary breakSrcInlineSelector breakDestInlineSelector vmMaker' + classVariableNames: 'NoRegParmsInAssertVMs' - classVariableNames: 'NoRegParmsInAssertVMs UseRightShiftForDivide' poolDictionaries: 'VMBasicConstants' category: 'VMMaker-Translation to C'! !CCodeGenerator commentStamp: 'tpr 5/2/2003 14:30' prior: 0! This class oversees the translation of a subset of Smalltalk to C, allowing the comforts of Smalltalk during development and the efficiency and portability of C for the resulting interpreter. See VMMaker for more useful info! Item was changed: ----- Method: CCodeGenerator class>>initialize (in category 'class initialization') ----- initialize "CCodeGenerator initialize" - UseRightShiftForDivide := true. - "If UseRightShiftForDivide is true, the translator will generate a right-shift when it encounters a division by a constant that is a small power of two. For example, 'x / 8' will generate '((int) x >> 3)'. The coercion to int is done to make it clear that the C compiler should generate a signed shift." - "Note: The Kernighan and Ritchie 2nd Edition C manual, p. 49, leaves the semantics of right-shifting a negative number open to the discretion of the compiler implementor. However, it strongly suggests that most compilers should generate an arithmetic right shift (i.e., shifting in the sign bit), which is the same as dividing by a power of two. If your compiler does not generate or simulate an arithmetic shift, then make this class variable false and re-translate." - NoRegParmsInAssertVMs := true "If NoRegParmsInAssertVMs is true the generator spits out an attribute turning off register parameters for static functions in the Assert and Debug VMs which makes debugging easier, since all functions can be safely called from gdb. One might hope that -mregparm=0 would work but at least on Mac OS X's gcc 4.2.1 it does not and hence we have to use a per funciton attribute. Sigh..."! Item was changed: ----- Method: CCodeGenerator>>generateDivide:on:indent: (in category 'C translation') ----- generateDivide: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." + self emitCExpression: msgNode receiver on: aStream. + aStream nextPutAll: ' / '. + self emitCExpression: msgNode args first on: aStream! - | rcvr arg divisor | - rcvr := msgNode receiver. - arg := msgNode args first. - (arg isConstant and: - [UseRightShiftForDivide and: - [(divisor := arg value) isInteger and: - [divisor isPowerOfTwo and: - [divisor > 0 and: - [divisor <= (1 bitShift: 31)]]]]]) - ifTrue: [ - "use signed (arithmetic) right shift instead of divide" - aStream nextPutAll: '((sqInt) '. - self emitCExpression: rcvr on: aStream. - aStream nextPutAll: ' >> ', (divisor log: 2) asInteger printString. - aStream nextPutAll: ')'. - ] ifFalse: [ - self emitCExpression: rcvr on: aStream. - aStream nextPutAll: ' / '. - self emitCExpression: arg on: aStream]. - ! Item was changed: ----- Method: InterpreterPrimitives>>positive32BitValueOf: (in category 'primitive support') ----- positive32BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a four-byte LargePositiveInteger." + <returnTypeC: #usqInt> - | value ok | (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop. value < 0 ifTrue: [self primitiveFail. value := 0]. ^value] ifFalse: [(objectMemory hasSpurMemoryManagerAPI and: [objectMemory isImmediate: oop]) ifTrue: [self primitiveFail. ^0]]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. (ok and: [(objectMemory lengthOf: oop) = 4]) ifFalse: [self primitiveFail. ^0]. ^(objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24)! Item was changed: ----- Method: InterpreterPrimitives>>positive64BitValueOf: (in category 'primitive support') ----- positive64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or an eight-byte LargePositiveInteger." + <returnTypeC: #usqLong> - <returnTypeC: #sqLong> | sz value ok | + <var: #value type: #usqLong> - <var: #value type: #sqLong> (objectMemory isIntegerObject: oop) ifTrue: + [(objectMemory integerValueOf: oop) < 0 ifTrue: + [^self primitiveFail]. + ^objectMemory integerValueOf: oop]. - [value := objectMemory integerValueOf: oop. - value < 0 ifTrue: [^self primitiveFail]. - ^value]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. (ok and: [(sz := objectMemory lengthOf: oop) <= (self sizeof: #sqLong)]) ifFalse: [^self primitiveFail]. value := 0. 0 to: sz - 1 do: [:i | + value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #usqLong) << (i*8))]. - value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>primitiveNewWithArg (in category 'object access primitives') ----- primitiveNewWithArg "Allocate a new indexable instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. May cause a GC." | size spaceOkay | size := self positive32BitValueOf: self stackTop. self cppIf: NewspeakVM ifTrue: "For the mirror prims check that the class obj is actually a valid class." [(argumentCount < 2 or: [self addressCouldBeClassObj: (self stackValue: 1)]) ifFalse: [self primitiveFailFor: PrimErrBadArgument]]. + self successful "positive32BitValueOf: succeds only for non-negative integers < 2^32" - (self successful and: [size >= 0]) ifTrue: [objectMemory hasSpurMemoryManagerAPI ifTrue: [(objectMemory instantiateClass: (self stackValue: 1) indexableSize: size) ifNotNil: [:obj| self pop: argumentCount + 1 thenPush: obj] ifNil: [self primitiveFailFor: PrimErrNoMemory]] ifFalse: [spaceOkay := objectMemory sufficientSpaceToInstantiate: (self stackValue: 1) indexableSize: size. spaceOkay ifTrue: [self pop: argumentCount + 1 thenPush: (objectMemory instantiateClass: (self stackValue: 1) indexableSize: size)] ifFalse: [self primitiveFailFor: PrimErrNoMemory]]] ifFalse: [self primitiveFailFor: PrimErrBadArgument]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSizeInBytes (in category 'memory space primitives') ----- primitiveSizeInBytes <option: #SpurObjectMemory> + | byteSize | + byteSize := objectMemory totalByteSizeOf: self stackTop. self pop: argumentCount + 1 + thenPush: (self positive64BitIntegerFor: byteSize)! - thenPushInteger: (objectMemory totalByteSizeOf: self stackTop)! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSizeInBytesOfInstance (in category 'memory space primitives') ----- primitiveSizeInBytesOfInstance "Answer the byte size of an instance of the receiver. If num args > 0 then the last argument is a variable size and the size answered is the size of an instance of the receiver with that many indexable elements." <option: #SpurObjectMemory> + | byteSize err | - | byteSizeOrErr | self cppIf: NewspeakVM ifTrue: "Support VMMirror>>byteSizeOfInstanceOf:WithIndexableVariables:" [argumentCount > 2 ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]] ifFalse: [argumentCount > 1 ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]]. + err := -1. argumentCount >= 1 ifTrue: [(objectMemory isIntegerObject: self stackTop) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. + byteSize := objectMemory + byteSizeOfInstanceOf: (self stackValue: 1) + withIndexableSlots: (objectMemory integerValueOf: self stackTop) + errInto: [:code| err := code]. + err >= 0 ifTrue: + [^self primitiveFailFor: err]. + ^self pop: argumentCount + 1 thenPush: (self positive64BitIntegerFor: byteSize)]. + byteSize := objectMemory + byteSizeOfInstanceOf: (self stackValue: 0) + errInto: [:code| err := code]. + err >= 0 ifTrue: + [^self primitiveFailFor: err]. + self pop: 1 thenPushInteger: byteSize! - byteSizeOrErr := objectMemory - byteSizeOfInstanceOf: (self stackValue: 1) - withIndexableSlots: (objectMemory integerValueOf: self stackTop). - byteSizeOrErr < 0 ifTrue: - [^self primitiveFailFor: byteSizeOrErr negated]. - ^self pop: argumentCount + 1 thenPushInteger: byteSizeOrErr]. - byteSizeOrErr := objectMemory byteSizeOfInstanceOf: (self stackValue: 0). - byteSizeOrErr < 0 ifTrue: - [^self primitiveFailFor: byteSizeOrErr negated]. - self pop: 1 thenPushInteger: byteSizeOrErr! Item was changed: ----- Method: Spur32BitMemoryManager>>allocateSlotsForPinningInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- allocateSlotsForPinningInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex "Answer the oop of a chunk of space in oldSpace with numSlots slots. Try and allocate in a segment that already includes pinned objects. The header of the result will have been filled-in but not the contents." + <var: #totalBytes type: #usqInt> <inline: false> | chunk | chunk := self allocateOldSpaceChunkOfBytes: totalBytes suchThat: [:f| (segmentManager segmentContainingObj: f) containsPinned]. chunk ifNil: [chunk := self allocateOldSpaceChunkOfBytes: totalBytes. chunk ifNotNil: [(segmentManager segmentContainingObj: chunk) containsPinned: true]]. self checkFreeSpace. chunk ifNil: [^nil]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self flag: #endianness. self longAt: chunk put: numSlots. self longAt: chunk + 4 put: self numSlotsMask << self numSlotsHalfShift. self long64At: chunk + self baseHeaderSize put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex). ^chunk + self baseHeaderSize]. self long64At: chunk put: (self headerForSlots: numSlots format: formatField classIndex: classIndex). ^chunk! Item was changed: ----- Method: Spur32BitMemoryManager>>allocateSlotsInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- allocateSlotsInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex "Answer the oop of a chunk of space in oldSpace with numSlots slots. The header will have been filled-in but not the contents." + <var: #totalBytes type: #usqInt> <inline: false> | chunk | chunk := self allocateOldSpaceChunkOfBytes: totalBytes. self checkFreeSpace. chunk ifNil: [^nil]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self flag: #endianness. self longAt: chunk put: numSlots. self longAt: chunk + 4 put: self numSlotsMask << self numSlotsHalfShift. self long64At: chunk + self baseHeaderSize put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex). ^chunk + self baseHeaderSize]. self long64At: chunk put: (self headerForSlots: numSlots format: formatField classIndex: classIndex). ^chunk! Item was changed: ----- Method: Spur32BitMemoryManager>>instantiateClass:indexableSize: (in category 'instantiation') ----- instantiateClass: classObj indexableSize: nElements + <var: #nElements type: #usqInt> | instSpec classFormat numSlots classIndex newObj fillValue | classFormat := self formatOfClass: classObj. instSpec := self instSpecOfClassFormat: classFormat. fillValue := 0. instSpec caseOf: { [self arrayFormat] -> + [nElements > self maxSlotsForAlloc ifTrue: + [^nil]. + numSlots := nElements. - [numSlots := nElements. fillValue := nilObj]. [self indexablePointersFormat] -> + [nElements > (self maxSlotsForAlloc - (self fixedFieldsOfClassFormat: classFormat)) ifTrue: + [^nil]. + numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. - [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self weakArrayFormat] -> + [nElements > (self maxSlotsForAlloc - (self fixedFieldsOfClassFormat: classFormat)) ifTrue: + [^nil]. + numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. - [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self sixtyFourBitIndexableFormat] -> + [nElements > (self maxSlotsForAlloc / 2) ifTrue: + [^nil]. + numSlots := nElements * 2]. - [numSlots := nElements * 2]. [self firstLongFormat] -> + [nElements > self maxSlotsForAlloc ifTrue: + [^nil]. + numSlots := nElements]. - [numSlots := nElements]. [self firstShortFormat] -> [numSlots := nElements + 1 // 2. + numSlots > self maxSlotsForAlloc ifTrue: + [^nil]. instSpec := instSpec + (nElements bitAnd: 1)]. [self firstByteFormat] -> [numSlots := nElements + 3 // 4. + numSlots > self maxSlotsForAlloc ifTrue: + [^nil]. instSpec := instSpec + (4 - nElements bitAnd: 3)]. [self firstCompiledMethodFormat] -> [numSlots := nElements + 3 // 4. + numSlots > self maxSlotsForAlloc ifTrue: + [^nil]. instSpec := instSpec + (4 - nElements bitAnd: 3)] } otherwise: ["some Squeak images include funky fixed subclasses of abstract variable superclasses. e.g. DirectoryEntry as a subclass of ArrayedCollection. Allow fixed classes to be instantiated here iff nElements = 0." (nElements ~= 0 or: [instSpec > self lastPointerFormat]) ifTrue: [^nil]. numSlots := self fixedFieldsOfClassFormat: classFormat]. "non-indexable" classIndex := self ensureBehaviorHash: classObj. classIndex < 0 ifTrue: [coInterpreter primitiveFailFor: classIndex negated. ^nil]. numSlots > self maxSlotsForNewSpaceAlloc ifTrue: [newObj := self allocateSlotsInOldSpace: numSlots format: instSpec classIndex: classIndex] ifFalse: [newObj := self allocateSlots: numSlots format: instSpec classIndex: classIndex]. newObj ifNotNil: [self fillObj: newObj numSlots: numSlots with: fillValue]. ^newObj! Item was changed: ----- Method: Spur32BitMemoryManager>>largeObjectBytesForSlots: (in category 'allocation') ----- largeObjectBytesForSlots: numSlots "Answer the total number of bytes in an object with an overflow header, including header bytes." + <returnTypeC: #usqInt> ^self baseHeaderSize + self baseHeaderSize "double header" + (numSlots + (numSlots bitAnd: 1) * self bytesPerSlot) "roundTo allocationUnit"! Item was added: + ----- Method: Spur32BitMemoryManager>>maxSlotsForAlloc (in category 'instantiation') ----- + maxSlotsForAlloc + "Answer the maximum number of slots we are willing to attempt to allocate in an object. + Must fit in 32-bits; c.f. bytesInObject:. Chosen so that maxSlotsForAlloc * self bytesPerWord is +ve." + ^512*1024*1024-1! Item was changed: ----- Method: Spur32BitMemoryManager>>objectBytesForSlots: (in category 'object enumeration') ----- objectBytesForSlots: numSlots "Answer the total number of bytes in an object with the given number of slots, including header and possible overflow size header." + <returnTypeC: #usqInt> ^(numSlots = 0 ifTrue: [self allocationUnit] "always at least one slot for forwarding pointer" ifFalse: [numSlots + (numSlots bitAnd: 1) << self shiftForWord]) + (numSlots >= self numSlotsMask ifTrue: [self baseHeaderSize + self baseHeaderSize] ifFalse: [self baseHeaderSize])! Item was changed: ----- Method: Spur32BitMemoryManager>>smallObjectBytesForSlots: (in category 'allocation') ----- smallObjectBytesForSlots: numSlots "Answer the total number of bytes in an object without an overflow header, including header bytes." <api> + <returnTypeC: #usqInt> ^self baseHeaderSize "single header" + (numSlots <= 1 ifTrue: [self allocationUnit] "at least one slot for the forwarding pointer" ifFalse: [numSlots + (numSlots bitAnd: 1) * self bytesPerSlot]) "round up to allocationUnit"! Item was changed: ----- Method: Spur64BitMemoryManager>>allocateSlotsForPinningInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- allocateSlotsForPinningInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex "Answer the oop of a chunk of space in oldSpace with numSlots slots. Try and allocate in a segment that already includes pinned objects. The header of the result will have been filled-in but not the contents." + <var: #totalBytes type: #usqInt> <inline: false> | chunk | chunk := self allocateOldSpaceChunkOfBytes: totalBytes suchThat: [:f| (segmentManager segmentContainingObj: f) containsPinned]. chunk ifNil: [chunk := self allocateOldSpaceChunkOfBytes: totalBytes]. self checkFreeSpace. chunk ifNil: [^nil]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self longAt: chunk put: numSlots + (self numSlotsMask << self numSlotsFullShift). self longAt: chunk + self baseHeaderSize put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex). ^chunk + self baseHeaderSize]. self longAt: chunk put: (self headerForSlots: numSlots format: formatField classIndex: classIndex). ^chunk! Item was changed: ----- Method: Spur64BitMemoryManager>>allocateSlotsInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- allocateSlotsInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex "Answer the oop of a chunk of space in oldSpace with numSlots slots. The header will have been filled-in but not the contents." + <var: #totalBytes type: #usqInt> <inline: false> | chunk | chunk := self allocateOldSpaceChunkOfBytes: totalBytes. self checkFreeSpace. chunk ifNil: [^nil]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self longAt: chunk put: numSlots + (self numSlotsMask << self numSlotsFullShift). self longAt: chunk + self baseHeaderSize put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex). ^chunk + self baseHeaderSize]. self longAt: chunk put: (self headerForSlots: numSlots format: formatField classIndex: classIndex). ^chunk! Item was changed: ----- Method: Spur64BitMemoryManager>>instantiateClass:indexableSize: (in category 'instantiation') ----- instantiateClass: classObj indexableSize: nElements + <var: #nElements type: #usqInt> | instSpec classFormat numSlots classIndex newObj fillValue | classFormat := self formatOfClass: classObj. instSpec := self instSpecOfClassFormat: classFormat. fillValue := 0. instSpec caseOf: { [self arrayFormat] -> [numSlots := nElements. fillValue := nilObj]. [self indexablePointersFormat] -> [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self weakArrayFormat] -> [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self sixtyFourBitIndexableFormat] -> [numSlots := nElements]. [self firstLongFormat] -> [numSlots := nElements + 1 // 2. instSpec := instSpec + (nElements bitAnd: 1)]. [self firstShortFormat] -> [numSlots := nElements + 3 // 4. instSpec := instSpec + (4 - nElements bitAnd: 3)]. [self firstByteFormat] -> [numSlots := nElements + 7 // 8. instSpec := instSpec + (8 - nElements bitAnd: 7)]. [self firstCompiledMethodFormat] -> [numSlots := nElements + 7 // 8. instSpec := instSpec + (8 - nElements bitAnd: 7)] } otherwise: ["some Squeak images include funky fixed subclasses of abstract variable superclasses. e.g. DirectoryEntry as a subclass of ArrayedCollection. Allow fixed classes to be instantiated here iff nElements = 0." (nElements ~= 0 or: [instSpec > self lastPointerFormat]) ifTrue: [^nil]. numSlots := self fixedFieldsOfClassFormat: classFormat]. "non-indexable" classIndex := self ensureBehaviorHash: classObj. classIndex < 0 ifTrue: [coInterpreter primitiveFailFor: classIndex negated. ^nil]. numSlots > self maxSlotsForNewSpaceAlloc + ifTrue: + [numSlots > self maxSlotsForAlloc ifTrue: + [^nil]. + newObj := self allocateSlotsInOldSpace: numSlots format: instSpec classIndex: classIndex] + ifFalse: + [newObj := self allocateSlots: numSlots format: instSpec classIndex: classIndex]. - ifTrue: [newObj := self allocateSlotsInOldSpace: numSlots format: instSpec classIndex: classIndex] - ifFalse: [newObj := self allocateSlots: numSlots format: instSpec classIndex: classIndex]. newObj ifNotNil: [self fillObj: newObj numSlots: numSlots with: fillValue]. ^newObj! Item was changed: ----- Method: Spur64BitMemoryManager>>largeObjectBytesForSlots: (in category 'allocation') ----- largeObjectBytesForSlots: numSlots "Answer the total number of bytes in an object with an overflow header, including header bytes." + <returnTypeC: #usqInt> ^self baseHeaderSize + self baseHeaderSize "double header" + (numSlots * self bytesPerSlot) "no rounding; bytesPerSlot = allocationUnit"! Item was added: + ----- Method: Spur64BitMemoryManager>>maxSlotsForAlloc (in category 'instantiation') ----- + maxSlotsForAlloc + "Answer the maximum number of slots we are willing to attempt to allocate in an object. + Must fit in 32-bits; c.f. bytesInObject:" + ^1024*1024*1024*1024! Item was changed: ----- Method: Spur64BitMemoryManager>>objectBytesForSlots: (in category 'object enumeration') ----- objectBytesForSlots: numSlots "Answer the total number of bytes in an object with the given number of slots, including header and possible overflow size header." + <returnTypeC: #usqInt> ^(numSlots max: 1) << self shiftForWord + (numSlots >= self numSlotsMask ifTrue: [self baseHeaderSize + self baseHeaderSize] ifFalse: [self baseHeaderSize])! Item was changed: ----- Method: Spur64BitMemoryManager>>smallObjectBytesForSlots: (in category 'allocation') ----- smallObjectBytesForSlots: numSlots "Answer the total number of bytes in an object without an overflow header, including header bytes." + <returnTypeC: #usqInt> ^self baseHeaderSize "single header" + (numSlots < 1 ifTrue: [self allocationUnit] "at least one slot for the forwarding pointer" ifFalse: [numSlots * self bytesPerSlot])! Item was changed: ----- Method: SpurMemoryManager>>addToFreeTree:bytes: (in category 'free space') ----- addToFreeTree: freeChunk bytes: chunkBytes "Add freeChunk to the large free chunk tree. For the benefit of sortedFreeObject:, answer the treeNode it is added to, if it is added to the next list of a freeTreeNode, otherwise answer 0." | childBytes parent child | self assert: (self isFreeObject: freeChunk). self assert: chunkBytes = (self bytesInObject: freeChunk). self assert: chunkBytes >= (self numFreeLists * self allocationUnit). self storePointer: self freeChunkNextIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkParentIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkSmallerIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkLargerIndex ofFreeChunk: freeChunk withValue: 0. "Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks." parent := 0. child := freeLists at: 0. [child ~= 0] whileTrue: [childBytes := self bytesInObject: child. + self assert: ((self oop: freeChunk + chunkBytes isLessThanOrEqualTo: child) - self assert: ((self oop: freeChunk + chunkBytes isLessThan: child) or: [self oop: freeChunk isGreaterThanOrEqualTo: child + childBytes]). childBytes = chunkBytes ifTrue: "size match; add to list at node." [self storePointer: self freeChunkNextIndex ofFreeChunk: freeChunk + withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: child); - withValue: (self fetchPointer: self freeChunkNextIndex ofObject: child); storePointer: self freeChunkNextIndex ofFreeChunk: child withValue: freeChunk. ^child]. "walk down the tree" parent := child. child := self fetchPointer: (childBytes > chunkBytes ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: child]. parent = 0 ifTrue: [self assert: (freeLists at: 0) = 0. freeLists at: 0 put: freeChunk. freeListsMask := freeListsMask bitOr: 1. ^0]. self assert: (freeListsMask anyMask: 1). "insert in tree" self storePointer: self freeChunkParentIndex ofFreeChunk: freeChunk withValue: parent. self storePointer: (childBytes > chunkBytes ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: parent withValue: freeChunk. ^0! Item was changed: ----- Method: SpurMemoryManager>>allocateBytes:classIndex: (in category 'allocation') ----- allocateBytes: numBytes classIndex: classIndex "Allocate an object of numBytes. Answer nil if no available memory. classIndex must be that of a byte class (e.g. ByteString). The object is *NOT FILLED*." + <var: #numBytes type: #usqInt> self assert: (coInterpreter addressCouldBeClassObj: (self classAtIndex: classIndex)). self assert: (self instSpecOfClass: (self classAtIndex: classIndex)) = self firstByteFormat. ^self allocateSlots: (numBytes + self bytesPerSlot - 1 // self bytesPerSlot) format: (self byteFormatForNumBytes: numBytes) classIndex: classIndex! Item was changed: ----- Method: SpurMemoryManager>>allocateOldSpaceChunkOfBytes: (in category 'free space') ----- allocateOldSpaceChunkOfBytes: chunkBytes "Answer a chunk of oldSpace from the free lists, if available, otherwise answer nil. Break up a larger chunk if one of the exact size does not exist. N.B. the chunk is simply a pointer, it has no valid header. The caller *must* fill in the header correctly." + <var: #chunkBytes type: #usqInt> | initialIndex chunk index nodeBytes parent child | "for debugging:" "totalFreeOldSpace := self totalFreeListBytes" totalFreeOldSpace := totalFreeOldSpace - chunkBytes. "be optimistic (& don't wait for the write)" initialIndex := chunkBytes / self allocationUnit. (initialIndex < self numFreeLists and: [1 << initialIndex <= freeListsMask]) ifTrue: [(freeListsMask anyMask: 1 << initialIndex) ifTrue: [(chunk := freeLists at: initialIndex) ~= 0 ifTrue: [self assert: chunk = (self startOfObject: chunk). self assert: (self isValidFreeObject: chunk). ^self unlinkFreeChunk: chunk atIndex: initialIndex]. freeListsMask := freeListsMask - (1 << initialIndex)]. "first search for free chunks of a multiple of chunkBytes in size" index := initialIndex. [(index := index + index) < self numFreeLists and: [1 << index <= freeListsMask]] whileTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(chunk := freeLists at: index) ~= 0 ifTrue: [self assert: chunk = (self startOfObject: chunk). self assert: (self isValidFreeObject: chunk). self unlinkFreeChunk: chunk atIndex: index. self assert: (self bytesInObject: chunk) = (index * self allocationUnit). self freeChunkWithBytes: index * self allocationUnit - chunkBytes at: (self startOfObject: chunk) + chunkBytes. ^chunk]. freeListsMask := freeListsMask - (1 << index)]]. "now get desperate and use the first that'll fit. Note that because the minimum free size is 16 bytes (2 * allocationUnit), to leave room for the forwarding pointer/next free link, we can only break chunks that are at least 16 bytes larger, hence start at initialIndex + 2." index := initialIndex + 1. [(index := index + 1) < self numFreeLists and: [1 << index <= freeListsMask]] whileTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(chunk := freeLists at: index) ~= 0 ifTrue: [self assert: chunk = (self startOfObject: chunk). self assert: (self isValidFreeObject: chunk). self unlinkFreeChunk: chunk atIndex: index. self assert: (self bytesInObject: chunk) = (index * self allocationUnit). self freeChunkWithBytes: index * self allocationUnit - chunkBytes at: (self startOfObject: chunk) + chunkBytes. ^chunk]. freeListsMask := freeListsMask - (1 << index)]]]. "Large chunk, or no space on small free lists. Search the large chunk list. Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks. When the search ends parent should hold the smallest chunk at least as large as chunkBytes, or 0 if none." parent := 0. child := freeLists at: 0. [child ~= 0] whileTrue: [| childBytes | self assert: (self isValidFreeObject: child). childBytes := self bytesInObject: child. childBytes = chunkBytes ifTrue: "size match; try to remove from list at node." [chunk := self fetchPointer: self freeChunkNextIndex ofFreeChunk: child. chunk ~= 0 ifTrue: [self assert: (self isValidFreeObject: chunk). self storePointer: self freeChunkNextIndex ofFreeChunk: child withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: chunk). ^self startOfObject: chunk]. nodeBytes := childBytes. parent := child. child := 0] "break out of loop to remove interior node" ifFalse: ["Note that because the minimum free size is 16 bytes (2 * allocationUnit), to leave room for the forwarding pointer/next free link, we can only break chunks that are at least 16 bytes larger, hence reject chunks < 2 * allocationUnit larger." childBytes <= (chunkBytes + self allocationUnit) ifTrue: "node too small; walk down the larger size of the tree" [child := self fetchPointer: self freeChunkLargerIndex ofFreeChunk: child] ifFalse: [parent := child. "parent will be smallest node >= chunkBytes + allocationUnit" nodeBytes := childBytes. child := self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: child]]]. parent = 0 ifTrue: [totalFreeOldSpace := totalFreeOldSpace + chunkBytes. "optimism was unfounded" ^nil]. "self printFreeChunk: parent" self assert: (nodeBytes = chunkBytes or: [nodeBytes >= (chunkBytes + (2 * self allocationUnit))]). self assert: (self bytesInObject: parent) = nodeBytes. "attempt to remove from list" chunk := self fetchPointer: self freeChunkNextIndex ofFreeChunk: parent. chunk ~= 0 ifTrue: [self assert: (chunkBytes = nodeBytes or: [chunkBytes + self allocationUnit < nodeBytes]). self storePointer: self freeChunkNextIndex ofFreeChunk: parent withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: chunk). chunkBytes ~= nodeBytes ifTrue: [self freeChunkWithBytes: nodeBytes - chunkBytes at: (self startOfObject: chunk) + chunkBytes]. ^self startOfObject: chunk]. "no list; remove the interior node" chunk := parent. self unlinkSolitaryFreeTreeNode: chunk. "if there's space left over, add the fragment back." chunkBytes ~= nodeBytes ifTrue: [self freeChunkWithBytes: nodeBytes - chunkBytes at: (self startOfObject: chunk) + chunkBytes]. ^self startOfObject: chunk! Item was changed: ----- Method: SpurMemoryManager>>allocateOldSpaceChunkOfBytes:suchThat: (in category 'free space') ----- allocateOldSpaceChunkOfBytes: chunkBytes suchThat: acceptanceBlock "Answer a chunk of oldSpace from the free lists that satisfies acceptanceBlock, if available, otherwise answer nil. Break up a larger chunk if one of the exact size cannot be found. N.B. the chunk is simply a pointer, it has no valid header. The caller *must* fill in the header correctly." + <var: #chunkBytes type: #usqInt> | initialIndex node next prev index child childBytes acceptedChunk acceptedNode | <inline: true> "must inline for acceptanceBlock" "for debugging:" "totalFreeOldSpace := self totalFreeListBytes" totalFreeOldSpace := totalFreeOldSpace - chunkBytes. "be optimistic (& don't wait for the write)" initialIndex := chunkBytes / self allocationUnit. (initialIndex < self numFreeLists and: [1 << initialIndex <= freeListsMask]) ifTrue: [(freeListsMask anyMask: 1 << initialIndex) ifTrue: [(node := freeLists at: initialIndex) = 0 ifTrue: [freeListsMask := freeListsMask - (1 << initialIndex)] ifFalse: [prev := 0. [node ~= 0] whileTrue: [self assert: node = (self startOfObject: node). self assert: (self isValidFreeObject: node). next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. (acceptanceBlock value: node) ifTrue: [prev = 0 ifTrue: [freeLists at: initialIndex put: next] ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. ^node]. prev := node. node := next]]]. "first search for free chunks of a multiple of chunkBytes in size" index := initialIndex. [(index := index + initialIndex) < self numFreeLists and: [1 << index <= freeListsMask]] whileTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(node := freeLists at: index) = 0 ifTrue: [freeListsMask := freeListsMask - (1 << index)] ifFalse: [prev := 0. [node ~= 0] whileTrue: [self assert: node = (self startOfObject: node). self assert: (self isValidFreeObject: node). next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. (acceptanceBlock value: node) ifTrue: [prev = 0 ifTrue: [freeLists at: index put: next] ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. self freeChunkWithBytes: index * self allocationUnit - chunkBytes at: (self startOfObject: node) + chunkBytes. ^node]. prev := node. node := next]]]]. "now get desperate and use the first that'll fit. Note that because the minimum free size is 16 bytes (2 * allocationUnit), to leave room for the forwarding pointer/next free link, we can only break chunks that are at least 16 bytes larger, hence start at initialIndex + 2." index := initialIndex + 1. [(index := index + 1) < self numFreeLists and: [1 << index <= freeListsMask]] whileTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(node := freeLists at: index) = 0 ifTrue: [freeListsMask := freeListsMask - (1 << index)] ifFalse: [prev := 0. [node ~= 0] whileTrue: [self assert: node = (self startOfObject: node). self assert: (self isValidFreeObject: node). next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. (acceptanceBlock value: node) ifTrue: [prev = 0 ifTrue: [freeLists at: index put: next] ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. self freeChunkWithBytes: index * self allocationUnit - chunkBytes at: (self startOfObject: node) + chunkBytes. ^node]. prev := node. node := next]]]]]. "Large chunk, or no space on small free lists. Search the large chunk list. Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks. When the search ends parent should hold the smallest chunk at least as large as chunkBytes, or 0 if none. acceptedChunk and acceptedNode save us from having to back-up when the acceptanceBlock filters-out all nodes of the right size, but there are nodes of the wrong size it does accept." child := freeLists at: 0. node := acceptedChunk := acceptedNode := 0. [child ~= 0] whileTrue: [self assert: (self isValidFreeObject: child). childBytes := self bytesInObject: child. childBytes = chunkBytes ifTrue: "size match; try to remove from list at node." [node := child. [prev := node. node := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. node ~= 0] whileTrue: [(acceptanceBlock value: node) ifTrue: [self assert: (self isValidFreeObject: node). self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: node). ^self startOfObject: node]]. (acceptanceBlock value: child) ifTrue: [next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: child. next = 0 ifTrue: "no list; remove the interior node" [self unlinkSolitaryFreeTreeNode: child] ifFalse: "list; replace node with it" [self inFreeTreeReplace: child with: next]. ^self startOfObject: child]]. child ~= 0 ifTrue: ["Note that because the minimum free size is 16 bytes (2 * allocationUnit), to leave room for the forwarding pointer/next free link, we can only break chunks that are at least 16 bytes larger, hence reject chunks < 2 * allocationUnit larger." childBytes <= (chunkBytes + self allocationUnit) ifTrue: "node too small; walk down the larger size of the tree" [child := self fetchPointer: self freeChunkLargerIndex ofFreeChunk: child] ifFalse: [self flag: 'we can do better here; preferentially choosing the lowest node. That would be a form of best-fit since we are trying to compact down'. node := child. child := self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: node. acceptedNode = 0 ifTrue: [acceptedChunk := node. "first search the list." [acceptedChunk := self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedChunk. (acceptedChunk ~= 0 and: [acceptanceBlock value: acceptedChunk]) ifTrue: [acceptedNode := node]. acceptedChunk ~= 0 and: [acceptedNode = 0]] whileTrue. "nothing on the list; will the node do? This prefers acceptable nodes higher up the tree over acceptable list elements further down, but we haven't got all day..." (acceptedNode = 0 and: [acceptanceBlock value: node]) ifTrue: [acceptedNode := node. child := 0 "break out of loop now we have an acceptedNode"]]]]]. acceptedNode ~= 0 ifTrue: [acceptedChunk ~= 0 ifTrue: [self assert: (self bytesInObject: acceptedChunk) >= (chunkBytes + self allocationUnit). [next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedNode. next ~= acceptedChunk] whileTrue: [acceptedNode := next]. self storePointer: self freeChunkNextIndex ofFreeChunk: acceptedNode withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedChunk). self freeChunkWithBytes: (self bytesInObject: acceptedChunk) - chunkBytes at: (self startOfObject: acceptedChunk) + chunkBytes. ^self startOfObject: acceptedChunk]. next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedNode. next = 0 ifTrue: "no list; remove the interior node" [self unlinkSolitaryFreeTreeNode: acceptedNode] ifFalse: "list; replace node with it" [self inFreeTreeReplace: acceptedNode with: next]. self assert: (self bytesInObject: acceptedNode) >= (chunkBytes + self allocationUnit). self freeChunkWithBytes: (self bytesInObject: acceptedNode) - chunkBytes at: (self startOfObject: acceptedNode) + chunkBytes. ^self startOfObject: acceptedNode]. totalFreeOldSpace := totalFreeOldSpace + chunkBytes. "optimism was unfounded" ^nil! Item was changed: ----- Method: SpurMemoryManager>>allocateOldSpaceChunkOfExactlyBytes: (in category 'free space') ----- allocateOldSpaceChunkOfExactlyBytes: chunkBytes "Answer a chunk of oldSpace from the free lists, if one of this size is available, otherwise answer nil. N.B. the chunk is simply a pointer, it has no valid header. The caller *must* fill in the header correctly." + <var: #chunkBytes type: #usqInt> | index node child | "for debugging:" "totalFreeOldSpace := self totalFreeListBytes" index := chunkBytes / self allocationUnit. index < self numFreeLists ifTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(node := freeLists at: index) ~= 0 ifTrue: [self assert: node = (self startOfObject: node). self assert: (self isValidFreeObject: node). totalFreeOldSpace := totalFreeOldSpace - chunkBytes. ^self unlinkFreeChunk: node atIndex: index]. freeListsMask := freeListsMask - (1 << index)]. ^nil]. "Large chunk. Search the large chunk list. Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks. When the search ends parent should hold the first chunk of the same size as chunkBytes, or 0 if none." child := freeLists at: 0. [child ~= 0] whileTrue: [| childBytes | self assert: (self isValidFreeObject: child). childBytes := self bytesInObject: child. childBytes = chunkBytes ifTrue: "size match; try to remove from list at node." [node := self fetchPointer: self freeChunkNextIndex ofFreeChunk: child. node ~= 0 ifTrue: [self assert: (self isValidFreeObject: node). self storePointer: self freeChunkNextIndex ofFreeChunk: child withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: node). totalFreeOldSpace := totalFreeOldSpace - chunkBytes. ^self startOfObject: node]. "nothing acceptable on node's list; answer the node." self unlinkSolitaryFreeTreeNode: child. totalFreeOldSpace := totalFreeOldSpace - chunkBytes. ^self startOfObject: child] ifFalse: [child := self fetchPointer: (childBytes < chunkBytes ifTrue: [self freeChunkLargerIndex] ifFalse: [self freeChunkSmallerIndex]) ofFreeChunk: child]]. ^nil! Item was changed: ----- Method: SpurMemoryManager>>allocateOldSpaceChunkOfExactlyBytes:suchThat: (in category 'free space') ----- allocateOldSpaceChunkOfExactlyBytes: chunkBytes suchThat: acceptanceBlock "Answer a chunk of oldSpace from the free lists that satisfies acceptanceBlock, if one of this size is available, otherwise answer nil. N.B. the chunk is simply a pointer, it has no valid header. The caller *must* fill in the header correctly." + <var: #chunkBytes type: #usqInt> | index node next prev child childBytes | <inline: true> "must inline for acceptanceBlock" "for debugging:" "totalFreeOldSpace := self totalFreeListBytes" index := chunkBytes / self allocationUnit. index < self numFreeLists ifTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(node := freeLists at: index) = 0 ifTrue: [freeListsMask := freeListsMask - (1 << index)] ifFalse: [prev := 0. [node ~= 0] whileTrue: [self assert: node = (self startOfObject: node). self assert: (self isValidFreeObject: node). next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. (acceptanceBlock value: node) ifTrue: [prev = 0 ifTrue: [freeLists at: index put: next] ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. totalFreeOldSpace := totalFreeOldSpace - chunkBytes. ^node]. prev := node. node := next]]]. ^nil]. "Large chunk. Search the large chunk list. Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks. When the search ends parent should hold the first chunk of the same size as chunkBytes, or 0 if none." node := 0. child := freeLists at: 0. [child ~= 0] whileTrue: [self assert: (self isValidFreeObject: child). childBytes := self bytesInObject: child. childBytes = chunkBytes ifTrue: "size match; try to remove from list at node first." [node := child. [prev := node. node := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. node ~= 0] whileTrue: [(acceptanceBlock value: node) ifTrue: [self assert: (self isValidFreeObject: node). self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: node). totalFreeOldSpace := totalFreeOldSpace - chunkBytes. ^self startOfObject: node]]. (acceptanceBlock value: child) ifFalse: [^nil]. "node was right size but unaceptable." next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: child. next = 0 ifTrue: "no list; remove the interior node" [self unlinkSolitaryFreeTreeNode: child] ifFalse: "list; replace node with it" [self inFreeTreeReplace: child with: next]. totalFreeOldSpace := totalFreeOldSpace - chunkBytes. ^self startOfObject: child] ifFalse: "no size match; walk down the tree" [child := self fetchPointer: (childBytes < chunkBytes ifTrue: [self freeChunkLargerIndex] ifFalse: [self freeChunkSmallerIndex]) ofFreeChunk: child]]. ^nil! Item was added: + ----- Method: SpurMemoryManager>>allocateSlotsForPinningInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- + allocateSlotsForPinningInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex + "Answer the oop of a chunk of space in oldSpace with numSlots slots. Try and + allocate in a segment that already includes pinned objects. The header of the + result will have been filled-in but not the contents." + <var: #totalBytes type: #usqInt> + ^self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>allocateSlotsInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- allocateSlotsInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex "Answer the oop of a chunk of space in oldSpace with numSlots slots. The header will have been filled-in but not the contents." + <var: #totalBytes type: #usqInt> ^self subclassResponsibility! Item was removed: - ----- Method: SpurMemoryManager>>byteSizeOfInstanceOf: (in category 'indexing primitive support') ----- - byteSizeOfInstanceOf: classObj - | instSpec classFormat numSlots | - classFormat := self formatOfClass: classObj. - instSpec := self instSpecOfClassFormat: classFormat. - (self isFixedSizePointerFormat: instSpec) ifFalse: - [^PrimErrBadReceiver negated]. "indexable" - numSlots := self fixedFieldsOfClassFormat: classFormat. - ^self objectBytesForSlots: numSlots! Item was added: + ----- Method: SpurMemoryManager>>byteSizeOfInstanceOf:errInto: (in category 'indexing primitive support') ----- + byteSizeOfInstanceOf: classObj errInto: errBlock + | instSpec classFormat numSlots | + classFormat := self formatOfClass: classObj. + instSpec := self instSpecOfClassFormat: classFormat. + (self isFixedSizePointerFormat: instSpec) ifFalse: + [^errBlock value: PrimErrBadReceiver]. "indexable" + numSlots := self fixedFieldsOfClassFormat: classFormat. + ^self objectBytesForSlots: numSlots! Item was removed: - ----- Method: SpurMemoryManager>>byteSizeOfInstanceOf:withIndexableSlots: (in category 'indexing primitive support') ----- - byteSizeOfInstanceOf: classObj withIndexableSlots: nElements - | instSpec classFormat numSlots | - <var: 'numSlots' type: #usqInt> - classFormat := self formatOfClass: classObj. - instSpec := self instSpecOfClassFormat: classFormat. - instSpec caseOf: { - [self arrayFormat] -> - [numSlots := nElements]. - [self indexablePointersFormat] -> - [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements]. - [self weakArrayFormat] -> - [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements]. - [self sixtyFourBitIndexableFormat] -> - [numSlots := self bytesPerSlot = 4 ifTrue: [nElements * 2] ifFalse: [nElements]]. - [self firstLongFormat] -> - [numSlots := self bytesPerSlot = 4 ifTrue: [nElements] ifFalse: [nElements + 1 // 2]]. - [self firstShortFormat] -> - [numSlots := self bytesPerSlot = 4 ifTrue: [nElements + 1 // 2] ifFalse: [nElements + 3 // 4]]. - [self firstByteFormat] -> - [numSlots := nElements + (self bytesPerSlot - 1) // self bytesPerSlot]. - [self firstCompiledMethodFormat] -> "Assume nElements is derived from CompiledMethod>>basicSize." - [numSlots := nElements + (self bytesPerSlot - 1) // self bytesPerSlot] } - otherwise: [^PrimErrBadReceiver negated]. "non-indexable" - numSlots >= (1 << (self bytesPerSlot * 8 - self logBytesPerSlot)) ifTrue: - [^PrimErrLimitExceeded negated]. - ^self objectBytesForSlots: numSlots! Item was added: + ----- Method: SpurMemoryManager>>byteSizeOfInstanceOf:withIndexableSlots:errInto: (in category 'indexing primitive support') ----- + byteSizeOfInstanceOf: classObj withIndexableSlots: nElements errInto: errorBlock + | instSpec classFormat numSlots | + <var: 'numSlots' type: #usqInt> + classFormat := self formatOfClass: classObj. + instSpec := self instSpecOfClassFormat: classFormat. + instSpec caseOf: { + [self arrayFormat] -> + [numSlots := nElements]. + [self indexablePointersFormat] -> + [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements]. + [self weakArrayFormat] -> + [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements]. + [self sixtyFourBitIndexableFormat] -> + [numSlots := self bytesPerSlot = 4 ifTrue: [nElements * 2] ifFalse: [nElements]]. + [self firstLongFormat] -> + [numSlots := self bytesPerSlot = 4 ifTrue: [nElements] ifFalse: [nElements + 1 // 2]]. + [self firstShortFormat] -> + [numSlots := self bytesPerSlot = 4 ifTrue: [nElements + 1 // 2] ifFalse: [nElements + 3 // 4]]. + [self firstByteFormat] -> + [numSlots := nElements + (self bytesPerSlot - 1) // self bytesPerSlot]. + [self firstCompiledMethodFormat] -> "Assume nElements is derived from CompiledMethod>>basicSize." + [numSlots := nElements + (self bytesPerSlot - 1) // self bytesPerSlot] } + otherwise: [^errorBlock value: PrimErrBadReceiver negated]. "non-indexable" + numSlots >= (1 << (self bytesPerSlot * 8 - self logBytesPerSlot)) ifTrue: + [^errorBlock value: PrimErrLimitExceeded]. + ^self objectBytesForSlots: numSlots! Item was changed: ----- Method: SpurMemoryManager>>inFreeTreeReplace:with: (in category 'free space') ----- inFreeTreeReplace: treeNode with: newNode "Part of reorderReversedTreeList:. Switch treeNode with newNode in the tree, but do nothing to the list linked through freeChunkNextIndex." | relative | "copy parent, smaller, larger" self freeChunkParentIndex to: self freeChunkLargerIndex do: [:i| + relative := self fetchPointer: i ofFreeChunk: treeNode. - relative := self fetchPointer: i ofObject: treeNode. i = self freeChunkParentIndex ifTrue: [relative = 0 ifTrue: "update root to point to newNode" [self assert: (freeLists at: 0) = treeNode. freeLists at: 0 put: newNode] ifFalse: "replace link from parent to treeNode with link to newNode." + [self storePointer: (treeNode = (self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: relative) - [self storePointer: (treeNode = (self fetchPointer: self freeChunkSmallerIndex ofObject: relative) ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: relative withValue: newNode]] ifFalse: [relative ~= 0 ifTrue: + [self assert: (self fetchPointer: self freeChunkParentIndex ofFreeChunk: relative) = treeNode. - [self assert: (self fetchPointer: self freeChunkParentIndex ofObject: relative) = treeNode. self storePointer: self freeChunkParentIndex ofFreeChunk: relative withValue: newNode]]. self storePointer: i ofFreeChunk: newNode withValue: relative. self storePointer: i ofFreeChunk: treeNode withValue: 0]! Item was changed: ----- Method: SpurMemoryManager>>inOrderPrintFreeTree:printList: (in category 'debug printing') ----- inOrderPrintFreeTree: freeChunk printList: printNextList "print free chunks in freeTree in order." <api> | next | + (next := self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: freeChunk) ~= 0 ifTrue: - (next := self fetchPointer: self freeChunkSmallerIndex ofObject: freeChunk) ~= 0 ifTrue: [self inOrderPrintFreeTree: next printList: printNextList]. self printFreeChunk: freeChunk isNextChunk: false. printNextList ifTrue: [next := freeChunk. + [(next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: next) ~= 0] whileTrue: - [(next := self fetchPointer: self freeChunkNextIndex ofObject: next) ~= 0] whileTrue: [coInterpreter tab. self printFreeChunk: next isNextChunk: true]]. + (next := self fetchPointer: self freeChunkLargerIndex ofFreeChunk: freeChunk) ~= 0 ifTrue: - (next := self fetchPointer: self freeChunkLargerIndex ofObject: freeChunk) ~= 0 ifTrue: [self inOrderPrintFreeTree: next printList: printNextList]! Item was changed: ----- Method: SpurMemoryManager>>initializeObjectMemory: (in category 'initialization') ----- initializeObjectMemory: bytesToShift + "Initialize object memory variables at startup time. Assume endOfMemory at al are + initialised by the image-reading code via setHeapBase:memoryLimit:endOfMemory:. + endOfMemory is assumed to point to the end of the last object in the image. + Assume: image reader also initializes the following variables: - "Initialize object memory variables at startup time. Assume endOfMemory is initially set (by the image-reading code) to the end of the last object in the image. Initialization redefines endOfMemory to be the end of the object allocation area based on the total available memory, but reserving some space for forwarding blocks." - "Assume: image reader initializes the following variables: - memory - memoryLimit specialObjectsOop + lastHash" - lastHash - " <inline: false> | freeListObj | "Catch mis-initializations leading to bad translations to C" self assert: BaseHeaderSize = self baseHeaderSize. + self assert: (self maxSlotsForAlloc * BytesPerWord) asInteger > 0. self bootstrapping ifFalse: [self initSegmentBridgeWithBytes: self bridgeSize at: endOfMemory - self bridgeSize]. segmentManager adjustSegmentSwizzlesBy: bytesToShift. "image may be at a different address; adjust oops for new location" self adjustAllOopsBy: bytesToShift. specialObjectsOop := segmentManager swizzleObj: specialObjectsOop. "heavily used special objects" nilObj := self splObj: NilObject. falseObj := self splObj: FalseObject. trueObj := self splObj: TrueObject. "In Cog we insist that nil, true & false are next to each other (Cogit generates tighter conditional branch code as a result). In addition, Spur places the free lists and class table root page immediately following them." self assert: nilObj = oldSpaceStart. self assert: falseObj = (self objectAfter: nilObj). self assert: trueObj = (self objectAfter: falseObj). freeListObj := self objectAfter: trueObj. self reInitializeClassTablePostLoad: (self objectAfter: freeListObj). markStack := self swizzleObjStackAt: MarkStackRootIndex. weaklingStack := self swizzleObjStackAt: WeaklingStackRootIndex. ephemeronQueue := self swizzleObjStackAt: EphemeronQueueRootIndex. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self initializeFreeSpacePostLoad: freeListObj. segmentManager collapseSegmentsPostSwizzle. self computeFreeSpacePostSwizzle. self bootstrapping ifFalse: [self initializeNewSpaceVariables]. self initializeOldSpaceFirstFree: freeOldSpaceStart. "initializes endOfMemory, freeStart" segmentManager checkSegments. "These defaults should depend on machine size; e.g. too small on a powerful laptop, too big on a Pi." growHeadroom := 16*1024*1024. "headroom when growing" shrinkThreshold := 32*1024*1024. "free space before shrinking" self setHeapSizeAtPreviousGC. heapGrowthToSizeGCRatio := 0.333333. "By default GC after scavenge if heap has grown by a third since the last GC"! Item was changed: ----- Method: SpurMemoryManager>>instantiateClass:indexableSize: (in category 'instantiation') ----- instantiateClass: classObj indexableSize: nElements + <var: #nElements type: #usqInt> ^self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>largeObjectBytesForSlots: (in category 'allocation') ----- largeObjectBytesForSlots: numSlots "Answer the total number of bytes in an object with an overflow header, including header bytes." + <returnTypeC: #usqInt> ^self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>maxSlotsForAlloc (in category 'instantiation') ----- + maxSlotsForAlloc + "Answer the maximum number of slots we are willing to attempt to allocate in an object. + Must fit in 32-bits; c.f. bytesInObject:" + ^self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>objectBytesForSlots: (in category 'allocation') ----- objectBytesForSlots: numSlots "Answer the total number of bytes in an object with the given number of slots, including header and possible overflow size header." + <returnTypeC: #usqInt> self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>rebuildFreeTreeFrom: (in category 'free space') ----- rebuildFreeTreeFrom: sortedFreeChunks "post sweep and pre compact, rebuild the large free chunk tree from the sortedFreeChunks list, such that the lists are ordered from low to high address." | freeChunk bytes totalBytes | "first add all the chunks to the tree. This will result in almost address-sorted lists. We will need to reorder the lists." freeChunk := sortedFreeChunks. totalBytes := 0. [freeChunk ~= 0] whileTrue: [bytes := self bytesInObject: freeChunk. totalBytes := totalBytes + bytes. self addToFreeTree: freeChunk bytes: bytes. freeChunk := self fetchPointer: self freeChunkNextAddressIndex + ofFreeChunk: freeChunk]. - ofObject: freeChunk]. "now reorder the lists to ensure they're in address order, apart from the list head, which should be highest." self freeTreeNodesDo: [:treeNode| | newTreeNode | newTreeNode := self reorderReversedTreeList: treeNode. newTreeNode]. ^totalBytes! Item was changed: ----- Method: SpurMemoryManager>>reorderReversedTreeList: (in category 'free space') ----- reorderReversedTreeList: treeNode "Once the freeTree has been rebuilt from the sortedFreeChunks list each list will be in a weird order, the list in reverse order, high to low, but the tree node, because it is inserted first, will be the lowest address. Reverse the list so it is sorted low to high, but make the highest address node the first, as this will be allocated from last." | first next node prev | "first becomes the new head, as this is the last one we want to allocate and we allocate from the list first." + first := self fetchPointer: self freeChunkNextIndex ofFreeChunk: treeNode. - first := self fetchPointer: self freeChunkNextIndex ofObject: treeNode. "no next node, so no change" first = 0 ifTrue: [^treeNode]. + node := self fetchPointer: self freeChunkNextIndex ofFreeChunk: first. - node := self fetchPointer: self freeChunkNextIndex ofObject: first. self storePointer: self freeChunkNextIndex ofFreeChunk: first withValue: treeNode. self inFreeTreeReplace: treeNode with: first. prev := 0. [node ~= 0] whileTrue: + [next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. - [next := self fetchPointer: self freeChunkNextIndex ofObject: node. self storePointer: self freeChunkNextIndex ofFreeChunk: node withValue: prev. prev := node. node := next]. self storePointer: self freeChunkNextIndex ofFreeChunk: treeNode withValue: prev. ^first! Item was changed: ----- Method: SpurMemoryManager>>reverseSmallListHeads (in category 'free space') ----- reverseSmallListHeads "After freeUnmarkedObjectsNilUnmarkedWeaklingSlotsAndSortAndCoalesceFreeSpace all small free chunks will be on the free lists in reverse address order. Reverse each list, summing the ammount of space. Answer the sum of bytes of free space on these small lists." | total | total := 0. freeListsMask := 0. 1 to: self numFreeLists - 1 do: [:i| | bytes node prev next | bytes := i * self allocationUnit. node := freeLists at: i. node ~= 0 ifTrue: [self assert: (self bytesInObject: node) = bytes. freeListsMask := freeListsMask + (1 << i). prev := 0. [node ~= 0] whileTrue: + [next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. - [next := self fetchPointer: self freeChunkNextIndex ofObject: node. self storePointer: self freeChunkNextIndex ofFreeChunk: node withValue: prev. prev := node. node := next. total := total + bytes]. freeLists at: i put: prev]]. ^total! Item was changed: ----- Method: SpurMemoryManager>>smallObjectBytesForSlots: (in category 'allocation') ----- smallObjectBytesForSlots: numSlots "Answer the total number of bytes in an object without an overflow header, including header bytes." + <returnTypeC: #usqInt> ^self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>sortFreeListAt: (in category 'free space') ----- sortFreeListAt: i "Sort the individual free list i so that the lowest address is at the head of the list. Use an insertion sort with a scan for initially sorted elements." | list next head | list := freeLists at: i. "list of objects to be inserted" list = 0 ifTrue: "empty list; we're done" [^self]. head := list. "scan list to find find first out-of-order element" + [(next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: list) > list] - [(next := self fetchPointer: self freeChunkNextIndex ofObject: list) > list] whileTrue: [list := next]. "no out-of-order elements; list was already sorted; we're done" next = 0 ifTrue: [^self]. "detatch already sorted list" self storePointer: self freeChunkNextIndex ofFreeChunk: list withValue: 0. list := next. [list ~= 0] whileTrue: [| node prev | "grab next node to be inserted" + next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: list. - next := self fetchPointer: self freeChunkNextIndex ofObject: list. "search sorted list for insertion point" prev := 0. "prev node for insertion sort" node := head. "current node for insertion sort" [node ~= 0 and: [self oop: node isLessThan: list]] whileTrue: [prev := node. + node := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node]. - node := self fetchPointer: self freeChunkNextIndex ofObject: node]. "insert the node into the sorted list" self assert: (node = 0 or: [node > list]). prev = 0 ifTrue: [head := list] ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: list]. self storePointer: self freeChunkNextIndex ofFreeChunk: list withValue: node. list := next]. "replace the list with the sorted list" freeLists at: i put: head!

1 0

setting priority limits on non-redhat linuxen
by gettimothy 29 Jun '14

29 Jun '14

Hi All, For those folks getting the pthread_setschedparam the example Eliot gives at http://www.mirandabanda.org/files/Cog/VM/VM.r3006/README.3006 does not apply to Slackware linux and I suspect other distros too. I did some digging this morning and figured out how to set this up on my system. This site https://www.hackthissite.org/articles/read/932 gives an overview, but it is a bit outdated. On Slackware 14.1 the output of 'man limits' shows a few more entries · A: max address space (KB) · C: max core file size (KB) · D: max data size (KB) · F: maximum filesize (KB) · K: file creation mask, set by umask(2). · I: max nice value (0..39 which translates to 20..-19) · L: max number of logins for this user · M: max locked-in-memory address space (KB) · N: max number of open files · O: max real time priority · P: process priority, set by setpriority(2). · R: max resident set size (KB) · S: max stack size (KB) · T: max CPU time (MIN) · U: max number of processes I created the /etc/limits file and added an entry tty O100 logout out and back in and I was able to run the squeak.cog.v3 build just fine. Prior to that limit fix, I was getting the dreaded pthread_setschedparam error and could only run the vm as root. Hope that helps. tty

2 1

VM Maker: Cog-eem.163.mcz
by commits＠source.squeak.org 29 Jun '14

29 Jun '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.163.mcz ==================== Summary ==================== Name: Cog-eem.163 Author: eem Time: 28 June 2014, 5:17:11.575 pm UUID: 45688939-4dbe-4f42-883b-916a2d3b7e0b Ancestors: Cog-tpr.162 Make byteSizeOfInstanceOfSize: cope with overflow in the primitive. Make both byteSizeOfInstance[OfSize:] answer a primitive error code. =============== Diff against Cog-tpr.162 =============== Item was changed: ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEbyteSizeOfInstance (in category 'method prototypes') ----- BehaviorPROTOTYPEbyteSizeOfInstance "Answer the total memory size of an instance of the receiver." + <primitive: 181 error: ec> - <primitive: 181> self isVariable ifTrue: [^self byteSizeOfInstanceOfSize: 0]. self primitiveFailed! Item was changed: ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEbyteSizeOfInstanceOfSize: (in category 'method prototypes') ----- BehaviorPROTOTYPEbyteSizeOfInstanceOfSize: basicSize "Answer the total memory size of an instance of the receiver with the given number of indexable instance variables." + <primitive: 181 error: ec> + self isVariable + ifTrue: "If the primitive overflowed answer a close approximation" + [(basicSize isInteger + and: [basicSize >= 16r1000000]) ifTrue: + [^2 * (self byteSizeOfInstanceOfSize: basicSize + 1 // 2) + - (self byteSizeOfInstanceOfSize: 0)]] + ifFalse: + [basicSize = 0 ifTrue: + [^self byteSizeOfInstance]]. - <primitive: 181> - self isVariable ifFalse: - [basicSize = 0 ifTrue: - [^self byteSizeOfInstance]]. self primitiveFailed!

1 0

VM Maker: VMMaker.oscog-tpr.784.mcz
by commits＠source.squeak.org 29 Jun '14

29 Jun '14

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.784.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.784 Author: tpr Time: 28 June 2014, 3:42:06.906 pm UUID: 31d41aa3-9d3c-43fb-b1f6-9bb2f6df8165 Ancestors: VMMaker.oscog-tpr.783 Rework the rotatable quick constant logic a little and clean up users. Fix concretizeMoveRXbrR to do byte not word loads. Fix concretizeConditionalJumpLong: to actually be conditional. Oops. =============== Diff against VMMaker.oscog-tpr.783 =============== Item was changed: ----- Method: CogARMCompiler>>concretizeAddCqR (in category 'generate machine code - concretize') ----- concretizeAddCqR "Will get inlined into concretizeAt: switch." "Try whether the quick constant is a small negative number. If it is, optimize." <inline: true> self rotateable8bitImmediate: (operands at: 0) ifTrue: [ :rot :immediate | | reg | reg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self adds: reg rn: reg imm: immediate ror: rot). - self machineCodeAt: 0 put: (self adds: reg rn: reg imm: immediate ror: rot<<1). ^machineCodeSize := 4] ifFalse: [ self rotateable8bitImmediate: (operands at: 0) negated ifTrue: [ :rot :immediate | |reg| reg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self subs: reg rn: reg imm: immediate ror: rot). - self machineCodeAt: 0 put: (self subs: reg rn: reg imm: immediate ror: rot<<1). ^machineCodeSize := 4] ifFalse: [^self concretizeDataOperationCwR: 4]]! Item was changed: ----- Method: CogARMCompiler>>concretizeAndCqR (in category 'generate machine code - concretize') ----- concretizeAndCqR "Will get inlined into concretizeAt: switch." <inline: true> self rotateable8bitImmediate: (operands at: 0) ifTrue: [ :rot :immediate | | reg | reg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self ands: reg rn: reg imm: immediate ror: rot). - self machineCodeAt: 0 put: (self ands: reg rn: reg imm: immediate ror: rot<<1). ^machineCodeSize := 4] ifFalse: [ "see if the constant bit-inverted makes a quick value and if so BIC it instead If the value is -ve, we 2s complement it instead" |val| val := operands at: 0. val <0 ifTrue:[val := -1 - val] ifFalse:[val := val bitInvert32]. self rotateable8bitImmediate: val ifTrue: [ :rot :immediate | |reg| reg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self bics: reg rn: reg imm: immediate ror: rot). - self machineCodeAt: 0 put: (self bics: reg rn: reg imm: immediate ror: rot<<1). ^machineCodeSize := 4] ifFalse: [^self concretizeDataOperationCwR: 0]]! Item was changed: ----- Method: CogARMCompiler>>concretizeConditionalJumpLong: (in category 'generate machine code - concretize') ----- concretizeConditionalJumpLong: conditionCode "Will get inlined into concretizeAt: switch." "Sizing/generating jumps. Jump targets can be to absolute addresses or other abstract instructions. Generating initial trampolines instructions may have no maxSize and be to absolute addresses. Otherwise instructions must have a machineCodeSize which must be kept to." <inline: true> | jumpTarget instrOffset| <var: #jumpTarget type: #'AbstractInstruction *'> jumpTarget := self longJumpTargetAddress. instrOffset := self at: 0 moveCw: jumpTarget intoR: RISCTempReg. "bx RISCTempReg" + self machineCodeAt: instrOffset put: (self cond: conditionCode bx: 0 target: RISCTempReg). - self machineCodeAt: instrOffset put: (self bx: RISCTempReg). ^machineCodeSize := instrOffset + 4! Item was changed: ----- Method: CogARMCompiler>>concretizeDataOperationCqR: (in category 'generate machine code - concretize') ----- concretizeDataOperationCqR: opcode "Will get inlined into concretizeAt: switch." "4 == Add, 2 == Sub, Xor == 1, And == 0, Or == 12, Bic == 14" <inline: true> self rotateable8bitImmediate: (operands at: 0) ifTrue: [:rot :immediate | | reg | reg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self type: 1 op: opcode set: 1 rn: reg rd: reg shifterOperand: ((rot>>1)"in this usage we have to halve the rot value" << 8 bitOr: immediate)). - self machineCodeAt: 0 put: (self type: 1 op: opcode set: 1 rn: reg rd: reg shifterOperand: (rot << 8 bitOr: immediate)). ^machineCodeSize := 4] ifFalse: [^self concretizeDataOperationCwR: opcode]. ! Item was changed: ----- Method: CogARMCompiler>>concretizeMoveCqR (in category 'generate machine code - concretize') ----- concretizeMoveCqR "Will get inlined into concretizeAt: switch." "If the quick constant is in fact a shiftable 8bit, generate the apropriate MOV, otherwise do what is necessary for a whole word." <inline: true> self rotateable8bitImmediate: (operands at: 0) ifTrue: [:rot :immediate | | reg | reg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self mov: reg imm: immediate ror: rot). - self machineCodeAt: 0 put: (self type: 1 op: 16rD set: 0 rn: 0 rd: reg shifterOperand: (rot << 8 bitOr: immediate)). ^machineCodeSize := 4] ifFalse: [^self concretizeMoveCwR]. ! Item was changed: ----- Method: CogARMCompiler>>concretizeMoveRR (in category 'generate machine code - concretize') ----- concretizeMoveRR "Will get inlined into concretizeAt: switch." <inline: true> | srcReg destReg | srcReg := self concreteRegister: (operands at: 0). destReg := self concreteRegister: (operands at: 1). "cond 000 1101 0 0000 dest 0000 0000 srcR" + self machineCodeAt: 0 put: (self mov: destReg rn: srcReg). - self machineCodeAt: 0 put: (self type: 0 op: 16rD set: 0 rn: 0 rd: destReg shifterOperand: srcReg). ^machineCodeSize := 4! Item was changed: ----- Method: CogARMCompiler>>concretizeMoveRXbrR (in category 'generate machine code - concretize') ----- concretizeMoveRXbrR "Will get inlined into concretizeAt: switch." "Write the word in R(src) into memory at address (base+1*index)" <inline: true> | index base src | src := self concreteRegister: (operands at: 0). index := self concreteRegister: (operands at: 1). base := self concreteRegister: (operands at: 2). + "str b src, [base, +index, LSL #0]" + "cond 011 1100 0 base srcR 00000 00 0 index" + self machineCodeAt: 0 put: (self strb: src rn: base rm: index). - "str src, [base, +index, LSL #0]" - "cond 011 1100 0 base srcR 00000 00 0 inde" - self machineCodeAt: 0 put: (self type: 3 op: 16rC set: 0 rn: base rd: src shifterOperand: index). ^machineCodeSize := 4! Item was changed: ----- Method: CogARMCompiler>>concretizeMoveRXwrR (in category 'generate machine code - concretize') ----- concretizeMoveRXwrR "Will get inlined into concretizeAt: switch." "Write the word in R(src) into memory at address (base+4*index)" <inline: true> | index base src | src := self concreteRegister: (operands at: 0). + index := self concreteRegister: (operands at: 1). "index is number of *words* = 4* bytes" - index := self concreteRegister: (operands at: 1). base := self concreteRegister: (operands at: 2). "str src, [base, +index, LSL #2]" "cond 011 1100 0 base srcR 00010 00 0 inde" + self machineCodeAt: 0 put: (self str: src rn: base rm: (16r100 bitOr: index)). - self machineCodeAt: 0 put: (self type: 3 op: 16rC set: 0 rn: base rd: src shifterOperand: (16r100 bitOr: index)). ^machineCodeSize := 4! Item was changed: ----- Method: CogARMCompiler>>concretizeMoveXbrRR (in category 'generate machine code - concretize') ----- concretizeMoveXbrRR "Will get inlined into concretizeAt: switch." <inline: true> | index base dest | + index := self concreteRegister: (operands at: 0). "index is number of *bytes*" - index := self concreteRegister: (operands at: 0). base := self concreteRegister: (operands at: 1). dest := self concreteRegister: (operands at: 2). + "LDRB dest, [base, +index, LSL #0]" - "LDR dest, [base, +index, LSL #0]" "cond 011 1100 1 base dest 00000 00 0 inde" + self machineCodeAt: 0 put: (self ldrb: dest rn: base rm: index). - self machineCodeAt: 0 put: (self type: 3 op: 16rC set: 1 rn: base rd: dest shifterOperand: index). ^machineCodeSize := 4! Item was changed: ----- Method: CogARMCompiler>>concretizeMoveXwrRR (in category 'generate machine code - concretize') ----- concretizeMoveXwrRR "Will get inlined into concretizeAt: switch." <inline: true> | index base dest | index := self concreteRegister: (operands at: 0). base := self concreteRegister: (operands at: 1). dest := self concreteRegister: (operands at: 2). "LDR dest, [base, +index, LSL #2]" "cond 011 1100 1 base dest 00010 00 0 inde" + self machineCodeAt: 0 put: (self ldr: dest rn: base rm: (16r100 bitOr: index)). - self machineCodeAt: 0 put: (self type: 3 op: 16rC set: 1 rn: base rd: dest shifterOperand: (16r100 bitOr: index)). ^machineCodeSize := 4! Item was changed: ----- Method: CogARMCompiler>>concretizeSubCqR (in category 'generate machine code - concretize') ----- concretizeSubCqR "Will get inlined into concretizeAt: switch." "Try whether the quick constant is a small negative number. If it is, optimize." <inline: true> self rotateable8bitImmediate: (operands at: 0) ifTrue: [ :rot :immediate | | reg | reg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self subs: reg rn: reg imm: immediate ror: rot). - self machineCodeAt: 0 put: (self subs: reg rn: reg imm: immediate ror: rot<<1). ^machineCodeSize := 4] ifFalse: [ "before building a full load of a big cinstant, see if we can do an add of the constant negated" self rotateable8bitImmediate: (operands at: 0) negated ifTrue: [ :rot :immediate | | reg | reg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self adds: reg rn: reg imm: immediate ror: rot). - self machineCodeAt: 0 put: (self adds: reg rn: reg imm: immediate ror: rot<<1). ^machineCodeSize := 4] ifFalse: [^self concretizeDataOperationCwR: 2]]! Item was changed: ----- Method: CogARMCompiler>>rotateable8bitImmediate:ifTrue:ifFalse: (in category 'testing') ----- rotateable8bitImmediate: constant ifTrue: trueAlternativeBlock ifFalse: falseAlternativeBlock "For data processing operands, there is the immediate shifter_operand variant, where an 8 bit value is ring shifted _right_ by 2*i. This is only suitable for quick constant(Cq), which don't change." (constant bitAnd: 16rFF) = constant ifTrue: [ ^trueAlternativeBlock value: 0 value: constant]. + 2 to: 30 do: [:i | + (constant bitAnd: 16rFF << i) = constant + ifTrue: [ ^trueAlternativeBlock value: 32 - i value: constant >> i ]]. - 1 to: 15 do: [:i | - (constant bitAnd: 16rFF << (i<<1)) = constant - ifTrue: [ ^trueAlternativeBlock value: 16 - i value: constant >> (i << 1)]]. ^falseAlternativeBlock value!

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