Vm-dev November 2014

vm-dev@lists.squeakfoundation.org

36 participants
165 discussions

[commit][3136] CogVM source as per VMMaker.oscog-eem.935
by commits＠squeakvm.org 15 Nov '14

15 Nov '14

Revision: 3136 Author: eliot Date: 2014-11-15 11:54:55 -0800 (Sat, 15 Nov 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.935 Restore the Spur initialization of BaseHeaderSize, which is still needed for correct C generation. Modified Paths: -------------- branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursrc/vm/interp.h branches/Cog/spurstacksrc/vm/interp.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/interp.h =================================================================== --- branches/Cog/nsspursrc/vm/interp.h 2014-11-15 19:20:52 UTC (rev 3135) +++ branches/Cog/nsspursrc/vm/interp.h 2014-11-15 19:54:55 UTC (rev 3136) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.935 uuid: e1096b9f-e01b-4709-b369-18563b884832 */ #define VM_PROXY_MAJOR 1 @@ -7,7 +7,7 @@ #define SQ_VI_BYTES_PER_WORD 4 -#define BaseHeaderSize 4 +#define BaseHeaderSize 8 #define BytesPerOop 4 #define BytesPerWord 4 Modified: branches/Cog/nsspurstacksrc/vm/interp.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.h 2014-11-15 19:20:52 UTC (rev 3135) +++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-11-15 19:54:55 UTC (rev 3136) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.935 uuid: e1096b9f-e01b-4709-b369-18563b884832 */ #define VM_PROXY_MAJOR 1 @@ -7,7 +7,7 @@ #define SQ_VI_BYTES_PER_WORD 4 -#define BaseHeaderSize 4 +#define BaseHeaderSize 8 #define BytesPerOop 4 #define BytesPerWord 4 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Nov 14 12:57:23 PST 2014 + Sat Nov 15 11:55:07 PST 2014 Modified: branches/Cog/spursistasrc/vm/interp.h =================================================================== --- branches/Cog/spursistasrc/vm/interp.h 2014-11-15 19:20:52 UTC (rev 3135) +++ branches/Cog/spursistasrc/vm/interp.h 2014-11-15 19:54:55 UTC (rev 3136) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.935 uuid: e1096b9f-e01b-4709-b369-18563b884832 */ #define VM_PROXY_MAJOR 1 @@ -7,7 +7,7 @@ #define SQ_VI_BYTES_PER_WORD 4 -#define BaseHeaderSize 4 +#define BaseHeaderSize 8 #define BytesPerOop 4 #define BytesPerWord 4 Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2014-11-15 19:20:52 UTC (rev 3135) +++ branches/Cog/spursrc/vm/interp.h 2014-11-15 19:54:55 UTC (rev 3136) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.935 uuid: e1096b9f-e01b-4709-b369-18563b884832 */ #define VM_PROXY_MAJOR 1 @@ -7,7 +7,7 @@ #define SQ_VI_BYTES_PER_WORD 4 -#define BaseHeaderSize 4 +#define BaseHeaderSize 8 #define BytesPerOop 4 #define BytesPerWord 4 Modified: branches/Cog/spurstacksrc/vm/interp.h =================================================================== --- branches/Cog/spurstacksrc/vm/interp.h 2014-11-15 19:20:52 UTC (rev 3135) +++ branches/Cog/spurstacksrc/vm/interp.h 2014-11-15 19:54:55 UTC (rev 3136) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.935 uuid: e1096b9f-e01b-4709-b369-18563b884832 */ #define VM_PROXY_MAJOR 1 @@ -7,7 +7,7 @@ #define SQ_VI_BYTES_PER_WORD 4 -#define BaseHeaderSize 4 +#define BaseHeaderSize 8 #define BytesPerOop 4 #define BytesPerWord 4

1 0

VM Maker: VMMaker.oscog-eem.935.mcz
by commits＠source.squeak.org 15 Nov '14

15 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.935.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.935 Author: eem Time: 15 November 2014, 11:44:43.564 am UUID: e1096b9f-e01b-4709-b369-18563b884832 Ancestors: VMMaker.oscog-eem.934 Restore the Spur initialization of BaseHeaderSize, which is still needed for correct C generation. Provide a 64-bit memory printing routine for debugging precisely this issue ;-) =============== Diff against VMMaker.oscog-eem.934 =============== Item was changed: ----- Method: SpurMemoryManager class>>initializeObjectHeaderConstants (in category 'class initialization') ----- initializeObjectHeaderConstants + BytesPerWord ifNil: [BytesPerWord := 4]. "May get called on fileIn, so supply default" + BaseHeaderSize := 8 "This is still needed for VM generation."! - BytesPerWord ifNil: [BytesPerWord := 4] "May get called on fileIn, so supply default"! Item was added: + ----- Method: SpurMemoryManager>>print64BitMemoryFrom:to: (in category 'debug printing') ----- + print64BitMemoryFrom: start to: end + <doNotGenerate> + | wordSize64 address | + wordSize64 := 8. + address := start bitAnd: (wordSize64 - 1) bitInvert. + [address < end] whileTrue: + [coInterpreter printHex: address; printChar: $:; space; printHex: (self long64At: address); cr. + address := address + wordSize64]!

1 0

[commit][3135] Fix line endings on a couple of scripts.
by commits＠squeakvm.org 15 Nov '14

15 Nov '14

