Vm-dev February 2013

vm-dev@lists.squeakfoundation.org

34 participants
108 discussions

new Cog VMs available
by Eliot Miranda 06 Feb '13

06 Feb '13

http://www.mirandabanda.org/files/Cog/VM/VM.r2678 CogVM binaries as per VMMaker.oscog-eem.264/r2678. Fix snapshot primitive failure in the StackVM and Cogit. The primitive should fail, not merely return the receiver. Also if in Cogit, need to back-up instruction pointer on failure. Make reportMinimumUnusedHeadroom more informative (also print available headroom). -- best, Eliot

1 0

[commit][2678] CogVM source as per VMMaker.oscog-eem.264.
by commits＠squeakvm.org 06 Feb '13

06 Feb '13

Revision: 2678 Author: eliot Date: 2013-02-05 18:55:12 -0800 (Tue, 05 Feb 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.264. Fix snapshot primitive failure in the StackVM and Cogit. The primitive should fail, not merely return the receiver. Also if in Cogit, need to back-up instruction pointer on failure. Make reportMinimumUnusedHeadroom more informative (also print available headroom). Back out of named SerialPlugin primitives (comprehensive platform support is lacking). Fix reportStackHeadroom switch testing. Not applicable to the StackVM. Modified Paths: -------------- 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/Mac OS/vm/sqMacUnixCommandLineInterface.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGenerator VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d from - StackToRegisterMappingCogit VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + StackToRegisterMappingCogit VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -4356,6 +4356,10 @@ return; } methodHeader = headerOf(methodObj); + if (hasLinkRegister(backEnd)) { + /* begin PushR: */ + genoperand(PushR, LinkReg); + } /* begin PushR: */ genoperand(PushR, FPReg); /* begin MoveR:R: */ Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGenerator VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGenerator VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d from - CoInterpreter VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CoInterpreter VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1175,7 +1175,6 @@ static sqInt withSmallIntegerTags(char *value); static sqInt wordSwapped(sqInt w); static void writeImageFileIO(sqInt imageBytes); -static void writeImageFile(sqInt imageBytes); usqInt youngStartAddress(void); /*** Variables ***/ @@ -1194,8 +1193,8 @@ _iss sqInt bytecodeSetSelector; _iss usqInt instructionPointer; _iss sqInt argumentCount; +_iss sqInt nilObj; _iss usqInt freeStart; -_iss sqInt nilObj; _iss sqInt messageSelector; _iss usqInt newMethod; _iss usqInt youngStart; @@ -1940,7 +1939,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.261"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.264"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -21591,7 +21590,8 @@ return; } thePage = GIV(stackPage); - if (thePage != null) { + if ((thePage != null) + && (thePage != 0)) { (thePage->stackLimit = ((char *) (((usqInt) -1)))); } GIV(stackLimit) = ((char *) (((usqInt) -1))); @@ -41536,8 +41536,15 @@ static void primitiveSnapshot(void) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT snapshot(0); + if ((iframeMethod(GIV(framePointer))) == GIV(newMethod)) { + + /* snapshot: has reached the end and built a frame. + In the JIT we need to back-up the pc before reentering the interpreter. */ + + GIV(instructionPointer) -= 1; + } siglongjmp(reenterInterpreter, ReturnToInterpreter); } @@ -41550,8 +41557,15 @@ static void primitiveSnapshotEmbedded(void) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT snapshot(1); + if ((iframeMethod(GIV(framePointer))) == GIV(newMethod)) { + + /* snapshot: has reached the end and built a frame. + In the JIT we need to back-up the pc before reentering the interpreter. */ + + GIV(instructionPointer) -= 1; + } siglongjmp(reenterInterpreter, ReturnToInterpreter); } @@ -47318,7 +47332,7 @@ void reportMinimumUnusedHeadroom(void) { - printf("stack page size %ld minimum unused stack headroom %ld bytes\n", stackPageByteSize(), minimumUnusedHeadroom()); + printf("stack page bytes %ld available headroom %ld minimum unused headroom %ld\n", stackPageByteSize(), ((stackPageByteSize()) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))) - ((IFrameSlots + 64) * BytesPerWord), minimumUnusedHeadroom()); } @@ -49335,38 +49349,63 @@ static void snapshot(sqInt embedded) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt activateCogMethod; sqInt activeContext; sqInt activeProc; sqInt chunk; + CogMethod *cogMethod; sqInt dataSize; + sqInt errorCode; sqInt fmt; sqInt header; sqInt header1; sqInt header2; sqInt i; sqInt i1; + sqInt i2; + usqInt initialIP; + sqInt methodHeader; + sqInt numArgs; + sqInt numTemps; sqInt object; sqInt object1; + sqInt object2; sqInt oop; sqInt oop1; sqInt oop2; sqInt oop3; sqInt rcvr; + sqInt rcvr1; void *setMacType; char *sp; char *sp1; + char *sp10; + char *sp11; + char *sp12; char *sp2; + char *sp3; + char *sp4; + char *sp5; + char *sp6; + char *sp7; + char *sp8; + char *sp9; sqInt stackIndex; sqInt sz; sqInt sz1; + sqInt table; - /* Need to convert all frames into contexts since the snapshot file only holds objects. */ + /* For nowe the stack munging below doesn't deal with more than omne argument. + It can, and should. */ + if (GIV(argumentCount) != 0) { + (GIV(primFailCode) = PrimErrBadNumArgs); return; + } /* begin push: */ - object1 = GIV(instructionPointer); - longAtput((sp2 = GIV(stackPointer) - BytesPerWord), object1); - GIV(stackPointer) = sp2; + object2 = GIV(instructionPointer); + longAtput((sp12 = GIV(stackPointer) - BytesPerWord), object2); + GIV(stackPointer) = sp12; /* update state of active process */ @@ -49413,8 +49452,8 @@ sz = ((header1 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(oop2 - (BytesPerWord * 2))) & LongSizeMask : header1 & SizeMask); - for (i = ((lastPointerOf(oop2)) + BytesPerWord); i <= (sz - BaseHeaderSize); i += BytesPerWord) { - longAtput(oop2 + i, GIV(nilObj)); + for (i2 = ((lastPointerOf(oop2)) + BytesPerWord); i2 <= (sz - BaseHeaderSize); i2 += BytesPerWord) { + longAtput(oop2 + i2, GIV(nilObj)); } } if (fmt >= 12) { @@ -49475,8 +49514,9 @@ stackIndex = (oop >> 1); rcvr = longAt((activeContext + BaseHeaderSize) + (((stackIndex + CtxtTempFrameStart) - 1) << ShiftForWord)); longAtput((activeContext + BaseHeaderSize) + (((stackIndex + CtxtTempFrameStart) - 1) << ShiftForWord), GIV(trueObj)); - writeImageFile(dataSize); - if (!embedded) { + writeImageFileIO(dataSize); + if ((!GIV(primFailCode)) + && (!embedded)) { /* set Mac file type and creator; this is a noop on other platforms */ @@ -49498,6 +49538,120 @@ /* begin push: */ longAtput((sp1 = GIV(stackPointer) - BytesPerWord), rcvr); GIV(stackPointer) = sp1; + /* begin justActivateNewMethod */ + VM_LABEL(2justActivateNewMethod); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + if ((activateCogMethod = isCogMethodReference(methodHeader))) { + cogMethod = ((CogMethod *) methodHeader); + methodHeader = (cogMethod->methodHeader); + } + numTemps = (((usqInt) methodHeader) >> 19) & 63; + numArgs = (((usqInt) methodHeader) >> 25) & 15; + + /* could new rcvr be set at point of send? */ + + rcvr1 = longAt(GIV(stackPointer) + (numArgs * BytesPerWord)); + if (activateCogMethod + && (GIV(instructionPointer) >= (startOfMemory()))) { + /* begin iframeSavedIP:put: */ + assert(!(isMachineCodeFrame(GIV(framePointer)))); + longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); + GIV(instructionPointer) = ceReturnToInterpreterPC(); + } + /* begin push: */ + longAtput((sp7 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); + GIV(stackPointer) = sp7; + /* begin push: */ + longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); + GIV(stackPointer) = sp8; + GIV(framePointer) = GIV(stackPointer); + initialIP = (GIV(newMethod) + ((LiteralStart + (((((sqInt) methodHeader)) < 0 + ? (((usqInt) methodHeader) >> 1) & 65535 + : (((usqInt) methodHeader) >> 10) & 255))) * BytesPerWord)) + BaseHeaderSize; + if (activateCogMethod) { + /* begin push: */ + longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod)); + GIV(stackPointer) = sp10; + /* begin push: */ + longAtput((sp11 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp11; + GIV(instructionPointer) = (((usqInt)cogMethod)) + ((cogMethod->stackCheckOffset)); + } + else { + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); + GIV(stackPointer) = sp2; + /* begin setMethod:methodHeader: */ + GIV(method) = GIV(newMethod); + assert(isOopCompiledMethod(GIV(method))); + assert((headerOf(GIV(method))) == methodHeader); + GIV(bytecodeSetSelector) = ((((sqInt) methodHeader)) < 0 + ? 256 + : 0); + + /* begin push: */ + longAtput((sp3 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp3; + /* begin push: */ + object1 = (VMBIGENDIAN + ? ((1 + (numArgs << ((BytesPerWord * 8) - 8))) + ((0 + ? 1 << ((BytesPerWord * 8) - 16) + : 0))) + ((0 + ? 1 << ((BytesPerWord * 8) - 24) + : 0)) + : ((1 + (numArgs << 8)) + ((0 + ? 1 << 16 + : 0))) + ((0 + ? 1 << 24 + : 0))); + longAtput((sp4 = GIV(stackPointer) - BytesPerWord), object1); + GIV(stackPointer) = sp4; + /* begin push: */ + longAtput((sp5 = GIV(stackPointer) - BytesPerWord), 0); + GIV(stackPointer) = sp5; + GIV(instructionPointer) = initialIP - 1; + } + /* begin push: */ + longAtput((sp9 = GIV(stackPointer) - BytesPerWord), rcvr1); + GIV(stackPointer) = sp9; + for (i = (numArgs + 1); i <= numTemps; i += 1) { + /* begin push: */ + longAtput((sp6 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp6; + } + if (((((sqInt) methodHeader)) < 0 + ? methodHeader & (65536 << SmallIntegerShift) + : (methodHeader & 536871934) != 0)) { + + /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts + with a long store temp. Strictly no need to skip the store because it's effectively a noop. */ + + initialIP += ((((sqInt) methodHeader)) < 0 + ? 3 + : 0); + if (!activateCogMethod) { + GIV(instructionPointer) = initialIP; + } + if (GIV(primFailCode) != 0) { + if ((byteAt(initialIP + 1)) == (((((sqInt) methodHeader)) < 0 + ? 234 + : 129))) { + /* begin getErrorObjectFromPrimFailCode */ + if (GIV(primFailCode) > 0) { + table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << ShiftForWord)); + if (GIV(primFailCode) <= (((sqInt) (lastPointerOf(table)) >> 2))) { + errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << ShiftForWord)); + goto l1; + } + } + errorCode = ((GIV(primFailCode) << 1) | 1); + l1: /* end getErrorObjectFromPrimFailCode */; + longAtPointerput(GIV(stackPointer), errorCode); + } + GIV(primFailCode) = 0; + } + } + methodHeader; } } @@ -52303,18 +52457,6 @@ sqImageFileClose(f); } -static void -writeImageFile(sqInt imageBytes) -{ - void *fn; - - writeImageFileIO(imageBytes); - fn = ioLoadFunctionFrom("setMacFileTypeAndCreator", "FilePlugin"); - if (!(fn == 0)) { - ((sqInt (*)(char*, char*, char*))fn)(imageName, "STim", "FAST"); - } -} - usqInt youngStartAddress(void) { Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-02-06 02:55:12 UTC (rev 2678) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d from - CoInterpreter VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CoInterpreter VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1178,7 +1178,6 @@ static sqInt withSmallIntegerTags(char *value); static sqInt wordSwapped(sqInt w); static void writeImageFileIO(sqInt imageBytes); -static void writeImageFile(sqInt imageBytes); usqInt youngStartAddress(void); /*** Variables ***/ @@ -1197,8 +1196,8 @@ _iss sqInt bytecodeSetSelector; _iss usqInt instructionPointer; _iss sqInt argumentCount; +_iss sqInt nilObj; _iss usqInt freeStart; -_iss sqInt nilObj; _iss sqInt messageSelector; _iss usqInt newMethod; _iss usqInt youngStart; @@ -1943,7 +1942,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.261"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.264"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -21600,7 +21599,8 @@ return; } thePage = GIV(stackPage); - if (thePage != null) { + if ((thePage != null) + && (thePage != 0)) { (thePage->stackLimit = ((char *) (((usqInt) -1)))); } GIV(stackLimit) = ((char *) (((usqInt) -1))); @@ -41545,8 +41545,15 @@ static void primitiveSnapshot(void) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT snapshot(0); + if ((iframeMethod(GIV(framePointer))) == GIV(newMethod)) { + + /* snapshot: has reached the end and built a frame. + In the JIT we need to back-up the pc before reentering the interpreter. */ + + GIV(instructionPointer) -= 1; + } siglongjmp(reenterInterpreter, ReturnToInterpreter); } @@ -41559,8 +41566,15 @@ static void primitiveSnapshotEmbedded(void) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT snapshot(1); + if ((iframeMethod(GIV(framePointer))) == GIV(newMethod)) { + + /* snapshot: has reached the end and built a frame. + In the JIT we need to back-up the pc before reentering the interpreter. */ + + GIV(instructionPointer) -= 1; + } siglongjmp(reenterInterpreter, ReturnToInterpreter); } @@ -47327,7 +47341,7 @@ void reportMinimumUnusedHeadroom(void) { - printf("stack page size %ld minimum unused stack headroom %ld bytes\n", stackPageByteSize(), minimumUnusedHeadroom()); + printf("stack page bytes %ld available headroom %ld minimum unused headroom %ld\n", stackPageByteSize(), ((stackPageByteSize()) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))) - ((IFrameSlots + 64) * BytesPerWord), minimumUnusedHeadroom()); } @@ -49344,38 +49358,63 @@ static void snapshot(sqInt embedded) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt activateCogMethod; sqInt activeContext; sqInt activeProc; sqInt chunk; + CogMethod *cogMethod; sqInt dataSize; + sqInt errorCode; sqInt fmt; sqInt header; sqInt header1; sqInt header2; sqInt i; sqInt i1; + sqInt i2; + usqInt initialIP; + sqInt methodHeader; + sqInt numArgs; + sqInt numTemps; sqInt object; sqInt object1; + sqInt object2; sqInt oop; sqInt oop1; sqInt oop2; sqInt oop3; sqInt rcvr; + sqInt rcvr1; void *setMacType; char *sp; char *sp1; + char *sp10; + char *sp11; + char *sp12; char *sp2; + char *sp3; + char *sp4; + char *sp5; + char *sp6; + char *sp7; + char *sp8; + char *sp9; sqInt stackIndex; sqInt sz; sqInt sz1; + sqInt table; - /* Need to convert all frames into contexts since the snapshot file only holds objects. */ + /* For nowe the stack munging below doesn't deal with more than omne argument. + It can, and should. */ + if (GIV(argumentCount) != 0) { + (GIV(primFailCode) = PrimErrBadNumArgs); return; + } /* begin push: */ - object1 = GIV(instructionPointer); - longAtput((sp2 = GIV(stackPointer) - BytesPerWord), object1); - GIV(stackPointer) = sp2; + object2 = GIV(instructionPointer); + longAtput((sp12 = GIV(stackPointer) - BytesPerWord), object2); + GIV(stackPointer) = sp12; /* update state of active process */ @@ -49422,8 +49461,8 @@ sz = ((header1 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(oop2 - (BytesPerWord * 2))) & LongSizeMask : header1 & SizeMask); - for (i = ((lastPointerOf(oop2)) + BytesPerWord); i <= (sz - BaseHeaderSize); i += BytesPerWord) { - longAtput(oop2 + i, GIV(nilObj)); + for (i2 = ((lastPointerOf(oop2)) + BytesPerWord); i2 <= (sz - BaseHeaderSize); i2 += BytesPerWord) { + longAtput(oop2 + i2, GIV(nilObj)); } } if (fmt >= 12) { @@ -49484,8 +49523,9 @@ stackIndex = (oop >> 1); rcvr = longAt((activeContext + BaseHeaderSize) + (((stackIndex + CtxtTempFrameStart) - 1) << ShiftForWord)); longAtput((activeContext + BaseHeaderSize) + (((stackIndex + CtxtTempFrameStart) - 1) << ShiftForWord), GIV(trueObj)); - writeImageFile(dataSize); - if (!embedded) { + writeImageFileIO(dataSize); + if ((!GIV(primFailCode)) + && (!embedded)) { /* set Mac file type and creator; this is a noop on other platforms */ @@ -49507,6 +49547,120 @@ /* begin push: */ longAtput((sp1 = GIV(stackPointer) - BytesPerWord), rcvr); GIV(stackPointer) = sp1; + /* begin justActivateNewMethod */ + VM_LABEL(2justActivateNewMethod); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + if ((activateCogMethod = isCogMethodReference(methodHeader))) { + cogMethod = ((CogMethod *) methodHeader); + methodHeader = (cogMethod->methodHeader); + } + numTemps = (((usqInt) methodHeader) >> 19) & 63; + numArgs = (((usqInt) methodHeader) >> 25) & 15; + + /* could new rcvr be set at point of send? */ + + rcvr1 = longAt(GIV(stackPointer) + (numArgs * BytesPerWord)); + if (activateCogMethod + && (GIV(instructionPointer) >= (startOfMemory()))) { + /* begin iframeSavedIP:put: */ + assert(!(isMachineCodeFrame(GIV(framePointer)))); + longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); + GIV(instructionPointer) = ceReturnToInterpreterPC(); + } + /* begin push: */ + longAtput((sp7 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); + GIV(stackPointer) = sp7; + /* begin push: */ + longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); + GIV(stackPointer) = sp8; + GIV(framePointer) = GIV(stackPointer); + initialIP = (GIV(newMethod) + ((LiteralStart + (((((sqInt) methodHeader)) < 0 + ? (((usqInt) methodHeader) >> 1) & 65535 + : (((usqInt) methodHeader) >> 10) & 255))) * BytesPerWord)) + BaseHeaderSize; + if (activateCogMethod) { + /* begin push: */ + longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod)); + GIV(stackPointer) = sp10; + /* begin push: */ + longAtput((sp11 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp11; + GIV(instructionPointer) = (((usqInt)cogMethod)) + ((cogMethod->stackCheckOffset)); + } + else { + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); + GIV(stackPointer) = sp2; + /* begin setMethod:methodHeader: */ + GIV(method) = GIV(newMethod); + assert(isOopCompiledMethod(GIV(method))); + assert((headerOf(GIV(method))) == methodHeader); + GIV(bytecodeSetSelector) = ((((sqInt) methodHeader)) < 0 + ? 256 + : 0); + + /* begin push: */ + longAtput((sp3 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp3; + /* begin push: */ + object1 = (VMBIGENDIAN + ? ((1 + (numArgs << ((BytesPerWord * 8) - 8))) + ((0 + ? 1 << ((BytesPerWord * 8) - 16) + : 0))) + ((0 + ? 1 << ((BytesPerWord * 8) - 24) + : 0)) + : ((1 + (numArgs << 8)) + ((0 + ? 1 << 16 + : 0))) + ((0 + ? 1 << 24 + : 0))); + longAtput((sp4 = GIV(stackPointer) - BytesPerWord), object1); + GIV(stackPointer) = sp4; + /* begin push: */ + longAtput((sp5 = GIV(stackPointer) - BytesPerWord), 0); + GIV(stackPointer) = sp5; + GIV(instructionPointer) = initialIP - 1; + } + /* begin push: */ + longAtput((sp9 = GIV(stackPointer) - BytesPerWord), rcvr1); + GIV(stackPointer) = sp9; + for (i = (numArgs + 1); i <= numTemps; i += 1) { + /* begin push: */ + longAtput((sp6 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp6; + } + if (((((sqInt) methodHeader)) < 0 + ? methodHeader & (65536 << SmallIntegerShift) + : (methodHeader & 536871934) != 0)) { + + /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts + with a long store temp. Strictly no need to skip the store because it's effectively a noop. */ + + initialIP += ((((sqInt) methodHeader)) < 0 + ? 3 + : 0); + if (!activateCogMethod) { + GIV(instructionPointer) = initialIP; + } + if (GIV(primFailCode) != 0) { + if ((byteAt(initialIP + 1)) == (((((sqInt) methodHeader)) < 0 + ? 234 + : 129))) { + /* begin getErrorObjectFromPrimFailCode */ + if (GIV(primFailCode) > 0) { + table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << ShiftForWord)); + if (GIV(primFailCode) <= (((sqInt) (lastPointerOf(table)) >> 2))) { + errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << ShiftForWord)); + goto l1; + } + } + errorCode = ((GIV(primFailCode) << 1) | 1); + l1: /* end getErrorObjectFromPrimFailCode */; + longAtPointerput(GIV(stackPointer), errorCode); + } + GIV(primFailCode) = 0; + } + } + methodHeader; } } @@ -52312,18 +52466,6 @@ sqImageFileClose(f); } -static void -writeImageFile(sqInt imageBytes) -{ - void *fn; - - writeImageFileIO(imageBytes); - fn = ioLoadFunctionFrom("setMacFileTypeAndCreator", "FilePlugin"); - if (!(fn == 0)) { - ((sqInt (*)(char*, char*, char*))fn)(imageName, "STim", "FAST"); - } -} - usqInt youngStartAddress(void) { Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/nscogsrc/vm/interp.h 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jan 31 09:58:48 PST 2013 + Tue Feb 5 18:53:21 PST 2013 Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2013-02-06 02:55:12 UTC (rev 2678) @@ -205,10 +205,6 @@ extern sqInt pollpip; pollpip = atoi(argv[1]); return 2; } - else if (!strcmp(argv[0], "-reportheadroom")) { - extern sqInt reportStackHeadroom; - reportStackHeadroom = 1; - return 1; } #endif /* STACKVM */ #if COGVM else if (!strcmp(argv[0], "-codesize")) { @@ -246,6 +242,10 @@ extern sqInt minBackwardJumpCountForCompile; minBackwardJumpCountForCompile = strtobkm(argv[1]); return 2; } + else if (!strcmp(argv[0], "-reportheadroom")) { + extern sqInt reportStackHeadroom; + reportStackHeadroom = 1; + return 1; } #endif /* COGVM */ else if (!strcmp(argv[0], "-pathenc")) { setEncodingType(argv[1]); Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2013-02-06 02:55:12 UTC (rev 2678) @@ -1368,10 +1368,6 @@ extern sqInt pollpip; pollpip = atoi(argv[1]); return 2; } - else if (!strcmp(argv[0], "-reportheadroom")) { - extern sqInt reportStackHeadroom; - reportStackHeadroom = 1; - return 1; } #endif /* STACKVM */ #if COGVM else if (!strcmp(argv[0], "-codesize")) { @@ -1405,6 +1401,10 @@ extern sqInt minBackwardJumpCountForCompile; minBackwardJumpCountForCompile = strtobkm(argv[1]); return 2; } + else if (!strcmp(argv[0], "-reportheadroom")) { + extern sqInt reportStackHeadroom; + reportStackHeadroom = 1; + return 1; } #endif /* COGVM */ else if (!strcmp(argv[0], "-textenc")) { Modified: branches/Cog/platforms/win32/vm/sqWin32Intel.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Intel.c 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/platforms/win32/vm/sqWin32Intel.c 2013-02-06 02:55:12 UTC (rev 2678) @@ -1688,10 +1688,6 @@ extern sqInt suppressHeartbeatFlag; suppressHeartbeatFlag = 1; return 1; } - else if (!strcmp(argv[0], "-reportheadroom")) { - extern sqInt reportStackHeadroom; - reportStackHeadroom = 1; - return 1; } #endif /* STACKVM */ #if COGVM else if (!strcmp(argv[0], "-codesize")) { @@ -1737,6 +1733,10 @@ extern sqInt minBackwardJumpCountForCompile; minBackwardJumpCountForCompile = strtobkm(argv[0]+13); return 2; } + else if (!strcmp(argv[0], "-reportheadroom")) { + extern sqInt reportStackHeadroom; + reportStackHeadroom = 1; + return 1; } #endif /* COGVM */ /* NOTE: the following flags are "undocumented" */ Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/src/vm/cogit.c 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGenerator VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d from - StackToRegisterMappingCogit VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + StackToRegisterMappingCogit VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -3937,6 +3937,10 @@ return; } methodHeader = headerOf(methodObj); + if (hasLinkRegister(backEnd)) { + /* begin PushR: */ + genoperand(PushR, LinkReg); + } /* begin PushR: */ genoperand(PushR, FPReg); /* begin MoveR:R: */ Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/src/vm/cogit.h 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGenerator VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/src/vm/cogmethod.h 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGenerator VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/src/vm/cointerp.c 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d from - CoInterpreter VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CoInterpreter VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1166,7 +1166,6 @@ static sqInt withSmallIntegerTags(char *value); static sqInt wordSwapped(sqInt w); static void writeImageFileIO(sqInt imageBytes); -static void writeImageFile(sqInt imageBytes); usqInt youngStartAddress(void); /*** Variables ***/ @@ -1183,8 +1182,8 @@ _iss StackPage * stackPage; _iss usqInt freeStart; _iss sqInt nilObj; +_iss usqInt instructionPointer; _iss usqInt method; -_iss usqInt instructionPointer; _iss sqInt argumentCount; _iss usqInt newMethod; _iss StackPage * pages; @@ -1930,7 +1929,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.261]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.264]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -17417,7 +17416,8 @@ return; } thePage = GIV(stackPage); - if (thePage != null) { + if ((thePage != null) + && (thePage != 0)) { (thePage->stackLimit = ((char *) (((usqInt) -1)))); } GIV(stackLimit) = ((char *) (((usqInt) -1))); @@ -37027,8 +37027,15 @@ static void primitiveSnapshot(void) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT snapshot(0); + if ((iframeMethod(GIV(framePointer))) == GIV(newMethod)) { + + /* snapshot: has reached the end and built a frame. + In the JIT we need to back-up the pc before reentering the interpreter. */ + + GIV(instructionPointer) -= 1; + } siglongjmp(reenterInterpreter, ReturnToInterpreter); } @@ -37041,8 +37048,15 @@ static void primitiveSnapshotEmbedded(void) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT snapshot(1); + if ((iframeMethod(GIV(framePointer))) == GIV(newMethod)) { + + /* snapshot: has reached the end and built a frame. + In the JIT we need to back-up the pc before reentering the interpreter. */ + + GIV(instructionPointer) -= 1; + } siglongjmp(reenterInterpreter, ReturnToInterpreter); } @@ -42802,7 +42816,7 @@ void reportMinimumUnusedHeadroom(void) { - printf("stack page size %ld minimum unused stack headroom %ld bytes\n", stackPageByteSize(), minimumUnusedHeadroom()); + printf("stack page bytes %ld available headroom %ld minimum unused headroom %ld\n", stackPageByteSize(), ((stackPageByteSize()) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))) - ((IFrameSlots + 64) * BytesPerWord), minimumUnusedHeadroom()); } @@ -44785,38 +44799,63 @@ static void snapshot(sqInt embedded) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt activateCogMethod; sqInt activeContext; sqInt activeProc; sqInt chunk; + CogMethod *cogMethod; sqInt dataSize; + sqInt errorCode; sqInt fmt; sqInt header; sqInt header1; sqInt header2; sqInt i; sqInt i1; + sqInt i2; + usqInt initialIP; + sqInt methodHeader; + sqInt numArgs; + sqInt numTemps; sqInt object; sqInt object1; + sqInt object2; sqInt oop; sqInt oop1; sqInt oop2; sqInt oop3; sqInt rcvr; + sqInt rcvr1; void *setMacType; char *sp; char *sp1; + char *sp10; + char *sp11; + char *sp12; char *sp2; + char *sp3; + char *sp4; + char *sp5; + char *sp6; + char *sp7; + char *sp8; + char *sp9; sqInt stackIndex; sqInt sz; sqInt sz1; + sqInt table; - /* Need to convert all frames into contexts since the snapshot file only holds objects. */ + /* For nowe the stack munging below doesn't deal with more than omne argument. + It can, and should. */ + if (GIV(argumentCount) != 0) { + (GIV(primFailCode) = PrimErrBadNumArgs); return; + } /* begin push: */ - object1 = GIV(instructionPointer); - longAtput((sp2 = GIV(stackPointer) - BytesPerWord), object1); - GIV(stackPointer) = sp2; + object2 = GIV(instructionPointer); + longAtput((sp12 = GIV(stackPointer) - BytesPerWord), object2); + GIV(stackPointer) = sp12; /* update state of active process */ @@ -44863,8 +44902,8 @@ sz = ((header1 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(oop2 - (BytesPerWord * 2))) & LongSizeMask : header1 & SizeMask); - for (i = ((lastPointerOf(oop2)) + BytesPerWord); i <= (sz - BaseHeaderSize); i += BytesPerWord) { - longAtput(oop2 + i, GIV(nilObj)); + for (i2 = ((lastPointerOf(oop2)) + BytesPerWord); i2 <= (sz - BaseHeaderSize); i2 += BytesPerWord) { + longAtput(oop2 + i2, GIV(nilObj)); } } if (fmt >= 12) { @@ -44925,8 +44964,9 @@ stackIndex = (oop >> 1); rcvr = longAt((activeContext + BaseHeaderSize) + (((stackIndex + CtxtTempFrameStart) - 1) << ShiftForWord)); longAtput((activeContext + BaseHeaderSize) + (((stackIndex + CtxtTempFrameStart) - 1) << ShiftForWord), GIV(trueObj)); - writeImageFile(dataSize); - if (!embedded) { + writeImageFileIO(dataSize); + if ((!GIV(primFailCode)) + && (!embedded)) { /* set Mac file type and creator; this is a noop on other platforms */ @@ -44948,6 +44988,109 @@ /* begin push: */ longAtput((sp1 = GIV(stackPointer) - BytesPerWord), rcvr); GIV(stackPointer) = sp1; + /* begin justActivateNewMethod */ + VM_LABEL(2justActivateNewMethod); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + if ((activateCogMethod = isCogMethodReference(methodHeader))) { + cogMethod = ((CogMethod *) methodHeader); + methodHeader = (cogMethod->methodHeader); + } + numTemps = (((usqInt) methodHeader) >> 19) & 63; + numArgs = (((usqInt) methodHeader) >> 25) & 15; + + /* could new rcvr be set at point of send? */ + + rcvr1 = longAt(GIV(stackPointer) + (numArgs * BytesPerWord)); + if (activateCogMethod + && (GIV(instructionPointer) >= (startOfMemory()))) { + /* begin iframeSavedIP:put: */ + assert(!(isMachineCodeFrame(GIV(framePointer)))); + longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); + GIV(instructionPointer) = ceReturnToInterpreterPC(); + } + /* begin push: */ + longAtput((sp7 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); + GIV(stackPointer) = sp7; + /* begin push: */ + longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); + GIV(stackPointer) = sp8; + GIV(framePointer) = GIV(stackPointer); + initialIP = (GIV(newMethod) + ((LiteralStart + ((((usqInt) methodHeader) >> 10) & 255)) * BytesPerWord)) + BaseHeaderSize; + if (activateCogMethod) { + /* begin push: */ + longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod)); + GIV(stackPointer) = sp10; + /* begin push: */ + longAtput((sp11 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp11; + GIV(instructionPointer) = (((usqInt)cogMethod)) + ((cogMethod->stackCheckOffset)); + } + else { + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); + GIV(stackPointer) = sp2; + /* begin setMethod:methodHeader: */ + GIV(method) = GIV(newMethod); + assert(isOopCompiledMethod(GIV(method))); + assert((headerOf(GIV(method))) == methodHeader); + + /* begin push: */ + longAtput((sp3 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp3; + /* begin push: */ + object1 = (VMBIGENDIAN + ? ((1 + (numArgs << ((BytesPerWord * 8) - 8))) + ((0 + ? 1 << ((BytesPerWord * 8) - 16) + : 0))) + ((0 + ? 1 << ((BytesPerWord * 8) - 24) + : 0)) + : ((1 + (numArgs << 8)) + ((0 + ? 1 << 16 + : 0))) + ((0 + ? 1 << 24 + : 0))); + longAtput((sp4 = GIV(stackPointer) - BytesPerWord), object1); + GIV(stackPointer) = sp4; + /* begin push: */ + longAtput((sp5 = GIV(stackPointer) - BytesPerWord), 0); + GIV(stackPointer) = sp5; + GIV(instructionPointer) = initialIP - 1; + } + /* begin push: */ + longAtput((sp9 = GIV(stackPointer) - BytesPerWord), rcvr1); + GIV(stackPointer) = sp9; + for (i = (numArgs + 1); i <= numTemps; i += 1) { + /* begin push: */ + longAtput((sp6 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp6; + } + if ((methodHeader & 536871934) != 0) { + + /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts + with a long store temp. Strictly no need to skip the store because it's effectively a noop. */ + + initialIP += 0; + if (!activateCogMethod) { + GIV(instructionPointer) = initialIP; + } + if (GIV(primFailCode) != 0) { + if ((byteAt(initialIP + 1)) == (129)) { + /* begin getErrorObjectFromPrimFailCode */ + if (GIV(primFailCode) > 0) { + table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << ShiftForWord)); + if (GIV(primFailCode) <= (((sqInt) (lastPointerOf(table)) >> 2))) { + errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << ShiftForWord)); + goto l1; + } + } + errorCode = ((GIV(primFailCode) << 1) | 1); + l1: /* end getErrorObjectFromPrimFailCode */; + longAtPointerput(GIV(stackPointer), errorCode); + } + GIV(primFailCode) = 0; + } + } + methodHeader; } } @@ -47727,18 +47870,6 @@ sqImageFileClose(f); } -static void -writeImageFile(sqInt imageBytes) -{ - void *fn; - - writeImageFileIO(imageBytes); - fn = ioLoadFunctionFrom("setMacFileTypeAndCreator", "FilePlugin"); - if (!(fn == 0)) { - ((sqInt (*)(char*, char*, char*))fn)(imageName, "STim", "FAST"); - } -} - usqInt youngStartAddress(void) { Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/src/vm/cointerp.h 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-01-31 18:00:18 UTC (rev 2677) +++ branches/Cog/src/vm/cointerpmt.c 2013-02-06 02:55:12 UTC (rev 2678) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d from - CoInterpreterMT VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + CoInterpreterMT VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.264 uuid: 64e76092-8af7-449f-9188-e65f3bd1f08d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1248,7 +1248,6 @@ static sqInt withSmallIntegerTags(char *value); static sqInt wordSwapped(sqInt w); static void writeImageFileIO(sqInt imageBytes); -static void writeImageFile(sqInt imageBytes); usqInt youngStartAddress(void); /*** Variables ***/ @@ -2029,7 +2028,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.261]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.264]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -18056,7 +18055,8 @@ return; } thePage = GIV(stackPage); - if (thePage != null) { + if ((thePage != null) + && (thePage != 0)) { (thePage->stackLimit = ((char *) (((usqInt) -1)))); } GIV(stackLimit) = ((char *) (((usqInt) -1))); @@ -38358,8 +38358,15 @@ static void primitiveSnapshot(void) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT snapshot(0); + if ((iframeMethod(GIV(framePointer))) == GIV(newMethod)) { + + /* snapshot: has reached the end and built a frame. + In the JIT we need to back-up the pc before reentering the interpreter. */ + + GIV(instructionPointer) -= 1; + } siglongjmp(reenterInterpreter, ReturnToInterpreter); } @@ -38372,8 +38379,15 @@ static void primitiveSnapshotEmbedded(void) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT snapshot(1); + if ((iframeMethod(GIV(framePointer))) == GIV(newMethod)) { + + /* snapshot: has reached the end and built a frame. + In the JIT we need to back-up the pc before reentering the interpreter. */ + + GIV(instructionPointer) -= 1; + } siglongjmp(reenterInterpreter, ReturnToInterpreter); } @@ -44197,7 +44211,7 @@ void reportMinimumUnusedHeadroom(void) { - printf("stack page size %ld minimum unused stack headroom %ld bytes\n", stackPageByteSize(), minimumUnusedHeadroom()); + printf("stack page bytes %ld available headroom %ld minimum unused headroom %ld\n", stackPageByteSize(), ((stackPageByteSize()) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))) - ((IFrameSlots + 64) * BytesPerWord), minimumUnusedHeadroom()); } @@ -46235,38 +46249,63 @@ static void snapshot(sqInt embedded) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt activateCogMethod; sqInt activeContext; sqInt activeProc; sqInt chunk; + CogMethod *cogMethod; sqInt dataSize; + sqInt errorCode; sqInt fmt; sqInt header; sqInt header1; sqInt header2; sqInt i; sqInt i1; + sqInt i2; + usqInt initialIP; + sqInt methodHeader; + sqInt numArgs; + sqInt numTemps; sqInt object; sqInt object1; + sqInt object2; sqInt oop; sqInt oop1; sqInt oop2; sqInt oop3; sqInt rcvr; + sqInt rcvr1; void *setMacType; char *sp; char *sp1; + char *sp10; + char *sp11; + char *sp12; char *sp2; + char *sp3; + char *sp4; + char *sp5; + char *sp6; + char *sp7; + char *sp8; + char *sp9; sqInt stackIndex; sqInt sz; sqInt sz1; + sqInt table; - /* Need to convert all frames into contexts since the snapshot file only holds objects. */ + /* For nowe the stack munging below doesn't deal with more than omne argument. + It can, and should. */ + if (GIV(argumentCount) != 0) { + (GIV(primFailCode) = PrimErrBadNumArgs); return; + } /* begin push: */ - object1 = GIV(instructionPointer); - longAtput((sp2 = GIV(stackPointer) - BytesPerWord), object1); - GIV(stackPointer) = sp2; + object2 = GIV(instructionPointer); + longAtput((sp12 = GIV(stackPointer) - BytesPerWord), object2); + GIV(stackPointer) = sp12; /* update state of active process */ @@ -46313,8 +46352,8 @@ sz = ((header1 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(oop2 - (BytesPerWord * 2))) & LongSizeMask : header1 & SizeMask); - for (i = ((lastPointerOf(oop2)) + BytesPerWord); i <= (sz - BaseHeaderSize); i += BytesPerWord) { - longAtput(oop2 + i, GIV(nilObj)); + for (i2 = ((lastPointerOf(oop2)) + BytesPerWord); i2 <= (sz - BaseHeaderSize); i2 += BytesPerWord) { + longAtput(oop2 + i2, GIV(nilObj)); } } if (fmt >= 12) { @@ -46375,8 +46414,9 @@ stackIndex = (oop >> 1); rcvr = longAt((activeContext + BaseHeaderSize) + (((stackIndex + CtxtTempFrameStart) - 1) << ShiftForWord)); longAtput((activeContext + BaseHeaderSize) + (((stackIndex + CtxtTempFrameStart) - 1) << ShiftForWord), GIV(trueObj)); - writeImageFile(dataSize); - if (!embedded) { + writeImageFileIO(dataSize); + if ((!GIV(primFailCode)) + && (!embedded)) { /* set Mac file type and creator; this is a noop on other platforms */ @@ -46398,6 +46438,109 @@ /* begin push: */ longAtput((sp1 = GIV(stackPointer) - BytesPerWord), rcvr); GIV(stackPointer) = sp1; + /* begin justActivateNewMethod */ + VM_LABEL(2justActivateNewMethod); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + if ((activateCogMethod = isCogMethodReference(methodHeader))) { + cogMethod = ((CogMethod *) methodHeader); + methodHeader = (cogMethod->methodHeader); + } + numTemps = (((usqInt) methodHeader) >> 19) & 63; + numArgs = (((usqInt) methodHeader) >> 25) & 15; + + /* could new rcvr be set at point of send? */ + + rcvr1 = longAt(GIV(stackPointer) + (numArgs * BytesPerWord)); + if (activateCogMethod + && (GIV(instructionPointer) >= (startOfMemory()))) { + /* begin iframeSavedIP:put: */ + assert(!(isMachineCodeFrame(GIV(framePointer)))); + longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); + GIV(instructionPointer) = ceReturnToInterpreterPC(); + } + /* begin push: */ + longAtput((sp7 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); + GIV(stackPointer) = sp7; + /* begin push: */ + longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); + GIV(stackPointer) = sp8; + GIV(framePointer) = GIV(stackPointer); + initialIP = (GIV(newMethod) + ((LiteralStart + ((((usqInt) methodHeader) >> 10) & 255)) * BytesPerWord)) + BaseHeaderSize; + if (activateCogMethod) { + /* begin push: */ + longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod)); + GIV(stackPointer) = sp10; + /* begin push: */ + longAtput((sp11 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp11; + GIV(instructionPointer) = (((usqInt)cogMethod)) + ((cogMethod->stackCheckOffset)); + } + else { + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); + GIV(stackPointer) = sp2; + /* begin setMethod:methodHeader: */ + GIV(method) = GIV(newMethod); + assert(isOopCompiledMethod(GIV(method))); + assert((headerOf(GIV(method))) == methodHeader); + + /* begin push: */ + longAtput((sp3 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp3; + /* begin push: */ + object1 = (VMBIGENDIAN + ? ((1 + (numArgs << ((BytesPerWord * 8) - 8))) + ((0 + ? 1 << ((BytesPerWord * 8) - 16) + : 0))) + ((0 + ? 1 << ((BytesPerWord * 8) - 24) + : 0)) + : ((1 + (numArgs << 8)) + ((0 + ? 1 << 16 + : 0))) + ((0 + ? 1 << 24 + : 0))); + longAtput((sp4 = GIV(stackPointer) - BytesPerWord), object1); + GIV(stackPointer) = sp4; + /* begin push: */ + longAtput((sp5 = GIV(stackPointer) - BytesPerWord), 0); + GIV(stackPointer) = sp5; + GIV(instructionPointer) = initialIP - 1; + } + /* begin push: */ + longAtput((sp9 = GIV(stackPointer) - BytesPerWord), rcvr1); + GIV(stackPointer) = sp9; + for (i = (numArgs + 1); i <= numTemps; i += 1) { + /* begin push: */ + longAtput((sp6 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); + GIV(stackPointer) = sp6; + } + if ((methodHeader & 536871934) != 0) { + + /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.264.mcz
by commits＠source.squeak.org 06 Feb '13

06 Feb '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.264.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.264 Author: eem Time: 5 February 2013, 6:37:47.099 pm UUID: 64e76092-8af7-449f-9188-e65f3bd1f08d Ancestors: VMMaker.oscog-lw.263 Fix snapshot primitive failure in the StackVM and Cogit. The primitive should fail, not merely return the receiver. Also if in Cogit, need to back-up instrufiton pointer on failure. Make reportMinimumUnusedHeadroom more informative (also print available headroom). Back out of named SerialPlugin primitives (comprehensive platform support is lacking). Fix simulation of forceInterruptCheck when snapshotting. Fix simulation of writeImageFileIO: when image file is not writable. Fix generateSqueakStackVM. =============== Diff against VMMaker.oscog-lw.263 =============== Item was changed: ----- Method: CoInterpreter>>reportMinimumUnusedHeadroom (in category 'debug support') ----- reportMinimumUnusedHeadroom "Report the stack page size and minimum unused headroom to stdout." <api> self cCode: + [self pri: 'stack page bytes %ld available headroom %ld minimum unused headroom %ld\n' + n: self stackPageByteSize + t: self stackPageByteSize - self stackLimitBytes - self stackLimitOffset - [self prin: 'stack page size %ld minimum unused stack headroom %ld bytes\n' - t: self stackPageByteSize f: self minimumUnusedHeadroom] inSmalltalk: + ["CogVMSimulator new initStackPagesForTests reportMinimumUnusedHeadroom" + self print: 'stack page bytes '; printNum: self stackPageByteSize; + print: ' available headroom '; printNum: self stackPageByteSize - self stackLimitBytes - self stackLimitOffset; + print: ' minimum unused headroom '; printNum: self minimumUnusedHeadroom; + cr]! - [self print: 'stack page size '; printNum: self stackPageByteSize; - print: ' minimum unused stack headroom '; printNum: self minimumUnusedHeadroom; - print: ' bytes'; cr]! Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveSnapshot (in category 'system control primitives') ----- primitiveSnapshot "Save a normal snapshot under the same name as it was loaded unless it has been renamed by the last primitiveImageName. Override to jump to the interpreter because the machine code zone is now void." <inline: false> self snapshot: false. + (self iframeMethod: framePointer) = newMethod ifTrue: + ["snapshot: has reached the end and built a frame. + In the JIT we need to back-up the pc before reentering the interpreter." + instructionPointer := instructionPointer - 1]. self siglong: reenterInterpreter jmp: ReturnToInterpreter "NOTREACHED"! Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveSnapshotEmbedded (in category 'system control primitives') ----- primitiveSnapshotEmbedded "Save an embedded snapshot. Override to jump to the interpreter because the machine code zone is now void." <inline: false> self snapshot: true. + (self iframeMethod: framePointer) = newMethod ifTrue: + ["snapshot: has reached the end and built a frame. + In the JIT we need to back-up the pc before reentering the interpreter." + instructionPointer := instructionPointer - 1]. self siglong: reenterInterpreter jmp: ReturnToInterpreter "NOTREACHED"! Item was changed: ----- Method: CogVMSimulator>>writeImageFileIO: (in category 'image save/restore') ----- writeImageFileIO: numberOfBytesToWrite "Actually emit the first numberOfBytesToWrite object memory bytes onto the snapshot." | headerSize file | BytesPerWord = 4 ifFalse: [self error: 'Not rewritten for 64 bits yet']. headerSize := 64. [ + file := FileStream fileNamed: imageName. + file == nil ifTrue: + [self primitiveFail. + ^nil]. + file binary. + - file := (FileStream fileNamed: imageName) binary. - file == nil ifTrue: [^nil]. - { self imageFormatVersion. headerSize. numberOfBytesToWrite. objectMemory startOfMemory. (objectMemory specialObjectsOop). (objectMemory lastHash). self ioScreenSize. self getImageHeaderFlags. extraVMMemory } do: [:long | self putLong: long toFile: file]. { desiredNumStackPages. self unknownShortOrCodeSizeInKs } do: [:short| self putShort: short toFile: file]. self putLong: desiredEdenBytes toFile: file. { maxExtSemTabSizeSet ifTrue: [self ioGetMaxExtSemTableSize] ifFalse: [0]. 0 } do: [:short| self putShort: short toFile: file]. "Pad the rest of the header." 4 timesRepeat: [self putLong: 0 toFile: file]. "Position the file after the header." file position: headerSize. "Write the object memory." objectMemory startOfMemory // 4 + 1 to: numberOfBytesToWrite // 4 do: [:index | self putLong: (objectMemory memory at: index) toFile: file]. self success: true ] + ensure: [file ifNotNil: [file close]]! - ensure: [file close]! Item was changed: ----- Method: NewspeakInterpreterSimulator>>writeImageFileIO: (in category 'image save/restore') ----- writeImageFileIO: numberOfBytesToWrite "Actually emit the first numberOfBytesToWrite object memory bytes onto the snapshot." | headerSize file | BytesPerWord = 4 ifFalse: [self error: 'Not rewritten for 64 bits yet']. headerSize := 64. [ + file := FileStream fileNamed: imageName. + file == nil ifTrue: + [self primitiveFail. + ^nil]. + file binary. - file := (FileStream fileNamed: imageName) binary. - file == nil ifTrue: [^nil]. { self imageFormatVersion. headerSize. numberOfBytesToWrite. self startOfMemory. specialObjectsOop. lastHash. self ioScreenSize. fullScreenFlag. extraVMMemory } do: [:long | self putLong: long toFile: file]. "Pad the rest of the header." 7 timesRepeat: [self putLong: 0 toFile: file]. "Position the file after the header." file position: headerSize. "Write the object memory." 1 to: numberOfBytesToWrite // 4 do: [:index | self putLong: (memory at: index) toFile: file]. self success: true ] + ensure: [file ifNotNil: [file close]]! - ensure: [file close]! Item was removed: - ----- Method: SerialPlugin>>primitiveSerialPortOpenByName:baudRate:stopBitsType:parityType:dataBits:inFlowControlType:outFlowControlType:xOnByte:xOffByte: (in category 'primitives') ----- - primitiveSerialPortOpenByName: portName baudRate: baudRate stopBitsType: stopBitsType parityType: parityType dataBits: dataBits inFlowControlType: inFlowControl outFlowControlType: outFlowControl xOnByte: xOnChar xOffByte: xOffChar - <var: #port type: 'char *'> - - | port portNameSize | - - self primitive: 'primitiveSerialPortOpenByName' - parameters: #(String SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger ). - - portNameSize := interpreterProxy slotSizeOf: (portName asOop: String). - port := self cCode: 'calloc(portNameSize, sizeof(char))'. - self cCode: 'memcpy(port, portName, portNameSize)'. - - self cCode: 'serialPortOpenByName( - port, baudRate, stopBitsType, parityType, dataBits, - inFlowControl, outFlowControl, xOnChar, xOffChar)'. - - self free: port.! Item was removed: - ----- Method: SerialPlugin>>primitiveSerialPortReadByName:into:startingAt:count: (in category 'primitives') ----- - primitiveSerialPortReadByName: portName into: array startingAt: startIndex count: count - <var: #port type: 'char *'> - - | port portNameSize bytesRead arrayPtr | - - self primitive: 'primitiveSerialPortReadByName' - parameters: #(String ByteArray SmallInteger SmallInteger ). - - interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= (interpreterProxy byteSizeOf: array cPtrAsOop)]). - "adjust for zero-origin indexing" - - portNameSize := interpreterProxy slotSizeOf: (portName asOop: String). - port := self cCode: 'calloc(portNameSize, sizeof(char))'. - self cCode: 'memcpy(port, portName, portNameSize)'. - - arrayPtr := array asInteger + startIndex - 1. - bytesRead := self cCode: 'serialPortReadIntoByName( port, count, arrayPtr)'. - - self free: port. - - ^ bytesRead asSmallIntegerObj! Item was removed: - ----- Method: SerialPlugin>>primitiveSerialPortWriteByName:from:startingAt:count: (in category 'primitives') ----- - primitiveSerialPortWriteByName: portName from: array startingAt: startIndex count: count - <var: #port type: 'char *'> - - | bytesWritten arrayPtr portNameSize port | - - self primitive: 'primitiveSerialPortWriteByName' - parameters: #(String ByteArray SmallInteger SmallInteger ). - - portNameSize := interpreterProxy slotSizeOf: (portName asOop: String). - port := self cCode: 'calloc(portNameSize, sizeof(char))'. - self cCode: 'memcpy(port, portName, portNameSize)'. - - interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= (interpreterProxy byteSizeOf: array cPtrAsOop)]). - interpreterProxy failed - ifFalse: [arrayPtr := array asInteger + startIndex - 1. - bytesWritten := self cCode: 'serialPortWriteFromByName(port, count, arrayPtr)' ]. - - self free: port. - - ^ bytesWritten asSmallIntegerObj! Item was changed: ----- Method: StackInterpreter>>forceInterruptCheck (in category 'process primitive support') ----- forceInterruptCheck "Force an interrupt check ASAP. Must set the stack page's limit before stackLimit to avoid a race condition if this is called from an interrupt handler." | thePage iccFunc | <inline: false> <var: #thePage type: #'StackPage *'> <var: #iccFunc declareC: 'void (*iccFunc)()'> "Do _not_ set stackLimit until the stack system has been initialized. stackLimit is the initialization flag for the stack system." stackLimit = 0 ifTrue: [^nil]. thePage := stackPage. + (thePage notNil and: [thePage ~= 0]) ifTrue: - thePage notNil ifTrue: [thePage stackLimit: (self cCoerceSimple: -1 signedIntToLong to: #'char *')]. stackLimit := self cCoerceSimple: -1 signedIntToLong to: #'char *'. self sqLowLevelMFence. "There is a race condition if we test the function and then dereference it a second time to call it. This is called from interrupt code but at the same time other code could be clearing the interruptCheckChain via setInterruptCheckChain:." (iccFunc := interruptCheckChain) notNil ifTrue: [self perform: iccFunc]. statForceInterruptCheck := statForceInterruptCheck + 1! Item was changed: ----- Method: StackInterpreter>>snapshot: (in category 'image save/restore') ----- snapshot: embedded "update state of active context" | activeContext activeProc dataSize rcvr setMacType stackIndex | <var: #setMacType type: 'void *'> + "For nowe the stack munging below doesn't deal with more than omne argument. + It can, and should." + argumentCount ~= 0 ifTrue: + [^self primitiveFailFor: PrimErrBadNumArgs]. + "Need to convert all frames into contexts since the snapshot file only holds objects." self push: instructionPointer. activeContext := self voidVMStateForSnapshot. "update state of active process" activeProc := self activeProcess. objectMemory storePointer: SuspendedContextIndex ofObject: activeProc withValue: activeContext. objectMemory pushRemappableOop: activeContext. "compact memory and compute the size of the memory actually in use" objectMemory incrementalGC. "maximimize space for forwarding table" objectMemory fullGC. self snapshotCleanUp. "Nothing moves from here on so it is safe to grab the activeContext again." activeContext := objectMemory popRemappableOop. dataSize := objectMemory freeStart - objectMemory startOfMemory. "Assume all objects are below the start of the free block" self successful ifTrue: ["Without contexts or stacks simulate rcvr := self popStack. ''pop rcvr'' self push: trueObj. to arrange that the snapshot resumes with true. N.B. stackIndex is one-relative." stackIndex := self quickFetchInteger: StackPointerIndex ofObject: activeContext. rcvr := objectMemory fetchPointer: stackIndex + CtxtTempFrameStart - 1 ofObject: activeContext. + objectMemory + storePointerUnchecked: stackIndex + CtxtTempFrameStart - 1 - objectMemory storePointerUnchecked: stackIndex + CtxtTempFrameStart - 1 ofObject: activeContext withValue: objectMemory trueObject. "now attempt to write the snapshot file" + self writeImageFileIO: dataSize. + (self successful and: [embedded not]) ifTrue: - self writeImageFile: dataSize. - embedded ifFalse: ["set Mac file type and creator; this is a noop on other platforms" setMacType := self ioLoadFunction: 'setMacFileTypeAndCreator' From: 'FilePlugin'. setMacType = 0 ifFalse: [self cCode: '((sqInt (*)(char *, char *, char *))setMacType)(imageName, "STim", "FAST")']]. "Without contexts or stacks simulate self pop: 1" + objectMemory + storePointerUnchecked: StackPointerIndex - objectMemory storePointerUnchecked: StackPointerIndex ofObject: activeContext withValue: (objectMemory integerObjectOf: stackIndex - 1)]. self marryContextInNewStackPageAndInitializeInterpreterRegisters: activeContext. self successful ifTrue: [self push: objectMemory falseObject] + ifFalse: + [self push: rcvr. + self justActivateNewMethod]! - ifFalse: [self push: rcvr]! Item was changed: ----- Method: StackInterpreter>>writeImageFile: (in category 'image save/restore') ----- writeImageFile: imageBytes | fn | <var: #fn type: 'void *'> self writeImageFileIO: imageBytes. + self successful ifTrue: + ["set Mac file type and creator; this is a noop on other platforms" + fn := self ioLoadFunction: 'setMacFileTypeAndCreator' From: 'FilePlugin'. + fn = 0 ifFalse: + [self cCode:'((sqInt (*)(char*, char*, char*))fn)(imageName, "STim", "FAST")']] - "set Mac file type and creator; this is a noop on other platforms" - fn := self ioLoadFunction: 'setMacFileTypeAndCreator' From: 'FilePlugin'. - fn = 0 ifFalse:[ - self cCode:'((sqInt (*)(char*, char*, char*))fn)(imageName, "STim", "FAST")'. - ]. ! Item was changed: ----- Method: StackInterpreterSimulator>>writeImageFileIO: (in category 'image save/restore') ----- writeImageFileIO: numberOfBytesToWrite "Actually emit the first numberOfBytesToWrite object memory bytes onto the snapshot." | headerSize file | BytesPerWord = 4 ifFalse: [self error: 'Not rewritten for 64 bits yet']. headerSize := 64. [ + file := FileStream fileNamed: imageName. + file == nil ifTrue: + [self primitiveFail. + ^nil]. + file binary. - file := (FileStream fileNamed: imageName) binary. - file == nil ifTrue: [^nil]. { self imageFormatVersion. headerSize. numberOfBytesToWrite. objectMemory startOfMemory. (objectMemory specialObjectsOop). (objectMemory lastHash). self ioScreenSize. fullScreenFlag. extraVMMemory } do: [:long | self putLong: long toFile: file]. { desiredNumStackPages. self unknownShortOrCodeSizeInKs } do: [:short| self putShort: short toFile: file]. self putLong: desiredEdenBytes toFile: file. { maxExtSemTabSizeSet ifTrue: [self ioGetMaxExtSemTableSize] ifFalse: [0]. 0 } do: [:short| self putShort: short toFile: file]. "Pad the rest of the header." 4 timesRepeat: [self putLong: 0 toFile: file]. "Position the file after the header." file position: headerSize. "Write the object memory." objectMemory startOfMemory // 4 + 1 to: numberOfBytesToWrite // 4 do: [:index | self putLong: (objectMemory memory at: index) toFile: file]. self success: true ] + ensure: [file ifNotNil: [file close]]! - ensure: [file close]! Item was changed: ----- Method: VMMaker class>>generateSqueakStackVM (in category 'configurations') ----- generateSqueakStackVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter to: (FileDirectory default pathFromURI: 'oscogvm/stacksrc') + platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') - platformDir: (FileDirectory default pathFromURI: 'cogvm/platforms') excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])!

1 0

Continuing after Send Site patch
by Lars 03 Feb '13

03 Feb '13

Hello, today, I added compilation of another two RTLOpcodes (MoveX(w|b)rRR) and ended up with patching the first send site (#rewriteInlineCacheAt:tag:target:). Yay. Unfortunately, continuing after that patch doesn't work yet. With any of the Interpreters, I end up with a broken assert in (#assertValidExecutionPointe:r:s:imbar:). Here the source of that assert. It is the last assert which is called in that method with my parameters. self assert: ((self mframeIsBlockActivation: lifp) or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self mframeReceiver: lifp)]) Is the problem that the Smalltalk stack is not well ordered? In the virtual or the Smalltalk-Smalltalk abi case? Is it possible to diagnose from afar whether the first or the second alternative should be true? What information would you need to decide that? All the best, Lars

1 0

VM Maker: VMMaker.oscog-lw.263.mcz
by commits＠source.squeak.org 03 Feb '13

03 Feb '13

Lars Wassermann uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-lw.263.mcz ==================== Summary ==================== Name: VMMaker.oscog-lw.263 Author: lw Time: 3 February 2013, 6:09:52.492 pm UUID: bf23be20-f2a7-1040-a675-76e097a7f431 Ancestors: VMMaker.oscog-lw.262 refactored the minimization of immediate 12bit values added send site updates =============== Diff against VMMaker.oscog-lw.262 =============== Item was changed: ----- Method: CogARMCompiler>>at:moveCw:intoR: (in category 'generate machine code - concretize') ----- at: offset moveCw: constant intoR: destReg "This loads aWord into the inter-opcode temporary register. Because most ARM instruction enable using a (8-12bit) offset relative to a register, the LS Byte can be included in that instruction, saving one instruction. This is done in a decorator, e.g. CmpCqR" "Generates:along the lines of MOV destReg, #<constantByte3>, 12 ORR destReg, destReg, #<constantByte2>, 8 ORR destReg, destReg, #<constantByte1>, 4 ORR destReg, destReg, #<constantByte0>, 0 with minimal choice of the rotation (last digit)" "The same area can be modified multiple times, because the opperation is (inclusive) or." <inline: true> + 0 to: 12 by: 4 do: [ :i | | rightRingRotation | + rightRingRotation := self minimalRightRingRotationFor: constant initialRotation: 12 - i. - 0 to: 12 by: 4 do: [ :i | | rightRingRotation byte | - rightRingRotation := 16rC - i. - "Counter rotation to get the according byte. Because Smalltalk does not have left ring shift, shift further right." - rightRingRotation ~= 0 ifTrue: [ - byte := constant >> (-2 * rightRingRotation + 32) bitAnd: 16rFF. - "For 0, the shift has to be 0. For other immediates, the encoding with minimal rightRingRotation should be choosen." - byte = 0 - ifTrue: [ rightRingRotation := 0] - ifFalse: [ - 0 to: 2 do: [ :j | - (byte bitAnd: 16r03) = 0 - ifTrue: [ rightRingRotation := rightRingRotation - 1. - byte := byte >> 2 ]]]] - ifFalse: [ byte := constant bitAnd: 16rFF]. machineCode at: offset + i + 3 put: 16rE3; at: offset + i + 2 put: (16r80 bitOr: destReg); + at: offset + i + 1 put: ((rightRingRotation at: 1) bitOr: destReg << 4); + at: offset + i"+0"put: (rightRingRotation at: 2). - at: offset + i + 1 put: (rightRingRotation bitOr: destReg << 4); - at: offset + i"+0"put: byte. ]. machineCode at: offset + 2 put: 16rA0. "only the first operation need be MOV" ^16! Item was changed: ----- Method: CogARMCompiler>>concretizeCall (in category 'generate machine code - concretize') ----- concretizeCall "Will get inlined into concretizeAt: switch." <inline: true> | offset | self assert: (operands at: 0) ~= 0. self assert: (operands at: 0) \\ 4 = 0. offset := (operands at: 0) signedIntFromLong - (address + 8 "normal pc offset") signedIntFromLong. (self isQuick: offset) ifTrue: [ self machineCodeAt: 0 put: (self t: 5 o: 8) + (offset >> 2 bitAnd: 16r00FFFFFF). "BL offset" ^machineCodeSize := 4] ifFalse: [ + self error: 'While we know how to generate a long distance call, we can''t update such a send site yet. Please restart with smaller cache size'. self concretizeConditionalJumpLong: AL. "move the actual jump two instructions further, inserting the pc back-up to lr and the pc push." self machineCodeAt: 16 put: (self machineCodeAt: 12). "Because the pc always points to the actual address + 8, the value at pc is the address of the instruction after the branch" "mov lr, pc" self machineCodeAt: 12 put: (self t: 0 o: 16rD s: 0 rn: 0 rd: LR shifterOperand: PC). ^machineCodeSize := 20]! Item was added: + ----- Method: CogARMCompiler>>concretizeMoveXbrRR (in category 'generate machine code - concretize') ----- + concretizeMoveXbrRR + "Will get inlined into concretizeAt: switch." + + <inline: true> + | index base dest | + index := self concreteRegister: (operands at: 0). + base := self concreteRegister: (operands at: 1). + dest := self concreteRegister: (operands at: 2). + "LDR dest, [base, +index, LSL #0]" + "cond 011 1100 1 base dest 00000 00 0 inde" + self machineCodeAt: 0 put: (self t: 3 o: 16rC s: 1 rn: base rd: dest shifterOperand: index). + ^machineCodeSize := 4! Item was added: + ----- Method: CogARMCompiler>>concretizeMoveXwrRR (in category 'generate machine code - concretize') ----- + concretizeMoveXwrRR + "Will get inlined into concretizeAt: switch." + + <inline: true> + | index base dest | + index := self concreteRegister: (operands at: 0). + base := self concreteRegister: (operands at: 1). + dest := self concreteRegister: (operands at: 2). + "LDR dest, [base, +index, LSL #2]" + "cond 011 1100 1 base dest 00010 00 0 inde" + self machineCodeAt: 0 put: (self t: 3 o: 16rC s: 1 rn: base rd: dest shifterOperand: (16r100 bitOr: index)). + ^machineCodeSize := 4! Item was added: + ----- Method: CogARMCompiler>>minimalRightRingRotationFor:initialRotation: (in category 'encoding') ----- + minimalRightRingRotationFor: constant initialRotation: iniRightRingRotation + "Given a constant and some initial rotation, tries to minimize that rotation in an effort to encode the according byte in constant. This is used, to encode the last 12bit of many operations, for which a 8bit immediate rotated by (2*)4bit is available. That immediate need be encoded with minimal rotation." + | byte rightRingRotation | + rightRingRotation := iniRightRingRotation. + "Counter rotation to get the according byte. Because Smalltalk does not have left ring shift, shift further right." + rightRingRotation ~= 0 ifTrue: [ + byte := constant >> (-2 * rightRingRotation + 32) bitAnd: 16rFF. + "For 0, the shift has to be 0. For other immediates, the encoding with minimal rightRingRotation should be choosen." + byte = 0 + ifTrue: [ rightRingRotation := 0] + ifFalse: [ + 0 to: 2 do: [ :j | + (byte bitAnd: 16r03) = 0 + ifTrue: [ rightRingRotation := rightRingRotation - 1. + byte := byte >> 2 ]]]] + ifFalse: [ byte := constant bitAnd: 16rFF]. + ^{rightRingRotation. byte}! Item was added: + ----- Method: CogARMCompiler>>rewriteInlineCacheAt:tag:target: (in category 'inline cacheing') ----- + rewriteInlineCacheAt: callSiteReturnAddress tag: cacheTag target: callTargetAddress + "Rewrite an inline cache to call a different target for a new tag. This variant is used + to link unlinked sends in ceSend:to:numArgs: et al. Answer the extent of the code + change which is used to compute the range of the icache to flush." + + "chacheTag contains an oop to the selector which need be loaded before jumping" + <var: #callSiteReturnAddress type: #usqInt> + <var: #callTargetAddress type: #usqInt> + | call callDistance | + "self cCode: '' + inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 20 to: callSiteReturnAddress -1]." + false + ifTrue: [self assert: callTargetAddress >= cogit minCallAddress] + ifFalse: [callTargetAddress >= cogit minCallAddress ifFalse: + [self error: 'linking callsite to invalid address']]. + callDistance := (callTargetAddress - (callSiteReturnAddress + 8 "pc offset"- 4 "return offset")) signedIntToLong. + + self assert: (self isQuick: callDistance). "we don't support long call updates, yet" + call := (self t: 5 o: 8)"BL" + (callDistance >> 2 bitAnd: 16rFFFFFF). + objectMemory + byteAt: callSiteReturnAddress - 1 put: (call >> 24 bitAnd: 16rFF); + byteAt: callSiteReturnAddress - 2 put: (call >> 16 bitAnd: 16rFF); + byteAt: callSiteReturnAddress - 3 put: (call >> 8 bitAnd: 16rFF); + byteAt: callSiteReturnAddress - 4 put: (call bitAnd: 16rFF). + + "The cacheTag is loaded byte by byte. Each byte needs to be encoded with minimal right ring rotation. See also #at:moveCw:intoR:" + -20 to: -8 by: 4 do: [ :offset || rotation | + rotation := self minimalRightRingRotationFor: cacheTag initialRotation: (offset + 8) negated. + (offset + 8) ~= 0 ifTrue: [ "in case of decoration which may change the last instrution, we should not overwrite bits 9 to 12" + objectMemory + byteAt: callSiteReturnAddress + offset + 1 + put: (((objectMemory byteAt: callSiteReturnAddress - offset + 1) + bitAnd: 16rF0) + bitOr: (rotation at: 1))]. + objectMemory + byteAt: callSiteReturnAddress + offset + put: (rotation at: 2)]. + + self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) signedIntToLong = callTargetAddress. + "self cCode: '' + inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 20 to: callSiteReturnAddress - 1]." + ^20!

1 0

VM Maker: VMMaker.oscog-lw.262.mcz
by commits＠source.squeak.org 02 Feb '13

02 Feb '13

Lars Wassermann uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-lw.262.mcz ==================== Summary ==================== Name: VMMaker.oscog-lw.262 Author: lw Time: 2 February 2013, 12:10:15.453 am UUID: e873534c-eaea-3e44-b57c-66c588bed675 Ancestors: VMMaker.oscog-eem.261 updated numberOfSaveableRegisters to reflect the correct number of registers saved in genSaveRegisters: 0. compileFrameBuild expects lr to be pushed before the frame pointer. This is done now. =============== Diff against VMMaker.oscog-eem.261 =============== Item was changed: ----- Method: CogARMCompiler>>numberOfSaveableRegisters (in category 'abi') ----- numberOfSaveableRegisters "Answer the number of registers to be saved in a trampoline call that saves registers. + None, See genSaveRegisters." + <cmacro: '(self) 0'> + ^0! - R0 through R12, See genSaveRegisters." - <cmacro: '(self) 13'> - ^13! Item was changed: ----- Method: SimpleStackBasedCogit>>compileFrameBuild (in category 'compile abstract instructions') ----- compileFrameBuild "Build a frame for a CogMethod activation. See CoInterpreter class>>initializeFrameIndices. receiver (in ReceiverResultReg) arg0 ... argN caller's saved ip/this stackPage (for a base frame) fp-> saved fp method context (uninitialized?) receiver first temp ... sp-> Nth temp If there is a primitive and an error code the Nth temp is the error code. Ensure SendNumArgsReg is set early on (incidentally to nilObj) because it is the flag determining whether context switch is allowed on stack-overflow." | methodHeader jumpSkip | <inline: false> <var: #jumpSkip type: #'AbstractInstruction *'> needsFrame ifFalse: [^0]. methodHeader := coInterpreter headerOf: methodObj. + backEnd hasLinkRegister ifTrue: [self PushR: LinkReg]. self PushR: FPReg. self MoveR: SPReg R: FPReg. methodLabel addDependent: (self annotateAbsolutePCRef: (self PushCw: methodLabel asInteger)). "method" self annotate: (self MoveCw: objectMemory nilObject R: SendNumArgsReg) objRef: objectMemory nilObject. self PushR: SendNumArgsReg. "context" self PushR: ReceiverResultReg. methodOrBlockNumArgs + 1 to: (coInterpreter tempCountOf: methodObj) do: [:i| self PushR: SendNumArgsReg]. (primitiveIndex > 0 and: [(coInterpreter longStoreBytecodeForHeader: methodHeader) = (objectMemory fetchByte: initialPC + (coInterpreter sizeOfCallPrimitiveBytecode: methodHeader) ofObject: methodObj)]) ifTrue: [self compileGetErrorCode. initialPC := initialPC + (coInterpreter sizeOfCallPrimitiveBytecode: methodHeader) + (coInterpreter sizeOfLongStoreTempBytecode: methodHeader)]. self MoveAw: coInterpreter stackLimitAddress R: TempReg. self CmpR: TempReg R: SPReg. "N.B. FLAGS := SPReg - TempReg" "If we can't context switch for this method, use a slightly slower overflow check that clears SendNumArgsReg." (coInterpreter canContextSwitchIfActivating: methodObj header: methodHeader) ifTrue: [self JumpBelow: stackOverflowCall. stackCheckLabel := self Label] ifFalse: [jumpSkip := self JumpAboveOrEqual: 0. self MoveCq: 0 R: SendNumArgsReg. self Jump: stackOverflowCall. jumpSkip jmpTarget: (stackCheckLabel := self Label)]. self annotateBytecode: stackCheckLabel!

1 0

VM Maker: Cog-lw.60.mcz
by commits＠source.squeak.org 02 Feb '13

02 Feb '13

Lars Wassermann uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-lw.60.mcz ==================== Summary ==================== Name: Cog-lw.60 Author: lw Time: 2 February 2013, 12:07:28.211 am UUID: 826fc17b-8f27-5b40-8103-3e2a690b49cb Ancestors: Cog-eem.59 Implemented Simulation frame building as hinted in Eliots Email 'Changing CogSimulator abi' =============== Diff against Cog-eem.59 =============== Item was added: + ----- Method: GdbARMAlien>>pushWord:in: (in category 'execution') ----- + pushWord: aValue in: aMemory + aMemory longAt: (self sp: self sp - 4) + 1 put: aValue bigEndian: false! Item was changed: ----- Method: GdbARMAlien>>simulateCallOf:nextpc:memory: (in category 'execution simulation') ----- simulateCallOf: address nextpc: nextpc memory: aMemory "Simulate a frame-building call of address. Build a frame since + a) this is used for calls into the run-time which are unlikely to be leaf-calls" + "This method builds a stack frame as expected by the simulator, not as defined by ARM aapcs-abi. + In ARM aapcs, every method can define for itself, wether it wants to push lr (nextpc), and wether it + uses a frame pointer. The standard never mentions a fp. It merely defines r4-r11 to be callee-saved." + + self assert: self sp \\ 8 = 0. "This check ensures, that we conform with ARM abi. Before doing anything to the stack, we ensure 2-word alignment." + self pushWord: nextpc in: aMemory. + self pushWord: self r11 in: aMemory. + self r11: self sp. + PostBuildStackDelta ~= 0 ifTrue: + [self sp: self sp - PostBuildStackDelta]. "In order to satisfy the CStackAlignment check by cogit, which is only valid on IA32 platforms." - a) this is used for calls into the run-time which are unlikely to be leaf-calls, and - b) stack alignment needs to be realistic for assert checking for platforms such as Mac OS X" - self lr: nextpc. self pc: address! Item was changed: + ----- Method: GdbARMAlien>>simulateLeafCallOf:nextpc:memory: (in category 'execution simulation') ----- - ----- Method: GdbARMAlien>>simulateLeafCallOf:nextpc:memory: (in category 'execution') ----- simulateLeafCallOf: address nextpc: nextpc memory: aMemory self lr: nextpc. self pc: address! Item was added: + ----- Method: GdbARMAlien>>simulateLeafReturnIn: (in category 'execution simulation') ----- + simulateLeafReturnIn: aMemory + self pc: self lr! Item was added: + ----- Method: GdbARMAlien>>simulateReturnIn: (in category 'execution simulation') ----- + simulateReturnIn: aMemory + PostBuildStackDelta ~= 0 ifTrue: + [self sp: self sp + PostBuildStackDelta]. + self r11: (self popWordIn: aMemory). + self pc: (self popWordIn: aMemory)!

1 0

bug leaving full-screen mode (not just for scratch anymore)
by Matthew Miller 01 Feb '13

01 Feb '13

I thought the problem I was having was scratch specific, but I've discovered that it happens more generally. If I use squeak-image 4.3, there's a little icon at the top right for going full-screen, and that works fine to get to full screen, but gives an unresponsive all-black window when clicked again to exit. I'm running squeak-vm-4.10.2.2614 on Fedora 18. -- Matthew Miller mattdm(a)mattdm.org <http://mattdm.org/>

3 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2013