Vm-dev April 2012

vm-dev@lists.squeakfoundation.org

30 participants
84 discussions

Start a nNew thread

Any pre-compiled CogVM for x86_64 linux (Fedora/Ubuntu/etc) ?
by Casimiro de Almeida Barreto 23 Apr '12

23 Apr '12

Are there pre-compiled versions of CogVM for x86_64 architectures (linux)? thnx CdAB

2 1

Fwd: Question about closure
by stephane ducasse 23 Apr '12

23 Apr '12

Hi eliot I'm rereading your blog. I understand that you create an array so that you are sure that local of the activation context of the method containing a block are not modified, just the array elements. so this means in particular that since the array is not allocated on the heap you guarantee that captured variables of the closure environment outlive the method activation. I hope I got it correctly. Now I have a question about the following snippet representing what the compiler is doing. Where indirectTempsCopy is initialized and to what? inject: thisValue into: binaryBlock | indirectTemps | indirectTemps := Array new: 1. indirectTemps at: 1 put: thisValue. self do: (thisContext closureCopy: [:each | | binaryBlockCopy indirectTempsCopy | indirectTempsCopy at:1 put: (binaryBlockCopy value: (indirectTempsCopy at: 1) value: each)] copiedValues: (Array with: binaryBlock with: indirectTemps)). ^indirectTemps at: 1 I thought that it should be like and I was wondering after if and why the indirectTemps should be copied. Because we create one context for each [:each | | binaryBlockCopy indirectTempsCopy | indirectTempsCopy := indirectTemps ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ indirectTempsCopy at:1 put: (binaryBlockCopy value: (indirectTempsCopy at: 1) value: each)] copiedValues: (Array with: binaryBlock with: indirectTemps)). ^indirectTemps at: 1 Thanks. Stef

2 2

Class checks in the vm
by Guillermo Polito 22 Apr '12

22 Apr '12

Hi! I'm playing to bootstrap a Pharo image, trying to get a new environment running into my 'host' image, and after that, dump those new objects into a new image file. Now, to do that, I'm creating new classes for String, Character... Which are well known by the vm specialObjectsArray. And trying to initialize my new image classes, which creates new character objects, and new string objects which is causing me some troubles :P. Now, my question is about this check in vmmaker (and some others that look similar): Interpreter>>#asciiOfCharacter: characterObj "Returns an integer object" <inline: false> *self assertClassOf: characterObj is: (self splObj: ClassCharacter).* successFlag ifTrue: [^ self fetchPointer: CharacterValueIndex ofObject: characterObj] ifFalse: [^ ConstZero] "in case some code needs an int" - Can't we put a more intelligent assersion like checking if the object responds true to #isCharacter? - And removing the static check from the vm and adding the dynamic and nice #isCharacter check into the image? Thanks! Guille

6 13

There are something fishy with FFI plugin
by Igor Stasenko 19 Apr '12

19 Apr '12

The FFI plugin built on jenkins does not works properly on windows. We tried multiple different ways, like changing the compilation flags etc, but no success. The source code used is identical to Eliot's branch, so i don't see any other difference except again, GCC compiler version. -- Best regards, Igor Stasenko.

2 2

CogVM binaries as per VMMaker.oscog-eem.157/r2550.
by Eliot Miranda 19 Apr '12

19 Apr '12

http://www.mirandabanda.org/files/Cog/VM/VM.r2550/ CogVM binaries as per VMMaker.oscog-eem.157/r2550. Stack/CoInterpreter/Cogit: Implement proper bounds checking for byte access to compiled methods. Raise errors for accesses outside initialPC to size. CoInterpreter: Provide a thorough flush primitive for CompiledMethods that discards all machine code and makes sure that any contexts using the method have bytecode pcs. Primitive #215 (same as 116 in the Stack VM). This is much slower than 116 (flushCache) since it has to enumerate over all heap contexts. Provide an xray primitive for CompiledMethod that answers if a method has machine code, and if so if it's machine code is frameless, and/or refers to a young object. No primitive number. Used to test the above. Make printOopShort: print Association keys. Useful for longPrintOop:, and hence printReferencesTo: etc. Mac OS: add fflush to debug printing in sqMacUIEventsUniversal.c so output appears promptly. Fix the annoying bogus error messages from the mprotect calls by getting the length arg to mprotect right. Add version infor for the Cross/plugins tree. Add a -version switch to win32 -- best, Eliot