Revision: 3135 Author: eliot Date: 2014-11-15 11:20:52 -0800 (Sat, 15 Nov 2014) Log Message: ----------- Fix line endings on a couple of scripts. Oh the womders of internet file transmission via email. Sigh... Modified Paths: -------------- branches/Cog/scripts/mkARMstackvmarchives branches/Cog/scripts/uploadARMvms Modified: branches/Cog/scripts/mkARMstackvmarchives =================================================================== --- branches/Cog/scripts/mkARMstackvmarchives 2014-11-15 18:33:53 UTC (rev 3134) +++ branches/Cog/scripts/mkARMstackvmarchives 2014-11-15 19:20:52 UTC (rev 3135) @@ -1,50 +1,50 @@ -#!/bin/sh -# Create the ARM Stack VM archives in products. Output a check of version numbers -# etc to products/MASVALOG -IFS=" -" - -case `uname -m` in - armv6* ) armarch="v6";; - armv7* ) armarch="v7";; - * ) echo "Error: this script is for ARM only." - exit 1;; -esac - -cd `dirname $0`/../products -SQB=squeak.stack.v3 -REV= -TAG= -EXES= - -while [ -n "$1" ]; do - case $1 in - -r) shift;REV="$1";; - -t) shift;TAG="$1";; - -?|-h) echo usage: $0 [-r REV -t TAG] - exit 0 - esac - shift -done - -test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \ - | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` -test -n "$TAG" || TAG=`date +%g.%U.`$REV -echo REV=$REV TAG=$TAG - -for archive in stklinuxhtARM stkspurlinuxhtARM; do - rm -rf $archive$armarch-$TAG.tgz - echo $archive '=>' $archive$armarch-$TAG.tgz - COPYFILE_DISABLE=1 tar czf $archive$armarch-$TAG.tgz $archive - EXES="$EXES $archive/lib/squeak/[0-9.-]*/squeak" -done - -for vm in $EXES -do - echo - echo checking $vm version -# strings - $vm | egrep '\$Rev: |Interp.*VMMaker|Cogit.*VMMaker| built on ' | grep -v 'Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__' | sed 's/ uuid:.*//' - strings - $vm | egrep '\$Rev: |Interp.*VMMaker|Cogit.*VMMaker| built on ' | sed 's/ uuid:.*//' - echo checking $vm for asserts - strings - $vm | grep "assert[^0-9]*[0-9][0-9][0-9]" -done 2>&1 | tee MASVALOG +#!/bin/sh +# Create the ARM Stack VM archives in products. Output a check of version numbers +# etc to products/MASVALOG +IFS=" +" + +case `uname -m` in + armv6* ) armarch="v6";; + armv7* ) armarch="v7";; + * ) echo "Error: this script is for ARM only." + exit 1;; +esac + +cd `dirname $0`/../products +SQB=squeak.stack.v3 +REV= +TAG= +EXES= + +while [ -n "$1" ]; do + case $1 in + -r) shift;REV="$1";; + -t) shift;TAG="$1";; + -?|-h) echo usage: $0 [-r REV -t TAG] + exit 0 + esac + shift +done + +test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \ + | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` +test -n "$TAG" || TAG=`date +%g.%U.`$REV +echo REV=$REV TAG=$TAG + +for archive in stklinuxhtARM stkspurlinuxhtARM; do + rm -rf $archive$armarch-$TAG.tgz + echo $archive '=>' $archive$armarch-$TAG.tgz + COPYFILE_DISABLE=1 tar czf $archive$armarch-$TAG.tgz $archive + EXES="$EXES $archive/lib/squeak/[0-9.-]*/squeak" +done + +for vm in $EXES +do + echo + echo checking $vm version +# strings - $vm | egrep '\$Rev: |Interp.*VMMaker|Cogit.*VMMaker| built on ' | grep -v 'Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__' | sed 's/ uuid:.*//' + strings - $vm | egrep '\$Rev: |Interp.*VMMaker|Cogit.*VMMaker| built on ' | sed 's/ uuid:.*//' + echo checking $vm for asserts + strings - $vm | grep "assert[^0-9]*[0-9][0-9][0-9]" +done 2>&1 | tee MASVALOG Modified: branches/Cog/scripts/uploadARMvms =================================================================== --- branches/Cog/scripts/uploadARMvms 2014-11-15 18:33:53 UTC (rev 3134) +++ branches/Cog/scripts/uploadARMvms 2014-11-15 19:20:52 UTC (rev 3135) @@ -1,61 +1,61 @@ -#!/bin/sh -# Upload archives from products to a web/ftp site via ssh. -RemoteUser=eliotmiranda(a)highland-park.dreamhost.com -RemoteRoot=mirandabanda.org/files/Cog/VM -IFS=" -" - -case `uname -m` in - armv6* ) ARMARCH="v6";; - armv7* ) ARMARCH="v7";; - * ) echo "Error: this script is for ARM only." - exit 1;; -esac - -REV= -TAG= -cd `dirname $0`/../products -VERBOSE= - -while [ -n "$1" ]; do - case $1 in - -r) shift;REV="$1";; - -t) shift;TAG="$1";; - -?|-h) echo usage: $0 [-r REV -t TAG]; exit 0;; - *) echo usage: $0 [-r REV -t TAG]; exit 1;; - esac - shift -done - -if [ -z "$REV" ]; then - REV="`svnversion .. | sed 's/^.*://'`" - case $REV in - *M) echo -n "source tree is modified, are you sure you want to continue? " - read a - case $a in - y|Y) ;; - *) exit 1 - esac - REV="`svnversion | sed 's/^.*://' | sed 's/M//'`";; - esac -fi - -if [ -z "$TAG" ]; then - TAG=`date +%g.%U.`$REV -fi -echo REV=$REV TAG=$TAG - -ARCHIVES="stklinuxhtARM$ARMARCH-$TAG.tgz stkspurlinuxhtARM$ARMARCH-$TAG.tgz" - -for a in $ARCHIVES; do - echo upload $a -done - - -ssh -x $RemoteUser mkdir $RemoteRoot/VM.r$REV - -echo scp -p $ARCHIVES "$@" $RemoteUser:$RemoteRoot/VM.r$REV -scp -p $ARCHIVES "$@" $RemoteUser:$RemoteRoot/VM.r$REV -echo ssh $RemoteUser chmod a-w $RemoteRoot/VM.r$REV/* \\\; ls -al $RemoteRoot/VM.r$REV -ssh $RemoteUser chmod a-w $RemoteRoot/VM.r$REV/* \; ls -al $RemoteRoot/VM.r$REV - +#!/bin/sh +# Upload archives from products to a web/ftp site via ssh. +RemoteUser=eliotmiranda(a)highland-park.dreamhost.com +RemoteRoot=mirandabanda.org/files/Cog/VM +IFS=" +" + +case `uname -m` in + armv6* ) ARMARCH="v6";; + armv7* ) ARMARCH="v7";; + * ) echo "Error: this script is for ARM only." + exit 1;; +esac + +REV= +TAG= +cd `dirname $0`/../products +VERBOSE= + +while [ -n "$1" ]; do + case $1 in + -r) shift;REV="$1";; + -t) shift;TAG="$1";; + -?|-h) echo usage: $0 [-r REV -t TAG]; exit 0;; + *) echo usage: $0 [-r REV -t TAG]; exit 1;; + esac + shift +done + +if [ -z "$REV" ]; then + REV="`svnversion .. | sed 's/^.*://'`" + case $REV in + *M) echo -n "source tree is modified, are you sure you want to continue? " + read a + case $a in + y|Y) ;; + *) exit 1 + esac + REV="`svnversion | sed 's/^.*://' | sed 's/M//'`";; + esac +fi + +if [ -z "$TAG" ]; then + TAG=`date +%g.%U.`$REV +fi +echo REV=$REV TAG=$TAG + +ARCHIVES="stklinuxhtARM$ARMARCH-$TAG.tgz stkspurlinuxhtARM$ARMARCH-$TAG.tgz" + +for a in $ARCHIVES; do + echo upload $a +done + + +ssh -x $RemoteUser mkdir $RemoteRoot/VM.r$REV + +echo scp -p $ARCHIVES "$@" $RemoteUser:$RemoteRoot/VM.r$REV +scp -p $ARCHIVES "$@" $RemoteUser:$RemoteRoot/VM.r$REV +echo ssh $RemoteUser chmod a-w $RemoteRoot/VM.r$REV/* \\\; ls -al $RemoteRoot/VM.r$REV +ssh $RemoteUser chmod a-w $RemoteRoot/VM.r$REV/* \; ls -al $RemoteRoot/VM.r$REV +

1 0

[commit][3134] Last minute changes for the ARM builds.
by commits＠squeakvm.org 15 Nov '14

15 Nov '14

