Vm-dev May 2015

vm-dev@lists.squeakfoundation.org

28 participants
153 discussions

Pharo running on Pi - video
by Torsten Bergmann 27 May '15

27 May '15

Made a video of Pharo running on a Raspberry Pi with small Tontec 3,5'' display: https://www.youtube.com/watch?t=16&v=sfxFqQIuawg

1 0

[commit][3360] CogVM source as per VMMaker.oscog-eem.1329
by commits＠squeakvm.org 27 May '15

27 May '15

Revision: 3360 Author: eliot Date: 2015-05-27 13:42:53 -0700 (Wed, 27 May 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1329 Cogit: Fix cache tag access for ARM in cPICHasForwardedClass: Guard access to the inline cache tag in PICs in GC routines by inlineCacheTagsMayBeObjects. Mark inlineCacheTagsMayBeObjects as inline to eliminate dead code. Linux build: Fix creating the launch scripts given the removal of VM_VERSION et al from the autoconf subsystem. Modified Paths: -------------- branches/Cog/image/buildspurtrunkvmmakerimage.sh branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/platforms/unix/config/Makefile.in branches/Cog/platforms/unix/config/Makefile.install branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/config/configure.ac branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c Added Paths: ----------- branches/Cog/image/BuildSpurTrunk64Image.st branches/Cog/image/buildspurtrunk64image.sh branches/Cog/image/updatespurimage.sh Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Added: branches/Cog/image/BuildSpurTrunk64Image.st =================================================================== --- branches/Cog/image/BuildSpurTrunk64Image.st (rev 0) +++ branches/Cog/image/BuildSpurTrunk64Image.st 2015-05-27 20:42:53 UTC (rev 3360) @@ -0,0 +1,2 @@ +Spur32to64BitBootstrap new bootstrapImage: 'trunk46-spur'. +Smalltalk snapshot: false andQuit: true Added: branches/Cog/image/buildspurtrunk64image.sh =================================================================== --- branches/Cog/image/buildspurtrunk64image.sh (rev 0) +++ branches/Cog/image/buildspurtrunk64image.sh 2015-05-27 20:42:53 UTC (rev 3360) @@ -0,0 +1,12 @@ +#!/bin/sh +. ./envvars.sh + +./buildspurtrunkvmmakerimage.sh + +. ./getGoodSpurVM.sh + +echo $VM SpurVMMaker.image BuildSqueakSpurTrunkVMMakerImage.st +$VM SpurVMMaker.image BuildSqueakSpurTrunkVMMakerImage.st + +echo $VM SpurVMMaker.image BuildSpurTrunk64Image.st +$VM SpurVMMaker.image BuildSpurTrunk64Image.st Property changes on: branches/Cog/image/buildspurtrunk64image.sh ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/image/buildspurtrunkvmmakerimage.sh =================================================================== --- branches/Cog/image/buildspurtrunkvmmakerimage.sh 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/image/buildspurtrunkvmmakerimage.sh 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,19 +1,10 @@ #!/bin/sh . ./envvars.sh -if [ ! -f trunk46-spur.image -o ! -f trunk46-spur.changes ]; then - ./getlatestspurtrunkimage.sh -fi +./updatespurimage.sh -./ensureSqueakV41sources.sh - cp -p trunk46-spur.image SpurVMMaker.image cp -p trunk46-spur.changes SpurVMMaker.changes -. ./getGoodSpurVM.sh - -echo $VM SpurVMMaker.image UpdateSqueakTrunkImage.st -$VM SpurVMMaker.image UpdateSqueakTrunkImage.st - echo $VM SpurVMMaker.image BuildSqueakSpurTrunkVMMakerImage.st $VM SpurVMMaker.image BuildSqueakSpurTrunkVMMakerImage.st Added: branches/Cog/image/updatespurimage.sh =================================================================== --- branches/Cog/image/updatespurimage.sh (rev 0) +++ branches/Cog/image/updatespurimage.sh 2015-05-27 20:42:53 UTC (rev 3360) @@ -0,0 +1,14 @@ +#!/bin/sh +# Update the latest Spur image. +. ./envvars.sh + +if [ ! -f trunk46-spur.image -o ! -f trunk46-spur.changes ]; then + ./getlatestspurtrunkimage.sh +fi + +./ensureSqueakV41sources.sh + +. ./getGoodSpurVM.sh + +echo $VM trunk46-spur.image UpdateSqueakTrunkImage.st +$VM trunk46-spur.image UpdateSqueakTrunkImage.st Property changes on: branches/Cog/image/updatespurimage.sh ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -882,7 +882,6 @@ static sqInt getActiveContextAllocatesInMachineCode(void); static sqInt hasSpurMemoryManagerAPI(void); static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; -static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); static AbstractInstruction * jumpNotCharacterUnsignedValueInRegister(sqInt reg) NoDbgRegParms; static sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address) NoDbgRegParms; @@ -6713,7 +6712,9 @@ /* Answer the long constant loaded by a MOV/ORR/ORR/ORR - or MOV/ORR/ORR/ORR/PUSH sequence, just before this address: */ + or MOV/ORR/ORR/ORR/PUSH, or MOV/ORR/ORR/ORR/CMP sequence, just before this + address: + */ /* CogARMCompiler>>#literalBeforeFollowingAddress: */ static sqInt @@ -9848,11 +9849,11 @@ { sqInt classIndex; sqInt i; - usqInt pc; + sqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - classIndex = inlineCacheTagAt(backEnd, pc); + classIndex = literalBeforeFollowingAddress(backEnd, pc - (loadLiteralByteSize(backEnd))); if (isForwardedClassIndex(classIndex)) { return 1; } @@ -11793,9 +11794,7 @@ refersToYoung = updateMaybeObjRefAt(pc - (jumpLongByteSize(backEnd))); pc += cPICCaseSize; for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - if (updateMaybeObjRefAt((pc - (jumpLongConditionalByteSize(backEnd))) - (loadLiteralByteSize(backEnd)))) { - refersToYoung = 1; - } + ; if (updateMaybeObjRefAt(pc - (jumpLongConditionalByteSize(backEnd)))) { refersToYoung = 1; } @@ -18437,13 +18436,6 @@ return 0; } - /* CogObjectRepresentationForSpur>>#inlineCacheTagsMayBeObjects */ -static sqInt -inlineCacheTagsMayBeObjects(void) -{ - return 0; -} - /* CogObjectRepresentationForSpur>>#isSmallIntegerTagNonZero */ static sqInt isSmallIntegerTagNonZero(void) Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -826,7 +826,6 @@ static sqInt getActiveContextAllocatesInMachineCode(void); static sqInt hasSpurMemoryManagerAPI(void); static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; -static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); static AbstractInstruction * jumpNotCharacterUnsignedValueInRegister(sqInt reg) NoDbgRegParms; static sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address) NoDbgRegParms; @@ -8586,7 +8585,7 @@ pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - classIndex = inlineCacheTagAt(backEnd, pc); + classIndex = literalBeforeFollowingAddress(backEnd, pc - (loadLiteralByteSize(backEnd))); if (isForwardedClassIndex(classIndex)) { return 1; } @@ -10533,9 +10532,7 @@ refersToYoung = updateMaybeObjRefAt(pc - (jumpLongByteSize(backEnd))); pc += cPICCaseSize; for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - if (updateMaybeObjRefAt((pc - (jumpLongConditionalByteSize(backEnd))) - (loadLiteralByteSize(backEnd)))) { - refersToYoung = 1; - } + ; if (updateMaybeObjRefAt(pc - (jumpLongConditionalByteSize(backEnd)))) { refersToYoung = 1; } @@ -17163,13 +17160,6 @@ return 0; } - /* CogObjectRepresentationForSpur>>#inlineCacheTagsMayBeObjects */ -static sqInt -inlineCacheTagsMayBeObjects(void) -{ - return 0; -} - /* CogObjectRepresentationForSpur>>#isSmallIntegerTagNonZero */ static sqInt isSmallIntegerTagNonZero(void) Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed May 27 10:09:31 PDT 2015 + Wed May 27 13:40:34 PDT 2015 Modified: branches/Cog/platforms/unix/config/Makefile.in =================================================================== --- branches/Cog/platforms/unix/config/Makefile.in 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/platforms/unix/config/Makefile.in 2015-05-27 20:42:53 UTC (rev 3360) @@ -69,6 +69,13 @@ reallyclean: for f in *; do case "$$f" in plugins.[ie][nx]t|mvm) ;; *) rm -rf $$f; esac; done +# unix launch scripts +squeak.sh: ${cfgdir}/squeak.sh.in getversion + sed "s|.expanded_relative_imgdir.|lib/squeak/`./getversion VERSION_TAG`|" <${cfgdir}/squeak.sh.in >squeak.sh + +bin.squeak.sh: ${cfgdir}/bin.squeak.sh.in getversion + sed "s|.expanded_relative_imgdir.|lib/squeak/`./getversion VERSION_TAG`|" <${cfgdir}/bin.squeak.sh.in >bin.squeak.sh + # npsqueak npsqueak : nps/npsqueak.so Modified: branches/Cog/platforms/unix/config/Makefile.install =================================================================== --- branches/Cog/platforms/unix/config/Makefile.install 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/platforms/unix/config/Makefile.install 2015-05-27 20:42:53 UTC (rev 3360) @@ -15,7 +15,7 @@ # squeak -install-squeak : $(squeak) getversion +install-squeak : $(squeak) $(squeaksh) $(binsqueaksh) getversion $(MKINSTALLDIRS) $(ROOT)$(plgdir) $(MKINSTALLDIRS) $(ROOT)$(bindir) $(INSTALL_PROG) $(squeak) $(ROOT)$(plgdir) Modified: branches/Cog/platforms/unix/config/configure =================================================================== --- branches/Cog/platforms/unix/config/configure 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/platforms/unix/config/configure 2015-05-27 20:42:53 UTC (rev 3360) @@ -29291,7 +29291,7 @@ ac_config_headers="$ac_config_headers config.h" - ac_config_files="$ac_config_files mkconfig make.cfg make.int make.ext make.prg inisqueak squeak.sh bin.squeak.sh Makefile" + ac_config_files="$ac_config_files mkconfig make.cfg make.int make.ext make.prg inisqueak Makefile" ac_config_commands="$ac_config_commands default" @@ -29839,8 +29839,6 @@ "make.ext" ) CONFIG_FILES="$CONFIG_FILES make.ext" ;; "make.prg" ) CONFIG_FILES="$CONFIG_FILES make.prg" ;; "inisqueak" ) CONFIG_FILES="$CONFIG_FILES inisqueak" ;; - "squeak.sh" ) CONFIG_FILES="$CONFIG_FILES squeak.sh" ;; - "bin.squeak.sh" ) CONFIG_FILES="$CONFIG_FILES bin.squeak.sh" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; Modified: branches/Cog/platforms/unix/config/configure.ac =================================================================== --- branches/Cog/platforms/unix/config/configure.ac 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/platforms/unix/config/configure.ac 2015-05-27 20:42:53 UTC (rev 3360) @@ -401,7 +401,7 @@ # Create the build environment AC_CONFIG_HEADER(config.h) -AC_CONFIG_FILES(mkconfig make.cfg make.int make.ext make.prg inisqueak squeak.sh bin.squeak.sh Makefile) +AC_CONFIG_FILES(mkconfig make.cfg make.int make.ext make.prg inisqueak Makefile) AC_CONFIG_COMMANDS([default],[ chmod +x mkconfig inisqueak ${SHELL} -ec "./mkconfig; ${cfgdir}/mktargets; ${cfgdir}/mkmf"],[ Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -876,7 +876,6 @@ static sqInt getActiveContextAllocatesInMachineCode(void); static sqInt hasSpurMemoryManagerAPI(void); static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; -static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); static AbstractInstruction * jumpNotCharacterUnsignedValueInRegister(sqInt reg) NoDbgRegParms; static sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address) NoDbgRegParms; @@ -6714,7 +6713,9 @@ /* Answer the long constant loaded by a MOV/ORR/ORR/ORR - or MOV/ORR/ORR/ORR/PUSH sequence, just before this address: */ + or MOV/ORR/ORR/ORR/PUSH, or MOV/ORR/ORR/ORR/CMP sequence, just before this + address: + */ /* CogARMCompiler>>#literalBeforeFollowingAddress: */ static sqInt @@ -9758,11 +9759,11 @@ { sqInt classIndex; sqInt i; - sqInt pc; + usqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - classIndex = inlineCacheTagAt(backEnd, pc); + classIndex = literalBeforeFollowingAddress(backEnd, pc - (loadLiteralByteSize(backEnd))); if (isForwardedClassIndex(classIndex)) { return 1; } @@ -11542,9 +11543,7 @@ refersToYoung = updateMaybeObjRefAt(pc - (jumpLongByteSize(backEnd))); pc += cPICCaseSize; for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - if (updateMaybeObjRefAt((pc - (jumpLongConditionalByteSize(backEnd))) - (loadLiteralByteSize(backEnd)))) { - refersToYoung = 1; - } + ; if (updateMaybeObjRefAt(pc - (jumpLongConditionalByteSize(backEnd)))) { refersToYoung = 1; } @@ -17482,13 +17481,6 @@ return 0; } - /* CogObjectRepresentationForSpur>>#inlineCacheTagsMayBeObjects */ -static sqInt -inlineCacheTagsMayBeObjects(void) -{ - return 0; -} - /* CogObjectRepresentationForSpur>>#isSmallIntegerTagNonZero */ static sqInt isSmallIntegerTagNonZero(void) Modified: branches/Cog/spursistasrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitIA32.c 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/spursistasrc/vm/cogitIA32.c 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -819,7 +819,6 @@ static sqInt getActiveContextAllocatesInMachineCode(void); static sqInt hasSpurMemoryManagerAPI(void); static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; -static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); static AbstractInstruction * jumpNotCharacterUnsignedValueInRegister(sqInt reg) NoDbgRegParms; static sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address) NoDbgRegParms; @@ -8484,7 +8483,7 @@ pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - classIndex = inlineCacheTagAt(backEnd, pc); + classIndex = literalBeforeFollowingAddress(backEnd, pc - (loadLiteralByteSize(backEnd))); if (isForwardedClassIndex(classIndex)) { return 1; } @@ -10270,9 +10269,7 @@ refersToYoung = updateMaybeObjRefAt(pc - (jumpLongByteSize(backEnd))); pc += cPICCaseSize; for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - if (updateMaybeObjRefAt((pc - (jumpLongConditionalByteSize(backEnd))) - (loadLiteralByteSize(backEnd)))) { - refersToYoung = 1; - } + ; if (updateMaybeObjRefAt(pc - (jumpLongConditionalByteSize(backEnd)))) { refersToYoung = 1; } @@ -16196,13 +16193,6 @@ return 0; } - /* CogObjectRepresentationForSpur>>#inlineCacheTagsMayBeObjects */ -static sqInt -inlineCacheTagsMayBeObjects(void) -{ - return 0; -} - /* CogObjectRepresentationForSpur>>#isSmallIntegerTagNonZero */ static sqInt isSmallIntegerTagNonZero(void) Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/spursrc/vm/cogit.h 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ Modified: branches/Cog/spursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursrc/vm/cogitARMv5.c 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/spursrc/vm/cogitARMv5.c 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -866,7 +866,6 @@ static sqInt getActiveContextAllocatesInMachineCode(void); static sqInt hasSpurMemoryManagerAPI(void); static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; -static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); static AbstractInstruction * jumpNotCharacterUnsignedValueInRegister(sqInt reg) NoDbgRegParms; static sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address) NoDbgRegParms; @@ -6389,7 +6388,9 @@ /* Answer the long constant loaded by a MOV/ORR/ORR/ORR - or MOV/ORR/ORR/ORR/PUSH sequence, just before this address: */ + or MOV/ORR/ORR/ORR/PUSH, or MOV/ORR/ORR/ORR/CMP sequence, just before this + address: + */ /* CogARMCompiler>>#literalBeforeFollowingAddress: */ static sqInt @@ -9389,7 +9390,7 @@ pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - classIndex = inlineCacheTagAt(backEnd, pc); + classIndex = literalBeforeFollowingAddress(backEnd, pc - (loadLiteralByteSize(backEnd))); if (isForwardedClassIndex(classIndex)) { return 1; } @@ -11202,9 +11203,7 @@ refersToYoung = updateMaybeObjRefAt(pc - (jumpLongByteSize(backEnd))); pc += cPICCaseSize; for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - if (updateMaybeObjRefAt((pc - (jumpLongConditionalByteSize(backEnd))) - (loadLiteralByteSize(backEnd)))) { - refersToYoung = 1; - } + ; if (updateMaybeObjRefAt(pc - (jumpLongConditionalByteSize(backEnd)))) { refersToYoung = 1; } @@ -16994,13 +16993,6 @@ return 0; } - /* CogObjectRepresentationForSpur>>#inlineCacheTagsMayBeObjects */ -static sqInt -inlineCacheTagsMayBeObjects(void) -{ - return 0; -} - /* CogObjectRepresentationForSpur>>#isSmallIntegerTagNonZero */ static sqInt isSmallIntegerTagNonZero(void) Modified: branches/Cog/spursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursrc/vm/cogitIA32.c 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/spursrc/vm/cogitIA32.c 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -809,7 +809,6 @@ static sqInt getActiveContextAllocatesInMachineCode(void); static sqInt hasSpurMemoryManagerAPI(void); static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; -static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); static AbstractInstruction * jumpNotCharacterUnsignedValueInRegister(sqInt reg) NoDbgRegParms; static sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address) NoDbgRegParms; @@ -8111,7 +8110,7 @@ pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - classIndex = inlineCacheTagAt(backEnd, pc); + classIndex = literalBeforeFollowingAddress(backEnd, pc - (loadLiteralByteSize(backEnd))); if (isForwardedClassIndex(classIndex)) { return 1; } @@ -9930,9 +9929,7 @@ refersToYoung = updateMaybeObjRefAt(pc - (jumpLongByteSize(backEnd))); pc += cPICCaseSize; for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { - if (updateMaybeObjRefAt((pc - (jumpLongConditionalByteSize(backEnd))) - (loadLiteralByteSize(backEnd)))) { - refersToYoung = 1; - } + ; if (updateMaybeObjRefAt(pc - (jumpLongConditionalByteSize(backEnd)))) { refersToYoung = 1; } @@ -15708,13 +15705,6 @@ return 0; } - /* CogObjectRepresentationForSpur>>#inlineCacheTagsMayBeObjects */ -static sqInt -inlineCacheTagsMayBeObjects(void) -{ - return 0; -} - /* CogObjectRepresentationForSpur>>#isSmallIntegerTagNonZero */ static sqInt isSmallIntegerTagNonZero(void) Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/src/vm/cogit.h 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ Modified: branches/Cog/src/vm/cogitARMv5.c =================================================================== --- branches/Cog/src/vm/cogitARMv5.c 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/src/vm/cogitARMv5.c 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -844,7 +844,6 @@ static sqInt genStoreSourceRegslotIndexintoNewObjectInDestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms; static sqInt inlineCacheTagForInstance(sqInt oop) NoDbgRegParms; static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; -static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); static void markAndTraceLiteralIfYoung(sqInt literal) NoDbgRegParms; static void markAndTraceLiteral(sqInt literal) NoDbgRegParms; @@ -6358,7 +6357,9 @@ /* Answer the long constant loaded by a MOV/ORR/ORR/ORR - or MOV/ORR/ORR/ORR/PUSH sequence, just before this address: */ + or MOV/ORR/ORR/ORR/PUSH, or MOV/ORR/ORR/ORR/CMP sequence, just before this + address: + */ /* CogARMCompiler>>#literalBeforeFollowingAddress: */ static sqInt @@ -8346,6 +8347,7 @@ && (!(isMarked(object)))) { return 1; } + object = literalBeforeFollowingAddress(backEnd, pc - offsetToLiteral); if ((couldBeObject(object)) && (!(isMarked(object)))) { @@ -11050,6 +11052,7 @@ if (updateMaybeObjRefAt((pc - (jumpLongConditionalByteSize(backEnd))) - (loadLiteralByteSize(backEnd)))) { refersToYoung = 1; } + if (updateMaybeObjRefAt(pc - (jumpLongConditionalByteSize(backEnd)))) { refersToYoung = 1; } @@ -15610,13 +15613,6 @@ return isYoung(cacheTag); } - /* CogObjectRepresentationForSqueakV3>>#inlineCacheTagsMayBeObjects */ -static sqInt -inlineCacheTagsMayBeObjects(void) -{ - return 1; -} - /* CogObjectRepresentationForSqueakV3>>#isSmallIntegerTagNonZero */ static sqInt isSmallIntegerTagNonZero(void) Modified: branches/Cog/src/vm/cogitIA32.c =================================================================== --- branches/Cog/src/vm/cogitIA32.c 2015-05-27 17:09:50 UTC (rev 3359) +++ branches/Cog/src/vm/cogitIA32.c 2015-05-27 20:42:53 UTC (rev 3360) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + CCodeGenerator VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 + StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1329 uuid: d25444c7-af99-40e1-ab8a-a765c046eae5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -786,7 +786,6 @@ static sqInt genStoreSourceRegslotIndexintoNewObjectInDestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms; static sqInt inlineCacheTagForInstance(sqInt oop) NoDbgRegParms; static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; -static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); static void markAndTraceLiteralIfYoung(sqInt literal) NoDbgRegParms; static void markAndTraceLiteral(sqInt literal) NoDbgRegParms; @@ -7093,6 +7092,7 @@ && (!(isMarked(object)))) { return 1; } + object = literalBeforeFollowingAddress(backEnd, pc - offsetToLiteral); if ((couldBeObject(object)) && (!(isMarked(object)))) { @@ -9777,6 +9777,7 @@ if (updateMaybeObjRefAt((pc - (jumpLongConditionalByteSize(backEnd))) - (loadLiteralByteSize(backEnd)))) { refersToYoung = 1; } + if (updateMaybeObjRefAt(pc - (jumpLongConditionalByteSize(backEnd)))) { refersToYoung = 1; } @@ -14338,13 +14339,6 @@ return isYoung(cacheTag); } - /* CogObjectRepresentationForSqueakV3>>#inlineCacheTagsMayBeObjects */ -static sqInt -inlineCacheTagsMayBeObjects(void) -{ - return 1; -} - /* CogObjectRepresentationForSqueakV3>>#isSmallIntegerTagNonZero */ static sqInt isSmallIntegerTagNonZero(void)

1 0

VM Maker: VMMaker.oscog-eem.1329.mcz
by commits＠source.squeak.org 27 May '15

27 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1329.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1329 Author: eem Time: 27 May 2015, 11:42:44.314 am UUID: d25444c7-af99-40e1-ab8a-a765c046eae5 Ancestors: VMMaker.oscog-eem.1328 Fix cache tag access for ARM in cPICHasForwardedClass: Guard access to the inline cache tag in PICs in GC routines by inlineCacheTagsMayBeObjects. Mark inlineCacheTagsMayBeObjects as inline to eliminate dead code. =============== Diff against VMMaker.oscog-eem.1328 =============== Item was changed: ----- Method: CogARMCompiler>>literalBeforeFollowingAddress: (in category 'inline cacheing') ----- literalBeforeFollowingAddress: followingAddress "Answer the long constant loaded by a MOV/ORR/ORR/ORR + or MOV/ORR/ORR/ORR/PUSH, or MOV/ORR/ORR/ORR/CMP sequence, just before this address:" - or MOV/ORR/ORR/ORR/PUSH sequence, just before this address:" ^(self instructionIsOR: (self instructionBeforeAddress: followingAddress)) ifTrue: [self extract32BitOperandFrom4InstructionsPreceeding: followingAddress] ifFalse: [self extract32BitOperandFrom4InstructionsPreceeding: followingAddress - 4]! Item was changed: ----- Method: CogObjectRepresentation>>inlineCacheTagsMayBeObjects (in category 'in-line cacheing') ----- inlineCacheTagsMayBeObjects + <inline: true> ^self subclassResponsibility! Item was changed: ----- Method: CogObjectRepresentationForSpur>>inlineCacheTagsMayBeObjects (in category 'in-line cacheing') ----- inlineCacheTagsMayBeObjects + <inline: true> ^false! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>inlineCacheTagsMayBeObjects (in category 'in-line cacheing') ----- inlineCacheTagsMayBeObjects + <inline: true> ^true! Item was changed: ----- Method: Cogit>>cPICHasForwardedClass: (in category 'in-line cacheing') ----- cPICHasForwardedClass: cPIC <var: #cPIC type: #'CogMethod *'> | pc | pc := cPIC asUnsignedInteger + firstCPICCaseOffset + cPICCaseSize - backEnd jumpLongConditionalByteSize. 2 to: cPIC cPICNumCases do: [:i| | classIndex | + classIndex := backEnd literalBeforeFollowingAddress: pc - backEnd loadLiteralByteSize. - classIndex := backEnd inlineCacheTagAt: pc. (objectMemory isForwardedClassIndex: classIndex) ifTrue: [^true]. pc := pc + cPICCaseSize]. ^false! Item was changed: ----- Method: Cogit>>closedPICRefersToUnmarkedObject: (in category 'garbage collection') ----- closedPICRefersToUnmarkedObject: cPIC "Answer if the ClosedPIC refers to any unmarked objects or freed/freeable target methods, applying markAndTraceOrFreeCogMethod:firstVisit: to those targets to determine if freed/freeable." <var: #cPIC type: #'CogMethod *'> | pc offsetToLiteral object entryPoint targetMethod | <var: #targetMethod type: #'CogMethod *'> (objectMemory isMarked: cPIC selector) ifFalse: [^true]. pc := cPIC asInteger + firstCPICCaseOffset. "First jump is unconditional; subsequent ones are conditional" offsetToLiteral := backEnd jumpLongByteSize. 1 to: cPIC cPICNumCases do: [:i| + objectRepresentation inlineCacheTagsMayBeObjects ifTrue: + [object := backEnd literalBeforeFollowingAddress: pc - offsetToLiteral - backEnd loadLiteralByteSize. + ((objectRepresentation couldBeObject: object) + and: [(objectMemory isMarked: object) not]) ifTrue: + [^true]]. - object := backEnd literalBeforeFollowingAddress: pc - offsetToLiteral - backEnd loadLiteralByteSize. - ((objectRepresentation couldBeObject: object) - and: [(objectMemory isMarked: object) not]) ifTrue: - [^true]. object := backEnd literalBeforeFollowingAddress: pc - offsetToLiteral. ((objectRepresentation couldBeObject: object) and: [(objectMemory isMarked: object) not]) ifTrue: [^true]. entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" (entryPoint asUnsignedInteger < cPIC asUnsignedInteger or: [entryPoint asUnsignedInteger > (cPIC asUnsignedInteger + cPIC blockSize) asUnsignedInteger]) ifTrue: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: (targetMethod cmType = CMMethod or: [targetMethod cmType = CMFree]). (self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > pc asUnsignedInteger) ifTrue: [^true]]. offsetToLiteral := backEnd jumpLongConditionalByteSize. pc := pc + cPICCaseSize]. ^false! Item was changed: ----- Method: Cogit>>mapObjectReferencesInClosedPIC: (in category 'garbage collection') ----- mapObjectReferencesInClosedPIC: cPIC "Remap all object references in the closed PIC. Answer if any references are young. Set codeModified if any modifications are made." <var: #cPIC type: #'CogMethod *'> | pc refersToYoung | pc := cPIC asInteger + firstCPICCaseOffset. refersToYoung := self updateMaybeObjRefAt: pc - backEnd jumpLongByteSize. pc := pc + cPICCaseSize. 2 to: cPIC cPICNumCases do: [:i| + objectRepresentation inlineCacheTagsMayBeObjects ifTrue: + [(self updateMaybeObjRefAt: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize) ifTrue: + [refersToYoung := true]]. - (self updateMaybeObjRefAt: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize) ifTrue: - [refersToYoung := true]. (self updateMaybeObjRefAt: pc - backEnd jumpLongConditionalByteSize) ifTrue: [refersToYoung := true]. pc := pc + cPICCaseSize]. ^refersToYoung!