1 0

[commit] r2550 - CogVM source as per VMMaker.oscog-eem.157.
by commits＠squeakvm.org 18 Apr '12

18 Apr '12

Author: eliot Date: 2012-04-17 23:14:23 -0700 (Tue, 17 Apr 2012) New Revision: 2550 Modified: branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Log: CogVM source as per VMMaker.oscog-eem.157. Implement proper bounds checking for byte access to compiled methods. Raise errors for accesses outside initialPC to size. Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/nscogsrc/vm/cogit.c 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc from - StackToRegisterMappingCogit VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + StackToRegisterMappingCogit VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9283,6 +9283,7 @@ sqInt jnx; AbstractInstruction *jumpBounds; AbstractInstruction *jumpFmtEq2; + AbstractInstruction *jumpFmtGt11; AbstractInstruction *jumpFmtGt4; AbstractInstruction *jumpFmtIs2; AbstractInstruction *jumpFmtLe4; @@ -9426,6 +9427,10 @@ genoperandoperand(CmpCqR, 8, ClassReg); /* begin JumpLess: */ jumpFmtLt8 = genoperand(JumpLess, ((sqInt)0)); + /* begin CmpCq:R: */ + genoperandoperand(CmpCqR, 11, ClassReg); + /* begin JumpGreater: */ + jumpFmtGt11 = genoperand(JumpGreater, ((sqInt)0)); /* begin AddCq:R: */ genoperandoperand(AddCqR, BaseHeaderSize, Arg1Reg); /* begin MoveXbr:R:R: */ @@ -9451,7 +9456,7 @@ genoperandoperand(MoveRR, TempReg, ReceiverResultReg); /* begin RetN: */ genoperand(RetN, retNoffset); - jmpTarget(jumpSI, jmpTarget(jumpNotSI, jmpTarget(jumpNotIndexable, jmpTarget(jumpIsContext, jmpTarget(jumpBounds, gLabel()))))); + jmpTarget(jumpSI, jmpTarget(jumpNotSI, jmpTarget(jumpNotIndexable, jmpTarget(jumpIsContext, jmpTarget(jumpBounds, jmpTarget(jumpFmtGt11, gLabel())))))); return 0; } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/nscogsrc/vm/cogit.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/nscogsrc/vm/cointerp.c 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc from - CoInterpreter VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1916,7 +1916,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.156"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.157"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -8001,8 +8001,11 @@ goto l98; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); - goto l98; + if ((fmt < 12) + || (((index >> 1)) >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); + goto l98; + } } } /* begin primitiveFailFor: */ @@ -8112,25 +8115,25 @@ goto l101; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l101; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (((index >> 1)) < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l101; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l101; } byteAtput((rcvr + BaseHeaderSize) + (((index >> 1)) - 1), valToPut); @@ -12937,25 +12940,25 @@ goto l1; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l1; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (index < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l1; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l1; } byteAtput((rcvr + BaseHeaderSize) + (index - 1), valToPut); @@ -13073,8 +13076,11 @@ goto l1; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); - goto l1; + if ((fmt < 12) + || (index >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); + goto l1; + } } } /* begin primitiveFailFor: */ @@ -43937,7 +43943,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:format: */ if (fmt <= 4) { @@ -44055,7 +44063,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:storing:format: */ VM_LABEL(2subscriptwithstoringformat); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/nscogsrc/vm/cointerp.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-04-18 06:14:23 UTC (rev 2550) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc from - CoInterpreter VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1919,7 +1919,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.156"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.157"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -8005,8 +8005,11 @@ goto l98; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); - goto l98; + if ((fmt < 12) + || (((index >> 1)) >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); + goto l98; + } } } /* begin primitiveFailFor: */ @@ -8116,25 +8119,25 @@ goto l101; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l101; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (((index >> 1)) < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l101; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l101; } byteAtput((rcvr + BaseHeaderSize) + (((index >> 1)) - 1), valToPut); @@ -12941,25 +12944,25 @@ goto l1; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l1; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (index < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l1; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l1; } byteAtput((rcvr + BaseHeaderSize) + (index - 1), valToPut); @@ -13077,8 +13080,11 @@ goto l1; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); - goto l1; + if ((fmt < 12) + || (index >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); + goto l1; + } } } /* begin primitiveFailFor: */ @@ -43941,7 +43947,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:format: */ if (fmt <= 4) { @@ -44059,7 +44067,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:storing:format: */ VM_LABEL(2subscriptwithstoringformat); Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/nscogsrc/vm/interp.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Apr 13 11:27:28 PDT 2012 + Tue Apr 17 23:13:00 PDT 2012 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/cogit.c 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc from - StackToRegisterMappingCogit VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + StackToRegisterMappingCogit VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9144,6 +9144,7 @@ sqInt jnx; AbstractInstruction *jumpBounds; AbstractInstruction *jumpFmtEq2; + AbstractInstruction *jumpFmtGt11; AbstractInstruction *jumpFmtGt4; AbstractInstruction *jumpFmtIs2; AbstractInstruction *jumpFmtLe4; @@ -9287,6 +9288,10 @@ genoperandoperand(CmpCqR, 8, ClassReg); /* begin JumpLess: */ jumpFmtLt8 = genoperand(JumpLess, ((sqInt)0)); + /* begin CmpCq:R: */ + genoperandoperand(CmpCqR, 11, ClassReg); + /* begin JumpGreater: */ + jumpFmtGt11 = genoperand(JumpGreater, ((sqInt)0)); /* begin AddCq:R: */ genoperandoperand(AddCqR, BaseHeaderSize, Arg1Reg); /* begin MoveXbr:R:R: */ @@ -9312,7 +9317,7 @@ genoperandoperand(MoveRR, TempReg, ReceiverResultReg); /* begin RetN: */ genoperand(RetN, retNoffset); - jmpTarget(jumpSI, jmpTarget(jumpNotSI, jmpTarget(jumpNotIndexable, jmpTarget(jumpIsContext, jmpTarget(jumpBounds, gLabel()))))); + jmpTarget(jumpSI, jmpTarget(jumpNotSI, jmpTarget(jumpNotIndexable, jmpTarget(jumpIsContext, jmpTarget(jumpBounds, jmpTarget(jumpFmtGt11, gLabel())))))); return 0; } Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/cogit.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/cogmethod.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/cointerp.c 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc from - CoInterpreter VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1906,7 +1906,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.156]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.157]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -7760,8 +7760,11 @@ goto l93; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); - goto l93; + if ((fmt < 12) + || (((index >> 1)) >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); + goto l93; + } } } /* begin primitiveFailFor: */ @@ -7871,25 +7874,25 @@ goto l96; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l96; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (((index >> 1)) < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l96; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l96; } byteAtput((rcvr + BaseHeaderSize) + (((index >> 1)) - 1), valToPut); @@ -12557,25 +12560,25 @@ goto l1; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l1; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (index < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l1; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l1; } byteAtput((rcvr + BaseHeaderSize) + (index - 1), valToPut); @@ -12693,8 +12696,11 @@ goto l1; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); - goto l1; + if ((fmt < 12) + || (index >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); + goto l1; + } } } /* begin primitiveFailFor: */ @@ -43248,7 +43254,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:format: */ if (fmt <= 4) { @@ -43366,7 +43374,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:storing:format: */ VM_LABEL(2subscriptwithstoringformat); Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/cointerp.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/cointerpmt.c 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc from - CoInterpreterMT VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CoInterpreterMT VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2005,7 +2005,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.156]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.157]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -7861,8 +7861,11 @@ goto l93; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); - goto l93; + if ((fmt < 12) + || (((index >> 1)) >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); + goto l93; + } } } /* begin primitiveFailFor: */ @@ -7972,25 +7975,25 @@ goto l96; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l96; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (((index >> 1)) < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l96; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l96; } byteAtput((rcvr + BaseHeaderSize) + (((index >> 1)) - 1), valToPut); @@ -12963,25 +12966,25 @@ goto l1; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l1; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (index < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l1; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l1; } byteAtput((rcvr + BaseHeaderSize) + (index - 1), valToPut); @@ -13099,8 +13102,11 @@ goto l1; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); - goto l1; + if ((fmt < 12) + || (index >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); + goto l1; + } } } /* begin primitiveFailFor: */ @@ -44745,7 +44751,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:format: */ if (fmt <= 4) { @@ -44863,7 +44871,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:storing:format: */ VM_LABEL(2subscriptwithstoringformat); Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/cointerpmt.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2012-04-18 06:14:23 UTC (rev 2550) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc from - CoInterpreter VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1909,7 +1909,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.156]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.157]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -7764,8 +7764,11 @@ goto l93; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); - goto l93; + if ((fmt < 12) + || (((index >> 1)) >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); + goto l93; + } } } /* begin primitiveFailFor: */ @@ -7875,25 +7878,25 @@ goto l96; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l96; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (((index >> 1)) < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l96; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l96; } byteAtput((rcvr + BaseHeaderSize) + (((index >> 1)) - 1), valToPut); @@ -12561,25 +12564,25 @@ goto l1; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l1; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (index < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l1; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l1; } byteAtput((rcvr + BaseHeaderSize) + (index - 1), valToPut); @@ -12697,8 +12700,11 @@ goto l1; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); - goto l1; + if ((fmt < 12) + || (index >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); + goto l1; + } } } /* begin primitiveFailFor: */ @@ -43252,7 +43258,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:format: */ if (fmt <= 4) { @@ -43370,7 +43378,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:storing:format: */ VM_LABEL(2subscriptwithstoringformat); Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-04-18 06:14:23 UTC (rev 2550) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc from - CoInterpreterMT VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CoInterpreterMT VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2008,7 +2008,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.156]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.157]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -7865,8 +7865,11 @@ goto l93; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); - goto l93; + if ((fmt < 12) + || (((index >> 1)) >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); + goto l93; + } } } /* begin primitiveFailFor: */ @@ -7976,25 +7979,25 @@ goto l96; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l96; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (((index >> 1)) < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l96; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l96; } byteAtput((rcvr + BaseHeaderSize) + (((index >> 1)) - 1), valToPut); @@ -12967,25 +12970,25 @@ goto l1; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l1; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (index < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l1; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l1; } byteAtput((rcvr + BaseHeaderSize) + (index - 1), valToPut); @@ -13103,8 +13106,11 @@ goto l1; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); - goto l1; + if ((fmt < 12) + || (index >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); + goto l1; + } } } /* begin primitiveFailFor: */ @@ -44749,7 +44755,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:format: */ if (fmt <= 4) { @@ -44867,7 +44875,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? (((literalCountOfHeader(headerOf(array))) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:storing:format: */ VM_LABEL(2subscriptwithstoringformat); Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/interp.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2012-04-13 18:28:27 UTC (rev 2549) +++ branches/Cog/src/vm/vmCallback.h 2012-04-18 06:14:23 UTC (rev 2550) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.156 uuid: f03602f8-cb8a-4ae7-9a2e-921b5b77cf01 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.157.mcz
by commits＠source.squeak.org 18 Apr '12

18 Apr '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.157.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.157 Author: eem Time: 17 April 2012, 11:08:52.202 pm UUID: 9a11acbe-4a62-43ce-81de-934f351598cc Ancestors: VMMaker.oscog-eem.156 Stack/CoInterpreter/Cogit: Implement proper bounds checking for byte access to compiled methods. Raise errors for accesses outside initialPC to size. Simulator: Nuke an old breakpojnt method in the simulator. =============== Diff against VMMaker.oscog-eem.156 =============== Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genInnerPrimitiveAt: (in category 'primitive generators') ----- genInnerPrimitiveAt: retNoffset + | jumpSI jumpNotSI jumpNotIndexable jumpIsContext jumpBounds jumpFmtGt4 jumpFmtEq2 jumpFmtLt8 jumpFmtGt11 jumpLarge | - | jumpSI jumpNotSI jumpNotIndexable jumpIsContext jumpBounds jumpFmtGt4 jumpFmtEq2 jumpFmtLt8 jumpLarge | "c.f. StackInterpreter>>stSizeOf: lengthOf:baseHeader:format: fixedFieldsOf:format:length:" <var: #jumpSI type: #'AbstractInstruction *'> <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpNotIndexable type: #'AbstractInstruction *'> <var: #jumpIsContext type: #'AbstractInstruction *'> <var: #jumpBounds type: #'AbstractInstruction *'> <var: #jumpFmtGt4 type: #'AbstractInstruction *'> <var: #jumpFmtEq2 type: #'AbstractInstruction *'> <var: #jumpFmtLt8 type: #'AbstractInstruction *'> + <var: #jumpFmtGt11 type: #'AbstractInstruction *'> <var: #jumpLarge type: #'AbstractInstruction *'> cogit MoveR: ReceiverResultReg R: TempReg. jumpSI := self genJumpSmallIntegerInScratchReg: TempReg. cogit MoveR: Arg0Reg R: TempReg. cogit MoveR: Arg0Reg R: Arg1Reg. jumpNotSI := self genJumpNotSmallIntegerInScratchReg: TempReg. self genGetSizeOf: ReceiverResultReg into: ClassReg formatReg: SendNumArgsReg scratchReg: TempReg abortJumpsInto: [:jnx :jic| jumpNotIndexable := jnx. jumpIsContext := jic]. self genConvertSmallIntegerToIntegerInScratchReg: Arg1Reg. cogit SubCq: 1 R: Arg1Reg. cogit CmpR: ClassReg R: Arg1Reg. jumpBounds := cogit JumpAboveOrEqual: 0. "This is tedious. Because of register pressure on x86 (and the baroque complexity of the size computation) we have to recompute the format because it may have been smashed computing the fixed fields. But at least we have the fixed fields, if any, in formatReg and recomputing these is more expensive than recomputing format. In any case this should still be faster than the interpreter and we hope this object representation's days are numbered." cogit MoveMw: 0 r: ReceiverResultReg R: ClassReg; "self baseHeader: receiver" LogicalShiftRightCq: objectMemory instFormatFieldLSB R: ClassReg; AndCq: self instFormatFieldMask R: ClassReg; "self formatOfHeader: ClassReg" CmpCq: 4 R: ClassReg. jumpFmtGt4 := cogit JumpGreater: 0. cogit CmpCq: 2 R: ClassReg. "Common case, e.g. Array, has format = 2" jumpFmtEq2 := cogit JumpZero: 0. cogit AddR: SendNumArgsReg R: Arg1Reg. "Add fixed fields to index" jumpFmtEq2 jmpTarget: cogit Label. cogit "Too lazy [knackered, more like. ed.] to define index with displacement addressing right now" AddCq: BaseHeaderSize / BytesPerWord R: Arg1Reg; MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg; RetN: retNoffset. jumpFmtGt4 jmpTarget: cogit Label. + "Byte objects have formats 8 through 15, Compiled methods being 12 through 15; + fail for CompiledMethod allowing the CoInterpeter to impose stricter bounds checks." cogit CmpCq: 8 R: ClassReg. jumpFmtLt8 := cogit JumpLess: 0. + cogit CmpCq: 11 R: ClassReg. + jumpFmtGt11 := cogit JumpGreater: 0. cogit AddCq: BaseHeaderSize R: Arg1Reg; MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. self genConvertIntegerToSmallIntegerInScratchReg: ReceiverResultReg. cogit RetN: retNoffset. jumpFmtLt8 jmpTarget: cogit Label. self assert: BytesPerWord = 4. "documenting my laziness" cogit "Too lazy [knackered, more like. ed.] to define index with displacement addressing right now" AddCq: BaseHeaderSize / BytesPerWord R: Arg1Reg; MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg; CmpCq: 16r3FFFFFFF R: ReceiverResultReg. jumpLarge := cogit JumpAbove: 0. self genConvertIntegerToSmallIntegerInScratchReg: ReceiverResultReg. cogit RetN: retNoffset. jumpLarge jmpTarget: (cogit CallRT: cogit cePositive32BitIntegerTrampoline). cogit MoveR: TempReg R: ReceiverResultReg; RetN: retNoffset. jumpSI jmpTarget: (jumpNotSI jmpTarget: (jumpNotIndexable jmpTarget: (jumpIsContext jmpTarget: (jumpBounds jmpTarget: + (jumpFmtGt11 jmpTarget: + cogit Label))))). - cogit Label)))). ^0! Item was removed: - ----- Method: CogVMSimulator>>install:inAtCache:at:string: (in category 'indexing primitive support') ----- - install: rcvr inAtCache: cache at: atIx string: stringy - (self is: rcvr KindOf: 'BooleanArray') ifTrue: [self halt]. - ^super install: rcvr inAtCache: cache at: atIx string: stringy! Item was added: + ----- Method: NewObjectMemory>>firstValidIndexOfIndexableObject:withFormat: (in category 'indexing primitive support') ----- + firstValidIndexOfIndexableObject: obj withFormat: fmt + "Answer the one-relative index of the first valid index in an indexbale object + with the given format. This is 1 for all objects except compiled methods + where the first index is beyond the last literal. + Used for safer bounds-checking on methods." + ^fmt >= 12 + ifTrue: [coInterpreter firstByteIndexOfMethod: obj] + ifFalse: [1]! Item was changed: ----- Method: StackInterpreter>>commonVariable:at:cacheIndex: (in category 'indexing primitive support') ----- commonVariable: rcvr at: index cacheIndex: atIx "This code assumes the receiver has been identified at location atIx in the atCache." | stSize fmt fixedFields result | <inline: true> stSize := atCache at: atIx+AtCacheSize. ((self oop: index isGreaterThanOrEqualTo: 1) + and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: - and: [self oop: index isLessThanOrEqualTo: stSize]) - ifTrue: [fmt := atCache at: atIx+AtCacheFmt. + fmt <= 4 ifTrue: - fmt <= 4 ifTrue: [self assert: (objectMemory isContextNonInt: rcvr) not. fixedFields := atCache at: atIx+AtCacheFixedFields. + ^objectMemory fetchPointer: index + fixedFields - 1 ofObject: rcvr]. + fmt < 8 ifTrue: "Bitmap" - ^ objectMemory fetchPointer: index + fixedFields - 1 ofObject: rcvr]. - fmt < 8 ifTrue: "Bitmap" [result := objectMemory fetchLong32: index - 1 ofObject: rcvr. ^self positive32BitIntegerFor: result]. + fmt >= 16 "Note fmt >= 16 is an artificial flag for strings" - fmt >= 16 "Note fmt >= 16 is an artificial flag for strings" ifTrue: "String" + [^self characterForAscii: (objectMemory fetchByte: index - 1 ofObject: rcvr)] + ifFalse: + [(fmt < 12 "ByteArray" + or: [index >= (self firstByteIndexOfMethod: rcvr) "CompiledMethod"]) ifTrue: + [^objectMemory integerObjectOf: (objectMemory fetchByte: index - 1 ofObject: rcvr)]]]. - [^ self characterForAscii: (objectMemory fetchByte: index - 1 ofObject: rcvr)] - ifFalse: "ByteArray" - [^ objectMemory integerObjectOf: (objectMemory fetchByte: index - 1 ofObject: rcvr)]]. ^self primitiveFailFor: ((objectMemory formatOf: rcvr) <= 1 ifTrue: [PrimErrBadReceiver] ifFalse: [PrimErrBadIndex])! Item was changed: ----- Method: StackInterpreter>>commonVariable:at:put:cacheIndex: (in category 'indexing primitive support') ----- commonVariable: rcvr at: index put: value cacheIndex: atIx "This code assumes the receiver has been identified at location atIx in the atCache." | stSize fmt fixedFields valToPut | <inline: true> - stSize := atCache at: atIx+AtCacheSize. ((self oop: index isGreaterThanOrEqualTo: 1) + and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: - and: [self oop: index isLessThanOrEqualTo: stSize]) - ifTrue: [fmt := atCache at: atIx+AtCacheFmt. fmt <= 4 ifTrue: [self assert: (objectMemory isContextNonInt: rcvr) not. fixedFields := atCache at: atIx+AtCacheFixedFields. + ^objectMemory storePointer: index + fixedFields - 1 ofObject: rcvr withValue: value]. - ^ objectMemory storePointer: index + fixedFields - 1 ofObject: rcvr withValue: value]. fmt < 8 ifTrue: "Bitmap" [valToPut := self positive32BitValueOf: value. self successful ifTrue: [objectMemory storeLong32: index - 1 ofObject: rcvr withValue: valToPut]. + ^nil]. - ^ nil]. fmt >= 16 "Note fmt >= 16 is an artificial flag for strings" + ifTrue: [(objectMemory + is: value + instanceOf: (objectMemory splObj: ClassCharacter) + compactClassIndex: 0) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. + valToPut := objectMemory fetchPointer: CharacterValueIndex ofObject: value] + ifFalse: + [(fmt >= 12 and: [index < (self firstByteIndexOfMethod: rcvr)]) ifTrue: "CompiledMethod" + [^self primitiveFailFor: PrimErrBadIndex]. + valToPut := value]. - ifTrue: [valToPut := self asciiOfCharacter: value. - self successful ifFalse: [^ nil]] - ifFalse: [valToPut := value]. (objectMemory isIntegerObject: valToPut) ifTrue: [valToPut := objectMemory integerValueOf: valToPut. + ((valToPut >= 0) and: [valToPut <= 255]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. + ^objectMemory storeByte: index - 1 ofObject: rcvr withValue: valToPut]]. - ((valToPut >= 0) and: [valToPut <= 255]) ifFalse: [^ self primitiveFail]. - ^ objectMemory storeByte: index - 1 ofObject: rcvr withValue: valToPut]]. ^self primitiveFailFor: ((objectMemory formatOf: rcvr) <= 1 ifTrue: [PrimErrBadReceiver] ifFalse: [PrimErrBadIndex])! Item was added: + ----- Method: StackInterpreter>>firstByteIndexOfMethod: (in category 'compiled methods') ----- + firstByteIndexOfMethod: methodObj + "Answer the one-relative index of the first bytecode in methodObj. + Used for safer bounds-checking on methods." + ^(self literalCountOf: methodObj) + LiteralStart * BytesPerWord + 1! Item was changed: ----- Method: StackInterpreter>>stObject:at: (in category 'indexing primitive support') ----- stObject: array at: index "Return what ST would return for <obj> at: index." | hdr fmt totalLength fixedFields stSize | <inline: false> hdr := objectMemory baseHeader: array. fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: array baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: array format: fmt length: totalLength. (fmt = 3 and: [objectMemory isContextHeader: hdr]) ifTrue: [stSize := self stackPointerForMaybeMarriedContext: array. ((self oop: index isGreaterThanOrEqualTo: 1) and: [(self oop: index isLessThanOrEqualTo: stSize) and: [self isStillMarriedContext: array]]) ifTrue: [^self noInlineTemporary: index - 1 in: (self frameOfMarriedContext: array)]] ifFalse: [stSize := totalLength - fixedFields]. + ((self oop: index isGreaterThanOrEqualTo: (objectMemory firstValidIndexOfIndexableObject: array withFormat: fmt)) - ((self oop: index isGreaterThanOrEqualTo: 1) and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: [^self subscript: array with: (index + fixedFields) format: fmt]. self primitiveFailFor: (fmt <= 1 ifTrue: [PrimErrBadReceiver] ifFalse: [PrimErrBadIndex]). ^0! Item was changed: ----- Method: StackInterpreter>>stObject:at:put: (in category 'indexing primitive support') ----- stObject: array at: index put: value "Do what ST would return for <obj> at: index put: value." | hdr fmt totalLength fixedFields stSize | <inline: false> hdr := objectMemory baseHeader: array. fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: array baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: array format: fmt length: totalLength. (fmt = 3 and: [objectMemory isContextHeader: hdr]) ifTrue: [stSize := self stackPointerForMaybeMarriedContext: array. ((self oop: index isGreaterThanOrEqualTo: 1) and: [(self oop: index isLessThanOrEqualTo: stSize) and: [self isStillMarriedContext: array]]) ifTrue: [self noInlineTemporary: index - 1 in: (self frameOfMarriedContext: array) put: value. ^self]] ifFalse: [stSize := totalLength - fixedFields]. + ((self oop: index isGreaterThanOrEqualTo: (objectMemory firstValidIndexOfIndexableObject: array withFormat: fmt)) - ((self oop: index isGreaterThanOrEqualTo: 1) and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: [self subscript: array with: (index + fixedFields) storing: value format: fmt] ifFalse: [self primitiveFailFor: (fmt <= 1 ifTrue: [PrimErrBadReceiver] ifFalse: [PrimErrBadIndex])]!

1 0

Re: [Pharo-project] Block with ^ examples ...
by Eliot Miranda 18 Apr '12

18 Apr '12

James, ^-return in a block attempts to return from the enclosing method activation (the home context), as if a return from the method has occurred. But errors and exceptions can occur. a) if the method has already been returned from the enclosing method context (the home context) will be specially marked (it will have a nil sender and a nil pc) and a cannotReturn: error should be invoked by sending cannotRetuern: with the result as its argument to the activation of the block which is trying to return. b) if the enclosing home context is not on the sender chain of the block activation (i.e. because the block is being evaluated in a different process, a so-called "sideways return") the implementation may choose (and IMO /should choose) to invoke a cannotReturn: error. c) if an unwind-protect is found between the block activation and the sender of the home context then a message invoking unwind-protect processing (implementation-dependent; in Squeak this is #aboutToReturn:through:) should be sent to the block activation, with at least the result as an argument, but typically with the result and the first unwind-protect activation as arguments. Further, if the return can occur without error, all activations must be marked as returned-from (so that other attempts to return from intervening acrtivations provoke cannotReturn: errors). In Squeak the following methods implement this in the simulation, but N.B. fail to prevent side-ways returns: MethodContext methods for accessing methodReturnContext "Answer the context from which an ^-return should return from." closureOrNil == nil ifTrue: [^self]. ^closureOrNil outerContext methodReturnContext ContextPart methods for instruction decoding methodReturnTop "Simulate the action of a 'return top of stack' bytecode. This corresponds to source expressions like '^something'." ^self return: self pop from: self methodReturnContext return: value from: aSender "For simulation. Roll back self to aSender and return value from it. Execute any unwind blocks on the way. ASSUMES aSender is a sender of self" | newTop ctxt | aSender isDead ifTrue: [ ^ self send: #cannotReturn: to: self with: {value} super: false]. newTop := aSender sender. ctxt := self findNextUnwindContextUpTo: newTop. ctxt ifNotNil: [ ^ self send: #aboutToReturn:through: to: self with: {value. ctxt} super: false]. self releaseTo: newTop. newTop ifNotNil: [newTop push: value]. ^ newTop To prevent side-ways returns return: value from: aSender needs to be modified to something like return: value from: aSender "For simulation. Roll back self to aSender and return value from it. Execute any unwind blocks on the way." | newTop | ((self hasSender: aSender) and: [aSender isDead not]) ifFalse: [^self send: #cannotReturn: to: self with: {value} super: false]. newTop := aSender sender. (self findNextUnwindContextUpTo: newTop) ifNotNil: [:ctxt| ^self send: #aboutToReturn:through: to: self with: {value. ctxt} super: false]. self releaseTo: newTop. newTop ifNotNil: [newTop push: value]. ^newTop HTH Eliot On Tue, Apr 17, 2012 at 3:56 PM, James Ladd <james_ladd(a)hotmail.com> wrote: > > If I understand what I have read from the blue book the following is > how a block with a return is handled: > > 1 - sampleMethod > 2 self doIt: [ ^ true ]. > 3 Transcript show: 'here'; cr. > > Line 1 defines the instance method 'sampleMethod' - using Redline syntax > of course. > Line 2 sends the keyword message doIt: to receiver with a block that > contains a '^' (return). > Line 3 outputs a message using the Transcript. > > When Line 2 is executed and the passed block is sent the message 'value' > then the > value true is returned from the method 'sampleMethod', and line 3 of > sampleMethod is > never executed. > > Correct? > > Rgs, James. > -- best, Eliot

1 0

Cannot checkout from svn anymore
by Igor Stasenko 17 Apr '12

17 Apr '12

svn co http://www.squeakvm.org/svn/squeak/branches/Cog says: svn: Can't find a temporary directory: Internal error tried on multiple different machines, different OSes.. it seems to be a problem on a server side. (Most probably space issues) -- Best regards, Igor Stasenko.

6 6

Re: [Vm-dev] Squeak written in other languages (was: Cannot checkout from svn anymore)
by Jeremy Kajikawa 17 Apr '12

17 Apr '12

Not so worried about anything more than a cSmalltalkVM implementation. I won't be able to permit the Smalltalk implimentation to Edit the VM shell module itself. I'm writing this for Amiga OS 4.x and have to do so blind about the Smalltalk language itself. You have seen me on the OpenCobalt discussion group as ジェレミー on occasions when staying with BrickViking. Inside the Smalltalk VM is still a black box and without being able to relate to the terms I already know the whole "Blue Book" reference may as well be written in Chinese and being presented as Japanese for readability of the English content as read in English by me. It is about that helpful in my attempts at reading it as my style of reading is more hunting for direct references I can use. I've also explained my never using printf or the standard C library despite actually learning the C language first by teaching myself. I'm using the same techniques where I managed to get a benchmark result between 16MHz and 20MHz when Interpreting an 80486DX processor on a 68040 processor based Amiga A4000 in writing this VM implementation. yes I managed to get a 32bit 68040 to Emulate a 32bit 80486 with FPU operations at a reasonable speed. I would like to do the same with Smalltalk operations if at all possible. Starting with the opcode values themselves, then how any data is formatted around them. followed up by what each opcode will modify. if possible to have the above described in some kind of classical sense similar to C or C++

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2012