Revision: 3134 Author: eliot Date: 2014-11-15 10:33:53 -0800 (Sat, 15 Nov 2014) Log Message: ----------- Last minute changes for the ARM builds. Eliminate BitBltArmOther.o Modified Paths: -------------- branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/plugins/BitBltPlugin/acinclude.m4 Modified: branches/Cog/platforms/unix/config/configure =================================================================== --- branches/Cog/platforms/unix/config/configure 2014-11-14 21:00:25 UTC (rev 3133) +++ branches/Cog/platforms/unix/config/configure 2014-11-15 18:33:53 UTC (rev 3134) @@ -27735,7 +27735,7 @@ if test "${enable_fast_bitblt+set}" = set; then enableval="$enable_fast_bitblt" if test "x$enableval" = "xyes" ; then - bitblt_objs="BitBltPlugin.o BitBltArm.o BitBltArmLinux.o BitBltArmOther.o BitBltArmSimd.o BitBltDispatch.o BitBltGeneric.o BitBltArmSimdAlphaBlend.o BitBltArmSimdBitLogical.o BitBltArmSimdPixPaint.o BitBltArmSimdSourceWord.o" + bitblt_objs="BitBltPlugin.o BitBltArm.o BitBltArmLinux.o BitBltArmSimd.o BitBltDispatch.o BitBltGeneric.o BitBltArmSimdAlphaBlend.o BitBltArmSimdBitLogical.o BitBltArmSimdPixPaint.o BitBltArmSimdSourceWord.o" bitblt_flags="-DENABLE_FAST_BLT" fi Modified: branches/Cog/platforms/unix/plugins/BitBltPlugin/acinclude.m4 =================================================================== --- branches/Cog/platforms/unix/plugins/BitBltPlugin/acinclude.m4 2014-11-14 21:00:25 UTC (rev 3133) +++ branches/Cog/platforms/unix/plugins/BitBltPlugin/acinclude.m4 2014-11-15 18:33:53 UTC (rev 3134) @@ -11,7 +11,7 @@ AC_ARG_ENABLE(fast-bitblt, [ --enable-fast-bitblt enable fast BitBlt optimizations (default=no)], [ if test "x$enableval" = "xyes" ; then - bitblt_objs="BitBltPlugin.o BitBltArm.o BitBltArmLinux.o BitBltArmOther.o BitBltArmSimd.o BitBltDispatch.o BitBltGeneric.o BitBltArmSimdAlphaBlend.o BitBltArmSimdBitLogical.o BitBltArmSimdPixPaint.o BitBltArmSimdSourceWord.o" + bitblt_objs="BitBltPlugin.o BitBltArm.o BitBltArmLinux.o BitBltArmSimd.o BitBltDispatch.o BitBltGeneric.o BitBltArmSimdAlphaBlend.o BitBltArmSimdBitLogical.o BitBltArmSimdPixPaint.o BitBltArmSimdSourceWord.o" bitblt_flags="-DENABLE_FAST_BLT" fi ],

1 0

Avoiding saving the Display bitmap in snapshots [Was Re: [squeak-dev] Too much MC stuff left in image]
by Eliot Miranda 15 Nov '14

15 Nov '14

On Fri, Nov 14, 2014 at 10:58 AM, tim Rowledge <tim(a)rowledge.org> wrote: > > On 14-11-2014, at 10:44 AM, tim Rowledge <tim(a)rowledge.org> wrote: > > > > I wonder where 10Mb of Bitmaps is being used… > > Well, duh, a 1700@1300 Display will do that, mostly. When did screens get > so frakkin huge? Why, when I was a lad we had 640@400 monochrome and > liked it! > It would be cool if Spur could some how handle not saving the display bitmap to the snapshot, given that it'll be repainted anyway. But I want to avoid that old Smalltalk-80 behaviour of the screen visibly shrinking when the tracer is run. Let me throw this out as whitewash. Spur has a segmented memory and can and does avoid writing empty segments (segments that only contain free space) and trailing free space in segments. So if the Display bitmap were in a segment on its won (likely if it is reallocated on every snapshot launch) then with a little bit of finagling it might be simple to avoid writing it to the snapshot. There are obviously tricky details here such as what object it actually writes to the snapshot file. Anyway, something to think about when producing deployment images for the cloud. > tim > -- > tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim > There are two ways to write error-free programs; only the third one works. -- best, Eliot

2 1

[commit][3133] CogVM source as per VMMaker.oscog-eem.934
by commits＠squeakvm.org 14 Nov '14

14 Nov '14

Revision: 3133 Author: eliot Date: 2014-11-14 13:00:25 -0800 (Fri, 14 Nov 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.934 Simulator/Slang: Refactor to allow 32-bit and 64-bit Spur to coexist in the simulator, thereby allowing a 64-bit bootstrap. Replace direct use of BytesPerWord, ShiftForWord, BytesPerOop and BaseHeaderSize with sends of wordSize, shiftForWord, bytesPerOop & baseHeaderSize respectively. Make sure these are still output as the manifest constants in the generated C. Eliminate use of bytesPerSlot in favour of bytesPerOop. The use of sends is similar to those in trunk VMMaker, but I don't have time to merge. Sorry :-(. Work-around use of sends for bytesPerOop in e.g. generateToByDo:on:indent: and users of isConstantNode:valueInto:. Do a better job at inlining via inlineCodeOrNilForStatement:in:. Comment in isNode:substitutableFor:inMethod:in: explains. Eliminate generic VM_LABEL support, labelling only the bytecodes in interpret. Eliminate use of LargeContextSize in the stack and cog VMs. Alas haven't yet eliminated the frame offset constants such as FoxCallerSavedIP et al. We only need one of the two word sizes of interpreter to be executable in the bootstrap. And remember to generate the GdbARMPlugin Modified Paths: -------------- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.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/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/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/scripts/revertUnchangedPlugins branches/Cog/scripts/svnci branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.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/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/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/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.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-11-14 03:43:01 UTC (rev 3132) +++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2014-11-14 21:00:25 UTC (rev 3133) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d + VMPluginCodeGenerator VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 from - BalloonEnginePlugin VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d + BalloonEnginePlugin VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 " __DATE__ ; @@ -839,9 +839,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.804 (i)" + "B2DPlugin VMMaker.oscog-eem.933 (i)" #else - "B2DPlugin VMMaker.oscog-eem.804 (e)" + "B2DPlugin VMMaker.oscog-eem.933 (e)" #endif ; static int* objBuffer; @@ -5764,12 +5764,20 @@ sqInt x2; sqInt x3; sqInt x4; + double xValue; + double xValue1; + double xValue2; + double xValue3; sqInt y; sqInt y0; sqInt y1; sqInt y2; sqInt y3; sqInt y4; + double yValue; + double yValue1; + double yValue2; + double yValue3; loadPointfrom(point1Get(), fetchPointerofObject(0, points)); if (failed()) { @@ -5799,10 +5807,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue = ((double) ((((int *) point))[0]) ); + yValue = ((double) ((((int *) point))[1]) ); /* begin edgeTransform */ transform = ((float *) (workBuffer + GWEdgeTransform)); - x = ((sqInt)(((((transform[0]) * (((double) ((((int *) point))[0]) ))) + ((transform[1]) * (((double) ((((int *) point))[1]) )))) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); - y = ((sqInt)(((((transform[3]) * (((double) ((((int *) point))[0]) ))) + ((transform[4]) * (((double) ((((int *) point))[1]) )))) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); + x = ((sqInt)(((((transform[0]) * xValue) + ((transform[1]) * yValue)) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); + y = ((sqInt)(((((transform[3]) * xValue) + ((transform[4]) * yValue)) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point))[0] = x; (((int *) point))[1] = y; } @@ -5824,10 +5834,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue1 = ((double) ((((int *) point1))[0]) ); + yValue1 = ((double) ((((int *) point1))[1]) ); /* begin edgeTransform */ transform1 = ((float *) (workBuffer + GWEdgeTransform)); - x2 = ((sqInt)(((((transform1[0]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[1]) * (((double) ((((int *) point1))[1]) )))) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); - y2 = ((sqInt)(((((transform1[3]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[4]) * (((double) ((((int *) point1))[1]) )))) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); + x2 = ((sqInt)(((((transform1[0]) * xValue1) + ((transform1[1]) * yValue1)) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); + y2 = ((sqInt)(((((transform1[3]) * xValue1) + ((transform1[4]) * yValue1)) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point1))[0] = x2; (((int *) point1))[1] = y2; } @@ -5849,10 +5861,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue2 = ((double) ((((int *) point2))[0]) ); + yValue2 = ((double) ((((int *) point2))[1]) ); /* begin edgeTransform */ transform2 = ((float *) (workBuffer + GWEdgeTransform)); - x3 = ((sqInt)(((((transform2[0]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[1]) * (((double) ((((int *) point2))[1]) )))) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); - y3 = ((sqInt)(((((transform2[3]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[4]) * (((double) ((((int *) point2))[1]) )))) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); + x3 = ((sqInt)(((((transform2[0]) * xValue2) + ((transform2[1]) * yValue2)) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); + y3 = ((sqInt)(((((transform2[3]) * xValue2) + ((transform2[4]) * yValue2)) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point2))[0] = x3; (((int *) point2))[1] = y3; } @@ -5874,10 +5888,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue3 = ((double) ((((int *) point3))[0]) ); + yValue3 = ((double) ((((int *) point3))[1]) ); /* begin edgeTransform */ transform3 = ((float *) (workBuffer + GWEdgeTransform)); - x4 = ((sqInt)(((((transform3[0]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[1]) * (((double) ((((int *) point3))[1]) )))) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); - y4 = ((sqInt)(((((transform3[3]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[4]) * (((double) ((((int *) point3))[1]) )))) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); + x4 = ((sqInt)(((((transform3[0]) * xValue3) + ((transform3[1]) * yValue3)) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); + y4 = ((sqInt)(((((transform3[3]) * xValue3) + ((transform3[4]) * yValue3)) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point3))[0] = x4; (((int *) point3))[1] = y4; } @@ -5919,6 +5935,10 @@ sqInt x3; sqInt x4; sqInt x5; + double xValue; + double xValue1; + double xValue2; + double xValue3; sqInt y; sqInt y0; sqInt y1; @@ -5926,6 +5946,10 @@ sqInt y3; sqInt y4; sqInt y5; + double yValue; + double yValue1; + double yValue2; + double yValue3; for (i = 0; i < nSegments; i += 1) { pointOop = fetchPointerofObject(i * 3, points); @@ -5948,10 +5972,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue = ((double) ((((int *) point))[0]) ); + yValue = ((double) ((((int *) point))[1]) ); /* begin edgeTransform */ transform = ((float *) (workBuffer + GWEdgeTransform)); - x = ((sqInt)(((((transform[0]) * (((double) ((((int *) point))[0]) ))) + ((transform[1]) * (((double) ((((int *) point))[1]) )))) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); - y = ((sqInt)(((((transform[3]) * (((double) ((((int *) point))[0]) ))) + ((transform[4]) * (((double) ((((int *) point))[1]) )))) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); + x = ((sqInt)(((((transform[0]) * xValue) + ((transform[1]) * yValue)) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); + y = ((sqInt)(((((transform[3]) * xValue) + ((transform[4]) * yValue)) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point))[0] = x; (((int *) point))[1] = y; } @@ -5973,10 +5999,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue1 = ((double) ((((int *) point1))[0]) ); + yValue1 = ((double) ((((int *) point1))[1]) ); /* begin edgeTransform */ transform1 = ((float *) (workBuffer + GWEdgeTransform)); - x3 = ((sqInt)(((((transform1[0]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[1]) * (((double) ((((int *) point1))[1]) )))) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); - y3 = ((sqInt)(((((transform1[3]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[4]) * (((double) ((((int *) point1))[1]) )))) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); + x3 = ((sqInt)(((((transform1[0]) * xValue1) + ((transform1[1]) * yValue1)) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); + y3 = ((sqInt)(((((transform1[3]) * xValue1) + ((transform1[4]) * yValue1)) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point1))[0] = x3; (((int *) point1))[1] = y3; } @@ -5998,10 +6026,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue2 = ((double) ((((int *) point2))[0]) ); + yValue2 = ((double) ((((int *) point2))[1]) ); /* begin edgeTransform */ transform2 = ((float *) (workBuffer + GWEdgeTransform)); - x4 = ((sqInt)(((((transform2[0]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[1]) * (((double) ((((int *) point2))[1]) )))) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); - y4 = ((sqInt)(((((transform2[3]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[4]) * (((double) ((((int *) point2))[1]) )))) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); + x4 = ((sqInt)(((((transform2[0]) * xValue2) + ((transform2[1]) * yValue2)) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); + y4 = ((sqInt)(((((transform2[3]) * xValue2) + ((transform2[4]) * yValue2)) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point2))[0] = x4; (((int *) point2))[1] = y4; } @@ -6023,10 +6053,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue3 = ((double) ((((int *) point3))[0]) ); + yValue3 = ((double) ((((int *) point3))[1]) ); /* begin edgeTransform */ transform3 = ((float *) (workBuffer + GWEdgeTransform)); - x5 = ((sqInt)(((((transform3[0]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[1]) * (((double) ((((int *) point3))[1]) )))) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); - y5 = ((sqInt)(((((transform3[3]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[4]) * (((double) ((((int *) point3))[1]) )))) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); + x5 = ((sqInt)(((((transform3[0]) * xValue3) + ((transform3[1]) * yValue3)) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); + y5 = ((sqInt)(((((transform3[3]) * xValue3) + ((transform3[4]) * yValue3)) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point3))[0] = x5; (((int *) point3))[1] = y5; } @@ -6327,6 +6359,14 @@ sqInt x7; sqInt x8; sqInt x9; + double xValue; + double xValue1; + double xValue2; + double xValue3; + double xValue4; + double xValue5; + double xValue6; + double xValue7; sqInt y; short y0; short y1; @@ -6338,6 +6378,14 @@ sqInt y7; sqInt y8; sqInt y9; + double yValue; + double yValue1; + double yValue2; + double yValue3; + double yValue4; + double yValue5; + double yValue6; + double yValue7; /* Check if have anything to do at all */ @@ -6402,10 +6450,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue = ((double) ((((int *) point))[0]) ); + yValue = ((double) ((((int *) point))[1]) ); /* begin edgeTransform */ transform = ((float *) (workBuffer + GWEdgeTransform)); - x = ((sqInt)(((((transform[0]) * (((double) ((((int *) point))[0]) ))) + ((transform[1]) * (((double) ((((int *) point))[1]) )))) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); - y = ((sqInt)(((((transform[3]) * (((double) ((((int *) point))[0]) ))) + ((transform[4]) * (((double) ((((int *) point))[1]) )))) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); + x = ((sqInt)(((((transform[0]) * xValue) + ((transform[1]) * yValue)) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); + y = ((sqInt)(((((transform[3]) * xValue) + ((transform[4]) * yValue)) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point))[0] = x; (((int *) point))[1] = y; } @@ -6427,10 +6477,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue1 = ((double) ((((int *) point1))[0]) ); + yValue1 = ((double) ((((int *) point1))[1]) ); /* begin edgeTransform */ transform1 = ((float *) (workBuffer + GWEdgeTransform)); - x3 = ((sqInt)(((((transform1[0]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[1]) * (((double) ((((int *) point1))[1]) )))) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); - y3 = ((sqInt)(((((transform1[3]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[4]) * (((double) ((((int *) point1))[1]) )))) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); + x3 = ((sqInt)(((((transform1[0]) * xValue1) + ((transform1[1]) * yValue1)) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); + y3 = ((sqInt)(((((transform1[3]) * xValue1) + ((transform1[4]) * yValue1)) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point1))[0] = x3; (((int *) point1))[1] = y3; } @@ -6452,10 +6504,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue2 = ((double) ((((int *) point2))[0]) ); + yValue2 = ((double) ((((int *) point2))[1]) ); /* begin edgeTransform */ transform2 = ((float *) (workBuffer + GWEdgeTransform)); - x4 = ((sqInt)(((((transform2[0]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[1]) * (((double) ((((int *) point2))[1]) )))) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); - y4 = ((sqInt)(((((transform2[3]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[4]) * (((double) ((((int *) point2))[1]) )))) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); + x4 = ((sqInt)(((((transform2[0]) * xValue2) + ((transform2[1]) * yValue2)) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); + y4 = ((sqInt)(((((transform2[3]) * xValue2) + ((transform2[4]) * yValue2)) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point2))[0] = x4; (((int *) point2))[1] = y4; } @@ -6477,10 +6531,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue3 = ((double) ((((int *) point3))[0]) ); + yValue3 = ((double) ((((int *) point3))[1]) ); /* begin edgeTransform */ transform3 = ((float *) (workBuffer + GWEdgeTransform)); - x5 = ((sqInt)(((((transform3[0]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[1]) * (((double) ((((int *) point3))[1]) )))) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); - y5 = ((sqInt)(((((transform3[3]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[4]) * (((double) ((((int *) point3))[1]) )))) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); + x5 = ((sqInt)(((((transform3[0]) * xValue3) + ((transform3[1]) * yValue3)) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); + y5 = ((sqInt)(((((transform3[3]) * xValue3) + ((transform3[4]) * yValue3)) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point3))[0] = x5; (((int *) point3))[1] = y5; } @@ -6511,10 +6567,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue4 = ((double) ((((int *) point4))[0]) ); + yValue4 = ((double) ((((int *) point4))[1]) ); /* begin edgeTransform */ transform4 = ((float *) (workBuffer + GWEdgeTransform)); - x6 = ((sqInt)(((((transform4[0]) * (((double) ((((int *) point4))[0]) ))) + ((transform4[1]) * (((double) ((((int *) point4))[1]) )))) + (transform4[2])) * (((double) (workBuffer[GWAALevel]) )))); - y6 = ((sqInt)(((((transform4[3]) * (((double) ((((int *) point4))[0]) ))) + ((transform4[4]) * (((double) ((((int *) point4))[1]) )))) + (transform4[5])) * (((double) (workBuffer[GWAALevel]) )))); + x6 = ((sqInt)(((((transform4[0]) * xValue4) + ((transform4[1]) * yValue4)) + (transform4[2])) * (((double) (workBuffer[GWAALevel]) )))); + y6 = ((sqInt)(((((transform4[3]) * xValue4) + ((transform4[4]) * yValue4)) + (transform4[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point4))[0] = x6; (((int *) point4))[1] = y6; } @@ -6536,10 +6594,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue5 = ((double) ((((int *) point5))[0]) ); + yValue5 = ((double) ((((int *) point5))[1]) ); /* begin edgeTransform */ transform5 = ((float *) (workBuffer + GWEdgeTransform)); - x7 = ((sqInt)(((((transform5[0]) * (((double) ((((int *) point5))[0]) ))) + ((transform5[1]) * (((double) ((((int *) point5))[1]) )))) + (transform5[2])) * (((double) (workBuffer[GWAALevel]) )))); - y7 = ((sqInt)(((((transform5[3]) * (((double) ((((int *) point5))[0]) ))) + ((transform5[4]) * (((double) ((((int *) point5))[1]) )))) + (transform5[5])) * (((double) (workBuffer[GWAALevel]) )))); + x7 = ((sqInt)(((((transform5[0]) * xValue5) + ((transform5[1]) * yValue5)) + (transform5[2])) * (((double) (workBuffer[GWAALevel]) )))); + y7 = ((sqInt)(((((transform5[3]) * xValue5) + ((transform5[4]) * yValue5)) + (transform5[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point5))[0] = x7; (((int *) point5))[1] = y7; } @@ -6561,10 +6621,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue6 = ((double) ((((int *) point6))[0]) ); + yValue6 = ((double) ((((int *) point6))[1]) ); /* begin edgeTransform */ transform6 = ((float *) (workBuffer + GWEdgeTransform)); - x8 = ((sqInt)(((((transform6[0]) * (((double) ((((int *) point6))[0]) ))) + ((transform6[1]) * (((double) ((((int *) point6))[1]) )))) + (transform6[2])) * (((double) (workBuffer[GWAALevel]) )))); - y8 = ((sqInt)(((((transform6[3]) * (((double) ((((int *) point6))[0]) ))) + ((transform6[4]) * (((double) ((((int *) point6))[1]) )))) + (transform6[5])) * (((double) (workBuffer[GWAALevel]) )))); + x8 = ((sqInt)(((((transform6[0]) * xValue6) + ((transform6[1]) * yValue6)) + (transform6[2])) * (((double) (workBuffer[GWAALevel]) )))); + y8 = ((sqInt)(((((transform6[3]) * xValue6) + ((transform6[4]) * yValue6)) + (transform6[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point6))[0] = x8; (((int *) point6))[1] = y8; } @@ -6586,10 +6648,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue7 = ((double) ((((int *) point7))[0]) ); + yValue7 = ((double) ((((int *) point7))[1]) ); /* begin edgeTransform */ transform7 = ((float *) (workBuffer + GWEdgeTransform)); - x9 = ((sqInt)(((((transform7[0]) * (((double) ((((int *) point7))[0]) ))) + ((transform7[1]) * (((double) ((((int *) point7))[1]) )))) + (transform7[2])) * (((double) (workBuffer[GWAALevel]) )))); - y9 = ((sqInt)(((((transform7[3]) * (((double) ((((int *) point7))[0]) ))) + ((transform7[4]) * (((double) ((((int *) point7))[1]) )))) + (transform7[5])) * (((double) (workBuffer[GWAALevel]) )))); + x9 = ((sqInt)(((((transform7[0]) * xValue7) + ((transform7[1]) * yValue7)) + (transform7[2])) * (((double) (workBuffer[GWAALevel]) )))); + y9 = ((sqInt)(((((transform7[3]) * xValue7) + ((transform7[4]) * yValue7)) + (transform7[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point7))[0] = x9; (((int *) point7))[1] = y9; } @@ -6659,6 +6723,14 @@ sqInt x7; sqInt x8; sqInt x9; + double xValue; + double xValue1; + double xValue2; + double xValue3; + double xValue4; + double xValue5; + double xValue6; + double xValue7; sqInt y; short y0; short y1; @@ -6670,6 +6742,14 @@ sqInt y7; sqInt y8; sqInt y9; + double yValue; + double yValue1; + double yValue2; + double yValue3; + double yValue4; + double yValue5; + double yValue6; + double yValue7; if (nSegments == 0) { return 0; @@ -6781,10 +6861,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue = ((double) ((((int *) point))[0]) ); + yValue = ((double) ((((int *) point))[1]) ); /* begin edgeTransform */ transform = ((float *) (workBuffer + GWEdgeTransform)); - x = ((sqInt)(((((transform[0]) * (((double) ((((int *) point))[0]) ))) + ((transform[1]) * (((double) ((((int *) point))[1]) )))) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); - y = ((sqInt)(((((transform[3]) * (((double) ((((int *) point))[0]) ))) + ((transform[4]) * (((double) ((((int *) point))[1]) )))) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); + x = ((sqInt)(((((transform[0]) * xValue) + ((transform[1]) * yValue)) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); + y = ((sqInt)(((((transform[3]) * xValue) + ((transform[4]) * yValue)) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point))[0] = x; (((int *) point))[1] = y; } @@ -6806,10 +6888,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue1 = ((double) ((((int *) point1))[0]) ); + yValue1 = ((double) ((((int *) point1))[1]) ); /* begin edgeTransform */ transform1 = ((float *) (workBuffer + GWEdgeTransform)); - x3 = ((sqInt)(((((transform1[0]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[1]) * (((double) ((((int *) point1))[1]) )))) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); - y3 = ((sqInt)(((((transform1[3]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[4]) * (((double) ((((int *) point1))[1]) )))) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); + x3 = ((sqInt)(((((transform1[0]) * xValue1) + ((transform1[1]) * yValue1)) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); + y3 = ((sqInt)(((((transform1[3]) * xValue1) + ((transform1[4]) * yValue1)) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point1))[0] = x3; (((int *) point1))[1] = y3; } @@ -6831,10 +6915,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue2 = ((double) ((((int *) point2))[0]) ); + yValue2 = ((double) ((((int *) point2))[1]) ); /* begin edgeTransform */ transform2 = ((float *) (workBuffer + GWEdgeTransform)); - x4 = ((sqInt)(((((transform2[0]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[1]) * (((double) ((((int *) point2))[1]) )))) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); - y4 = ((sqInt)(((((transform2[3]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[4]) * (((double) ((((int *) point2))[1]) )))) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); + x4 = ((sqInt)(((((transform2[0]) * xValue2) + ((transform2[1]) * yValue2)) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); + y4 = ((sqInt)(((((transform2[3]) * xValue2) + ((transform2[4]) * yValue2)) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point2))[0] = x4; (((int *) point2))[1] = y4; } @@ -6856,10 +6942,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue3 = ((double) ((((int *) point3))[0]) ); + yValue3 = ((double) ((((int *) point3))[1]) ); /* begin edgeTransform */ transform3 = ((float *) (workBuffer + GWEdgeTransform)); - x5 = ((sqInt)(((((transform3[0]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[1]) * (((double) ((((int *) point3))[1]) )))) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); - y5 = ((sqInt)(((((transform3[3]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[4]) * (((double) ((((int *) point3))[1]) )))) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); + x5 = ((sqInt)(((((transform3[0]) * xValue3) + ((transform3[1]) * yValue3)) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); + y5 = ((sqInt)(((((transform3[3]) * xValue3) + ((transform3[4]) * yValue3)) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point3))[0] = x5; (((int *) point3))[1] = y5; } @@ -6891,10 +6979,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue4 = ((double) ((((int *) point4))[0]) ); + yValue4 = ((double) ((((int *) point4))[1]) ); /* begin edgeTransform */ transform4 = ((float *) (workBuffer + GWEdgeTransform)); - x6 = ((sqInt)(((((transform4[0]) * (((double) ((((int *) point4))[0]) ))) + ((transform4[1]) * (((double) ((((int *) point4))[1]) )))) + (transform4[2])) * (((double) (workBuffer[GWAALevel]) )))); - y6 = ((sqInt)(((((transform4[3]) * (((double) ((((int *) point4))[0]) ))) + ((transform4[4]) * (((double) ((((int *) point4))[1]) )))) + (transform4[5])) * (((double) (workBuffer[GWAALevel]) )))); + x6 = ((sqInt)(((((transform4[0]) * xValue4) + ((transform4[1]) * yValue4)) + (transform4[2])) * (((double) (workBuffer[GWAALevel]) )))); + y6 = ((sqInt)(((((transform4[3]) * xValue4) + ((transform4[4]) * yValue4)) + (transform4[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point4))[0] = x6; (((int *) point4))[1] = y6; } @@ -6916,10 +7006,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue5 = ((double) ((((int *) point5))[0]) ); + yValue5 = ((double) ((((int *) point5))[1]) ); /* begin edgeTransform */ transform5 = ((float *) (workBuffer + GWEdgeTransform)); - x7 = ((sqInt)(((((transform5[0]) * (((double) ((((int *) point5))[0]) ))) + ((transform5[1]) * (((double) ((((int *) point5))[1]) )))) + (transform5[2])) * (((double) (workBuffer[GWAALevel]) )))); - y7 = ((sqInt)(((((transform5[3]) * (((double) ((((int *) point5))[0]) ))) + ((transform5[4]) * (((double) ((((int *) point5))[1]) )))) + (transform5[5])) * (((double) (workBuffer[GWAALevel]) )))); + x7 = ((sqInt)(((((transform5[0]) * xValue5) + ((transform5[1]) * yValue5)) + (transform5[2])) * (((double) (workBuffer[GWAALevel]) )))); + y7 = ((sqInt)(((((transform5[3]) * xValue5) + ((transform5[4]) * yValue5)) + (transform5[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point5))[0] = x7; (((int *) point5))[1] = y7; } @@ -6941,10 +7033,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue6 = ((double) ((((int *) point6))[0]) ); + yValue6 = ((double) ((((int *) point6))[1]) ); /* begin edgeTransform */ transform6 = ((float *) (workBuffer + GWEdgeTransform)); - x8 = ((sqInt)(((((transform6[0]) * (((double) ((((int *) point6))[0]) ))) + ((transform6[1]) * (((double) ((((int *) point6))[1]) )))) + (transform6[2])) * (((double) (workBuffer[GWAALevel]) )))); - y8 = ((sqInt)(((((transform6[3]) * (((double) ((((int *) point6))[0]) ))) + ((transform6[4]) * (((double) ((((int *) point6))[1]) )))) + (transform6[5])) * (((double) (workBuffer[GWAALevel]) )))); + x8 = ((sqInt)(((((transform6[0]) * xValue6) + ((transform6[1]) * yValue6)) + (transform6[2])) * (((double) (workBuffer[GWAALevel]) )))); + y8 = ((sqInt)(((((transform6[3]) * xValue6) + ((transform6[4]) * yValue6)) + (transform6[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point6))[0] = x8; (((int *) point6))[1] = y8; } @@ -6966,10 +7060,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue7 = ((double) ((((int *) point7))[0]) ); + yValue7 = ((double) ((((int *) point7))[1]) ); /* begin edgeTransform */ transform7 = ((float *) (workBuffer + GWEdgeTransform)); - x9 = ((sqInt)(((((transform7[0]) * (((double) ((((int *) point7))[0]) ))) + ((transform7[1]) * (((double) ((((int *) point7))[1]) )))) + (transform7[2])) * (((double) (workBuffer[GWAALevel]) )))); - y9 = ((sqInt)(((((transform7[3]) * (((double) ((((int *) point7))[0]) ))) + ((transform7[4]) * (((double) ((((int *) point7))[1]) )))) + (transform7[5])) * (((double) (workBuffer[GWAALevel]) )))); + x9 = ((sqInt)(((((transform7[0]) * xValue7) + ((transform7[1]) * yValue7)) + (transform7[2])) * (((double) (workBuffer[GWAALevel]) )))); + y9 = ((sqInt)(((((transform7[3]) * xValue7) + ((transform7[4]) * yValue7)) + (transform7[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point7))[0] = x9; (((int *) point7))[1] = y9; } @@ -7071,9 +7167,15 @@ sqInt x; sqInt x1; sqInt x2; + double xValue; + double xValue1; + double xValue2; sqInt y; sqInt y1; sqInt y2; + double yValue; + double yValue1; + double yValue2; point2[0] = ((point2[0]) + (point1[0])); point2[1] = ((point2[1]) + (point1[1])); @@ -7086,10 +7188,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue = ((double) ((((int *) point1))[0]) ); + yValue = ((double) ((((int *) point1))[1]) ); /* begin edgeTransform */ transform = ((float *) (workBuffer + GWEdgeTransform)); - x = ((sqInt)(((((transform[0]) * (((double) ((((int *) point1))[0]) ))) + ((transform[1]) * (((double) ((((int *) point1))[1]) )))) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); - y = ((sqInt)(((((transform[3]) * (((double) ((((int *) point1))[0]) ))) + ((transform[4]) * (((double) ((((int *) point1))[1]) )))) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); + x = ((sqInt)(((((transform[0]) * xValue) + ((transform[1]) * yValue)) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); + y = ((sqInt)(((((transform[3]) * xValue) + ((transform[4]) * yValue)) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point1))[0] = x; (((int *) point1))[1] = y; } @@ -7107,10 +7211,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue1 = ((double) ((((int *) point2))[0]) ); + yValue1 = ((double) ((((int *) point2))[1]) ); /* begin edgeTransform */ transform1 = ((float *) (workBuffer + GWEdgeTransform)); - x1 = ((sqInt)(((((transform1[0]) * (((double) ((((int *) point2))[0]) ))) + ((transform1[1]) * (((double) ((((int *) point2))[1]) )))) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); - y1 = ((sqInt)(((((transform1[3]) * (((double) ((((int *) point2))[0]) ))) + ((transform1[4]) * (((double) ((((int *) point2))[1]) )))) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); + x1 = ((sqInt)(((((transform1[0]) * xValue1) + ((transform1[1]) * yValue1)) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); + y1 = ((sqInt)(((((transform1[3]) * xValue1) + ((transform1[4]) * yValue1)) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point2))[0] = x1; (((int *) point2))[1] = y1; } @@ -7128,10 +7234,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue2 = ((double) ((((int *) point3))[0]) ); + yValue2 = ((double) ((((int *) point3))[1]) ); /* begin edgeTransform */ transform2 = ((float *) (workBuffer + GWEdgeTransform)); - x2 = ((sqInt)(((((transform2[0]) * (((double) ((((int *) point3))[0]) ))) + ((transform2[1]) * (((double) ((((int *) point3))[1]) )))) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); - y2 = ((sqInt)(((((transform2[3]) * (((double) ((((int *) point3))[0]) ))) + ((transform2[4]) * (((double) ((((int *) point3))[1]) )))) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); + x2 = ((sqInt)(((((transform2[0]) * xValue2) + ((transform2[1]) * yValue2)) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); + y2 = ((sqInt)(((((transform2[3]) * xValue2) + ((transform2[4]) * yValue2)) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point3))[0] = x2; (((int *) point3))[1] = y2; } @@ -7372,10 +7480,18 @@ sqInt x1; sqInt x2; sqInt x3; + double xValue; + double xValue1; + double xValue2; + double xValue3; sqInt y; sqInt y1; sqInt y2; sqInt y3; + double yValue; + double yValue1; + double yValue2; + double yValue3; w = (((point2Get())[0]) - ((point1Get())[0])) / 2; h = (((point2Get())[1]) - ((point1Get())[1])) / 2; @@ -7394,10 +7510,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue = ((double) ((((int *) point))[0]) ); + yValue = ((double) ((((int *) point))[1]) ); /* begin edgeTransform */ transform = ((float *) (workBuffer + GWEdgeTransform)); - x = ((sqInt)(((((transform[0]) * (((double) ((((int *) point))[0]) ))) + ((transform[1]) * (((double) ((((int *) point))[1]) )))) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); - y = ((sqInt)(((((transform[3]) * (((double) ((((int *) point))[0]) ))) + ((transform[4]) * (((double) ((((int *) point))[1]) )))) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); + x = ((sqInt)(((((transform[0]) * xValue) + ((transform[1]) * yValue)) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); + y = ((sqInt)(((((transform[3]) * xValue) + ((transform[4]) * yValue)) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point))[0] = x; (((int *) point))[1] = y; } @@ -7419,10 +7537,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue1 = ((double) ((((int *) point1))[0]) ); + yValue1 = ((double) ((((int *) point1))[1]) ); /* begin edgeTransform */ transform1 = ((float *) (workBuffer + GWEdgeTransform)); - x1 = ((sqInt)(((((transform1[0]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[1]) * (((double) ((((int *) point1))[1]) )))) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); - y1 = ((sqInt)(((((transform1[3]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[4]) * (((double) ((((int *) point1))[1]) )))) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); + x1 = ((sqInt)(((((transform1[0]) * xValue1) + ((transform1[1]) * yValue1)) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); + y1 = ((sqInt)(((((transform1[3]) * xValue1) + ((transform1[4]) * yValue1)) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point1))[0] = x1; (((int *) point1))[1] = y1; } @@ -7444,10 +7564,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue2 = ((double) ((((int *) point2))[0]) ); + yValue2 = ((double) ((((int *) point2))[1]) ); /* begin edgeTransform */ transform2 = ((float *) (workBuffer + GWEdgeTransform)); - x2 = ((sqInt)(((((transform2[0]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[1]) * (((double) ((((int *) point2))[1]) )))) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); - y2 = ((sqInt)(((((transform2[3]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[4]) * (((double) ((((int *) point2))[1]) )))) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); + x2 = ((sqInt)(((((transform2[0]) * xValue2) + ((transform2[1]) * yValue2)) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); + y2 = ((sqInt)(((((transform2[3]) * xValue2) + ((transform2[4]) * yValue2)) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point2))[0] = x2; (((int *) point2))[1] = y2; } @@ -7469,10 +7591,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue3 = ((double) ((((int *) point3))[0]) ); + yValue3 = ((double) ((((int *) point3))[1]) ); /* begin edgeTransform */ transform3 = ((float *) (workBuffer + GWEdgeTransform)); - x3 = ((sqInt)(((((transform3[0]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[1]) * (((double) ((((int *) point3))[1]) )))) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); - y3 = ((sqInt)(((((transform3[3]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[4]) * (((double) ((((int *) point3))[1]) )))) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); + x3 = ((sqInt)(((((transform3[0]) * xValue3) + ((transform3[1]) * yValue3)) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); + y3 = ((sqInt)(((((transform3[3]) * xValue3) + ((transform3[4]) * yValue3)) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point3))[0] = x3; (((int *) point3))[1] = y3; } @@ -7567,12 +7691,20 @@ sqInt x2; sqInt x3; sqInt x4; + double xValue; + double xValue1; + double xValue2; + double xValue3; sqInt y; short y0; short y1; sqInt y2; sqInt y3; sqInt y4; + double yValue; + double yValue1; + double yValue2; + double yValue3; if (isShort) { /* begin loadPointShortAt:from: */ @@ -7610,10 +7742,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue = ((double) ((((int *) point))[0]) ); + yValue = ((double) ((((int *) point))[1]) ); /* begin edgeTransform */ transform = ((float *) (workBuffer + GWEdgeTransform)); - x = ((sqInt)(((((transform[0]) * (((double) ((((int *) point))[0]) ))) + ((transform[1]) * (((double) ((((int *) point))[1]) )))) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); - y = ((sqInt)(((((transform[3]) * (((double) ((((int *) point))[0]) ))) + ((transform[4]) * (((double) ((((int *) point))[1]) )))) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); + x = ((sqInt)(((((transform[0]) * xValue) + ((transform[1]) * yValue)) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); + y = ((sqInt)(((((transform[3]) * xValue) + ((transform[4]) * yValue)) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point))[0] = x; (((int *) point))[1] = y; } @@ -7635,10 +7769,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue1 = ((double) ((((int *) point1))[0]) ); + yValue1 = ((double) ((((int *) point1))[1]) ); /* begin edgeTransform */ transform1 = ((float *) (workBuffer + GWEdgeTransform)); - x2 = ((sqInt)(((((transform1[0]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[1]) * (((double) ((((int *) point1))[1]) )))) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); - y2 = ((sqInt)(((((transform1[3]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[4]) * (((double) ((((int *) point1))[1]) )))) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); + x2 = ((sqInt)(((((transform1[0]) * xValue1) + ((transform1[1]) * yValue1)) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); + y2 = ((sqInt)(((((transform1[3]) * xValue1) + ((transform1[4]) * yValue1)) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point1))[0] = x2; (((int *) point1))[1] = y2; } @@ -7660,10 +7796,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue2 = ((double) ((((int *) point2))[0]) ); + yValue2 = ((double) ((((int *) point2))[1]) ); /* begin edgeTransform */ transform2 = ((float *) (workBuffer + GWEdgeTransform)); - x3 = ((sqInt)(((((transform2[0]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[1]) * (((double) ((((int *) point2))[1]) )))) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); - y3 = ((sqInt)(((((transform2[3]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[4]) * (((double) ((((int *) point2))[1]) )))) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); + x3 = ((sqInt)(((((transform2[0]) * xValue2) + ((transform2[1]) * yValue2)) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); + y3 = ((sqInt)(((((transform2[3]) * xValue2) + ((transform2[4]) * yValue2)) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point2))[0] = x3; (((int *) point2))[1] = y3; } @@ -7685,10 +7823,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue3 = ((double) ((((int *) point3))[0]) ); + yValue3 = ((double) ((((int *) point3))[1]) ); /* begin edgeTransform */ transform3 = ((float *) (workBuffer + GWEdgeTransform)); - x4 = ((sqInt)(((((transform3[0]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[1]) * (((double) ((((int *) point3))[1]) )))) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); - y4 = ((sqInt)(((((transform3[3]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[4]) * (((double) ((((int *) point3))[1]) )))) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); + x4 = ((sqInt)(((((transform3[0]) * xValue3) + ((transform3[1]) * yValue3)) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); + y4 = ((sqInt)(((((transform3[3]) * xValue3) + ((transform3[4]) * yValue3)) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point3))[0] = x4; (((int *) point3))[1] = y4; } @@ -7801,6 +7941,14 @@ sqInt x7; sqInt x8; sqInt x9; + double xValue; + double xValue1; + double xValue2; + double xValue3; + double xValue4; + double xValue5; + double xValue6; + double xValue7; sqInt y; short y0; short y1; @@ -7812,6 +7960,14 @@ sqInt y7; sqInt y8; sqInt y9; + double yValue; + double yValue1; + double yValue2; + double yValue3; + double yValue4; + double yValue5; + double yValue6; + double yValue7; for (i = 1; i <= nSegments; i += 1) { /* begin loadCompressedSegment:from:short:leftFill:rightFill:lineWidth:lineColor: */ @@ -7877,10 +8033,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue = ((double) ((((int *) point))[0]) ); + yValue = ((double) ((((int *) point))[1]) ); /* begin edgeTransform */ transform = ((float *) (workBuffer + GWEdgeTransform)); - x = ((sqInt)(((((transform[0]) * (((double) ((((int *) point))[0]) ))) + ((transform[1]) * (((double) ((((int *) point))[1]) )))) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); - y = ((sqInt)(((((transform[3]) * (((double) ((((int *) point))[0]) ))) + ((transform[4]) * (((double) ((((int *) point))[1]) )))) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); + x = ((sqInt)(((((transform[0]) * xValue) + ((transform[1]) * yValue)) + (transform[2])) * (((double) (workBuffer[GWAALevel]) )))); + y = ((sqInt)(((((transform[3]) * xValue) + ((transform[4]) * yValue)) + (transform[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point))[0] = x; (((int *) point))[1] = y; } @@ -7902,10 +8060,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue1 = ((double) ((((int *) point1))[0]) ); + yValue1 = ((double) ((((int *) point1))[1]) ); /* begin edgeTransform */ transform1 = ((float *) (workBuffer + GWEdgeTransform)); - x3 = ((sqInt)(((((transform1[0]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[1]) * (((double) ((((int *) point1))[1]) )))) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); - y3 = ((sqInt)(((((transform1[3]) * (((double) ((((int *) point1))[0]) ))) + ((transform1[4]) * (((double) ((((int *) point1))[1]) )))) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); + x3 = ((sqInt)(((((transform1[0]) * xValue1) + ((transform1[1]) * yValue1)) + (transform1[2])) * (((double) (workBuffer[GWAALevel]) )))); + y3 = ((sqInt)(((((transform1[3]) * xValue1) + ((transform1[4]) * yValue1)) + (transform1[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point1))[0] = x3; (((int *) point1))[1] = y3; } @@ -7927,10 +8087,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue2 = ((double) ((((int *) point2))[0]) ); + yValue2 = ((double) ((((int *) point2))[1]) ); /* begin edgeTransform */ transform2 = ((float *) (workBuffer + GWEdgeTransform)); - x4 = ((sqInt)(((((transform2[0]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[1]) * (((double) ((((int *) point2))[1]) )))) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); - y4 = ((sqInt)(((((transform2[3]) * (((double) ((((int *) point2))[0]) ))) + ((transform2[4]) * (((double) ((((int *) point2))[1]) )))) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); + x4 = ((sqInt)(((((transform2[0]) * xValue2) + ((transform2[1]) * yValue2)) + (transform2[2])) * (((double) (workBuffer[GWAALevel]) )))); + y4 = ((sqInt)(((((transform2[3]) * xValue2) + ((transform2[4]) * yValue2)) + (transform2[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point2))[0] = x4; (((int *) point2))[1] = y4; } @@ -7952,10 +8114,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue3 = ((double) ((((int *) point3))[0]) ); + yValue3 = ((double) ((((int *) point3))[1]) ); /* begin edgeTransform */ transform3 = ((float *) (workBuffer + GWEdgeTransform)); - x5 = ((sqInt)(((((transform3[0]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[1]) * (((double) ((((int *) point3))[1]) )))) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); - y5 = ((sqInt)(((((transform3[3]) * (((double) ((((int *) point3))[0]) ))) + ((transform3[4]) * (((double) ((((int *) point3))[1]) )))) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); + x5 = ((sqInt)(((((transform3[0]) * xValue3) + ((transform3[1]) * yValue3)) + (transform3[2])) * (((double) (workBuffer[GWAALevel]) )))); + y5 = ((sqInt)(((((transform3[3]) * xValue3) + ((transform3[4]) * yValue3)) + (transform3[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point3))[0] = x5; (((int *) point3))[1] = y5; } @@ -7987,10 +8151,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue4 = ((double) ((((int *) point4))[0]) ); + yValue4 = ((double) ((((int *) point4))[1]) ); /* begin edgeTransform */ transform4 = ((float *) (workBuffer + GWEdgeTransform)); - x6 = ((sqInt)(((((transform4[0]) * (((double) ((((int *) point4))[0]) ))) + ((transform4[1]) * (((double) ((((int *) point4))[1]) )))) + (transform4[2])) * (((double) (workBuffer[GWAALevel]) )))); - y6 = ((sqInt)(((((transform4[3]) * (((double) ((((int *) point4))[0]) ))) + ((transform4[4]) * (((double) ((((int *) point4))[1]) )))) + (transform4[5])) * (((double) (workBuffer[GWAALevel]) )))); + x6 = ((sqInt)(((((transform4[0]) * xValue4) + ((transform4[1]) * yValue4)) + (transform4[2])) * (((double) (workBuffer[GWAALevel]) )))); + y6 = ((sqInt)(((((transform4[3]) * xValue4) + ((transform4[4]) * yValue4)) + (transform4[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point4))[0] = x6; (((int *) point4))[1] = y6; } @@ -8012,10 +8178,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue5 = ((double) ((((int *) point5))[0]) ); + yValue5 = ((double) ((((int *) point5))[1]) ); /* begin edgeTransform */ transform5 = ((float *) (workBuffer + GWEdgeTransform)); - x7 = ((sqInt)(((((transform5[0]) * (((double) ((((int *) point5))[0]) ))) + ((transform5[1]) * (((double) ((((int *) point5))[1]) )))) + (transform5[2])) * (((double) (workBuffer[GWAALevel]) )))); - y7 = ((sqInt)(((((transform5[3]) * (((double) ((((int *) point5))[0]) ))) + ((transform5[4]) * (((double) ((((int *) point5))[1]) )))) + (transform5[5])) * (((double) (workBuffer[GWAALevel]) )))); + x7 = ((sqInt)(((((transform5[0]) * xValue5) + ((transform5[1]) * yValue5)) + (transform5[2])) * (((double) (workBuffer[GWAALevel]) )))); + y7 = ((sqInt)(((((transform5[3]) * xValue5) + ((transform5[4]) * yValue5)) + (transform5[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point5))[0] = x7; (((int *) point5))[1] = y7; } @@ -8037,10 +8205,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue6 = ((double) ((((int *) point6))[0]) ); + yValue6 = ((double) ((((int *) point6))[1]) ); /* begin edgeTransform */ transform6 = ((float *) (workBuffer + GWEdgeTransform)); - x8 = ((sqInt)(((((transform6[0]) * (((double) ((((int *) point6))[0]) ))) + ((transform6[1]) * (((double) ((((int *) point6))[1]) )))) + (transform6[2])) * (((double) (workBuffer[GWAALevel]) )))); - y8 = ((sqInt)(((((transform6[3]) * (((double) ((((int *) point6))[0]) ))) + ((transform6[4]) * (((double) ((((int *) point6))[1]) )))) + (transform6[5])) * (((double) (workBuffer[GWAALevel]) )))); + x8 = ((sqInt)(((((transform6[0]) * xValue6) + ((transform6[1]) * yValue6)) + (transform6[2])) * (((double) (workBuffer[GWAALevel]) )))); + y8 = ((sqInt)(((((transform6[3]) * xValue6) + ((transform6[4]) * yValue6)) + (transform6[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point6))[0] = x8; (((int *) point6))[1] = y8; } @@ -8062,10 +8232,12 @@ /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ + xValue7 = ((double) ((((int *) point7))[0]) ); + yValue7 = ((double) ((((int *) point7))[1]) ); /* begin edgeTransform */ transform7 = ((float *) (workBuffer + GWEdgeTransform)); - x9 = ((sqInt)(((((transform7[0]) * (((double) ((((int *) point7))[0]) ))) + ((transform7[1]) * (((double) ((((int *) point7))[1]) )))) + (transform7[2])) * (((double) (workBuffer[GWAALevel]) )))); - y9 = ((sqInt)(((((transform7[3]) * (((double) ((((int *) point7))[0]) ))) + ((transform7[4]) * (((double) ((((int *) point7))[1]) )))) + (transform7[5])) * (((double) (workBuffer[GWAALevel]) )))); + x9 = ((sqInt)(((((transform7[0]) * xValue7) + ((transform7[1]) * yValue7)) + (transform7[2])) * (((double) (workBuffer[GWAALevel]) )))); + y9 = ((sqInt)(((((transform7[3]) * xValue7) + ((transform7[4]) * yValue7)) + (transform7[5])) * (((double) (workBuffer[GWAALevel]) )))); (((int *) point7))[0] = x9; (((int *) point7))[1] = y9; } @@ -8662,10 +8834,18 @@ sqInt x1; sqInt x2; sqInt x3; + double xValue; + double xValue1; + double xValue2; + double xValue3; sqInt y; sqInt y1; sqInt y2; sqInt y3; + double yValue; + double yValue1; + double yValue2; + double yValue3; /* Fail if we have the wrong number of arguments */ @@ -8708,10 +8888,12 @@ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.934.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.934.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.934 Author: eem Time: 14 November 2014, 12:54:52.37 pm UUID: 5e8d814f-34c9-4966-a0c3-4d424bfe1b80 Ancestors: VMMaker.oscog-eem.933 And remember to generate the GdbARMPlugin =============== Diff against VMMaker.oscog-eem.933 =============== Item was changed: ----- Method: VMMaker class>>generateSqueakCogVMWithInterpreterClass:options: (in category 'confs-support') ----- generateSqueakCogVMWithInterpreterClass: interpreterClass options: optionsArray ^VMMaker generate: interpreterClass and: StackToRegisterMappingCogit with: optionsArray to: (FileDirectory default pathFromURI: self sourceTree, '/src') platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin CameraPlugin CroquetPlugin DSAPlugin DeflatePlugin DropPlugin "FT2Plugin" FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin + GeniePlugin GdbARMPlugin HostWindowPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin - GeniePlugin HostWindowPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin ScratchPlugin SecurityPlugin SerialPlugin SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin ThreadedFFIPlugin ThreadedARMFFIPlugin ThreadedIA32FFIPlugin UnicodePlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin WeDoPlugin XDisplayControlPlugin)!

1 0

VM Maker: Cog-eem.213.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.213.mcz ==================== Summary ==================== Name: Cog-eem.213 Author: eem Time: 14 November 2014, 12:48:53.089 pm UUID: f6547b0d-188b-4b30-8a43-d2c7e78fc45c Ancestors: Cog-eem.212 Eliminate an assignment to a block arg. Update the processor simulator plugins to reflect VMMaker.oscog-eem.933. Include the rwrite script that produced VMMaker.oscog-eem.933. =============== Diff against Cog-eem.212 =============== Item was changed: ----- Method: BochsIA32Plugin>>sizeField: (in category 'alien support') ----- sizeField: rcvr "Answer the first field of rcvr which is assumed to be an Alien of at least 8 bytes" <inline: true> + ^self longAt: rcvr + interpreterProxy baseHeaderSize! - ^self longAt: rcvr + BaseHeaderSize! Item was changed: ----- Method: BochsIA32Plugin>>startOfData: (in category 'alien support') ----- startOfData: rcvr "<Alien oop> ^<Integer>" "Answer the start of rcvr's data. For direct aliens this is the address of the second field. For indirect and pointer aliens it is what the second field points to." <inline: true> ^(self sizeField: rcvr) > 0 + ifTrue: [rcvr + interpreterProxy baseHeaderSize + interpreterProxy bytesPerOop] + ifFalse: [self longAt: rcvr + interpreterProxy baseHeaderSize + interpreterProxy bytesPerOop]! - ifTrue: [rcvr + BaseHeaderSize + BytesPerOop] - ifFalse: [self longAt: rcvr + BaseHeaderSize + BytesPerOop]! Item was added: + ----- Method: CogScripts class>>changeMethodsForBasicConstantSendsIn: (in category 'separate vm scripts') ----- + changeMethodsForBasicConstantSendsIn: aClass + "CogScripts changedMethodsForBasicConstantSendsIn: StackInterpreter" + | receiver rules model env | + rules := RBParseTreeRewriter new. + receiver := ((aClass includesBehavior: ObjectMemory) + or: [aClass includesBehavior: SpurMemoryManager]) + ifTrue: ['self'] + ifFalse: + [#('objectMemory' 'manager' 'interpreterProxy') detect: [:ivn| (aClass instVarIndexFor: ivn ifAbsent: nil) notNil]]. + rules + replace: 'BaseHeaderSize' with: receiver, ' baseHeaderSize'; + replace: 'BytesPerOop' with: receiver, ' bytesPerOop'; + replace: 'BytesPerWord' with: receiver, ' wordSize'; + replace: 'ShiftForWord' with: receiver, ' shiftForWord'. + model := RBNamespace new. + env := RBBrowserEnvironment new forClasses: { aClass }. + env classesAndSelectorsDo: + [ :class :selector | | tree | + tree := class parseTreeFor: selector. + (rules executeTree: tree) ifTrue: + [model compile: rules tree newSource in: class classified: (class whichCategoryIncludesSelector: selector)]]. + + model changes changes do: + [:mr| + aClass + compile: mr source + classified: (aClass whichCategoryIncludesSelector: mr selector) + withStamp: (Utilities changeStamp copyReplaceAll: Utilities authorInitials with: Utilities authorInitials, ' (const to msg rewrite)') + notifying: nil]! Item was changed: ----- Method: GdbARMPlugin>>sizeField: (in category 'alien support') ----- sizeField: rcvr "Answer the first field of rcvr which is assumed to be an Alien of at least 8 bytes" <inline: true> + ^self longAt: rcvr + interpreterProxy baseHeaderSize! - ^self longAt: rcvr + BaseHeaderSize! Item was changed: ----- Method: GdbARMPlugin>>startOfData: (in category 'alien support') ----- startOfData: rcvr "<Alien oop> ^<Integer>" "Answer the start of rcvr's data. For direct aliens this is the address of the second field. For indirect and pointer aliens it is what the second field points to." <inline: true> ^(self sizeField: rcvr) > 0 + ifTrue: [rcvr + interpreterProxy baseHeaderSize + interpreterProxy bytesPerOop] + ifFalse: [self longAt: rcvr + interpreterProxy baseHeaderSize + interpreterProxy bytesPerOop]! - ifTrue: [rcvr + BaseHeaderSize + BytesPerOop] - ifFalse: [self longAt: rcvr + BaseHeaderSize + BytesPerOop]! Item was changed: ----- Method: SpurBootstrap>>prototypeClassNameMetaSelectorMethodDo: (in category 'method prototypes') ----- prototypeClassNameMetaSelectorMethodDo: quaternaryBlock "Evaluate aBlock with class name, class is meta, method and selector. For now find methods in class-side category #'method prototypes'. Scheme could be extended to have different protocols for different Squeak/Pharo versions." self allMethodPrototypes do: + [:methodArg| | method className isMeta | + className := self classNameForPrototypeMethod: (method := methodArg). - [:method| | className isMeta | - className := self classNameForPrototypeMethod: method. (isMeta := className endsWith: 'class') ifTrue: [className := (className allButLast: 5) asSymbol]. (method pragmaAt: #indirect) ifNotNil: [method := (isMeta ifTrue: [(Smalltalk classNamed: className) class] ifFalse: [Smalltalk classNamed: className]) >> method selector]. quaternaryBlock value: className value: isMeta value: (self selectorForPrototypeMethod: method) value: method]!

1 0

VM Maker: VMMaker.oscog-eem.933.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.933.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.933 Author: eem Time: 14 November 2014, 12:17:50.73 pm UUID: 5a37067c-b76b-4ada-9399-1de11632acd8 Ancestors: VMMaker.oscog-eem.932 And more of the same... =============== Diff against VMMaker.oscog-eem.932 =============== Item was added: + ----- Method: Spur32BitMemoryManager>>logBytesPerOop (in category 'header format') ----- + logBytesPerOop + ^2! Item was removed: - ----- Method: Spur32BitMemoryManager>>logBytesPerSlot (in category 'header format') ----- - logBytesPerSlot - ^2! Item was added: + ----- Method: Spur64BitMemoryManager>>logBytesPerOop (in category 'accessing') ----- + logBytesPerOop + ^3! Item was removed: - ----- Method: Spur64BitMemoryManager>>logBytesPerSlot (in category 'accessing') ----- - logBytesPerSlot - ^3! Item was changed: ----- 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 bytesPerOop = 4 ifTrue: [nElements * 2] ifFalse: [nElements]]. [self firstLongFormat] -> [numSlots := self bytesPerOop = 4 ifTrue: [nElements] ifFalse: [nElements + 1 // 2]]. [self firstShortFormat] -> [numSlots := self bytesPerOop = 4 ifTrue: [nElements + 1 // 2] ifFalse: [nElements + 3 // 4]]. [self firstByteFormat] -> [numSlots := nElements + (self bytesPerOop - 1) // self bytesPerOop]. [self firstCompiledMethodFormat] -> "Assume nElements is derived from CompiledMethod>>basicSize." [numSlots := nElements + (self bytesPerOop - 1) // self bytesPerOop] } otherwise: [^errorBlock value: PrimErrBadReceiver negated]. "non-indexable" + numSlots >= (1 << (self bytesPerOop * 8 - self logBytesPerOop)) ifTrue: - numSlots >= (1 << (self bytesPerOop * 8 - self logbytesPerOop)) ifTrue: [^errorBlock value: PrimErrLimitExceeded]. ^self objectBytesForSlots: numSlots!

1 0

VM Maker: VMMaker.oscog-eem.932.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.932.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.932 Author: eem Time: 14 November 2014, 11:42:09.769 am UUID: 64910734-a74a-4e9b-8357-68ee708d8318 Ancestors: VMMaker.oscog-eem.931 Deal with collateral damage from the friendly fire of VMMaker.oscog-eem.931. =============== Diff against VMMaker.oscog-eem.931 =============== Item was changed: ----- Method: VMClass class>>writeVMHeaderTo:bytesPerWord: (in category 'translation') ----- writeVMHeaderTo: aStream bytesPerWord: bytesPerWord "Generate the contents of interp.h on aStream. Specific Interpreter subclasses override to add more stuff." aStream nextPutAll: '#define VM_PROXY_MAJOR '; print: self vmProxyMajorVersion; cr; nextPutAll: '#define VM_PROXY_MINOR '; print: self vmProxyMinorVersion; cr; cr; nextPutAll: '#define SQ_VI_BYTES_PER_WORD '; print: bytesPerWord; cr; cr. "The most basic constants must be defined here, not in e.g. the plugin sources, so allow those other sources to be shared between different builds (Spur vs SqueakV3, 32-bit vs 64-bit, etc)" + VMBasicConstants mostBasicConstantNames asSet asArray sort do: + [:constName| + (VMBasicConstants classPool at: constName ifAbsent: []) ifNotNil: + [:const| + aStream nextPutAll: '#define '; nextPutAll: constName; space; print: const; cr]]. - VMBasicConstants mostBasicConstantNames do: - [:const| - aStream nextPutAll: '#define '; nextPutAll: const; space; print: (VMBasicConstants classPool at: const); cr]. aStream cr. ((VMBasicConstants classPool associations select: [:a| a key beginsWith: 'PrimErr']) asSortedCollection: [:a1 :a2| a1 value <= a2 value]) do: [:a| aStream nextPutAll: '#define '; nextPutAll: a key; space; print: a value; cr]. aStream cr!

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2014