1 0

[commit][3359] CogVM source as per VMMaker.oscog-eem.1328
by commits＠squeakvm.org 27 May '15

27 May '15

Revision: 3359 Author: eliot Date: 2015-05-27 10:09:50 -0700 (Wed, 27 May 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1328 Fix determination of the picInterpretAbortOffset on ARM in cogExtendPIC:CaseNMethod:tag:isMNUCase:. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -729,6 +729,7 @@ sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); sqInt pcisWithinMethod(char *address, CogMethod *cogMethod); static sqInt picAbortDiscriminatorValue(void); +static sqInt picInterpretAbortOffset(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); void printTrampolineTable(void); @@ -8928,13 +8929,14 @@ target = (((sqInt)(cogMethodOf(caseNMethod)))) + cmNoCheckEntryOffset; } else { + operand = caseNMethod; if (isMNUCase) { (cPIC->cpicHasMNUCase = 1); + target = (((sqInt)cPIC)) + (sizeof(CogMethod)); } - operand = caseNMethod; - target = (((sqInt)cPIC)) + ((isMNUCase - ? sizeof(CogMethod) - : (interpretOffset()) - (callInstructionByteSize(backEnd)))); + else { + target = (((sqInt)cPIC)) + (picInterpretAbortOffset()); + } } /* begin CmpCw:R: */ genoperandoperand(CmpCwR, caseNTag, TempReg); @@ -10570,15 +10572,8 @@ firstCPICCaseOffset = ((endCPICCase0->address)) - methodZoneBase; cPICCaseSize = ((endCPICCase1->address)) - ((endCPICCase0->address)); cPICEndSize = closedPICSize - (((numPICCases - 1) * cPICCaseSize) + firstCPICCaseOffset); - - /* self cCode: '' - inSmalltalk: - [| end | - end := self outputInstructionsAt: methodZoneBase + headerSize. - self disassembleFrom: methodZoneBase + headerSize to: end - 1. - self halt] */ - closedPICSize = roundUpLength(closedPICSize); + assert(((picInterpretAbort->address)) == (((methodLabel->address)) + (picInterpretAbortOffset()))); } @@ -12993,6 +12988,18 @@ } +/* Answer the start of the abort sequence for invoking the interpreter in a + closed PIC. + */ + + /* Cogit>>#picInterpretAbortOffset */ +static sqInt +picInterpretAbortOffset(void) +{ + return (interpretOffset()) - ((pushLinkRegisterByteSize(backEnd)) + (callInstructionByteSize(backEnd))); +} + + /* If there is a generator for the current primitive then answer it; otherwise answer nil. */ Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -672,6 +672,7 @@ sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); sqInt pcisWithinMethod(char *address, CogMethod *cogMethod); static sqInt picAbortDiscriminatorValue(void); +static sqInt picInterpretAbortOffset(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); void printTrampolineTable(void); @@ -7688,13 +7689,14 @@ target = (((sqInt)(cogMethodOf(caseNMethod)))) + cmNoCheckEntryOffset; } else { + operand = caseNMethod; if (isMNUCase) { (cPIC->cpicHasMNUCase = 1); + target = (((sqInt)cPIC)) + (sizeof(CogMethod)); } - operand = caseNMethod; - target = (((sqInt)cPIC)) + ((isMNUCase - ? sizeof(CogMethod) - : (interpretOffset()) - (callInstructionByteSize(backEnd)))); + else { + target = (((sqInt)cPIC)) + (picInterpretAbortOffset()); + } } /* begin CmpCw:R: */ genoperandoperand(CmpCwR, caseNTag, TempReg); @@ -9300,15 +9302,8 @@ firstCPICCaseOffset = ((endCPICCase0->address)) - methodZoneBase; cPICCaseSize = ((endCPICCase1->address)) - ((endCPICCase0->address)); cPICEndSize = closedPICSize - (((numPICCases - 1) * cPICCaseSize) + firstCPICCaseOffset); - - /* self cCode: '' - inSmalltalk: - [| end | - end := self outputInstructionsAt: methodZoneBase + headerSize. - self disassembleFrom: methodZoneBase + headerSize to: end - 1. - self halt] */ - closedPICSize = roundUpLength(closedPICSize); + assert(((picInterpretAbort->address)) == (((methodLabel->address)) + (picInterpretAbortOffset()))); } @@ -11732,6 +11727,18 @@ } +/* Answer the start of the abort sequence for invoking the interpreter in a + closed PIC. + */ + + /* Cogit>>#picInterpretAbortOffset */ +static sqInt +picInterpretAbortOffset(void) +{ + return (interpretOffset()) - (callInstructionByteSize(backEnd)); +} + + /* If there is a generator for the current primitive then answer it; otherwise answer nil. */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue May 26 10:20:52 PDT 2015 + Wed May 27 10:09:31 PDT 2015 Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -724,6 +724,7 @@ sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); sqInt pcisWithinMethod(char *address, CogMethod *cogMethod); static sqInt picAbortDiscriminatorValue(void); +static sqInt picInterpretAbortOffset(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); void printTrampolineTable(void); @@ -8849,13 +8850,14 @@ target = (((sqInt)(cogMethodOf(caseNMethod)))) + cmNoCheckEntryOffset; } else { + operand = caseNMethod; if (isMNUCase) { (cPIC->cpicHasMNUCase = 1); + target = (((sqInt)cPIC)) + (sizeof(CogMethod)); } - operand = caseNMethod; - target = (((sqInt)cPIC)) + ((isMNUCase - ? sizeof(CogMethod) - : (interpretOffset()) - (callInstructionByteSize(backEnd)))); + else { + target = (((sqInt)cPIC)) + (picInterpretAbortOffset()); + } } /* begin CmpCw:R: */ genoperandoperand(CmpCwR, caseNTag, TempReg); @@ -9756,7 +9758,7 @@ { sqInt classIndex; sqInt i; - usqInt pc; + sqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -10426,15 +10428,8 @@ firstCPICCaseOffset = ((endCPICCase0->address)) - methodZoneBase; cPICCaseSize = ((endCPICCase1->address)) - ((endCPICCase0->address)); cPICEndSize = closedPICSize - (((numPICCases - 1) * cPICCaseSize) + firstCPICCaseOffset); - - /* self cCode: '' - inSmalltalk: - [| end | - end := self outputInstructionsAt: methodZoneBase + headerSize. - self disassembleFrom: methodZoneBase + headerSize to: end - 1. - self halt] */ - closedPICSize = roundUpLength(closedPICSize); + assert(((picInterpretAbort->address)) == (((methodLabel->address)) + (picInterpretAbortOffset()))); } @@ -12700,6 +12695,18 @@ } +/* Answer the start of the abort sequence for invoking the interpreter in a + closed PIC. + */ + + /* Cogit>>#picInterpretAbortOffset */ +static sqInt +picInterpretAbortOffset(void) +{ + return (interpretOffset()) - ((pushLinkRegisterByteSize(backEnd)) + (callInstructionByteSize(backEnd))); +} + + /* If there is a generator for the current primitive then answer it; otherwise answer nil. */ Modified: branches/Cog/spursistasrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitIA32.c 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/spursistasrc/vm/cogitIA32.c 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -666,6 +666,7 @@ sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); sqInt pcisWithinMethod(char *address, CogMethod *cogMethod); static sqInt picAbortDiscriminatorValue(void); +static sqInt picInterpretAbortOffset(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); void printTrampolineTable(void); @@ -7597,13 +7598,14 @@ target = (((sqInt)(cogMethodOf(caseNMethod)))) + cmNoCheckEntryOffset; } else { + operand = caseNMethod; if (isMNUCase) { (cPIC->cpicHasMNUCase = 1); + target = (((sqInt)cPIC)) + (sizeof(CogMethod)); } - operand = caseNMethod; - target = (((sqInt)cPIC)) + ((isMNUCase - ? sizeof(CogMethod) - : (interpretOffset()) - (callInstructionByteSize(backEnd)))); + else { + target = (((sqInt)cPIC)) + (picInterpretAbortOffset()); + } } /* begin CmpCw:R: */ genoperandoperand(CmpCwR, caseNTag, TempReg); @@ -9144,15 +9146,8 @@ firstCPICCaseOffset = ((endCPICCase0->address)) - methodZoneBase; cPICCaseSize = ((endCPICCase1->address)) - ((endCPICCase0->address)); cPICEndSize = closedPICSize - (((numPICCases - 1) * cPICCaseSize) + firstCPICCaseOffset); - - /* self cCode: '' - inSmalltalk: - [| end | - end := self outputInstructionsAt: methodZoneBase + headerSize. - self disassembleFrom: methodZoneBase + headerSize to: end - 1. - self halt] */ - closedPICSize = roundUpLength(closedPICSize); + assert(((picInterpretAbort->address)) == (((methodLabel->address)) + (picInterpretAbortOffset()))); } @@ -11427,6 +11422,18 @@ } +/* Answer the start of the abort sequence for invoking the interpreter in a + closed PIC. + */ + + /* Cogit>>#picInterpretAbortOffset */ +static sqInt +picInterpretAbortOffset(void) +{ + return (interpretOffset()) - (callInstructionByteSize(backEnd)); +} + + /* If there is a generator for the current primitive then answer it; otherwise answer nil. */ Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/spursrc/vm/cogit.h 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ Modified: branches/Cog/spursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursrc/vm/cogitARMv5.c 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/spursrc/vm/cogitARMv5.c 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -719,6 +719,7 @@ sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); sqInt pcisWithinMethod(char *address, CogMethod *cogMethod); static sqInt picAbortDiscriminatorValue(void); +static sqInt picInterpretAbortOffset(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); void printTrampolineTable(void); @@ -8485,13 +8486,14 @@ target = (((sqInt)(cogMethodOf(caseNMethod)))) + cmNoCheckEntryOffset; } else { + operand = caseNMethod; if (isMNUCase) { (cPIC->cpicHasMNUCase = 1); + target = (((sqInt)cPIC)) + (sizeof(CogMethod)); } - operand = caseNMethod; - target = (((sqInt)cPIC)) + ((isMNUCase - ? sizeof(CogMethod) - : (interpretOffset()) - (callInstructionByteSize(backEnd)))); + else { + target = (((sqInt)cPIC)) + (picInterpretAbortOffset()); + } } /* begin CmpCw:R: */ genoperandoperand(CmpCwR, caseNTag, TempReg); @@ -10078,15 +10080,8 @@ firstCPICCaseOffset = ((endCPICCase0->address)) - methodZoneBase; cPICCaseSize = ((endCPICCase1->address)) - ((endCPICCase0->address)); cPICEndSize = closedPICSize - (((numPICCases - 1) * cPICCaseSize) + firstCPICCaseOffset); - - /* self cCode: '' - inSmalltalk: - [| end | - end := self outputInstructionsAt: methodZoneBase + headerSize. - self disassembleFrom: methodZoneBase + headerSize to: end - 1. - self halt] */ - closedPICSize = roundUpLength(closedPICSize); + assert(((picInterpretAbort->address)) == (((methodLabel->address)) + (picInterpretAbortOffset()))); } @@ -12357,6 +12352,18 @@ } +/* Answer the start of the abort sequence for invoking the interpreter in a + closed PIC. + */ + + /* Cogit>>#picInterpretAbortOffset */ +static sqInt +picInterpretAbortOffset(void) +{ + return (interpretOffset()) - ((pushLinkRegisterByteSize(backEnd)) + (callInstructionByteSize(backEnd))); +} + + /* If there is a generator for the current primitive then answer it; otherwise answer nil. */ Modified: branches/Cog/spursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursrc/vm/cogitIA32.c 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/spursrc/vm/cogitIA32.c 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -661,6 +661,7 @@ sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); sqInt pcisWithinMethod(char *address, CogMethod *cogMethod); static sqInt picAbortDiscriminatorValue(void); +static sqInt picInterpretAbortOffset(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); void printTrampolineTable(void); @@ -7233,13 +7234,14 @@ target = (((sqInt)(cogMethodOf(caseNMethod)))) + cmNoCheckEntryOffset; } else { + operand = caseNMethod; if (isMNUCase) { (cPIC->cpicHasMNUCase = 1); + target = (((sqInt)cPIC)) + (sizeof(CogMethod)); } - operand = caseNMethod; - target = (((sqInt)cPIC)) + ((isMNUCase - ? sizeof(CogMethod) - : (interpretOffset()) - (callInstructionByteSize(backEnd)))); + else { + target = (((sqInt)cPIC)) + (picInterpretAbortOffset()); + } } /* begin CmpCw:R: */ genoperandoperand(CmpCwR, caseNTag, TempReg); @@ -8796,15 +8798,8 @@ firstCPICCaseOffset = ((endCPICCase0->address)) - methodZoneBase; cPICCaseSize = ((endCPICCase1->address)) - ((endCPICCase0->address)); cPICEndSize = closedPICSize - (((numPICCases - 1) * cPICCaseSize) + firstCPICCaseOffset); - - /* self cCode: '' - inSmalltalk: - [| end | - end := self outputInstructionsAt: methodZoneBase + headerSize. - self disassembleFrom: methodZoneBase + headerSize to: end - 1. - self halt] */ - closedPICSize = roundUpLength(closedPICSize); + assert(((picInterpretAbort->address)) == (((methodLabel->address)) + (picInterpretAbortOffset()))); } @@ -11084,6 +11079,18 @@ } +/* Answer the start of the abort sequence for invoking the interpreter in a + closed PIC. + */ + + /* Cogit>>#picInterpretAbortOffset */ +static sqInt +picInterpretAbortOffset(void) +{ + return (interpretOffset()) - (callInstructionByteSize(backEnd)); +} + + /* If there is a generator for the current primitive then answer it; otherwise answer nil. */ Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/src/vm/cogit.h 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ Modified: branches/Cog/src/vm/cogitARMv5.c =================================================================== --- branches/Cog/src/vm/cogitARMv5.c 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/src/vm/cogitARMv5.c 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -720,6 +720,7 @@ sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); sqInt pcisWithinMethod(char *address, CogMethod *cogMethod); static sqInt picAbortDiscriminatorValue(void); +static sqInt picInterpretAbortOffset(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); void printTrampolineTable(void); @@ -8523,13 +8524,14 @@ target = (((sqInt)(cogMethodOf(caseNMethod)))) + cmNoCheckEntryOffset; } else { + operand = caseNMethod; if (isMNUCase) { (cPIC->cpicHasMNUCase = 1); + target = (((sqInt)cPIC)) + (sizeof(CogMethod)); } - operand = caseNMethod; - target = (((sqInt)cPIC)) + ((isMNUCase - ? sizeof(CogMethod) - : (interpretOffset()) - (callInstructionByteSize(backEnd)))); + else { + target = (((sqInt)cPIC)) + (picInterpretAbortOffset()); + } } /* begin CmpCw:R: */ genoperandoperand(CmpCwR, caseNTag, TempReg); @@ -9939,15 +9941,8 @@ firstCPICCaseOffset = ((endCPICCase0->address)) - methodZoneBase; cPICCaseSize = ((endCPICCase1->address)) - ((endCPICCase0->address)); cPICEndSize = closedPICSize - (((numPICCases - 1) * cPICCaseSize) + firstCPICCaseOffset); - - /* self cCode: '' - inSmalltalk: - [| end | - end := self outputInstructionsAt: methodZoneBase + headerSize. - self disassembleFrom: methodZoneBase + headerSize to: end - 1. - self halt] */ - closedPICSize = roundUpLength(closedPICSize); + assert(((picInterpretAbort->address)) == (((methodLabel->address)) + (picInterpretAbortOffset()))); } @@ -12385,6 +12380,18 @@ } +/* Answer the start of the abort sequence for invoking the interpreter in a + closed PIC. + */ + + /* Cogit>>#picInterpretAbortOffset */ +static sqInt +picInterpretAbortOffset(void) +{ + return (interpretOffset()) - ((pushLinkRegisterByteSize(backEnd)) + (callInstructionByteSize(backEnd))); +} + + /* If there is a generator for the current primitive then answer it; otherwise answer nil. */ Modified: branches/Cog/src/vm/cogitIA32.c =================================================================== --- branches/Cog/src/vm/cogitIA32.c 2015-05-26 20:40:31 UTC (rev 3358) +++ branches/Cog/src/vm/cogitIA32.c 2015-05-27 17:09:50 UTC (rev 3359) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + CCodeGenerator VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1328 uuid: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -661,6 +661,7 @@ sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); sqInt pcisWithinMethod(char *address, CogMethod *cogMethod); static sqInt picAbortDiscriminatorValue(void); +static sqInt picInterpretAbortOffset(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); void printTrampolineTable(void); @@ -7270,13 +7271,14 @@ target = (((sqInt)(cogMethodOf(caseNMethod)))) + cmNoCheckEntryOffset; } else { + operand = caseNMethod; if (isMNUCase) { (cPIC->cpicHasMNUCase = 1); + target = (((sqInt)cPIC)) + (sizeof(CogMethod)); } - operand = caseNMethod; - target = (((sqInt)cPIC)) + ((isMNUCase - ? sizeof(CogMethod) - : (interpretOffset()) - (callInstructionByteSize(backEnd)))); + else { + target = (((sqInt)cPIC)) + (picInterpretAbortOffset()); + } } /* begin CmpCw:R: */ genoperandoperand(CmpCwR, caseNTag, TempReg); @@ -8656,15 +8658,8 @@ firstCPICCaseOffset = ((endCPICCase0->address)) - methodZoneBase; cPICCaseSize = ((endCPICCase1->address)) - ((endCPICCase0->address)); cPICEndSize = closedPICSize - (((numPICCases - 1) * cPICCaseSize) + firstCPICCaseOffset); - - /* self cCode: '' - inSmalltalk: - [| end | - end := self outputInstructionsAt: methodZoneBase + headerSize. - self disassembleFrom: methodZoneBase + headerSize to: end - 1. - self halt] */ - closedPICSize = roundUpLength(closedPICSize); + assert(((picInterpretAbort->address)) == (((methodLabel->address)) + (picInterpretAbortOffset()))); } @@ -11111,6 +11106,18 @@ } +/* Answer the start of the abort sequence for invoking the interpreter in a + closed PIC. + */ + + /* Cogit>>#picInterpretAbortOffset */ +static sqInt +picInterpretAbortOffset(void) +{ + return (interpretOffset()) - (callInstructionByteSize(backEnd)); +} + + /* If there is a generator for the current primitive then answer it; otherwise answer nil. */

1 0

VM Maker: VMMaker.oscog-eem.1328.mcz
by commits＠source.squeak.org 27 May '15

27 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1328.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1328 Author: eem Time: 27 May 2015, 9:54:09.994 am UUID: c1e2ed6b-28c4-448f-88b8-4c7a3ad53b78 Ancestors: VMMaker.oscog-EstebanLorenzano.1327 Fix determination of the picInterpretAbortOffset on ARM in cogExtendPIC:CaseNMethod:tag:isMNUCase:. =============== Diff against VMMaker.oscog-EstebanLorenzano.1327 =============== Item was changed: + SystemOrganization addCategory: #'VMMaker-Building'! + SystemOrganization addCategory: #'VMMaker-Interpreter'! + SystemOrganization addCategory: #'VMMaker-InterpreterSimulation'! + SystemOrganization addCategory: #'VMMaker-InterpreterSimulation-Morphic'! + SystemOrganization addCategory: #'VMMaker-JIT'! + SystemOrganization addCategory: #'VMMaker-JITSimulation'! + SystemOrganization addCategory: #'VMMaker-Multithreading'! + SystemOrganization addCategory: #'VMMaker-Plugins'! + SystemOrganization addCategory: #'VMMaker-Plugins-Alien'! + SystemOrganization addCategory: #'VMMaker-Plugins-IOS'! + SystemOrganization addCategory: #'VMMaker-PostProcessing'! + SystemOrganization addCategory: #'VMMaker-SmartSyntaxPlugins'! + SystemOrganization addCategory: #'VMMaker-SpurMemoryManager'! + SystemOrganization addCategory: #'VMMaker-SpurMemoryManagerSimulation'! + SystemOrganization addCategory: #'VMMaker-Support'! + SystemOrganization addCategory: #'VMMaker-Tests'! + SystemOrganization addCategory: #'VMMaker-Translation to C'! - SystemOrganization addCategory: #VMMaker! - SystemOrganization addCategory: 'VMMaker-Building'! - SystemOrganization addCategory: 'VMMaker-Interpreter'! - SystemOrganization addCategory: 'VMMaker-InterpreterSimulation'! - SystemOrganization addCategory: 'VMMaker-InterpreterSimulation-Morphic'! - SystemOrganization addCategory: 'VMMaker-JIT'! - SystemOrganization addCategory: 'VMMaker-JITSimulation'! - SystemOrganization addCategory: 'VMMaker-Multithreading'! - SystemOrganization addCategory: 'VMMaker-Plugins'! - SystemOrganization addCategory: 'VMMaker-Plugins-Alien'! - SystemOrganization addCategory: 'VMMaker-Plugins-IOS'! - SystemOrganization addCategory: 'VMMaker-PostProcessing'! - SystemOrganization addCategory: 'VMMaker-SmartSyntaxPlugins'! - SystemOrganization addCategory: 'VMMaker-SpurMemoryManager'! - SystemOrganization addCategory: 'VMMaker-SpurMemoryManagerSimulation'! - SystemOrganization addCategory: 'VMMaker-Support'! - SystemOrganization addCategory: 'VMMaker-Tests'! - SystemOrganization addCategory: 'VMMaker-Translation to C'! Item was changed: ----- Method: CCodeGenerator>>storeAPIExportHeader:OnFile: (in category 'public') ----- storeAPIExportHeader: headerName OnFile: fullHeaderPath "Store C header code on the given file. Evaluate aBlock with the stream to generate its contents." | header | header := String streamContents: [:s| s nextPutAll: (self fileHeaderVersionStampForSourceClass: nil); cr. self emitCAPIExportHeaderOn: s]. (self needToGenerateHeader: headerName file: fullHeaderPath contents: header) ifTrue: [self storeHeaderOnFile: fullHeaderPath contents: header]! Item was changed: ----- Method: CCodeGenerator>>storeHeaderOnFile:contents: (in category 'public') ----- storeHeaderOnFile: fileName contents: contents "Store C header code on the given file. Evaluate aBlock with the stream to generate its contents." | aStream | aStream := VMMaker forceNewFileNamed: fileName. aStream ifNil: [Error signal: 'Could not open C header file: ', fileName]. [(contents beginsWith: '/* Automatic') ifFalse: [aStream nextPutAll: (self fileHeaderVersionStampForSourceClass: nil); cr]. aStream nextPutAll: contents] ensure: [aStream close]! Item was changed: ----- Method: CCodeGenerator>>structClassesForTranslationClasses: (in category 'utilities') ----- structClassesForTranslationClasses: classes "Answer in superclass order (any superclass precedes any subclass) the ancilliaryClasses that are struct classes for all the given classes." | theStructClasses | theStructClasses := OrderedCollection new. classes do: [:aTranslationClass| ([aTranslationClass ancilliaryClasses: self options] on: MessageNotUnderstood do: [:ex| ex message selector == #ancilliaryClasses: ifTrue: [#()] ifFalse: [ex pass]]) do: [:class| (class isStructClass and: [(vmClass isNil or: [vmClass isAcceptableAncilliaryClass: class]) and: [(theStructClasses includes: class) not]]) ifTrue: [theStructClasses addLast: class]]]. ^ChangeSet superclassOrder: theStructClasses! Item was changed: ----- Method: CogARMCompiler>>sub:rn:imm:ror: (in category 'ARM convenience instructions') ----- sub: destReg rn: srcReg imm: immediate ror: rot " Remember the ROR is doubled by the cpu so use 30>>1 etc SUB destReg, srcReg, #immediate ROR rot" ^self type: 1 op: SubOpcode set: 0 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! Item was changed: ----- Method: CogMethodSurrogate32 class>>alignedByteSize (in category 'accessing') ----- alignedByteSize ^20 + self baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate64 class>>alignedByteSize (in category 'accessing') ----- alignedByteSize ^32 + self baseHeaderSize! Item was changed: ----- Method: Cogit>>cogExtendPIC:CaseNMethod:tag:isMNUCase: (in category 'in-line cacheing') ----- cogExtendPIC: cPIC CaseNMethod: caseNMethod tag: caseNTag isMNUCase: isMNUCase "Extend the cPIC with the supplied case. If caseNMethod is cogged dispatch direct to its unchecked entry-point. If caseNMethod is not cogged, jump to the fast interpreter dispatch, and if isMNUCase then dispatch to fast MNU invocation and mark the cPIC as having the MNU case for cache flushing." <var: #cPIC type: #'CogMethod *'> | operand target address size end | "stack allocate the various collections so that they are effectively garbage collected on return." coInterpreter compilationBreak: cPIC selector point: (objectMemory numBytesOf: cPIC selector) isMNUCase: isMNUCase. self allocateOpcodes: 5 bytecodes: 0. methodLabel address: cPIC asUnsignedInteger; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" self assert: (objectRepresentation inlineCacheTagIsYoung: caseNTag) not. "Caller patches to open pic if caseNMethod is young." self assert: (caseNMethod notNil and: [(objectMemory isYoung: caseNMethod) not]). (isMNUCase not and: [coInterpreter methodHasCogMethod: caseNMethod]) ifTrue: [operand := 0. target := (coInterpreter cogMethodOf: caseNMethod) asInteger + cmNoCheckEntryOffset] ifFalse: + [operand := caseNMethod. + isMNUCase + ifTrue: + [cPIC cpicHasMNUCase: true. + target := cPIC asInteger + (self sizeof: CogMethod)] + ifFalse: + [target := cPIC asInteger + self picInterpretAbortOffset]]. - [isMNUCase ifTrue: - [cPIC cpicHasMNUCase: true]. - operand := caseNMethod. - target := cPIC asInteger - + (isMNUCase - ifTrue: [self sizeof: CogMethod] - ifFalse: [self interpretOffset - backEnd callInstructionByteSize])]. self CmpCw: caseNTag R: TempReg. self MoveCw: operand R: SendNumArgsReg. self JumpLongZero: target. self MoveCw: cPIC asUnsignedInteger R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: cPIC cmNumArgs). self computeMaximumSizes. address := self addressOfEndOfCase: cPIC cPICNumCases - 1 inCPIC: cPIC. size := self generateInstructionsAt: address. end := self outputInstructionsAt: address. processor flushICacheFrom: cPIC asInteger to: cPIC asInteger + closedPICSize. cPIC cPICNumCases: cPIC cPICNumCases + 1. ^0! Item was changed: ----- Method: Cogit>>generateClosedPICPrototype (in category 'initialization') ----- generateClosedPICPrototype "Generate the prototype ClosedPIC to determine how much space as full PIC takes. When we first allocate a closed PIC it only has one or two cases and we want to grow it. So we have to determine how big a full one is before hand." numPICCases := 6. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: numPICCases * 7 bytecodes: 0. methodLabel address: methodZoneBase; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" self compileClosedPICPrototype. self computeMaximumSizes. closedPICSize := (self sizeof: CogMethod) + (self generateInstructionsAt: methodZoneBase + (self sizeof: CogMethod)). firstCPICCaseOffset := endCPICCase0 address - methodZoneBase. cPICCaseSize := endCPICCase1 address - endCPICCase0 address. cPICEndSize := closedPICSize - (numPICCases - 1 * cPICCaseSize + firstCPICCaseOffset). + closedPICSize := methodZone roundUpLength: closedPICSize. + self assert: picInterpretAbort address = (methodLabel address + self picInterpretAbortOffset) - closedPICSize := methodZone roundUpLength: closedPICSize "self cCode: '' inSmalltalk: [| end | end := self outputInstructionsAt: methodZoneBase + headerSize. self disassembleFrom: methodZoneBase + headerSize to: end - 1. self halt]"! Item was added: + ----- Method: Cogit>>picInterpretAbortOffset (in category 'debugging') ----- + picInterpretAbortOffset + "Answer the start of the abort sequence for invoking the interpreter in a closed PIC." + ^self interpretOffset + - (backEnd hasLinkRegister + ifTrue: [backEnd pushLinkRegisterByteSize + backEnd callInstructionByteSize] + ifFalse: [backEnd callInstructionByteSize])! Item was changed: ----- Method: Integer>>asUnsignedInteger (in category '*VMMaker-interpreter simulator') ----- asUnsignedInteger self assert: self >= 0. ^self! Item was changed: ----- Method: InterpreterPlugin class>>shouldBeTranslated (in category 'translation') ----- shouldBeTranslated "is this class intended to be translated as a plugin? Most subclasses should answer true, but some such as:- TestInterpreterPlugin FlippArrayPlugin2 InflatePlugin should answer false for various reasons." ^true! Item was changed: ----- Method: InterpreterPlugin class>>shouldBeTranslatedFor: (in category 'translation') ----- shouldBeTranslatedFor: platformName "Is this class intended to be translated as a plugin, perhaps specific to a platform? Most subclasses should answer true, but some such as simulation-only versions should answer false for various reasons." ^self shouldBeTranslated! Item was changed: ----- Method: InterpreterProxy>>isImmediate: (in category 'testing') ----- isImmediate: anObject <option: #(atLeastVMProxyMajor:minor: 1 13)> ^StackInterpreter objectMemoryClass isImmediate: anObject! Item was changed: ----- Method: SpurGenerationScavenger>>copyAndForward: (in category 'scavenger') ----- copyAndForward: survivor "copyAndForward: survivor copies a survivor object either to futureSurvivorSpace or, if it is to be promoted, to oldSpace. It leaves a forwarding pointer behind. If the object is weak then corpse is threaded onto the weakList for later treatment." <inline: false> | bytesInObj format tenure newLocation | self assert: ((manager isInEden: survivor) "cog methods should be excluded." or: [manager isInPastSpace: survivor]). bytesInObj := manager bytesInObject: survivor. format := manager formatOf: survivor. tenure := self shouldBeTenured: survivor. "Allow Slang to inline." newLocation := (tenure or: [futureSurvivorStart + bytesInObj > futureSpace limit]) ifTrue: [self copyToOldSpace: survivor bytes: bytesInObj format: format] ifFalse: [self copyToFutureSpace: survivor bytes: bytesInObj]. manager forwardSurvivor: survivor to: newLocation. "if weak or ephemeron add to the relevant list for subsequent scanning." (manager isWeakFormat: format) ifTrue: [self addToWeakList: survivor]. ((manager isEphemeronFormat: format) and: [(self isScavengeSurvivor: (manager keyOfEphemeron: newLocation)) not]) ifTrue: [self addToEphemeronList: survivor]. ^newLocation! Item was changed: ----- Method: SpurMemoryManager>>isForwarded: (in category 'object testing') ----- isForwarded: objOop "Answer if objOop is that if a forwarder. Take advantage of isForwardedObjectClassIndexPun being a power of two to generate a more efficient test than the straight-forward (self classIndexOf: objOop) = self isForwardedObjectClassIndexPun at the cost of this being ambiguous with free chunks. So either never apply this to free chunks or guard with (self isFreeObject: foo) not. So far the idiom has been to guard with isFreeObject:" <api> <inline: true> "self assert: (self isFreeObject: objOop) not." ^(self longAt: objOop) noMask: self classIndexMask - self isForwardedObjectClassIndexPun! Item was changed: ----- Method: StackInterpreter>>codeGeneratorToComputeAccessorDepth (in category 'primitive support') ----- codeGeneratorToComputeAccessorDepth ^VMMaker new buildCodeGeneratorForInterpreter: self class primitivesClass includeAPIMethods: false initializeClasses: false! Item was changed: ----- Method: StackInterpreter>>primitiveIndexOfMethod:header: (in category 'compiled methods') ----- primitiveIndexOfMethod: theMethod header: methodHeader "Note: With the Squeak V0 format we now have 10 bits of primitive index, but they are in two places for temporary backward compatibility. The time to unpack is negligible, since the derived primitive function pointer is stored in the method cache. With the new format we assume a 3-byte CallPrimitive with a little-endian 16-bit primitive index." <api> <inline: true> | firstBytecode | ^objectMemory hasSpurMemoryManagerAPI ifTrue: [(self alternateHeaderHasPrimitiveFlag: methodHeader) ifTrue: [firstBytecode := self firstBytecodeOfAlternateHeader: methodHeader method: theMethod. (objectMemory byteAt: firstBytecode + 1) + ((objectMemory byteAt: firstBytecode + 2) << 8)] ifFalse: [0]] ifFalse: [MULTIPLEBYTECODESETS ifTrue: [(self headerIndicatesAlternateBytecodeSet: methodHeader) ifTrue: [(self alternateHeaderHasPrimitiveFlag: methodHeader) ifTrue: [firstBytecode := self firstBytecodeOfAlternateHeader: methodHeader method: theMethod. (objectMemory byteAt: firstBytecode + 1) + ((objectMemory byteAt: firstBytecode + 2) << 8)] ifFalse: [0]] ifFalse: [| primBits | primBits := objectMemory integerValueOf: methodHeader. (primBits bitAnd: 16r1FF) + (primBits >> 19 bitAnd: 16r200)]] ifFalse: [| primBits | primBits := objectMemory integerValueOf: methodHeader. (primBits bitAnd: 16r1FF) + (primBits >> 19 bitAnd: 16r200)]]! Item was changed: ----- Method: StackInterpreterSimulator>>runAtEachStep: (in category 'testing') ----- runAtEachStep: aBlock self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. aBlock value: currentBytecode. self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: TAssignmentNode>>emitCCodeAsExpressionOn:level:generator: (in category 'C code generation') ----- emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen aStream nextPut: $(. self emitCCodeOn: aStream level: level generator: aCodeGen. aStream nextPut: $)! Item was changed: ----- Method: TParseNode>>emitCCodeAsArgumentOn:level:generator: (in category 'C code generation') ----- emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen ^self emitCCodeOn: aStream level: level generator: aCodeGen! Item was changed: ----- Method: TParseNode>>emitCCodeAsExpressionOn:level:generator: (in category 'C code generation') ----- emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen ^self emitCCodeOn: aStream level: level generator: aCodeGen! Item was changed: ----- Method: TSendNode>>emitCCodeAsExpressionOn:level:generator: (in category 'C code generation') ----- emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen ^self emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen! Item was changed: ----- Method: VMClass class>>initializePrimitiveErrorCodes (in category 'initialization') ----- initializePrimitiveErrorCodes "Define the VM's primitive error codes. N.B. these are replicated in platforms/Cross/vm/sqVirtualMachine.h." "VMClass initializePrimitiveErrorCodes" | pet | PrimErrTableIndex := 51. "Zero-relative" "See SmalltalkImage>>recreateSpecialObjectsArray for the table definition. If the table exists and is large enough the corresponding entry is returned as the primitive error, otherwise the error is answered numerically." pet := Smalltalk specialObjectsArray at: PrimErrTableIndex + 1 ifAbsent: [#()]. pet isArray ifFalse: [pet := #()]. PrimNoErr := 0. "for helper methods that need to answer success or an error code." PrimErrGenericFailure := pet indexOf: nil ifAbsent: 1. PrimErrBadReceiver := pet indexOf: #'bad receiver' ifAbsent: 2. PrimErrBadArgument := pet indexOf: #'bad argument' ifAbsent: 3. PrimErrBadIndex := pet indexOf: #'bad index' ifAbsent: 4. PrimErrBadNumArgs := pet indexOf: #'bad number of arguments' ifAbsent: 5. PrimErrInappropriate := pet indexOf: #'inappropriate operation' ifAbsent: 6. PrimErrUnsupported := pet indexOf: #'unsupported operation' ifAbsent: 7. PrimErrNoModification := pet indexOf: #'no modification' ifAbsent: 8. PrimErrNoMemory := pet indexOf: #'insufficient object memory' ifAbsent: 9. PrimErrNoCMemory := pet indexOf: #'insufficient C memory' ifAbsent: 10. PrimErrNotFound := pet indexOf: #'not found' ifAbsent: 11. PrimErrBadMethod := pet indexOf: #'bad method' ifAbsent: 12. PrimErrNamedInternal := pet indexOf: #'internal error in named primitive machinery' ifAbsent: 13. PrimErrObjectMayMove := pet indexOf: #'object may move' ifAbsent: 14. PrimErrLimitExceeded := pet indexOf: #'resource limit exceeded' ifAbsent: 15. PrimErrObjectIsPinned := pet indexOf: #'object is pinned' ifAbsent: 16. PrimErrWritePastObject := pet indexOf: #'primitive write beyond end of object' ifAbsent: 17!

1 0

VM Maker: VMMaker.oscog-EstebanLorenzano.1327.mcz
by commits＠source.squeak.org 27 May '15

27 May '15

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1327.mcz ==================== Summary ==================== Name: VMMaker.oscog-EstebanLorenzano.1327 Author: EstebanLorenzano Time: 27 May 2015, 2:47:05.018933 pm UUID: 66c08101-8728-4cf9-9cb7-994f08387c86 Ancestors: VMMaker.oscog-EstebanLorenzano.1326 simulator should use LittleEndianBitmap instead Bitmap as memory when possible . =============== Diff against VMMaker.oscog-EstebanLorenzano.1326 =============== Item was changed: ----- Method: StackInterpreterSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "StackInterpreterSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize dataSize count oldBaseAddr bytesToShift swapBytes headerFlags heapBase firstSegSize heapSize hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize allocationReserve | "open image file and read the header" f := FileStream readOnlyFileNamed: fileName. f ifNil: [^self error: 'no image found']. ["begin ensure block..." imageName := f fullName. f binary. version := self getWord32FromFile: f swap: false. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := objectMemory byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getWord32FromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getWord32FromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. It is used for the cog code size in Cog. Preserve it to be polite to other VMs." theUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = (objectMemory wordSize = 4 ifTrue: [40] ifFalse: [64]). hdrEdenBytes := self getWord32FromFile: f swap: swapBytes. objectMemory edenBytes: (hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = (objectMemory wordSize = 4 ifTrue: [48] ifFalse: [72]). firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "compare memory requirements with availability" allocationReserve := self interpreterAllocationReserveBytes. objectMemory hasSpurMemoryManagerAPI ifTrue: [| freeOldSpaceInImage headroom | freeOldSpaceInImage := self getLongFromFile: f swap: swapBytes. headroom := objectMemory initialHeadroom: extraVMMemory givenFreeOldSpaceInImage: freeOldSpaceInImage. heapSize := objectMemory roundUpHeapSize: dataSize + headroom + objectMemory newSpaceBytes + (headroom > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])] ifFalse: [heapSize := dataSize + extraBytes + objectMemory newSpaceBytes + (extraBytes > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])]. "allocate interpreter memory" heapBase := objectMemory startOfMemory. objectMemory setHeapBase: heapBase memoryLimit: heapBase + heapSize endOfMemory: heapBase + dataSize. "bogus for Spur" + objectMemory memory: (((self endianness == #little) + ifTrue: [ LittleEndianBitmap ] + ifFalse: [ Bitmap ]) new: objectMemory memoryLimit // 4). - objectMemory memory: (Bitmap new: objectMemory memoryLimit // 4). "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. count := objectMemory readHeapFromImageFile: f dataBytes: dataSize. count ~= dataSize ifTrue: [self halt]. ] ensure: [f close]. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]!

1 0

[commit][3358] Update the getGoodFooVM scripts to use the 15.20.3354 VMs
by commits＠squeakvm.org 26 May '15

26 May '15

Revision: 3358 Author: eliot Date: 2015-05-26 13:40:31 -0700 (Tue, 26 May 2015) Log Message: ----------- Update the getGoodFooVM scripts to use the 15.20.3354 VMs Modified Paths: -------------- branches/Cog/image/getGoodCogVM.sh branches/Cog/image/getGoodSpurVM.sh Modified: branches/Cog/image/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh 2015-05-26 17:24:44 UTC (rev 3357) +++ branches/Cog/image/getGoodCogVM.sh 2015-05-26 20:40:31 UTC (rev 3358) @@ -1,32 +1,32 @@ #!/bin/sh -# Sets the VM env var to the r3284 Cog VM for the current platform. +# Sets the VM env var to the r3354 Cog VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=15.12.3284 -REV=3284 -LCBINDIR=4.0-3284 +TAG=15.20.3354 +REV=3354 +LCBINDIR=4.0-3354 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - Cog.app/Contents/MacOS/Squeak 51f69399642245df1978b81b529ed7a0 \ - Cog.app-$TAG.tgz 34828c5b563e5e64ede280429ca1a745 + Cog.app/Contents/MacOS/Squeak a6f0ece7775772220e8bfe1e48524959 \ + Cog.app-$TAG.tgz 269ba0ef5e63aeaa52287834b6242966 VM=Cog.app/Contents/MacOS/Squeak;; Linux) if expr $OSREL \> 2.6.12; then get_vm_from_tar \ - coglinuxht/lib/squeak/$LCBINDIR/squeak b8c8ccdb36d1fd893a9b15778e2bf500 \ - coglinuxht-$TAG.tgz 2035d84a2a4f2dc27d40b988348c21f8 + coglinuxht/lib/squeak/$LCBINDIR/squeak 7ed115ceb484859c182ced6541137ce8 \ + coglinuxht-$TAG.tgz 9f50e0fa254d763fae635eeb98ecdeb0 else get_vm_from_tar \ - coglinux/lib/squeak/$LCBINDIR/squeak 4c9add7b905d9b80ccca522926df16d4 \ - coglinux-$TAG.tgz af87e9a96be77318cce91a9fd07396ad + coglinux/lib/squeak/$LCBINDIR/squeak 43804a192631dabba11f4051611475b0 \ + coglinux-$TAG.tgz 16b277420542af403be016dde6769c18 fi;; CYGWIN*) get_vm_from_zip \ - cogwin/SqueakConsole.exe 60f116a058a6d6ed55b3eda594b9e267 \ - cogwin-$TAG.zip 0c4d4eab877bbdc884fb691176640aea + cogwin/SqueakConsole.exe f55a39e14e6d0228c718f7b868e70bbc \ + cogwin-$TAG.zip b5253c1675b9e0d3887d50bd050fd75d VM=cogwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/getGoodSpurVM.sh =================================================================== --- branches/Cog/image/getGoodSpurVM.sh 2015-05-26 17:24:44 UTC (rev 3357) +++ branches/Cog/image/getGoodSpurVM.sh 2015-05-26 20:40:31 UTC (rev 3358) @@ -1,26 +1,26 @@ #!/bin/sh -# Sets the VM env var to the r3284 Cog Spur VM for the current platform. +# Sets the VM env var to the r3354 Cog Spur VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=15.12.3284 -REV=3284 -LSBINDIR=5.0-3284 +TAG=15.20.3354 +REV=3354 +LSBINDIR=5.0-3354 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - CogSpur.app/Contents/MacOS/Squeak c54b15ba899696e2efbe8844c8ba50c3 \ - CogSpur.app-$TAG.tgz cb11c0850aa43b0bef658254b1e02bc0 + CogSpur.app/Contents/MacOS/Squeak 4858caf533bcac30301b63b4a2b03dee \ + CogSpur.app-$TAG.tgz 69dfd7c4af7c5c1323b57f8df1945759 VM=CogSpur.app/Contents/MacOS/Squeak;; Linux) get_vm_from_tar \ - cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 2092203ae9f5e6daedc9be0a1a85fa8a \ - cogspurlinuxht-$TAG.tgz 3ee0ff388b993297340a40dd8df6388c + cogspurlinuxht/lib/squeak/$LSBINDIR/squeak e7ef9060beedb0e3d049de685d269eb1 \ + cogspurlinuxht-$TAG.tgz 7d91b75be4f17ea0ea836eba5237fa10 VM=cogspurlinuxht/squeak;; CYGWIN*) get_vm_from_zip \ - cogspurwin/SqueakConsole.exe c703176603aa14bf83d68ad9fa2749f0 \ - cogspurwin-$TAG.zip 048352452883f843ab28c0a9be821891 + cogspurwin/SqueakConsole.exe f0cf0edce87d42cf1cc7bd8afc4ed8ca \ + cogspurwin-$TAG.zip 75d735ce6f9b4368662e21b26de1ae11 VM=cogspurwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac

1 0

[commit][3357] CogVM source as per VMMaker.oscog-eem.1325
by commits＠squeakvm.org 26 May '15

26 May '15

Revision: 3357 Author: eliot Date: 2015-05-26 10:24:44 -0700 (Tue, 26 May 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1325 Merge with Pharo (with VMMaker.oscog-EstebanLorenzano.1322). Changes are null to Squeak VM. Pulled in are conditionally compiled changes for directory & file creation (added ceration permissions) and to macro used to read image file (for iPhone). Cogit: Fix PIC creation on ARM to jive with new pc-relative addressing support (addressIsInCurrentCompilation:). Slang: Move comment containing method name from after opening brace to before function prototype, because otherwise it interferes with the var struct decl. Move the specifics of NoDbgRegParms out of VMMaker. Assume it is defined in the various sqPlatformSpecific.h (see r3356). Modified Paths: -------------- branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nsspursrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nsspursrc/plugins/DropPlugin/DropPlugin.c branches/Cog/nsspursrc/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nsspursrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/nsspursrc/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nsspursrc/plugins/ImmX11Plugin/ImmX11Plugin.c branches/Cog/nsspursrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nsspursrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c branches/Cog/nsspursrc/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c branches/Cog/nsspursrc/plugins/SoundPlugin/SoundPlugin.c branches/Cog/nsspursrc/plugins/SqueakSSL/SqueakSSL.c branches/Cog/nsspursrc/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nsspursrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/nsspursrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/AioPlugin/AioPlugin.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/CameraPlugin/CameraPlugin.c branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/plugins/DropPlugin/DropPlugin.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/ImmX11Plugin/ImmX11Plugin.c branches/Cog/src/plugins/InternetConfigPlugin/InternetConfigPlugin.c branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c branches/Cog/src/plugins/Klatt/Klatt.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.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/SecurityPlugin/SecurityPlugin.c branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/SqueakSSL/SqueakSSL.c branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c branches/Cog/src/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/src/plugins/UnicodePlugin/UnicodePlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/src/plugins/WeDoPlugin/WeDoPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c 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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/ branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/ branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/GdbARMPlugin.xcodeproj/ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/build.macos32x86/newspeak.cog.spur/installer ___________________________________________________________________ Added: svn:ignore + *.dmg Property changes on: branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj ___________________________________________________________________ Added: svn:ignore + *.pbxuser *.mode* Property changes on: branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/GdbARMPlugin.xcodeproj ___________________________________________________________________ Added: svn:ignore + *.pbxuser *.mode* Property changes on: branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj ___________________________________________________________________ Added: svn:ignore + *.pbxuser *.mode* Modified: branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c 2015-05-24 02:03:15 UTC (rev 3356) +++ branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c 2015-05-26 17:24:44 UTC (rev 3357) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + VMPluginCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 from UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.18 uuid: c426ab70-05a2-43a1-a899-e324aaf8f92f */ @@ -135,6 +135,7 @@ #primitiveAioHandle. */ + /* UnixAioPlugin>>#aioForward:withData:andFlags: */ static void aioForwardwithDataandFlags(int fd, void *data, int flags) { @@ -154,6 +155,7 @@ */ /* return type should be int, but skip the declaration to permit inlining */ + /* AioPlugin>>#fileDescriptorFrom: */ static sqInt fileDescriptorFrom(sqInt aSQFileByteArray) { @@ -170,6 +172,7 @@ /* Answer a file handle from a SQFile structure. On most platforms, this will be a (FILE *). On Win32, it is a HANDLE. */ + /* AioPlugin>>#fileHandleFrom: */ static FILEHANDLETYPE fileHandleFrom(sqInt sqFileStructByteArray) { @@ -182,6 +185,7 @@ /* Answer the size of a SQFile data structure in bytes. */ + /* AioPlugin>>#fileRecordSize */ static sqInt fileRecordSize(void) { @@ -195,6 +199,7 @@ self>>fileRecordSize. */ + /* AioPlugin>>#fileValueOf: */ static SQFile * fileValueOf(sqInt anSQFileRecord) { @@ -207,18 +212,21 @@ it is loaded to check if it does really contain the module we're thinking it contains. This is important! */ + /* InterpreterPlugin>>#getModuleName */ EXPORT(const char*) getModuleName(void) { return moduleName; } + /* AioPlugin>>#getThisSessionIdentifier */ static sqInt getThisSessionIdentifier(void) { return getThisSessionID(); } + /* AioPlugin>>#initialiseModule */ EXPORT(sqInt) initialiseModule(void) { @@ -228,6 +236,7 @@ /* Check for the common failure mode of a SQFile record with all zeros. */ + /* AioPlugin>>#isNonNullSQFile: */ static sqInt isNonNullSQFile(sqInt objectPointer) { @@ -248,6 +257,7 @@ /* Check for the common failure mode of a SQSocket record with all zeros. */ + /* AioPlugin>>#isNullSQSocket: */ static sqInt isNullSQSocket(sqInt objectPointer) { @@ -270,6 +280,7 @@ This check is appropriate if objectPointer has been passed as a parameter to a primitive, and is expected to represent a valid file reference. */ + /* AioPlugin>>#isSQFileObject: */ static sqInt isSQFileObject(sqInt objectPointer) { @@ -287,6 +298,7 @@ is expected to represent a valid socket reference. */ + /* AioPlugin>>#isSQSocketObject: */ static sqInt isSQSocketObject(sqInt objectPointer) { @@ -300,6 +312,7 @@ identifier. */ + /* AioPlugin>>#isValidFileSession: */ static sqInt isValidFileSession(sqInt objectPointer) { @@ -310,6 +323,7 @@ /* The module with the given name was just unloaded. Make sure we have no dangling references. */ + /* AioPlugin>>#moduleUnloaded: */ EXPORT(sqInt) moduleUnloaded(char *aModuleName) { @@ -319,6 +333,7 @@ /* Definitively disable asynchronous event notification for a descriptor. The parameter is an OS level integer file descriptor. */ + /* UnixAioPlugin>>#primitiveAioDisable */ EXPORT(sqInt) primitiveAioDisable(void) { @@ -347,6 +362,7 @@ the semaphore index. */ + /* UnixAioPlugin>>#primitiveAioEnable */ EXPORT(sqInt) primitiveAioEnable(void) { @@ -389,6 +405,7 @@ AIO_R (1<<1) handle for read AIO_W (1<<2) handle for write */ + /* UnixAioPlugin>>#primitiveAioHandle */ EXPORT(sqInt) primitiveAioHandle(void) { @@ -435,6 +452,7 @@ AIO_R (1<<1) handle for read AIO_W (1<<2) handle for write */ + /* UnixAioPlugin>>#primitiveAioSuspend */ EXPORT(sqInt) primitiveAioSuspend(void) { @@ -472,6 +490,7 @@ /* Answer a string containing the module name string for this plugin. */ + /* AioPlugin>>#primitiveModuleName */ EXPORT(sqInt) primitiveModuleName(void) { @@ -483,6 +502,7 @@ number. */ + /* UnixAioPlugin>>#primitiveOSFileHandle */ EXPORT(sqInt) primitiveOSFileHandle(void) { @@ -515,6 +535,7 @@ file number. */ + /* UnixAioPlugin>>#primitiveOSSocketHandle */ EXPORT(sqInt) primitiveOSSocketHandle(void) { @@ -538,6 +559,7 @@ /* Answer a string containing the version string for this plugin. */ + /* AioPlugin>>#primitiveVersionString */ EXPORT(sqInt) primitiveVersionString(void) { @@ -549,6 +571,7 @@ reference, this identifier will match the session identifier supplied by the interpreter. */ + /* AioPlugin>>#sessionIdentifierFromSqFile: */ static SESSIONIDENTIFIERTYPE sessionIdentifierFromSqFile(SQFile *sqFile) { @@ -558,6 +581,7 @@ /* Note: This is coded so that it can be run in Squeak. */ + /* InterpreterPlugin>>#setInterpreter: */ EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter) { @@ -590,6 +614,7 @@ return ok; } + /* AioPlugin>>#shutdownModule */ EXPORT(sqInt) shutdownModule(void) { @@ -608,6 +633,7 @@ structure. */ + /* AioPlugin>>#socketDescriptorFrom: */ static int socketDescriptorFrom(sqInt sqSocketOop) { @@ -626,6 +652,7 @@ /* Answer the size of a SQSocket data structure in bytes. */ + /* AioPlugin>>#socketRecordSize */ static sqInt socketRecordSize(void) { @@ -639,6 +666,7 @@ self>>socketRecordSize. */ + /* AioPlugin>>#socketValueOf: */ static SQSocket * socketValueOf(sqInt anSQSocketRecord) { @@ -649,6 +677,7 @@ /* Answer a new String copied from a null-terminated C string. Caution: This may invoke the garbage collector. */ + /* AioPlugin>>#stringFromCString: */ static sqInt stringFromCString(const char *aCString) { @@ -671,6 +700,7 @@ */ /* 2.0 supports 64bit code base */ + /* AioPlugin>>#versionString */ static char * versionString(void) { Modified: branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2015-05-24 02:03:15 UTC (rev 3356) +++ branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2015-05-26 17:24:44 UTC (rev 3357) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 from - AsynchFilePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + AsynchFilePlugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; @@ -102,9 +102,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.1313 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.1325 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.1313 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.1325 (e)" #endif ; static void * sCOAFfn; @@ -115,6 +115,7 @@ given Smalltalk bytes object, or fail and answer nil if oop is not an async file record. */ + /* AsynchFilePlugin>>#asyncFileValueOf: */ static AsyncFile * asyncFileValueOf(sqInt oop) { @@ -132,6 +133,7 @@ it is loaded to check if it does really contain the module we're thinking it contains. This is important! */ + /* InterpreterPlugin>>#getModuleName */ EXPORT(const char*) getModuleName(void) { @@ -141,6 +143,7 @@ /* Initialise the module */ + /* AsynchFilePlugin>>#initialiseModule */ EXPORT(sqInt) initialiseModule(void) { @@ -152,6 +155,7 @@ /* The module with the given name was just unloaded. Make sure we have no dangling references. */ + /* AsynchFilePlugin>>#moduleUnloaded: */ EXPORT(sqInt) moduleUnloaded(char *aModuleName) { @@ -163,6 +167,7 @@ } } + /* AsynchFilePlugin>>#primitiveAsyncFileClose */ EXPORT(sqInt) primitiveAsyncFileClose(void) { @@ -193,6 +198,7 @@ return null; } + /* AsynchFilePlugin>>#primitiveAsyncFileOpen */ EXPORT(sqInt) primitiveAsyncFileOpen(void) { @@ -243,6 +249,7 @@ return null; } + /* AsynchFilePlugin>>#primitiveAsyncFileReadResult */ EXPORT(sqInt) primitiveAsyncFileReadResult(void) { @@ -303,6 +310,7 @@ return null; } + /* AsynchFilePlugin>>#primitiveAsyncFileReadStart */ EXPORT(sqInt) primitiveAsyncFileReadStart(void) { @@ -337,6 +345,7 @@ return null; } + /* AsynchFilePlugin>>#primitiveAsyncFileWriteResult */ EXPORT(sqInt) primitiveAsyncFileWriteResult(void) { @@ -370,6 +379,7 @@ return null; } + /* AsynchFilePlugin>>#primitiveAsyncFileWriteStart */ EXPORT(sqInt) primitiveAsyncFileWriteStart(void) { @@ -432,6 +442,7 @@ /* Note: This is coded so that it can be run in Squeak. */ + /* InterpreterPlugin>>#setInterpreter: */ EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter) { @@ -469,12 +480,14 @@ /* Initialise the module */ + /* AsynchFilePlugin>>#shutdownModule */ EXPORT(sqInt) shutdownModule(void) { return asyncFileShutdown(); } + /* SmartSyntaxInterpreterPlugin>>#sqAssert: */ static sqInt sqAssert(sqInt aBool) { Modified: branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-05-24 02:03:15 UTC (rev 3356) +++ branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-05-26 17:24:44 UTC (rev 3357) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 + VMPluginCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 from - BalloonEnginePlugin VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 + BalloonEnginePlugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; @@ -836,9 +836,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.1315 (i)" + "B2DPlugin VMMaker.oscog-eem.1325 (i)" #else - "B2DPlugin VMMaker.oscog-eem.1315 (e)" + "B2DPlugin VMMaker.oscog-eem.1325 (e)" #endif ; static int* objBuffer; @@ -847,24 +847,28 @@ static int* workBuffer; + /* BalloonEngineBase>>#aaColorMaskGet */ static sqInt aaColorMaskGet(void) { return workBuffer[GWAAColorMask]; } + /* BalloonEngineBase>>#aaColorMaskPut: */ static sqInt aaColorMaskPut(sqInt value) { return workBuffer[GWAAColorMask] = value; } + /* BalloonEngineBase>>#aaColorShiftGet */ static sqInt aaColorShiftGet(void) { return workBuffer[GWAAColorShift]; } + /* BalloonEngineBase>>#aaColorShiftPut: */ static sqInt aaColorShiftPut(sqInt value) { @@ -874,6 +878,7 @@ /* Common function to compute the first full pixel for AA drawing */ + /* BalloonEngineBase>>#aaFirstPixelFrom:to: */ static sqInt aaFirstPixelFromto(sqInt leftX, sqInt rightX) { @@ -888,12 +893,14 @@ } } + /* BalloonEngineBase>>#aaHalfPixelGet */ static sqInt aaHalfPixelGet(void) { return workBuffer[GWAAHalfPixel]; } + /* BalloonEngineBase>>#aaHalfPixelPut: */ static sqInt aaHalfPixelPut(sqInt value) { @@ -903,42 +910,49 @@ /* Common function to compute the last full pixel for AA drawing */ + /* BalloonEngineBase>>#aaLastPixelFrom:to: */ static sqInt aaLastPixelFromto(sqInt leftX, sqInt rightX) { return (rightX - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); } + /* BalloonEngineBase>>#aaLevelGet */ static sqInt aaLevelGet(void) { return workBuffer[GWAALevel]; } + /* BalloonEngineBase>>#aaLevelPut: */ static sqInt aaLevelPut(sqInt value) { return workBuffer[GWAALevel] = value; } + /* BalloonEngineBase>>#aaScanMaskGet */ static sqInt aaScanMaskGet(void) { return workBuffer[GWAAScanMask]; } + /* BalloonEngineBase>>#aaScanMaskPut: */ static sqInt aaScanMaskPut(sqInt value) { return workBuffer[GWAAScanMask] = value; } + /* BalloonEngineBase>>#aaShiftGet */ static sqInt aaShiftGet(void) { return workBuffer[GWAAShift]; } + /* BalloonEngineBase>>#aaShiftPut: */ static sqInt aaShiftPut(sqInt value) { @@ -949,6 +963,7 @@ /* Compute the squared value of a 8.24 number with 0.0 <= value < 1.0, e.g., compute (value * value) bitShift: -24 */ + /* BalloonEnginePlugin>>#absoluteSquared8Dot24: */ static sqInt absoluteSquared8Dot24(sqInt value) { @@ -963,6 +978,7 @@ /* Return the accurate length of the vector described by deltaX and deltaY */ + /* BalloonEngineBase>>#accurateLengthOf:with: */ static sqInt accurateLengthOfwith(sqInt deltaX, sqInt deltaY) { @@ -994,6 +1010,7 @@ } } + /* BalloonEngineBase>>#addEdgeToGET: */ static sqInt addEdgeToGET(sqInt edge) { @@ -1013,6 +1030,7 @@ to 255 and thus fill the entire range of colors. */ + /* BalloonEngineBase>>#adjustAALevel */ static sqInt adjustAALevel(void) { @@ -1036,6 +1054,7 @@ /* Adjust the wide bezier curve (dx < 0) to start/end at the right point */ + /* BalloonEnginePlugin>>#adjustWideBezierLeft:width:offset:endX: */ static sqInt adjustWideBezierLeftwidthoffsetendX(sqInt bezier, sqInt lineWidth, sqInt lineOffset, sqInt endX) { @@ -1053,6 +1072,7 @@ /* Adjust the wide bezier curve (dx >= 0) to start/end at the right point */ + /* BalloonEnginePlugin>>#adjustWideBezierRight:width:offset:endX: */ static sqInt adjustWideBezierRightwidthoffsetendX(sqInt bezier, sqInt lineWidth, sqInt lineOffset, sqInt endX) { @@ -1075,6 +1095,7 @@ Special adjustments of line width and start position are made here to simulate a rectangular brush */ + /* BalloonEnginePlugin>>#adjustWideLine:afterSteppingFrom:to: */ static sqInt adjustWideLineafterSteppingFromto(sqInt line, sqInt lastX, sqInt nextX) { @@ -1139,24 +1160,28 @@ objBuffer[line + GLWideWidth] = lineWidth; } + /* BalloonEngineBase>>#aetStartGet */ static sqInt aetStartGet(void) { return workBuffer[GWAETStart]; } + /* BalloonEngineBase>>#aetStartPut: */ static sqInt aetStartPut(sqInt value) { return workBuffer[GWAETStart] = value; } + /* BalloonEngineBase>>#aetUsedGet */ static sqInt aetUsedGet(void) { return workBuffer[GWAETUsed]; } + /* BalloonEngineBase>>#aetUsedPut: */ static sqInt aetUsedPut(sqInt value) { @@ -1166,6 +1191,7 @@ /* Allocate n slots in the active edge table */ + /* BalloonEngineBase>>#allocateAETEntry: */ static sqInt allocateAETEntry(sqInt nSlots) { @@ -1179,6 +1205,7 @@ return 1; } + /* BalloonEnginePlugin>>#allocateBezier */ static sqInt allocateBezier(void) { @@ -1195,6 +1222,7 @@ return bezier; } + /* BalloonEnginePlugin>>#allocateBezierStackEntry */ static sqInt allocateBezierStackEntry(void) { @@ -1209,6 +1237,7 @@ return (workBuffer[GWSize]) - (workBuffer[GWBufferTop]); } + /* BalloonEnginePlugin>>#allocateBitmapFill:colormap: */ static sqInt allocateBitmapFillcolormap(sqInt cmSize, int *cmBits) { @@ -1245,6 +1274,7 @@ /* Allocate n slots in the global edge table */ + /* BalloonEngineBase>>#allocateGETEntry: */ static sqInt allocateGETEntry(sqInt nSlots) { @@ -1272,6 +1302,7 @@ return 1; } + /* BalloonEnginePlugin>>#allocateGradientFill:rampWidth:isRadial: */ static sqInt allocateGradientFillrampWidthisRadial(int *ramp, sqInt rampWidth, sqInt isRadial) { @@ -1310,6 +1341,7 @@ return fill; } + /* BalloonEnginePlugin>>#allocateLine */ static sqInt allocateLine(void) { @@ -1329,6 +1361,7 @@ /* Allocate n slots in the object buffer */ + /* BalloonEngineBase>>#allocateObjEntry: */ static sqInt allocateObjEntry(sqInt nSlots) { @@ -1359,6 +1392,7 @@ /* AET and Stack allocation are symmetric */ + /* BalloonEngineBase>>#allocateStackEntry: */ static sqInt allocateStackEntry(sqInt nSlots) { @@ -1372,6 +1406,7 @@ return 1; } + /* BalloonEngineBase>>#allocateStackFillEntry */ static sqInt allocateStackFillEntry(void) { @@ -1383,6 +1418,7 @@ return 1; } + /* BalloonEnginePlugin>>#allocateWideBezier */ static sqInt allocateWideBezier(void) { @@ -1399,6 +1435,7 @@ return bezier; } + /* BalloonEnginePlugin>>#allocateWideLine */ static sqInt allocateWideLine(void) { @@ -1415,6 +1452,7 @@ return line; } + /* BalloonEngineBase>>#areEdgeFillsValid: */ static sqInt areEdgeFillsValid(sqInt edge) { @@ -1424,6 +1462,7 @@ /* Make sure that val1 is between val2 and val3. */ + /* BalloonEnginePlugin>>#assureValue:between:and: */ static sqInt assureValuebetweenand(sqInt val1, sqInt val2, sqInt val3) { @@ -1446,144 +1485,168 @@ return val1; } + /* BalloonEnginePlugin>>#bezierEndXOf: */ static sqInt bezierEndXOf(sqInt bezier) { return objBuffer[bezier + GBEndX]; } + /* BalloonEnginePlugin>>#bezierEndXOf:put: */ static sqInt bezierEndXOfput(sqInt bezier, sqInt value) { return objBuffer[bezier + GBEndX] = value; } + /* BalloonEnginePlugin>>#bezierEndYOf: */ static sqInt bezierEndYOf(sqInt bezier) { return objBuffer[bezier + GBEndY]; } + /* BalloonEnginePlugin>>#bezierEndYOf:put: */ static sqInt bezierEndYOfput(sqInt bezier, sqInt value) { return objBuffer[bezier + GBEndY] = value; } + /* BalloonEnginePlugin>>#bezierFinalXOf: */ static sqInt bezierFinalXOf(sqInt bezier) { return objBuffer[bezier + GBFinalX]; } + /* BalloonEnginePlugin>>#bezierFinalXOf:put: */ static sqInt bezierFinalXOfput(sqInt bezier, sqInt value) { return objBuffer[bezier + GBFinalX] = value; } + /* BalloonEnginePlugin>>#bezierUpdateDataOf: */ static int * bezierUpdateDataOf(sqInt bezier) { return (objBuffer + bezier) + GBUpdateData; } + /* BalloonEnginePlugin>>#bezierViaXOf: */ static sqInt bezierViaXOf(sqInt bezier) { return objBuffer[bezier + GBViaX]; } + /* BalloonEnginePlugin>>#bezierViaXOf:put: */ static sqInt bezierViaXOfput(sqInt bezier, sqInt value) { return objBuffer[bezier + GBViaX] = value; } + /* BalloonEnginePlugin>>#bezierViaYOf: */ static sqInt bezierViaYOf(sqInt bezier) { return objBuffer[bezier + GBViaY]; } + /* BalloonEnginePlugin>>#bezierViaYOf:put: */ static sqInt bezierViaYOfput(sqInt bezier, sqInt value) { return objBuffer[bezier + GBViaY] = value; } + /* BalloonEnginePlugin>>#bitmapCmSizeOf: */ static sqInt bitmapCmSizeOf(sqInt bmFill) { return objBuffer[bmFill + GBColormapSize]; } + /* BalloonEnginePlugin>>#bitmapCmSizeOf:put: */ static sqInt bitmapCmSizeOfput(sqInt bmFill, sqInt value) { return objBuffer[bmFill + GBColormapSize] = value; } + /* BalloonEnginePlugin>>#bitmapDepthOf: */ static sqInt bitmapDepthOf(sqInt bmFill) { return objBuffer[bmFill + GBBitmapDepth]; } + /* BalloonEnginePlugin>>#bitmapDepthOf:put: */ static sqInt bitmapDepthOfput(sqInt bmFill, sqInt value) { return objBuffer[bmFill + GBBitmapDepth] = value; } + /* BalloonEnginePlugin>>#bitmapHeightOf: */ static sqInt bitmapHeightOf(sqInt bmFill) { return objBuffer[bmFill + GBBitmapHeight]; } + /* BalloonEnginePlugin>>#bitmapHeightOf:put: */ static sqInt bitmapHeightOfput(sqInt bmFill, sqInt value) { return objBuffer[bmFill + GBBitmapHeight] = value; } + /* BalloonEnginePlugin>>#bitmapRasterOf: */ static sqInt bitmapRasterOf(sqInt bmFill) { return objBuffer[bmFill + GBBitmapRaster]; } + /* BalloonEnginePlugin>>#bitmapRasterOf:put: */ static sqInt bitmapRasterOfput(sqInt bmFill, sqInt value) { return objBuffer[bmFill + GBBitmapRaster] = value; } + /* BalloonEnginePlugin>>#bitmapSizeOf: */ static sqInt bitmapSizeOf(sqInt bmFill) { return objBuffer[bmFill + GBBitmapSize]; } + /* BalloonEnginePlugin>>#bitmapSizeOf:put: */ static sqInt bitmapSizeOfput(sqInt bmFill, sqInt value) { return objBuffer[bmFill + GBBitmapSize] = value; } + /* BalloonEnginePlugin>>#bitmapTileFlagOf: */ static sqInt bitmapTileFlagOf(sqInt bmFill) { return objBuffer[bmFill + GBTileFlag]; } + /* BalloonEnginePlugin>>#bitmapTileFlagOf:put: */ static sqInt bitmapTileFlagOfput(sqInt bmFill, sqInt value) { return objBuffer[bmFill + GBTileFlag] = value; } + /* BalloonEnginePlugin>>#bitmapValue:bits:atX:y: */ static sqInt bitmapValuebitsatXy(sqInt bmFill, sqInt bits, sqInt xp, sqInt yp) { @@ -1650,84 +1713,98 @@ return uncheckedTransformColor(value); } + /* BalloonEnginePlugin>>#bitmapWidthOf: */ static sqInt bitmapWidthOf(sqInt bmFill) { return objBuffer[bmFill + GBBitmapWidth]; } + /* BalloonEnginePlugin>>#bitmapWidthOf:put: */ static sqInt bitmapWidthOfput(sqInt bmFill, sqInt value) { return objBuffer[bmFill + GBBitmapWidth] = value; } + /* BalloonEnginePlugin>>#bzEndX: */ static sqInt bzEndX(sqInt index) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 4)]; } + /* BalloonEnginePlugin>>#bzEndX:put: */ static sqInt bzEndXput(sqInt index, sqInt value) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 4)] = value; } + /* BalloonEnginePlugin>>#bzEndY: */ static sqInt bzEndY(sqInt index) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 5)]; } + /* BalloonEnginePlugin>>#bzEndY:put: */ static sqInt bzEndYput(sqInt index, sqInt value) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 5)] = value; } + /* BalloonEnginePlugin>>#bzStartX: */ static sqInt bzStartX(sqInt index) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index))]; } + /* BalloonEnginePlugin>>#bzStartX:put: */ static sqInt bzStartXput(sqInt index, sqInt value) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index))] = value; } + /* BalloonEnginePlugin>>#bzStartY: */ static sqInt bzStartY(sqInt index) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 1)]; } + /* BalloonEnginePlugin>>#bzStartY:put: */ static sqInt bzStartYput(sqInt index, sqInt value) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 1)] = value; } + /* BalloonEnginePlugin>>#bzViaX: */ static sqInt bzViaX(sqInt index) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 2)]; } + /* BalloonEnginePlugin>>#bzViaX:put: */ static sqInt bzViaXput(sqInt index, sqInt value) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 2)] = value; } + /* BalloonEnginePlugin>>#bzViaY: */ static sqInt bzViaY(sqInt index) { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 3)]; } + /* BalloonEnginePlugin>>#bzViaY:put: */ static sqInt bzViaYput(sqInt index, sqInt value) { @@ -1737,6 +1814,7 @@ /* Check the fill indexes in the run-length encoded fillList */ + /* BalloonEnginePlugin>>#checkCompressedFillIndexList:max:segments: */ static sqInt checkCompressedFillIndexListmaxsegments(sqInt fillList, sqInt maxIndex, sqInt nSegs) { @@ -1765,6 +1843,7 @@ /* Check if the indexList (containing fill handles) is okay. */ + /* BalloonEnginePlugin>>#checkCompressedFills: */ static sqInt checkCompressedFills(sqInt indexList) { @@ -1796,6 +1875,7 @@ /* Check the run-length encoded lineWidthList matches nSegments */ + /* BalloonEnginePlugin>>#checkCompressedLineWidths:segments: */ static sqInt checkCompressedLineWidthssegments(sqInt lineWidthList, sqInt nSegments) { @@ -1818,6 +1898,7 @@ /* Check if the given point array can be handled by the engine. */ + /* BalloonEnginePlugin>>#checkCompressedPoints:segments: */ static sqInt checkCompressedPointssegments(sqInt points, sqInt nSegments) { @@ -1844,6 +1925,7 @@ /* Check if the given shape can be handled by the engine. Since there are a number of requirements this is an extra method. */ + /* BalloonEnginePlugin>>#checkCompressedShape:segments:leftFills:rightFills:lineWidths:lineFills:fillIndexList: */ static sqInt checkCompressedShapesegmentsleftFillsrightFillslineWidthslineFillsfillIndexList(sqInt points, sqInt nSegments, sqInt leftFills, sqInt rightFills, sqInt lineWidths, sqInt lineFills, sqInt fillIndexList) { @@ -1876,6 +1958,7 @@ region */ + /* BalloonEnginePlugin>>#checkedAddBezierToGET: */ static sqInt checkedAddBezierToGET(sqInt bezier) { @@ -1901,6 +1984,7 @@ /* Add the edge to the global edge table. For known edge types, check if the edge intersects the visible region */ + /* BalloonEnginePlugin>>#checkedAddEdgeToGET: */ static sqInt checkedAddEdgeToGET(sqInt edge) { @@ -1949,6 +2033,7 @@ /* Add the line to the global edge table if it intersects the clipping region */ + /* BalloonEnginePlugin>>#checkedAddLineToGET: */ static sqInt checkedAddLineToGET(sqInt line) { @@ -1970,6 +2055,7 @@ addEdgeToGET(line); } + /* BalloonEnginePlugin>>#circleCosTable */ static double * circleCosTable(void) { @@ -1987,6 +2073,7 @@ return theTable; } + /* BalloonEnginePlugin>>#circleSinTable */ static double * circleSinTable(void) { @@ -2004,6 +2091,7 @@ return theTable; } + /* BalloonEnginePlugin>>#clampValue:max: */ static sqInt clampValuemax(sqInt value, sqInt maxValue) { @@ -2026,6 +2114,7 @@ previous scan line. */ + /* BalloonEngineBase>>#clearSpanBuffer */ static sqInt clearSpanBuffer(void) { @@ -2048,72 +2137,84 @@ workBuffer[GWSpanEnd] = 0; } + /* BalloonEngineBase>>#clearSpanBufferGet */ static sqInt clearSpanBufferGet(void) { return workBuffer[GWClearSpanBuffer]; } + /* BalloonEngineBase>>#clearSpanBufferPut: */ static sqInt clearSpanBufferPut(sqInt value) { return workBuffer[GWClearSpanBuffer] = value; } + /* BalloonEngineBase>>#clipMaxXGet */ static sqInt clipMaxXGet(void) { return workBuffer[GWClipMaxX]; } + /* BalloonEngineBase>>#clipMaxXPut: */ static sqInt clipMaxXPut(sqInt value) { return workBuffer[GWClipMaxX] = value; } + /* BalloonEngineBase>>#clipMaxYGet */ static sqInt clipMaxYGet(void) { return workBuffer[GWClipMaxY]; } + /* BalloonEngineBase>>#clipMaxYPut: */ static sqInt clipMaxYPut(sqInt value) { return workBuffer[GWClipMaxY] = value; } + /* BalloonEngineBase>>#clipMinXGet */ static sqInt clipMinXGet(void) { return workBuffer[GWClipMinX]; } + /* BalloonEngineBase>>#clipMinXPut: */ static sqInt clipMinXPut(sqInt value) { return workBuffer[GWClipMinX] = value; } + /* BalloonEngineBase>>#clipMinYGet */ static sqInt clipMinYGet(void) { return workBuffer[GWClipMinY]; } + /* BalloonEngineBase>>#clipMinYPut: */ static sqInt clipMinYPut(sqInt value) { return workBuffer[GWClipMinY] = value; } + /* BalloonEnginePlugin>>#colormapOf: */ static int * colormapOf(sqInt bmFill) { return (objBuffer + bmFill) + GBColormapOffset; } + /* BalloonEngineBase>>#colorTransform */ static float * colorTransform(void) { @@ -2123,6 +2224,7 @@ /* Split the bezier curve at 0.5. */ + /* BalloonEnginePlugin>>#computeBezierSplitAtHalf: */ static sqInt computeBezierSplitAtHalf(sqInt index) { @@ -2193,6 +2295,7 @@ beziers monoton we must check for the resulting y values to be *really* between the start and end value. */ + /* BalloonEnginePlugin>>#computeBezier:splitAt: */ static sqInt computeBeziersplitAt(sqInt index, double param) { @@ -2307,6 +2410,7 @@ /* Get both values from the two boundaries of the given bezier and compute the actual position/width of the line */ + /* BalloonEnginePlugin>>#computeFinalWideBezierValues:width: */ static sqInt computeFinalWideBezierValueswidth(sqInt bezier, sqInt lineWidth) { @@ -2330,6 +2434,7 @@ } } + /* BalloonEngineBase>>#computeSqrt: */ static sqInt computeSqrt(sqInt length2) { @@ -2341,6 +2446,7 @@ } } + /* BalloonEngineBase>>#copyBitsFrom:to:at: */ static sqInt copyBitsFromtoat(sqInt x0, sqInt x1, sqInt yValue) { @@ -2358,6 +2464,7 @@ /* Create the global edge table */ + /* BalloonEngineBase>>#createGlobalEdgeTable */ static sqInt createGlobalEdgeTable(void) { @@ -2428,48 +2535,56 @@ } } + /* BalloonEngineBase>>#currentYGet */ static sqInt currentYGet(void) { return workBuffer[GWCurrentY]; } + /* BalloonEngineBase>>#currentYPut: */ static sqInt currentYPut(sqInt value) { return workBuffer[GWCurrentY] = value; } + /* BalloonEngineBase>>#currentZGet */ static sqInt currentZGet(void) { return workBuffer[GWCurrentZ]; } + /* BalloonEngineBase>>#currentZPut: */ static sqInt currentZPut(sqInt value) { return workBuffer[GWCurrentZ] = value; } + /* BalloonEngineBase>>#destOffsetXGet */ static sqInt destOffsetXGet(void) { return workBuffer[GWDestOffsetX]; } + /* BalloonEngineBase>>#destOffsetXPut: */ static sqInt destOffsetXPut(sqInt value) { return workBuffer[GWDestOffsetX] = value; } + /* BalloonEngineBase>>#destOffsetYGet */ static sqInt destOffsetYGet(void) { return workBuffer[GWDestOffsetY]; } + /* BalloonEngineBase>>#destOffsetYPut: */ static sqInt destOffsetYPut(sqInt value) { @@ -2479,6 +2594,7 @@ /* Display the span buffer at the current scan line. */ + /* BalloonEngineBase>>#displaySpanBufferAt: */ static sqInt displaySpanBufferAt(sqInt y) { @@ -2511,6 +2627,7 @@ /* Draw the given edge starting from leftX with the edge's fill. Return the end value of the drawing operation. */ + /* BalloonEngineBase>>#drawWideEdge:from: */ static sqInt drawWideEdgefrom(sqInt edge, sqInt leftX) { @@ -2558,54 +2675,63 @@ return rightX; } + /* BalloonEngineBase>>#edgeFillsInvalidate: */ static sqInt edgeFillsInvalidate(sqInt edge) { return objBuffer[edge + GEObjectType] = (((objBuffer[edge + GEObjectType]) & GEPrimitiveTypeMask) | GEEdgeFillsInvalid); } + /* BalloonEngineBase>>#edgeFillsValidate: */ static sqInt edgeFillsValidate(sqInt edge) { return objBuffer[edge + GEObjectType] = (((objBuffer[edge + GEObjectType]) & GEPrimitiveTypeMask) & ((unsigned int)~GEEdgeFillsInvalid)); } + /* BalloonEngineBase>>#edgeLeftFillOf: */ static sqInt edgeLeftFillOf(sqInt edge) { return objBuffer[edge + GEFillIndexLeft]; } + /* BalloonEngineBase>>#edgeLeftFillOf:put: */ static sqInt edgeLeftFillOfput(sqInt edge, sqInt value) { return objBuffer[edge + GEFillIndexLeft] = value; } + /* BalloonEngineBase>>#edgeNumLinesOf: */ static sqInt edgeNumLinesOf(sqInt edge) { return objBuffer[edge + GENumLines]; } + /* BalloonEngineBase>>#edgeNumLinesOf:put: */ static sqInt edgeNumLinesOfput(sqInt edge, sqInt value) { return objBuffer[edge + GENumLines] = value; } + /* BalloonEngineBase>>#edgeRightFillOf: */ static sqInt edgeRightFillOf(sqInt edge) { return objBuffer[edge + GEFillIndexRight]; } + /* BalloonEngineBase>>#edgeRightFillOf:put: */ static sqInt edgeRightFillOfput(sqInt edge, sqInt value) { return objBuffer[edge + GEFillIndexRight] = value; } + /* BalloonEngineBase>>#edgeTransform */ static float * edgeTransform(void) { @@ -2615,42 +2741,49 @@ /* Return the edge type (e.g., witout the wide edge flag) */ + /* BalloonEngineBase>>#edgeTypeOf: */ static sqInt edgeTypeOf(sqInt edge) { return ((usqInt) ((objBuffer[edge + GEObjectType]) & GEPrimitiveTypeMask)) >> 1; } + /* BalloonEngineBase>>#edgeXValueOf: */ static sqInt edgeXValueOf(sqInt edge) { return objBuffer[edge + GEXValue]; } + /* BalloonEngineBase>>#edgeXValueOf:put: */ static sqInt edgeXValueOfput(sqInt edge, sqInt value) { return objBuffer[edge + GEXValue] = value; } + /* BalloonEngineBase>>#edgeYValueOf: */ static sqInt edgeYValueOf(sqInt edge) { return objBuffer[edge + GEYValue]; } + /* BalloonEngineBase>>#edgeYValueOf:put: */ static sqInt edgeYValueOfput(sqInt edge, sqInt value) { return objBuffer[edge + GEYValue] = value; } + /* BalloonEngineBase>>#edgeZValueOf: */ static sqInt edgeZValueOf(sqInt edge) { return objBuffer[edge + GEZValue]; } + /* BalloonEngineBase>>#edgeZValueOf:put: */ static sqInt edgeZValueOfput(sqInt edge, sqInt value) { @@ -2661,6 +2794,7 @@ /* Ignore dispatch errors when translating to C (since we have no entry point for #error in the VM proxy) */ + /* BalloonEngineBase>>#errorWrongIndex */ static sqInt errorWrongIndex(void) { @@ -2673,6 +2807,7 @@ if you know exactly that this doesn't matter. Otherwise use #accurateLengthOf:width: */ + /* BalloonEngineBase>>#estimatedLengthOf:with: */ static sqInt estimatedLengthOfwith(sqInt deltaX, sqInt deltaY) { @@ -2702,6 +2837,7 @@ /* Fill the span buffer from leftX to rightX with the given fill. */ + /* BalloonEngineBase>>#fillAllFrom:to: */ static sqInt fillAllFromto(sqInt leftX, sqInt rightX) { @@ -2793,12 +2929,14 @@ return 0; } + /* BalloonEnginePlugin>>#fillBitmapSpan */ static sqInt fillBitmapSpan(void) { return fillBitmapSpanfromtoat(workBuffer[GWLastExportedFill], workBuffer[GWLastExportedLeftX], workBuffer[GWLastExportedRightX], workBuffer[GWCurrentY]); } + /* BalloonEnginePlugin>>#fillBitmapSpanAA:from:to:at: */ static sqInt fillBitmapSpanAAfromtoat(sqInt bmFill, sqInt leftX, sqInt rightX, sqInt yValue) { @@ -3271,6 +3409,7 @@ directly. */ + /* BalloonEngineBase>>#fillBitmapSpan:from:to: */ static sqInt fillBitmapSpanfromto(int *bits, sqInt leftX, sqInt rightX) { @@ -3322,6 +3461,7 @@ } } + /* BalloonEnginePlugin>>#fillBitmapSpan:from:to:at: */ static sqInt fillBitmapSpanfromtoat(sqInt bmFill, sqInt leftX, sqInt rightX, sqInt yValue) { @@ -3500,6 +3640,7 @@ b) copy aaLevel pixels between the first and the last full pixel c) copy all pixels that fall in the last full pixel */ + /* BalloonEngineBase>>#fillColorSpanAA:x0:x1: */ static sqInt fillColorSpanAAx0x1(sqInt pixelValue32, sqInt leftX, sqInt rightX) { @@ -3567,6 +3708,7 @@ value. */ + /* BalloonEngineBase>>#fillColorSpan:from:to: */ static sqInt fillColorSpanfromto(sqInt pixelValue32, sqInt leftX, sqInt rightX) { @@ -3597,30 +3739,35 @@ } } + /* BalloonEnginePlugin>>#fillDirectionXOf: */ static sqInt fillDirectionXOf(sqInt fill) { return objBuffer[fill + GFDirectionX]; } + /* BalloonEnginePlugin>>#fillDirectionXOf:put: */ static sqInt fillDirectionXOfput(sqInt fill, sqInt value) { return objBuffer[fill + GFDirectionX] = value; } + /* BalloonEnginePlugin>>#fillDirectionYOf: */ static sqInt fillDirectionYOf(sqInt fill) { return objBuffer[fill + GFDirectionY]; } + /* BalloonEnginePlugin>>#fillDirectionYOf:put: */ static sqInt fillDirectionYOfput(sqInt fill, sqInt value) { return objBuffer[fill + GFDirectionY] = value; } + /* BalloonEnginePlugin>>#fillLinearGradient */ static sqInt fillLinearGradient(void) { @@ -3630,6 +3777,7 @@ /* This is the AA version of linear gradient filling. */ + /* BalloonEnginePlugin>>#fillLinearGradientAA:ramp:ds:dsX:from:to: */ static sqInt fillLinearGradientAArampdsdsXfromto(sqInt fill, int *ramp, sqInt deltaS, sqInt dsX, sqInt leftX, sqInt rightX) { @@ -3731,6 +3879,7 @@ /* Draw a linear gradient fill. */ + /* BalloonEnginePlugin>>#fillLinearGradient:from:to:at: */ static sqInt fillLinearGradientfromtoat(sqInt fill, sqInt leftX, sqInt rightX, sqInt yValue) { @@ -3841,120 +3990,140 @@ } } + /* BalloonEngineBase>>#fillMaxXGet */ static sqInt fillMaxXGet(void) { return workBuffer[GWFillMaxX]; } + /* BalloonEngineBase>>#fillMaxXPut: */ static sqInt fillMaxXPut(sqInt value) { return workBuffer[GWFillMaxX] = value; } + /* BalloonEngineBase>>#fillMaxYGet */ static sqInt fillMaxYGet(void) { return workBuffer[GWFillMaxY]; } + /* BalloonEngineBase>>#fillMaxYPut: */ static sqInt fillMaxYPut(sqInt value) { return workBuffer[GWFillMaxY] = value; } + /* BalloonEngineBase>>#fillMinXGet */ static sqInt fillMinXGet(void) { return workBuffer[GWFillMinX]; } + /* BalloonEngineBase>>#fillMinXPut: */ static sqInt fillMinXPut(sqInt value) { return workBuffer[GWFillMinX] = value; } + /* BalloonEngineBase>>#fillMinYGet */ static sqInt fillMinYGet(void) { return workBuffer[GWFillMinY]; } + /* BalloonEngineBase>>#fillMinYPut: */ static sqInt fillMinYPut(sqInt value) { return workBuffer[GWFillMinY] = value; } + /* BalloonEnginePlugin>>#fillNormalXOf: */ static sqInt fillNormalXOf(sqInt fill) { return objBuffer[fill + GFNormalX]; } + /* BalloonEnginePlugin>>#fillNormalXOf:put: */ static sqInt fillNormalXOfput(sqInt fill, sqInt value) { return objBuffer[fill + GFNormalX] = value; } + /* BalloonEnginePlugin>>#fillNormalYOf: */ static sqInt fillNormalYOf(sqInt fill) { return objBuffer[fill + GFNormalY]; } + /* BalloonEnginePlugin>>#fillNormalYOf:put: */ static sqInt fillNormalYOfput(sqInt fill, sqInt value) { return objBuffer[fill + GFNormalY] = value; } + /* BalloonEngineBase>>#fillOffsetXGet */ static sqInt fillOffsetXGet(void) { return workBuffer[GWFillOffsetX]; } + /* BalloonEngineBase>>#fillOffsetXPut: */ static sqInt fillOffsetXPut(sqInt value) { return workBuffer[GWFillOffsetX] = value; } + /* BalloonEngineBase>>#fillOffsetYGet */ static sqInt fillOffsetYGet(void) { return workBuffer[GWFillOffsetY]; } + /* BalloonEngineBase>>#fillOffsetYPut: */ static sqInt fillOffsetYPut(sqInt value) { return workBuffer[GWFillOffsetY] = value; } + /* BalloonEnginePlugin>>#fillOriginXOf: */ static sqInt fillOriginXOf(sqInt fill) { return objBuffer[fill + GFOriginX]; } + /* BalloonEnginePlugin>>#fillOriginXOf:put: */ static sqInt fillOriginXOfput(sqInt fill, sqInt value) { return objBuffer[fill + GFOriginX] = value; } + /* BalloonEnginePlugin>>#fillOriginYOf: */ static sqInt fillOriginYOf(sqInt fill) { return objBuffer[fill + GFOriginY]; } + /* BalloonEnginePlugin>>#fillOriginYOf:put: */ static sqInt fillOriginYOfput(sqInt fill, sqInt value) { @@ -3964,6 +4133,7 @@ /* Part 2a) Compute the decreasing part of the ramp */ + /* BalloonEnginePlugin>>#fillRadialDecreasingAA:ramp:deltaST:dsX:dtX:from:to: */ static sqInt fillRadialDecreasingAArampdeltaSTdsXdtXfromto(sqInt fill, int *ramp, int *deltaST, sqInt dsX, sqInt dtX, sqInt leftX, sqInt rightX) { @@ -4096,6 +4266,7 @@ /* Part 2a) Compute the decreasing part of the ramp */ + /* BalloonEnginePlugin>>#fillRadialDecreasing:ramp:deltaST:dsX:dtX:from:to: */ static sqInt fillRadialDecreasingrampdeltaSTdsXdtXfromto(sqInt fill, sqInt ramp, sqInt deltaST, sqInt dsX, sqInt dtX, sqInt leftX, sqInt rightX) { @@ -4141,6 +4312,7 @@ return x; } + /* BalloonEnginePlugin>>#fillRadialGradient */ static sqInt fillRadialGradient(void) { @@ -4150,6 +4322,7 @@ /* Draw a radial gradient fill. */ + /* BalloonEnginePlugin>>#fillRadialGradient:from:to:at: */ static sqInt fillRadialGradientfromtoat(sqInt fill, sqInt leftX, sqInt rightX, sqInt yValue) { @@ -4358,6 +4531,7 @@ /* Part 2b) Compute the increasing part of the ramp */ + /* BalloonEnginePlugin>>#fillRadialIncreasingAA:ramp:deltaST:dsX:dtX:from:to: */ static sqInt fillRadialIncreasingAArampdeltaSTdsXdtXfromto(sqInt fill, int *ramp, int *deltaST, sqInt dsX, sqInt dtX, sqInt leftX, sqInt rightX) { @@ -4499,6 +4673,7 @@ /* Part 2b) Compute the increasing part of the ramp */ + /* BalloonEnginePlugin>>#fillRadialIncreasing:ramp:deltaST:dsX:dtX:from:to: */ static sqInt fillRadialIncreasingrampdeltaSTdsXdtXfromto(sqInt fill, sqInt ramp, sqInt deltaST, sqInt dsX, sqInt dtX, sqInt leftX, sqInt rightX) { @@ -4553,6 +4728,7 @@ /* Return true if fillEntry1 should be drawn before fillEntry2 */ + /* BalloonEngineBase>>#fillSorts:before: */ static sqInt fillSortsbefore(sqInt fillEntry1, sqInt fillEntry2) { @@ -4573,6 +4749,7 @@ Clip before performing any operations. Return true if the fill must be handled by some Smalltalk code. */ + /* BalloonEngineBase>>#fillSpan:from:to: */ static sqInt fillSpanfromto(unsigned int fill, sqInt leftX, sqInt rightX) { @@ -4670,12 +4847,14 @@ return 0; } + /* BalloonEngineBase>>#fillTypeOf: */ static sqInt fillTypeOf(sqInt fill) { return ((usqInt) (((objBuffer[fill + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveFillMask)) >> 8; } + /* BalloonEngineBase>>#findNextAETEdgeFrom: */ static sqInt findNextAETEdgeFrom(sqInt leftEdge) { @@ -4700,6 +4879,7 @@ it to the AET */ + /* BalloonEngineBase>>#findNextExternalEntryFromGET */ static sqInt findNextExternalEntryFromGET(void) { @@ -4760,6 +4940,7 @@ ]. */ + /* BalloonEngineBase>>#findNextExternalFillFromAET */ static sqInt findNextExternalFillFromAET(void) { @@ -5004,6 +5185,7 @@ value. */ + /* BalloonEngineBase>>#findNextExternalUpdateFromAET */ static sqInt findNextExternalUpdateFromAET(void) { @@ -5056,6 +5238,7 @@ return 0; } + /* BalloonEngineBase>>#findStackFill:depth: */ static sqInt findStackFilldepth(sqInt fillIndex, sqInt depth) { @@ -5078,24 +5261,28 @@ /* Return true if processing is finished */ + /* BalloonEngineBase>>#finishedProcessing */ static sqInt finishedProcessing(void) { return (workBuffer[GWState]) == GEStateCompleted; } + /* BalloonEngineBase>>#firstPointListGet */ static sqInt firstPointListGet(void) { return workBuffer[GWPointListFirst]; } + /* BalloonEngineBase>>#firstPointListPut: */ static sqInt firstPointListPut(sqInt value) { return workBuffer[GWPointListFirst] = value; } + /* BalloonEngineBase>>#freeStackFillEntry */ static sqInt freeStackFillEntry(void) { @@ -5109,6 +5296,7 @@ it is loaded to check if it does really contain the module we're thinking it contains. This is important! */ + /* InterpreterPlugin>>#getModuleName */ EXPORT(const char*) getModuleName(void) { @@ -5118,6 +5306,7 @@ /* Return true if the edge at index i should sort before the edge at index j. */ + /* BalloonEngineBase>>#getSorts:before: */ static sqInt getSortsbefore(sqInt edge1, sqInt edge2) { @@ -5134,78 +5323,91 @@ return diff < 0; } + /* BalloonEngineBase>>#getStartGet */ static sqInt getStartGet(void) { return workBuffer[GWGETStart]; } + /* BalloonEngineBase>>#getStartPut: */ static sqInt getStartPut(sqInt value) { return workBuffer[GWGETStart] = value; } + /* BalloonEngineBase>>#getUsedGet */ static sqInt getUsedGet(void) { return workBuffer[GWGETUsed]; } + /* BalloonEngineBase>>#getUsedPut: */ static sqInt getUsedPut(sqInt value) { return workBuffer[GWGETUsed] = value; } + /* BalloonEnginePlugin>>#gradientRampLengthOf: */ static sqInt gradientRampLengthOf(sqInt fill) { return objBuffer[fill + GFRampLength]; } + /* BalloonEnginePlugin>>#gradientRampLengthOf:put: */ static sqInt gradientRampLengthOfput(sqInt fill, sqInt value) { return objBuffer[fill + GFRampLength] = value; } + /* BalloonEnginePlugin>>#gradientRampOf: */ static int * gradientRampOf(sqInt fill) { return (objBuffer + fill) + GFRampOffset; } + /* BalloonEngineBase>>#hasColorTransform */ static sqInt hasColorTransform(void) { return (workBuffer[GWHasColorTransform]) != 0; } + /* BalloonEngineBase>>#hasColorTransformGet */ static sqInt hasColorTransformGet(void) { return workBuffer[GWHasColorTransform]; } + /* BalloonEngineBase>>#hasColorTransformPut: */ static sqInt hasColorTransformPut(sqInt value) { return workBuffer[GWHasColorTransform] = value; } + /* BalloonEngineBase>>#hasEdgeTransform */ static sqInt hasEdgeTransform(void) { return (workBuffer[GWHasEdgeTransform]) != 0; } + /* BalloonEngineBase>>#hasEdgeTransformGet */ static sqInt hasEdgeTransformGet(void) { return workBuffer[GWHasEdgeTransform]; } + /* BalloonEngineBase>>#hasEdgeTransformPut: */ static sqInt hasEdgeTransformPut(sqInt value) { @@ -5215,6 +5417,7 @@ /* Make the fill style with the given index invisible */ + /* BalloonEngineBase>>#hideFill:depth: */ static sqInt hideFilldepth(sqInt fillIndex, sqInt depth) { @@ -5266,6 +5469,7 @@ return 1; } + /* BalloonEngineBase>>#incrementPoint:by: */ static sqInt incrementPointby(int *point, sqInt delta) { @@ -5273,6 +5477,7 @@ point[1] = ((point[1]) + delta); } + /* BalloonEngineBase>>#incrementStat:by: */ static sqInt incrementStatby(sqInt statIndex, sqInt value) { @@ -5282,6 +5487,7 @@ /* Find insertion point for the given edge in the AET */ + /* BalloonEngineBase>>#indexForInsertingIntoAET: */ static sqInt indexForInsertingIntoAET(sqInt edge) { @@ -5302,6 +5508,7 @@ return index; } + /* BalloonEngineBase>>#initColorTransform */ static sqInt initColorTransform(void) { @@ -5320,6 +5527,7 @@ workBuffer[GWHasColorTransform] = 0; } + /* BalloonEngineBase>>#initEdgeTransform */ static sqInt initEdgeTransform(void) { @@ -5336,6 +5544,7 @@ workBuffer[GWHasEdgeTransform] = 0; } + /* BalloonEngineBase>>#initialiseModule */ EXPORT(sqInt) initialiseModule(void) { @@ -5351,6 +5560,7 @@ */ /* Make sure aaLevel is initialized */ + /* BalloonEngineBase>>#initializeGETProcessing */ static sqInt initializeGETProcessing(void) { @@ -5402,6 +5612,7 @@ are both set. */ + /* BalloonEngineBase>>#insertEdgeIntoAET: */ static sqInt insertEdgeIntoAET(sqInt edge) { @@ -5423,6 +5634,7 @@ /* Insert the given edge into the AET. */ + /* BalloonEngineBase>>#insertToAET:beforeIndex: */ static sqInt insertToAETbeforeIndex(sqInt edge, sqInt index) { @@ -5443,12 +5655,14 @@ workBuffer[GWAETUsed] = ((workBuffer[GWAETUsed]) + 1); } + /* BalloonEnginePlugin>>#isBezier: */ static sqInt isBezier(sqInt bezier) { return (((objBuffer[bezier + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveWideMask) == GEPrimitiveBezier; } + /* BalloonEngineBase>>#isEdge: */ static sqInt isEdge(sqInt edge) { @@ -5461,12 +5675,14 @@ return (((objBuffer[edge + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveEdgeMask) != 0; } + /* BalloonEngineBase>>#isFillColor: */ static sqInt isFillColor(sqInt fill) { return (fill & 0xFF000000UL) != 0; } + /* BalloonEnginePlugin>>#isFillOkay: */ static sqInt isFillOkay(sqInt fill) { @@ -5478,6 +5694,7 @@ || ((((objBuffer[fill + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveFillMask) != 0)))); } + /* BalloonEngineBase>>#isFill: */ static sqInt isFill(sqInt fill) { @@ -5485,12 +5702,14 @@ || ((((objBuffer[fill + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveFillMask) != 0); } + /* BalloonEnginePlugin>>#isLine: */ static sqInt isLine(sqInt line) { return (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveWideMask) == GEPrimitiveLine; } + /* BalloonEngineBase>>#isObject: */ static sqInt isObject(sqInt obj) { @@ -5498,12 +5717,14 @@ && (obj < objUsed); } + /* BalloonEngineBase>>#isRealFill: */ static sqInt isRealFill(sqInt fill) { return (((objBuffer[fill + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveFillMask) != 0; } + /* BalloonEngineBase>>#isStackEntry: */ static sqInt isStackEntry(sqInt entry) { @@ -5511,6 +5732,7 @@ && (entry < (workBuffer[GWSize])); } + /* BalloonEngineBase>>#isStackIndex: */ static sqInt isStackIndex(sqInt index) { @@ -5518,6 +5740,7 @@ && (index < ((workBuffer[GWSize]) - (workBuffer[GWBufferTop]))); } + /* BalloonEnginePlugin>>#isWideBezier: */ static sqInt isWideBezier(sqInt bezier) { @@ -5525,6 +5748,7 @@ && ((((objBuffer[bezier + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveWide) != 0); } + /* BalloonEnginePlugin>>#isWideLine: */ static sqInt isWideLine(sqInt line) { @@ -5532,150 +5756,175 @@ && ((((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveWide) != 0); } + /* BalloonEngineBase>>#isWide: */ static sqInt isWide(sqInt object) { return (((objBuffer[object + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveWide) != 0; } + /* BalloonEngineBase>>#lastExportedEdgeGet */ static sqInt lastExportedEdgeGet(void) { return workBuffer[GWLastExportedEdge]; } + /* BalloonEngineBase>>#lastExportedEdgePut: */ static sqInt lastExportedEdgePut(sqInt value) { return workBuffer[GWLastExportedEdge] = value; } + /* BalloonEngineBase>>#lastExportedFillGet */ static sqInt lastExportedFillGet(void) { return workBuffer[GWLastExportedFill]; } + /* BalloonEngineBase>>#lastExportedFillPut: */ static sqInt lastExportedFillPut(sqInt value) { return workBuffer[GWLastExportedFill] = value; } + /* BalloonEngineBase>>#lastExportedLeftXGet */ static sqInt lastExportedLeftXGet(void) { return workBuffer[GWLastExportedLeftX]; } + /* BalloonEngineBase>>#lastExportedLeftXPut: */ static sqInt lastExportedLeftXPut(sqInt value) { return workBuffer[GWLastExportedLeftX] = value; } + /* BalloonEngineBase>>#lastExportedRightXGet */ static sqInt lastExportedRightXGet(void) { return workBuffer[GWLastExportedRightX]; } + /* BalloonEngineBase>>#lastExportedRightXPut: */ static sqInt lastExportedRightXPut(sqInt value) { return workBuffer[GWLastExportedRightX] = value; } + /* BalloonEnginePlugin>>#lineEndXOf: */ static sqInt lineEndXOf(sqInt line) { return objBuffer[line + GLEndX]; } + /* BalloonEnginePlugin>>#lineEndXOf:put: */ static sqInt lineEndXOfput(sqInt line, sqInt value) { return objBuffer[line + GLEndX] = value; } + /* BalloonEnginePlugin>>#lineEndYOf: */ static sqInt lineEndYOf(sqInt line) { return objBuffer[line + GLEndY]; } + /* BalloonEnginePlugin>>#lineEndYOf:put: */ static sqInt lineEndYOfput(sqInt line, sqInt value) { return objBuffer[line + GLEndY] = value; } + /* BalloonEnginePlugin>>#lineErrorAdjDownOf: */ static sqInt lineErrorAdjDownOf(sqInt line) { return objBuffer[line + GLErrorAdjDown]; } + /* BalloonEnginePlugin>>#lineErrorAdjDownOf:put: */ static sqInt lineErrorAdjDownOfput(sqInt line, sqInt value) { return objBuffer[line + GLErrorAdjDown] = value; } + /* BalloonEnginePlugin>>#lineErrorAdjUpOf: */ static sqInt lineErrorAdjUpOf(sqInt line) { return objBuffer[line + GLErrorAdjUp]; } + /* BalloonEnginePlugin>>#lineErrorAdjUpOf:put: */ static sqInt lineErrorAdjUpOfput(sqInt line, sqInt value) { return objBuffer[line + GLErrorAdjUp] = value; } + /* BalloonEnginePlugin>>#lineErrorOf: */ static sqInt lineErrorOf(sqInt line) { return objBuffer[line + GLError]; } + /* BalloonEnginePlugin>>#lineErrorOf:put: */ static sqInt lineErrorOfput(sqInt line, sqInt value) { return objBuffer[line + GLError] = value; } + /* BalloonEnginePlugin>>#lineXDirectionOf: */ static sqInt lineXDirectionOf(sqInt line) { return objBuffer[line + GLXDirection]; } @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-EstebanLorenzano.1326.mcz
by commits＠source.squeak.org 26 May '15

26 May '15

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1326.mcz ==================== Summary ==================== Name: VMMaker.oscog-EstebanLorenzano.1326 Author: EstebanLorenzano Time: 26 May 2015, 3:29:25.646752 pm UUID: 8979417d-cdd7-4f86-9439-d474c595e021 Ancestors: VMMaker.oscog-eem.1325 StackInterpreterSimulator>>#veryDeepCopyWith: just work if working inside a Spur image, and Pharo is still not ready to do that. Added a check to ensure it works. =============== Diff against VMMaker.oscog-eem.1325 =============== Item was changed: + SystemOrganization addCategory: #VMMaker! + SystemOrganization addCategory: 'VMMaker-Building'! + SystemOrganization addCategory: 'VMMaker-Interpreter'! + SystemOrganization addCategory: 'VMMaker-InterpreterSimulation'! + SystemOrganization addCategory: 'VMMaker-InterpreterSimulation-Morphic'! + SystemOrganization addCategory: 'VMMaker-JIT'! + SystemOrganization addCategory: 'VMMaker-JITSimulation'! + SystemOrganization addCategory: 'VMMaker-Multithreading'! + SystemOrganization addCategory: 'VMMaker-Plugins'! + SystemOrganization addCategory: 'VMMaker-Plugins-Alien'! + SystemOrganization addCategory: 'VMMaker-Plugins-IOS'! + SystemOrganization addCategory: 'VMMaker-PostProcessing'! + SystemOrganization addCategory: 'VMMaker-SmartSyntaxPlugins'! + SystemOrganization addCategory: 'VMMaker-SpurMemoryManager'! + SystemOrganization addCategory: 'VMMaker-SpurMemoryManagerSimulation'! + SystemOrganization addCategory: 'VMMaker-Support'! + SystemOrganization addCategory: 'VMMaker-Tests'! + SystemOrganization addCategory: 'VMMaker-Translation to C'! - SystemOrganization addCategory: #'VMMaker-Building'! - SystemOrganization addCategory: #'VMMaker-Interpreter'! - SystemOrganization addCategory: #'VMMaker-InterpreterSimulation'! - SystemOrganization addCategory: #'VMMaker-InterpreterSimulation-Morphic'! - SystemOrganization addCategory: #'VMMaker-JIT'! - SystemOrganization addCategory: #'VMMaker-JITSimulation'! - SystemOrganization addCategory: #'VMMaker-Multithreading'! - SystemOrganization addCategory: #'VMMaker-Plugins'! - SystemOrganization addCategory: #'VMMaker-Plugins-Alien'! - SystemOrganization addCategory: #'VMMaker-Plugins-IOS'! - SystemOrganization addCategory: #'VMMaker-PostProcessing'! - SystemOrganization addCategory: #'VMMaker-SmartSyntaxPlugins'! - SystemOrganization addCategory: #'VMMaker-SpurMemoryManager'! - SystemOrganization addCategory: #'VMMaker-SpurMemoryManagerSimulation'! - SystemOrganization addCategory: #'VMMaker-Support'! - SystemOrganization addCategory: #'VMMaker-Tests'! - SystemOrganization addCategory: #'VMMaker-Translation to C'! Item was changed: ----- Method: CCodeGenerator>>storeAPIExportHeader:OnFile: (in category 'public') ----- storeAPIExportHeader: headerName OnFile: fullHeaderPath "Store C header code on the given file. Evaluate aBlock with the stream to generate its contents." | header | header := String streamContents: [:s| s nextPutAll: (self fileHeaderVersionStampForSourceClass: nil); cr. self emitCAPIExportHeaderOn: s]. (self needToGenerateHeader: headerName file: fullHeaderPath contents: header) ifTrue: [self storeHeaderOnFile: fullHeaderPath contents: header]! Item was changed: ----- Method: CCodeGenerator>>storeHeaderOnFile:contents: (in category 'public') ----- storeHeaderOnFile: fileName contents: contents "Store C header code on the given file. Evaluate aBlock with the stream to generate its contents." | aStream | aStream := VMMaker forceNewFileNamed: fileName. aStream ifNil: [Error signal: 'Could not open C header file: ', fileName]. [(contents beginsWith: '/* Automatic') ifFalse: [aStream nextPutAll: (self fileHeaderVersionStampForSourceClass: nil); cr]. aStream nextPutAll: contents] ensure: [aStream close]! Item was changed: ----- Method: CCodeGenerator>>structClassesForTranslationClasses: (in category 'utilities') ----- structClassesForTranslationClasses: classes "Answer in superclass order (any superclass precedes any subclass) the ancilliaryClasses that are struct classes for all the given classes." | theStructClasses | theStructClasses := OrderedCollection new. classes do: [:aTranslationClass| ([aTranslationClass ancilliaryClasses: self options] on: MessageNotUnderstood do: [:ex| ex message selector == #ancilliaryClasses: ifTrue: [#()] ifFalse: [ex pass]]) do: [:class| (class isStructClass and: [(vmClass isNil or: [vmClass isAcceptableAncilliaryClass: class]) and: [(theStructClasses includes: class) not]]) ifTrue: [theStructClasses addLast: class]]]. ^ChangeSet superclassOrder: theStructClasses! Item was changed: ----- Method: CogARMCompiler>>sub:rn:imm:ror: (in category 'ARM convenience instructions') ----- sub: destReg rn: srcReg imm: immediate ror: rot " Remember the ROR is doubled by the cpu so use 30>>1 etc SUB destReg, srcReg, #immediate ROR rot" ^self type: 1 op: SubOpcode set: 0 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! Item was changed: ----- Method: CogMethodSurrogate32 class>>alignedByteSize (in category 'accessing') ----- alignedByteSize ^20 + self baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate64 class>>alignedByteSize (in category 'accessing') ----- alignedByteSize ^32 + self baseHeaderSize! Item was changed: ----- Method: Integer>>asUnsignedInteger (in category '*VMMaker-interpreter simulator') ----- asUnsignedInteger self assert: self >= 0. ^self! Item was changed: ----- Method: InterpreterPlugin class>>shouldBeTranslated (in category 'translation') ----- shouldBeTranslated "is this class intended to be translated as a plugin? Most subclasses should answer true, but some such as:- TestInterpreterPlugin FlippArrayPlugin2 InflatePlugin should answer false for various reasons." ^true! Item was changed: ----- Method: InterpreterPlugin class>>shouldBeTranslatedFor: (in category 'translation') ----- shouldBeTranslatedFor: platformName "Is this class intended to be translated as a plugin, perhaps specific to a platform? Most subclasses should answer true, but some such as simulation-only versions should answer false for various reasons." ^self shouldBeTranslated! Item was changed: ----- Method: InterpreterProxy>>isImmediate: (in category 'testing') ----- isImmediate: anObject <option: #(atLeastVMProxyMajor:minor: 1 13)> ^StackInterpreter objectMemoryClass isImmediate: anObject! Item was changed: ----- Method: SpurGenerationScavenger>>copyAndForward: (in category 'scavenger') ----- copyAndForward: survivor "copyAndForward: survivor copies a survivor object either to futureSurvivorSpace or, if it is to be promoted, to oldSpace. It leaves a forwarding pointer behind. If the object is weak then corpse is threaded onto the weakList for later treatment." <inline: false> | bytesInObj format tenure newLocation | self assert: ((manager isInEden: survivor) "cog methods should be excluded." or: [manager isInPastSpace: survivor]). bytesInObj := manager bytesInObject: survivor. format := manager formatOf: survivor. tenure := self shouldBeTenured: survivor. "Allow Slang to inline." newLocation := (tenure or: [futureSurvivorStart + bytesInObj > futureSpace limit]) ifTrue: [self copyToOldSpace: survivor bytes: bytesInObj format: format] ifFalse: [self copyToFutureSpace: survivor bytes: bytesInObj]. manager forwardSurvivor: survivor to: newLocation. "if weak or ephemeron add to the relevant list for subsequent scanning." (manager isWeakFormat: format) ifTrue: [self addToWeakList: survivor]. ((manager isEphemeronFormat: format) and: [(self isScavengeSurvivor: (manager keyOfEphemeron: newLocation)) not]) ifTrue: [self addToEphemeronList: survivor]. ^newLocation! Item was changed: ----- Method: SpurMemoryManager>>isForwarded: (in category 'object testing') ----- isForwarded: objOop "Answer if objOop is that if a forwarder. Take advantage of isForwardedObjectClassIndexPun being a power of two to generate a more efficient test than the straight-forward (self classIndexOf: objOop) = self isForwardedObjectClassIndexPun at the cost of this being ambiguous with free chunks. So either never apply this to free chunks or guard with (self isFreeObject: foo) not. So far the idiom has been to guard with isFreeObject:" <api> <inline: true> "self assert: (self isFreeObject: objOop) not." ^(self longAt: objOop) noMask: self classIndexMask - self isForwardedObjectClassIndexPun! Item was changed: ----- Method: StackInterpreter>>codeGeneratorToComputeAccessorDepth (in category 'primitive support') ----- codeGeneratorToComputeAccessorDepth ^VMMaker new buildCodeGeneratorForInterpreter: self class primitivesClass includeAPIMethods: false initializeClasses: false! Item was changed: ----- Method: StackInterpreter>>primitiveIndexOfMethod:header: (in category 'compiled methods') ----- primitiveIndexOfMethod: theMethod header: methodHeader "Note: With the Squeak V0 format we now have 10 bits of primitive index, but they are in two places for temporary backward compatibility. The time to unpack is negligible, since the derived primitive function pointer is stored in the method cache. With the new format we assume a 3-byte CallPrimitive with a little-endian 16-bit primitive index." <api> <inline: true> | firstBytecode | ^objectMemory hasSpurMemoryManagerAPI ifTrue: [(self alternateHeaderHasPrimitiveFlag: methodHeader) ifTrue: [firstBytecode := self firstBytecodeOfAlternateHeader: methodHeader method: theMethod. (objectMemory byteAt: firstBytecode + 1) + ((objectMemory byteAt: firstBytecode + 2) << 8)] ifFalse: [0]] ifFalse: [MULTIPLEBYTECODESETS ifTrue: [(self headerIndicatesAlternateBytecodeSet: methodHeader) ifTrue: [(self alternateHeaderHasPrimitiveFlag: methodHeader) ifTrue: [firstBytecode := self firstBytecodeOfAlternateHeader: methodHeader method: theMethod. (objectMemory byteAt: firstBytecode + 1) + ((objectMemory byteAt: firstBytecode + 2) << 8)] ifFalse: [0]] ifFalse: [| primBits | primBits := objectMemory integerValueOf: methodHeader. (primBits bitAnd: 16r1FF) + (primBits >> 19 bitAnd: 16r200)]] ifFalse: [| primBits | primBits := objectMemory integerValueOf: methodHeader. (primBits bitAnd: 16r1FF) + (primBits >> 19 bitAnd: 16r200)]]! Item was changed: ----- Method: StackInterpreterSimulator>>runAtEachStep: (in category 'testing') ----- runAtEachStep: aBlock self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. aBlock value: currentBytecode. self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>veryDeepCopyWith: (in category 'debug support') ----- veryDeepCopyWith: deepCopier "Override to short-circuit the copying of any VMPluginCodeGenerators referenced from mappedPluginEntries. These can in turn hold onto Monticello state, resulting in a huge ammount of unnecessary copying." + self objectMemory hasSpurMemoryManagerAPI ifTrue: + [deepCopier references + at: mappedPluginEntries ifAbsentPut: [mappedPluginEntries]. + mappedPluginEntries do: + [:tuple| + [:sim :sel :block :argCount| + deepCopier references at: block ifAbsentPut: [block]] valueWithArguments: tuple]]. - deepCopier references - at: mappedPluginEntries ifAbsentPut: [mappedPluginEntries]. - mappedPluginEntries do: - [:tuple| - [:sim :sel :block :argCount| - deepCopier references at: block ifAbsentPut: [block]] valueWithArguments: tuple]. ^super veryDeepCopyWith: deepCopier! Item was changed: ----- Method: TAssignmentNode>>emitCCodeAsExpressionOn:level:generator: (in category 'C code generation') ----- emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen aStream nextPut: $(. self emitCCodeOn: aStream level: level generator: aCodeGen. aStream nextPut: $)! Item was changed: ----- Method: TParseNode>>emitCCodeAsArgumentOn:level:generator: (in category 'C code generation') ----- emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen ^self emitCCodeOn: aStream level: level generator: aCodeGen! Item was changed: ----- Method: TParseNode>>emitCCodeAsExpressionOn:level:generator: (in category 'C code generation') ----- emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen ^self emitCCodeOn: aStream level: level generator: aCodeGen! Item was changed: ----- Method: TSendNode>>emitCCodeAsExpressionOn:level:generator: (in category 'C code generation') ----- emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen ^self emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen! Item was changed: ----- Method: VMClass class>>initializePrimitiveErrorCodes (in category 'initialization') ----- initializePrimitiveErrorCodes "Define the VM's primitive error codes. N.B. these are replicated in platforms/Cross/vm/sqVirtualMachine.h." "VMClass initializePrimitiveErrorCodes" | pet | PrimErrTableIndex := 51. "Zero-relative" "See SmalltalkImage>>recreateSpecialObjectsArray for the table definition. If the table exists and is large enough the corresponding entry is returned as the primitive error, otherwise the error is answered numerically." pet := Smalltalk specialObjectsArray at: PrimErrTableIndex + 1 ifAbsent: [#()]. pet isArray ifFalse: [pet := #()]. PrimNoErr := 0. "for helper methods that need to answer success or an error code." PrimErrGenericFailure := pet indexOf: nil ifAbsent: 1. PrimErrBadReceiver := pet indexOf: #'bad receiver' ifAbsent: 2. PrimErrBadArgument := pet indexOf: #'bad argument' ifAbsent: 3. PrimErrBadIndex := pet indexOf: #'bad index' ifAbsent: 4. PrimErrBadNumArgs := pet indexOf: #'bad number of arguments' ifAbsent: 5. PrimErrInappropriate := pet indexOf: #'inappropriate operation' ifAbsent: 6. PrimErrUnsupported := pet indexOf: #'unsupported operation' ifAbsent: 7. PrimErrNoModification := pet indexOf: #'no modification' ifAbsent: 8. PrimErrNoMemory := pet indexOf: #'insufficient object memory' ifAbsent: 9. PrimErrNoCMemory := pet indexOf: #'insufficient C memory' ifAbsent: 10. PrimErrNotFound := pet indexOf: #'not found' ifAbsent: 11. PrimErrBadMethod := pet indexOf: #'bad method' ifAbsent: 12. PrimErrNamedInternal := pet indexOf: #'internal error in named primitive machinery' ifAbsent: 13. PrimErrObjectMayMove := pet indexOf: #'object may move' ifAbsent: 14. PrimErrLimitExceeded := pet indexOf: #'resource limit exceeded' ifAbsent: 15. PrimErrObjectIsPinned := pet indexOf: #'object is pinned' ifAbsent: 16. PrimErrWritePastObject := pet indexOf: #'primitive write beyond end of object' ifAbsent: 17!

1 0

VM Maker: VMMaker.oscog-eem.1325.mcz
by commits＠source.squeak.org 24 May '15

24 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1325.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1325 Author: eem Time: 24 May 2015, 2:19:24.991 pm UUID: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 Ancestors: VMMaker.oscog-eem.1324 NullStream needs to support crtab. =============== Diff against VMMaker.oscog-eem.1324 =============== Item was added: + ----- Method: NullStream>>crtab (in category '*VMMaker-translation support') ----- + crtab!

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 May 2015