Vm-dev September 2014

vm-dev@lists.squeakfoundation.org

25 participants
90 discussions

[commit][3085] CogVM source as per VMMaker.oscog-eem.887
by commits＠squeakvm.org 30 Sep '14

30 Sep '14

Revision: 3085 Author: eliot Date: 2014-09-29 18:16:34 -0700 (Mon, 29 Sep 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.887 Install the callPrimitiveBytecode in the Interpreter's bytecodeDispatchTable on Spur. Modify callPrimitiveBytecode to not invoke unknownBytecode processing if at the first bytecode of a primitive method. Correct sign comparison of instructionPointer in justActivateNewMethod. Relax the validInstructionPointer:inMethod:framePointer: assert to accept any pc in initialPC to self size range now that callPrimitiveBytecode is more forgiving. Speed up primitiveMarkUnwindMethod & primitiveMarkHandlerMethod in the StackInterpreter by setting them to 0 in the primitive table. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/uploadvms branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-09-25 23:12:18 UTC (rev 3084) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-09-30 01:16:34 UTC (rev 3085) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 from - CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -703,8 +703,6 @@ static void primitiveLogN(void); static void primitiveLowSpaceSemaphore(void); static void primitiveMakePoint(void); -static void primitiveMarkHandlerMethod(void); -static void primitiveMarkUnwindMethod(void); static void primitiveMaxIdentityHash(void); usqInt primitiveMethod(void); static void primitiveMillisecondClock(void); @@ -1707,8 +1705,8 @@ /* 195 */ primitiveFindNextUnwindContext, /* 196 */ primitiveTerminateTo, /* 197 */ primitiveFindHandlerContext, - /* 198 */ primitiveMarkUnwindMethod, - /* 199 */ primitiveMarkHandlerMethod, + /* 198 */ (void (*)(void))0, + /* 199 */ (void (*)(void))0, /* 200 */ primitiveClosureCopyWithCopiedValues, /* 201 */ primitiveClosureValue, /* 202 */ primitiveClosureValue, @@ -2086,7 +2084,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.885"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.887"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -13043,11 +13041,38 @@ { sqInt byte1; sqInt byte2; + sqInt header; + sqInt header1; + sqInt header2; sqInt prim; VM_LABEL(0callPrimitiveBytecode); - error("callPrimitiveBytecode should not be evaluated. method activation should step beyond this bytecode."); + /* begin methodHeaderOf: */ + assert(isCompiledMethod(GIV(method))); + header2 = longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + header = ((header2 & 1) + ? header2 + : (assert((((usqInt)header2)) < (heapBase())), + assert((((((CogMethod *) header2))->objectHeader)) == (nullHeaderForMachineCodeMethod())), + ((((CogMethod *) header2))->methodHeader))); + if ((((((sqInt) header)) < 0 + ? header & (65536 << SmallIntegerShift) + : (header & 536871934) != 0)) + && (localIP == ((GIV(method) + ((LiteralStart + (literalCountOfMethodHeader(header))) * BytesPerOop)) + (BaseHeaderSize)))) { + localIP += ((((sqInt) header)) < 0 + ? 3 + : 0); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + null; + goto l296; + } + else { + goto respondToUnknownBytecode; + goto l296; + } + } l296: /* end case */; break; @@ -13837,7 +13862,7 @@ GIV(argumentCount) = (((usqInt) header) >> 25) & 15; assert(wasInMachineCode == (isMachineCodeFrame(GIV(framePointer)))); if (calledFromMachineCode) { - if (GIV(instructionPointer) >= (startOfMemory())) { + if ((((usqInt)GIV(instructionPointer))) >= (startOfMemory())) { /* begin iframeSavedIP:put: */ assert(!(isMachineCodeFrame(GIV(framePointer)))); longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); @@ -19868,7 +19893,7 @@ rcvr = longAt(GIV(stackPointer) + (numArgs * BytesPerWord)); assert(!(isOopForwarded(rcvr))); if (activateCogMethod - && (GIV(instructionPointer) >= (startOfMemory()))) { + && ((((usqInt)GIV(instructionPointer))) >= (startOfMemory()))) { /* begin iframeSavedIP:put: */ assert(!(isMachineCodeFrame(GIV(framePointer)))); longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); @@ -20101,7 +20126,7 @@ rcvr = longAt(GIV(stackPointer) + (numArgs * BytesPerWord)); assert(!(isOopForwarded(rcvr))); if (activateCogMethod - && (GIV(instructionPointer) >= (startOfMemory()))) { + && ((((usqInt)GIV(instructionPointer))) >= (startOfMemory()))) { /* begin iframeSavedIP:put: */ assert(!(isMachineCodeFrame(GIV(framePointer)))); longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); @@ -20762,15 +20787,19 @@ longAtput((theContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord), ((tempIndex << 1) | 1)); } + +/* Note that we accept anInstrPointer pointing to a callPrimitiveBytecode + at the start of a method that contains a primitive. This because methods + like Context(Part)>>reset have to be updated to skip the callPrimtiive + bytecode otherwise. */ +/* -1 for pre-increment in fetchNextBytecode */ + sqInt validInstructionPointerinMethodframePointer(usqInt instrPointer, usqInt aMethod, char *fp) { CogMethod *cogMethod; sqInt header; sqInt methodField; - sqInt methodHeader; - sqInt methodHeader1; - sqInt methodHeader2; usqInt theInstrPointer; if (instrPointer == (ceCannotResumePC())) { @@ -20798,21 +20827,7 @@ } } - - /* begin noAssertHeaderOf: */ - methodHeader2 = longAt((aMethod + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); - methodHeader = (isCogMethodReference(methodHeader2) - ? ((((CogMethod *) methodHeader2))->methodHeader) - : methodHeader2); return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) - && ((theInstrPointer < (((aMethod + (numBytesOf(aMethod))) + BaseHeaderSize) - 1)) - && (!(((((sqInt) methodHeader)) < 0) - && ((methodHeader & (65536 << SmallIntegerShift)) - && (theInstrPointer < ((((aMethod + BytesPerOop) - 1) + (lastPointerOf(aMethod))) + (((((sqInt) methodHeader)) < 0 - ? 3 - : 0)))))))); - - return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (numBytesOf(aMethod))) + (BaseHeaderSize)) - 1)); } @@ -29701,37 +29716,7 @@ GIV(stackPointer) = sp; } - -/* Primitive. Mark the method for exception handling. The primitive must fail - after marking the context so that the regular code is run. - */ - static void -primitiveMarkHandlerMethod(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } -} - - -/* Primitive. Mark the method for exception unwinding. The primitive must - fail after marking the context so that the regular code is run. It must - also *not* allow a context switch. - */ - -static void -primitiveMarkUnwindMethod(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } - return; -} - -static void primitiveMaxIdentityHash(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT char *sp; @@ -51304,7 +51289,7 @@ rcvr1 = longAt(GIV(stackPointer) + (numArgs * BytesPerWord)); assert(!(isOopForwarded(rcvr1))); if (activateCogMethod - && (GIV(instructionPointer) >= (startOfMemory()))) { + && ((((usqInt)GIV(instructionPointer))) >= (startOfMemory()))) { /* begin iframeSavedIP:put: */ assert(!(isMachineCodeFrame(GIV(framePointer)))); longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); @@ -52176,6 +52161,12 @@ return (((usqInt) header) >> 19) & 0x3F; } + +/* Note that we accept anInstrPointer pointing to a callPrimitiveBytecode + at the start of a method that contains a primitive. This because methods + like Context(Part)>>reset have to be updated to skip the callPrimtiive + bytecode otherwise. */ + static sqInt validInstructionPointerinFrame(usqInt anInstrPointer, char *fp) { Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-09-25 23:12:18 UTC (rev 3084) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-09-30 01:16:34 UTC (rev 3085) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-25 23:12:18 UTC (rev 3084) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-30 01:16:34 UTC (rev 3085) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 from - CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -706,8 +706,6 @@ static void primitiveLogN(void); static void primitiveLowSpaceSemaphore(void); static void primitiveMakePoint(void); -static void primitiveMarkHandlerMethod(void); -static void primitiveMarkUnwindMethod(void); static void primitiveMaxIdentityHash(void); usqInt primitiveMethod(void); static void primitiveMillisecondClock(void); @@ -1710,8 +1708,8 @@ /* 195 */ primitiveFindNextUnwindContext, /* 196 */ primitiveTerminateTo, /* 197 */ primitiveFindHandlerContext, - /* 198 */ primitiveMarkUnwindMethod, - /* 199 */ primitiveMarkHandlerMethod, + /* 198 */ (void (*)(void))0, + /* 199 */ (void (*)(void))0, /* 200 */ primitiveClosureCopyWithCopiedValues, /* 201 */ primitiveClosureValue, /* 202 */ primitiveClosureValue, @@ -2089,7 +2087,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.885"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.887"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -13052,11 +13050,38 @@ { sqInt byte1; sqInt byte2; + sqInt header; + sqInt header1; + sqInt header2; sqInt prim; VM_LABEL(0callPrimitiveBytecode); - error("callPrimitiveBytecode should not be evaluated. method activation should step beyond this bytecode."); + /* begin methodHeaderOf: */ + assert(isCompiledMethod(GIV(method))); + header2 = longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + header = ((header2 & 1) + ? header2 + : (assert((((usqInt)header2)) < (heapBase())), + assert((((((CogMethod *) header2))->objectHeader)) == (nullHeaderForMachineCodeMethod())), + ((((CogMethod *) header2))->methodHeader))); + if ((((((sqInt) header)) < 0 + ? header & (65536 << SmallIntegerShift) + : (header & 536871934) != 0)) + && (localIP == ((GIV(method) + ((LiteralStart + (literalCountOfMethodHeader(header))) * BytesPerOop)) + (BaseHeaderSize)))) { + localIP += ((((sqInt) header)) < 0 + ? 3 + : 0); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + null; + goto l296; + } + else { + goto respondToUnknownBytecode; + goto l296; + } + } l296: /* end case */; BREAK; @@ -13846,7 +13871,7 @@ GIV(argumentCount) = (((usqInt) header) >> 25) & 15; assert(wasInMachineCode == (isMachineCodeFrame(GIV(framePointer)))); if (calledFromMachineCode) { - if (GIV(instructionPointer) >= (startOfMemory())) { + if ((((usqInt)GIV(instructionPointer))) >= (startOfMemory())) { /* begin iframeSavedIP:put: */ assert(!(isMachineCodeFrame(GIV(framePointer)))); longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); @@ -19877,7 +19902,7 @@ rcvr = longAt(GIV(stackPointer) + (numArgs * BytesPerWord)); assert(!(isOopForwarded(rcvr))); if (activateCogMethod - && (GIV(instructionPointer) >= (startOfMemory()))) { + && ((((usqInt)GIV(instructionPointer))) >= (startOfMemory()))) { /* begin iframeSavedIP:put: */ assert(!(isMachineCodeFrame(GIV(framePointer)))); longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); @@ -20110,7 +20135,7 @@ rcvr = longAt(GIV(stackPointer) + (numArgs * BytesPerWord)); assert(!(isOopForwarded(rcvr))); if (activateCogMethod - && (GIV(instructionPointer) >= (startOfMemory()))) { + && ((((usqInt)GIV(instructionPointer))) >= (startOfMemory()))) { /* begin iframeSavedIP:put: */ assert(!(isMachineCodeFrame(GIV(framePointer)))); longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); @@ -20771,15 +20796,19 @@ longAtput((theContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord), ((tempIndex << 1) | 1)); } + +/* Note that we accept anInstrPointer pointing to a callPrimitiveBytecode + at the start of a method that contains a primitive. This because methods + like Context(Part)>>reset have to be updated to skip the callPrimtiive + bytecode otherwise. */ +/* -1 for pre-increment in fetchNextBytecode */ + sqInt validInstructionPointerinMethodframePointer(usqInt instrPointer, usqInt aMethod, char *fp) { CogMethod *cogMethod; sqInt header; sqInt methodField; - sqInt methodHeader; - sqInt methodHeader1; - sqInt methodHeader2; usqInt theInstrPointer; if (instrPointer == (ceCannotResumePC())) { @@ -20807,21 +20836,7 @@ } } - - /* begin noAssertHeaderOf: */ - methodHeader2 = longAt((aMethod + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); - methodHeader = (isCogMethodReference(methodHeader2) - ? ((((CogMethod *) methodHeader2))->methodHeader) - : methodHeader2); return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) - && ((theInstrPointer < (((aMethod + (numBytesOf(aMethod))) + BaseHeaderSize) - 1)) - && (!(((((sqInt) methodHeader)) < 0) - && ((methodHeader & (65536 << SmallIntegerShift)) - && (theInstrPointer < ((((aMethod + BytesPerOop) - 1) + (lastPointerOf(aMethod))) + (((((sqInt) methodHeader)) < 0 - ? 3 - : 0)))))))); - - return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (numBytesOf(aMethod))) + (BaseHeaderSize)) - 1)); } @@ -29710,37 +29725,7 @@ GIV(stackPointer) = sp; } - -/* Primitive. Mark the method for exception handling. The primitive must fail - after marking the context so that the regular code is run. - */ - static void -primitiveMarkHandlerMethod(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } -} - - -/* Primitive. Mark the method for exception unwinding. The primitive must - fail after marking the context so that the regular code is run. It must - also *not* allow a context switch. - */ - -static void -primitiveMarkUnwindMethod(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } - return; -} - -static void primitiveMaxIdentityHash(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT char *sp; @@ -51313,7 +51298,7 @@ rcvr1 = longAt(GIV(stackPointer) + (numArgs * BytesPerWord)); assert(!(isOopForwarded(rcvr1))); if (activateCogMethod - && (GIV(instructionPointer) >= (startOfMemory()))) { + && ((((usqInt)GIV(instructionPointer))) >= (startOfMemory()))) { /* begin iframeSavedIP:put: */ assert(!(isMachineCodeFrame(GIV(framePointer)))); longAtput(GIV(framePointer) + FoxIFSavedIP, GIV(instructionPointer)); @@ -52185,6 +52170,12 @@ return (((usqInt) header) >> 19) & 0x3F; } + +/* Note that we accept anInstrPointer pointing to a callPrimitiveBytecode + at the start of a method that contains a primitive. This because methods + like Context(Part)>>reset have to be updated to skip the callPrimtiive + bytecode otherwise. */ + static sqInt validInstructionPointerinFrame(usqInt anInstrPointer, char *fp) { Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-09-25 23:12:18 UTC (rev 3084) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-09-30 01:16:34 UTC (rev 3085) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 from - CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -713,8 +713,6 @@ static void primitiveLogN(void); static void primitiveLowSpaceSemaphore(void); static void primitiveMakePoint(void); -static void primitiveMarkHandlerMethod(void); -static void primitiveMarkUnwindMethod(void); static void primitiveMaxIdentityHash(void); usqInt primitiveMethod(void); static void primitiveMillisecondClock(void); @@ -1523,8 +1521,8 @@ _iss sqInt trueObj; _iss sqInt falseObj; _iss sqInt remapBufferCount; -_iss usqInt totalFreeOldSpace; _iss usqInt newSpaceStart; +_iss usqInt totalFreeOldSpace; _iss sqInt bytesPerPage; _iss sqInt numSegments; _iss sqInt traceLogIndex; @@ -1918,8 +1916,8 @@ /* 195 */ primitiveFindNextUnwindContext, /* 196 */ primitiveTerminateTo, /* 197 */ primitiveFindHandlerContext, - /* 198 */ primitiveMarkUnwindMethod, - /* 199 */ primitiveMarkHandlerMethod, + /* 198 */ (void (*)(void))0, + /* 199 */ (void (*)(void))0, /* 200 */ primitiveClosureCopyWithCopiedValues, /* 201 */ primitiveClosureValue, /* 202 */ primitiveClosureValue, @@ -2328,7 +2326,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.885"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.887"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5120,7 +5118,7 @@ ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { goto commonCallerReturn; - goto l287; + goto l288; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -5157,11 +5155,11 @@ theMethod = longAt((home + (BaseHeaderSize)) + (MethodIndex << 2)); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; - goto l289; + goto l290; } } unwindContextOrNilOrZero = ctxtOrNilOrZero; - l289: /* end internalFindUnwindThroughContext: */; + l290: /* end internalFindUnwindThroughContext: */; if (unwindContextOrNilOrZero == GIV(nilObj)) { /* error: can't find home on chain; cannot return */ @@ -5175,10 +5173,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l291; + goto l292; } ourContext = marryFrameSP(localFP, localSP); - l291: /* end ensureFrameIsMarried:SP: */; + l292: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -5187,7 +5185,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l287; + goto l288; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -5199,10 +5197,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l288; + goto l289; } ourContext1 = marryFrameSP(localFP, localSP); - l288: /* end ensureFrameIsMarried:SP: */; + l289: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -5213,7 +5211,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l287; + goto l288; } contextToReturnTo = null; if (((longAt((home + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { @@ -5272,10 +5270,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l290; + goto l291; } ourContext2 = marryFrameSP(localFP, localSP); - l290: /* end ensureFrameIsMarried:SP: */; + l291: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -5284,7 +5282,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l287; + goto l288; } } assert(pageListIsWellFormed()); @@ -5399,7 +5397,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l287; + goto l288; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5417,7 +5415,7 @@ /* return self */ } - l287: /* end case */; + l288: /* end case */; break; case 121: /* returnTrue */ @@ -5537,27 +5535,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l294; + goto l295; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l294; + goto l295; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l294: /* end findFrameAbove:inPage: */; + l295: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = ((mostRecentlyUsedPage())->nextPage); if (isFree(lruOrFree)) { newPage = lruOrFree; - goto l295; + goto l296; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l295: /* end newStackPage */; + l296: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -5581,7 +5579,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCannotReturn << 2)), contextToReturnFrom, 1); - goto l293; + goto l294; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -5620,8 +5618,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; - goto l293; + goto l294; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5638,9 +5635,9 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; - l293: /* end baseFrameReturn */; - goto l292; + /* return self */ + l294: /* end baseFrameReturn */; + goto l293; } /* begin frameCallerSavedIP: */ localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); @@ -5669,7 +5666,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l292; + goto l293; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5686,7 +5683,7 @@ longAtPointerput(localSP, localReturnValue); } - l292: /* end case */; + l293: /* end case */; break; case 126: /* dynamicSuperSendBytecode */ @@ -6019,10 +6016,10 @@ lkupClassTag = ((tagBits & 1) != 0 ? 1 : tagBits); - goto l296; + goto l297; } lkupClassTag = (longAt(rcvr)) & 0x3FFFFF; - l296: /* end fetchClassTagOf: */; + l297: /* end fetchClassTagOf: */; assert(lkupClassTag != (nilObject())); commonSend: @@ -6066,10 +6063,10 @@ classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) lkupClassTag) >> 10) << 2)); if (classTablePage == GIV(nilObj)) { classOrInteger = null; - goto l303; + goto l304; } classOrInteger = longAt((classTablePage + (BaseHeaderSize)) + ((lkupClassTag & ((1 << 10) - 1)) << 2)); - l303: /* end classAtIndex: */; + l304: /* end classAtIndex: */; GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; @@ -6096,7 +6093,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l298; + goto l299; } /* second probe */ @@ -6107,7 +6104,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l298; + goto l299; } probe = (((usqInt) hash) >> 2) & MethodCacheMask; if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) @@ -6115,10 +6112,10 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l298; + goto l299; } ok = 0; - l298: /* end inlineLookupInMethodCacheSel:classTag: */; + l299: /* end inlineLookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ methodHeader2 = longAt((GIV(newMethod) + (BaseHeaderSize)) + (HeaderIndex << 2)); @@ -6176,7 +6173,7 @@ maybeFlagMethodAsInterpreted(GIV(newMethod)); } } - goto l301; + goto l302; } } /* begin classForClassTag: */ @@ -6188,10 +6185,10 @@ classTablePage1 = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) lkupClassTag) >> 10) << 2)); if (classTablePage1 == GIV(nilObj)) { GIV(lkupClass) = null; - goto l297; + goto l298; } GIV(lkupClass) = longAt((classTablePage1 + (BaseHeaderSize)) + ((lkupClassTag & ((1 << 10) - 1)) << 2)); - l297: /* end classAtIndex: */; + l298: /* end classAtIndex: */; lookupMethodInClass(GIV(lkupClass)); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); @@ -6200,7 +6197,7 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); } - l301: /* end internalFindNewMethod */; + l302: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ VM_LABEL(0internalExecuteNewMethod); if (primitiveFunctionPointer != 0) { @@ -6214,31 +6211,31 @@ if (localPrimIndex >= 264) { longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + (BaseHeaderSize)) + ((localPrimIndex - 264) << 2))); 1; - goto l299; + goto l300; } if (localPrimIndex == 256) { 1; - goto l299; + goto l300; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); 1; - goto l299; + goto l300; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); 1; - goto l299; + goto l300; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); 1; - goto l299; + goto l300; } longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); 1; - l299: /* end internalQuickPrimitiveResponse */; - goto l300; + l300: /* end internalQuickPrimitiveResponse */; + goto l301; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -6304,7 +6301,7 @@ returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); null; - goto l300; + goto l301; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -6381,11 +6378,11 @@ table = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (PrimErrTableIndex << 2)); if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { errorCode = longAt((table + (BaseHeaderSize)) + ((GIV(primFailCode) - 1) << 2)); - goto l302; + goto l303; } } errorCode = ((GIV(primFailCode) << 1) | 1); - l302: /* end getErrorObjectFromPrimFailCode */; + l303: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -6409,7 +6406,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l300: /* end internalExecuteNewMethod */; + l301: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -6876,13 +6873,13 @@ if (((newHash = (longAt(superclass + 4)) & 0x3FFFFF)) == 0) { if (((err = enterIntoClassTable(superclass))) != 0) { -err; - goto l304; + goto l305; } newHash = (longAt(superclass + 4)) & 0x3FFFFF; assert((classAtIndex(newHash)) == superclass); } newHash; - l304: /* end ensureBehaviorHash: */; + l305: /* end ensureBehaviorHash: */; /* begin classTagForClass: */ assert(addressCouldBeClassObj(superclass)); /* begin ensureBehaviorHash: */ @@ -6890,13 +6887,13 @@ if (((newHash1 = (longAt(superclass + 4)) & 0x3FFFFF)) == 0) { if (((err1 = enterIntoClassTable(superclass))) != 0) { lkupClassTag = -err1; - goto l305; + goto l306; } newHash1 = (longAt(superclass + 4)) & 0x3FFFFF; assert((classAtIndex(newHash1)) == superclass); } lkupClassTag = newHash1; - l305: /* end ensureBehaviorHash: */; + l306: /* end ensureBehaviorHash: */; assert(lkupClassTag != (nilObject())); goto commonSend; } @@ -7042,28 +7039,40 @@ } break; case 139: - /* pushExplicitOuterReceiverBytecode */ + /* callPrimitiveBytecode */ { - sqInt anIntOop; - sqInt litIndex; - sqInt n; - sqInt object; + sqInt byte1; + sqInt byte2; + sqInt header; + sqInt header1; + sqInt header2; + sqInt prim; - VM_LABEL(0pushExplicitOuterReceiverBytecode); - litIndex = byteAtPointer(++localIP); - /* begin literal: */ - assert(GIV(method) == (iframeMethod(localFP))); - anIntOop = longAt((GIV(method) + (BaseHeaderSize)) + ((litIndex + LiteralStart) << 2)); - n = ((anIntOop & 1) - ? (anIntOop >> 1) - : 0); - /* begin fetchNextBytecode */ - currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + VM_LABEL(0callPrimitiveBytecode); + /* begin methodHeaderOf: */ + assert(isCompiledMethod(GIV(method))); + header2 = longAt((GIV(method) + (BaseHeaderSize)) + (HeaderIndex << 2)); + header = ((header2 & 1) + ? header2 + : (assert((((usqInt)header2)) < GIV(newSpaceStart)), + assert((((((CogMethod *) header2))->objectHeader)) == (nullHeaderForMachineCodeMethod())), + ((((CogMethod *) header2))->methodHeader))); + if ((header & (65536 << SmallIntegerShift)) + && (localIP == ((GIV(method) + ((LiteralStart + (literalCountOfMethodHeader(header))) * 4)) + (BaseHeaderSize)))) { + localIP += 3; + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* begin internalPush: */ - object = explicitOuterReceiverwithObjectwithMixin(n, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))); - longAtPointerput((localSP -= BytesPerOop), object); + null; + goto l12; + } + else { + goto respondToUnknownBytecode; + goto l12; + } + } + l12: /* end case */; break; case 140: case 506: /*250*/ @@ -7206,10 +7215,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); context = longAt(localFP + FoxThisContext); - goto l13; + goto l14; } context = marryFrameSP(localFP, localSP + (numCopied * BytesPerOop)); - l13: /* end ensureFrameIsMarried:SP: */; + l14: /* end ensureFrameIsMarried:SP: */; /* begin closureIn:numArgs:instructionPointer:numCopiedValues: */ VM_LABEL(0closureInnumArgsinstructionPointernumCopiedValues); initialIP = ((oopForPointer(localIP)) + 2) - (GIV(method) + BaseHeaderSize); @@ -7235,13 +7244,13 @@ if ((GIV(freeStart) + numBytes) > (((eden()).limit))) { error("no room in eden for allocateSmallNewSpaceSlots:format:classIndex:"); newClosure1 = 0; - goto l15; + goto l16; } } long64Atput(newObj, (((((usqLong) (ClosureFirstCopiedValueIndex + numCopied))) << 56) + (3 << 24)) + ClassBlockClosureCompactIndex); GIV(freeStart) += numBytes; newClosure1 = newObj; - l15: /* end allocateSmallNewSpaceSlots:format:classIndex: */; + l16: /* end allocateSmallNewSpaceSlots:format:classIndex: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(newClosure1))); @@ -7423,7 +7432,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorMustBeBoolean << 2)); GIV(argumentCount) = 0; goto normalSend; - goto l16; + goto l17; } /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -7431,7 +7440,7 @@ } /* begin internalPop: */ localSP += 1 * BytesPerOop; - l16: /* end jumplfFalseBy: */; + l17: /* end jumplfFalseBy: */; } break; case 160: @@ -7454,7 +7463,7 @@ /* begin ifBackwardsCheckForEvents: */ VM_LABEL(0ifBackwardsCheckForEvents); if (offset >= 0) { - goto l17; + goto l18; } if (localSP < GIV(stackLimit)) { /* begin externalizeIPandSP */ @@ -7471,7 +7480,7 @@ localSP = pointerForOop(GIV(stackPointer)); localFP = pointerForOop(GIV(framePointer)); if (switched) { - goto l17; + goto l18; } } backwardJumpCountByte = byteAt(localFP + ((VMBIGENDIAN @@ -7501,7 +7510,7 @@ byteAtput(localFP + ((VMBIGENDIAN ? (FoxIFrameFlags + BytesPerWord) - 1 : FoxIFrameFlags)), backwardJumpCountByte); - l17: /* end ifBackwardsCheckForEvents: */; + l18: /* end ifBackwardsCheckForEvents: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -7533,7 +7542,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorMustBeBoolean << 2)); GIV(argumentCount) = 0; goto normalSend; - goto l18; + goto l19; } /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -7541,7 +7550,7 @@ } /* begin internalPop: */ localSP += 1 * BytesPerOop; - l18: /* end jumplfTrueBy: */; + l19: /* end jumplfTrueBy: */; } break; case 172: @@ -7570,7 +7579,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorMustBeBoolean << 2)); GIV(argumentCount) = 0; goto normalSend; - goto l19; + goto l20; } /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -7578,7 +7587,7 @@ } /* begin internalPop: */ localSP += 1 * BytesPerOop; - l19: /* end jumplfFalseBy: */; + l20: /* end jumplfFalseBy: */; } break; case 176: @@ -7608,7 +7617,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l20; + goto l21; } } else { @@ -7623,67 +7632,67 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l23; + goto l24; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 3) != 0) { isFloat = 0; - goto l22; + goto l23; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!(isImmediate(rcvr))); ccIndex = (longAt(rcvr)) & 0x3FFFFF; isFloat = ClassFloatCompactIndex == ccIndex; - goto l22; + goto l23; isFloat = (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassFloat << 2))) == (classAtIndex(ccIndex)); - l22: /* end is:instanceOf:compactClassIndex: */; + l23: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result1); rcvr1 = result1; - goto l25; + goto l26; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l25: /* end floatValueOf: */; - l23: /* end loadFloatOrIntFrom: */; + l26: /* end floatValueOf: */; + l24: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l26; + goto l27; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 3) != 0) { isFloat1 = 0; - goto l21; + goto l22; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!(isImmediate(arg))); ccIndex1 = (longAt(arg)) & 0x3FFFFF; isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l21; + goto l22; isFloat1 = (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassFloat << 2))) == (classAtIndex(ccIndex1)); - l21: /* end is:instanceOf:compactClassIndex: */; + l22: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result2); arg1 = result2; - goto l24; + goto l25; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l24: /* end floatValueOf: */; - l26: /* end loadFloatOrIntFrom: */; + l25: /* end floatValueOf: */; + l27: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 + arg1)); @@ -7698,14 +7707,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l20; + goto l21; } } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SpecialSelectors << 2))) + (BaseHeaderSize)) + ((0 * 2) << 2)); GIV(argumentCount) = 1; goto normalSend; } - l20: /* end case */; + l21: /* end case */; break; case 177: /* bytecodePrimSubtract */ @@ -7734,7 +7743,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l27; + goto l28; } } else { @@ -7749,67 +7758,67 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l30; + goto l31; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 3) != 0) { isFloat = 0; - goto l29; + goto l30; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!(isImmediate(rcvr))); ccIndex = (longAt(rcvr)) & 0x3FFFFF; isFloat = ClassFloatCompactIndex == ccIndex; - goto l29; + goto l30; isFloat = (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassFloat << 2))) == (classAtIndex(ccIndex)); - l29: /* end is:instanceOf:compactClassIndex: */; + l30: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result1); rcvr1 = result1; - goto l32; + goto l33; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l32: /* end floatValueOf: */; - l30: /* end loadFloatOrIntFrom: */; + l33: /* end floatValueOf: */; + l31: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l33; + goto l34; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 3) != 0) { isFloat1 = 0; - goto l28; + goto l29; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!(isImmediate(arg))); ccIndex1 = (longAt(arg)) & 0x3FFFFF; isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l28; + goto l29; isFloat1 = (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassFloat << 2))) == (classAtIndex(ccIndex1)); - l28: /* end is:instanceOf:compactClassIndex: */; + l29: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result2); arg1 = result2; - goto l31; + goto l32; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l31: /* end floatValueOf: */; - l33: /* end loadFloatOrIntFrom: */; + l32: /* end floatValueOf: */; + l34: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 - arg1)); @@ -7824,14 +7833,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l27; + goto l28; } } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SpecialSelectors << 2))) + (BaseHeaderSize)) + ((1 * 2) << 2)); GIV(argumentCount) = 1; goto normalSend; } - l27: /* end case */; + l28: /* end case */; break; case 178: /* bytecodePrimLessThan */ @@ -7863,7 +7872,7 @@ else { goto booleanCheatFalse; } - goto l34; + goto l35; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -7871,67 +7880,67 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l37; + goto l38; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 3) != 0) { isFloat = 0; - goto l36; + goto l37; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!(isImmediate(rcvr))); ccIndex = (longAt(rcvr)) & 0x3FFFFF; isFloat = ClassFloatCompactIndex == ccIndex; - goto l36; + goto l37; isFloat = (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassFloat << 2))) == (classAtIndex(ccIndex)); - l36: /* end is:instanceOf:compactClassIndex: */; + l37: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l39; + goto l40; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l39: /* end floatValueOf: */; - l37: /* end loadFloatOrIntFrom: */; + l40: /* end floatValueOf: */; + l38: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l40; + goto l41; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 3) != 0) { isFloat1 = 0; - goto l35; + goto l36; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!(isImmediate(arg))); ccIndex1 = (longAt(arg)) & 0x3FFFFF; isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l35; + goto l36; isFloat1 = (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassFloat << 2))) == (classAtIndex(ccIndex1)); - l35: /* end is:instanceOf:compactClassIndex: */; + l36: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l38; + goto l39; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l38: /* end floatValueOf: */; - l40: /* end loadFloatOrIntFrom: */; + l39: /* end floatValueOf: */; + l41: /* end loadFloatOrIntFrom: */; aBool = rcvr1 < arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7941,13 +7950,13 @@ else { goto booleanCheatFalse; } - goto l34; + goto l35; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SpecialSelectors << 2))) + (BaseHeaderSize)) + ((2 * 2) << 2)); GIV(argumentCount) = 1; goto normalSend; } - l34: /* end case */; + l35: /* end case */; booleanCheatTrue: /* booleanCheatTrue */ @@ -7971,7 +7980,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l306; + goto l307; } if (bytecode == 172) { @@ -7981,7 +7990,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l306; + goto l307; } if (bytecode > 167) { @@ -7992,7 +8001,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l306; + goto l307; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -8000,7 +8009,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l306: /* end case */; + l307: /* end case */; break; case 179: /* bytecodePrimGreaterThan */ @@ -8032,7 +8041,7 @@ else { /* goto booleanCheatFalse */ } - goto l41; + goto l42; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -8040,67 +8049,67 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l44; + goto l45; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 3) != 0) { isFloat = 0; - goto l43; + goto l44; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!(isImmediate(rcvr))); ccIndex = (longAt(rcvr)) & 0x3FFFFF; isFloat = ClassFloatCompactIndex == ccIndex; - goto l43; + goto l44; isFloat = (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassFloat << 2))) == (classAtIndex(ccIndex)); - l43: /* end is:instanceOf:compactClassIndex: */; + l44: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l46; + goto l47; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l46: /* end floatValueOf: */; - l44: /* end loadFloatOrIntFrom: */; + l47: /* end floatValueOf: */; + l45: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l47; + goto l48; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 3) != 0) { isFloat1 = 0; - goto l42; + goto l43; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!(isImmediate(arg))); ccIndex1 = (longAt(arg)) & 0x3FFFFF; isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l42; + goto l43; isFloat1 = (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassFloat << 2))) == (classAtIndex(ccIndex1)); - l42: /* end is:instanceOf:compactClassIndex: */; + l43: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l45; + goto l46; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l45: /* end floatValueOf: */; - l47: /* end loadFloatOrIntFrom: */; + l46: /* end floatValueOf: */; + l48: /* end loadFloatOrIntFrom: */; aBool = rcvr1 > arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -8110,13 +8119,13 @@ else { goto booleanCheatFalse; } - goto l41; + goto l42; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SpecialSelectors << 2))) + (BaseHeaderSize)) + ((3 * 2) << 2)); GIV(argumentCount) = 1; goto normalSend; } - l41: /* end case */; + l42: /* end case */; booleanCheatFalse: /* booleanCheatFalse */ @@ -8140,7 +8149,7 @@ localIP = (localIP + (bytecode - 151)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l307; + goto l308; } if (bytecode == 172) { @@ -8151,14 +8160,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l307; + goto l308; } @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.887.mcz
by commits＠source.squeak.org 30 Sep '14

30 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.887.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.887 Author: eem Time: 29 September 2014, 6:09:33.297 pm UUID: f980d45a-5622-46f6-95d9-ac8d00a34e81 Ancestors: VMMaker.oscog-eem.885 Install the callPrimitiveBytecode in the Interpreter's bytecodeDispatchTable on Spur. Modify callPrimitiveBytecode to not invoke unknownBytecode processing if at the first bytecode of a primitive method. Correct sign comparison of instructionPointer in justActivateNewMethod. Relax the validInstructionPointer:inMethod:framePointer: assert to accept any pc in initialPC to self size range now that callPrimitiveBytecode is more forgiving. Speed up primitiveMarkUnwindMethod & primitiveMarkHandlerMethod in the StackInterpreter by setting them to 0 in the primitive table. =============== Diff against VMMaker.oscog-eem.885 =============== Item was changed: ----- Method: CoInterpreter>>callbackEnter: (in category 'callback support') ----- callbackEnter: callbackID "Re-enter the interpreter for executing a callback" | currentCStackPointer currentCFramePointer savedReenterInterpreter wasInMachineCode calledFromMachineCode | <volatile> <export: true> <var: #currentCStackPointer type: #'void *'> <var: #currentCFramePointer type: #'void *'> <var: #callbackID type: #'sqInt *'> <var: #savedReenterInterpreter type: #'jmp_buf'> "For now, do not allow a callback unless we're in a primitiveResponse" (self asserta: primitiveFunctionPointer ~= 0) ifFalse: [^false]. self assert: primFailCode = 0. "Check if we've exceeded the callback depth" (self asserta: jmpDepth < MaxJumpBuf) ifFalse: [^false]. jmpDepth := jmpDepth + 1. wasInMachineCode := self isMachineCodeFrame: framePointer. calledFromMachineCode := instructionPointer <= objectMemory startOfMemory. "Suspend the currently active process" suspendedCallbacks at: jmpDepth put: self activeProcess. "We need to preserve newMethod explicitly since it is not activated yet and therefore no context has been created for it. If the caller primitive for any reason decides to fail we need to make sure we execute the correct method and not the one 'last used' in the call back" suspendedMethods at: jmpDepth put: newMethod. self flag: 'need to debug this properly. Conceptually it is the right thing to do but it crashes in practice'. false ifTrue: ["Signal external semaphores since a signalSemaphoreWithIndex: request may have been issued immediately prior to this callback before the VM has any chance to do a signalExternalSemaphores in checkForEventsMayContextSwitch:" self signalExternalSemaphores. "If no process is awakened by signalExternalSemaphores then transfer to the highest priority runnable one." (suspendedCallbacks at: jmpDepth) == self activeProcess ifTrue: [self transferTo: self wakeHighestPriority from: CSCallbackLeave]] ifFalse: [self transferTo: self wakeHighestPriority from: CSCallbackLeave]. "Typically, invoking the callback means that some semaphore has been signaled to indicate the callback. Force an interrupt check as soon as possible." self forceInterruptCheck. "Save the previous CStackPointers and interpreter entry jmp_buf." currentCStackPointer := cogit getCStackPointer. currentCFramePointer := cogit getCFramePointer. self mem: savedReenterInterpreter asVoidPointer cp: reenterInterpreter y: (self sizeof: #'jmp_buf'). cogit assertCStackWellAligned. (self setjmp: (jmpBuf at: jmpDepth)) == 0 ifTrue: "Fill in callbackID" [callbackID at: 0 put: jmpDepth. self enterSmalltalkExecutive. self assert: false "NOTREACHED"]. "Restore the previous CStackPointers and interpreter entry jmp_buf." cogit setCStackPointer: currentCStackPointer. cogit setCFramePointer: currentCFramePointer. self mem: reenterInterpreter cp: (self cCoerceSimple: savedReenterInterpreter to: #'void *') y: (self sizeof: #'jmp_buf'). "Transfer back to the previous process so that caller can push result" self putToSleep: self activeProcess yieldingIf: preemptionYields. self transferTo: (suspendedCallbacks at: jmpDepth) from: CSCallbackLeave. newMethod := suspendedMethods at: jmpDepth. "see comment above" argumentCount := self argumentCountOf: newMethod. self assert: wasInMachineCode = (self isMachineCodeFrame: framePointer). calledFromMachineCode ifTrue: + [instructionPointer asUnsignedInteger >= objectMemory startOfMemory ifTrue: - [instructionPointer >= objectMemory startOfMemory ifTrue: [self iframeSavedIP: framePointer put: instructionPointer. instructionPointer := cogit ceReturnToInterpreterPC]] ifFalse: ["Even if the context was flushed to the heap and rebuilt in transferTo:from: above it will remain an interpreted frame because the context's pc would remain a bytecode pc. So the instructionPointer must also be a bytecode pc." self assert: (self isMachineCodeFrame: framePointer) not. self assert: instructionPointer > objectMemory startOfMemory]. self assert: primFailCode = 0. jmpDepth := jmpDepth-1. ^true! Item was changed: ----- Method: CoInterpreter>>justActivateNewMethod (in category 'message sending') ----- justActivateNewMethod | methodHeader activateCogMethod cogMethod numArgs numTemps rcvr errorCode initialIP | <var: #cogMethod type: #'CogMethod *'> <var: #initialIP type: #usqInt> <inline: true> methodHeader := self rawHeaderOf: newMethod. (activateCogMethod := self isCogMethodReference: methodHeader) ifTrue: [cogMethod := self cCoerceSimple: methodHeader to: #'CogMethod *'. methodHeader := cogMethod methodHeader]. numTemps := self temporaryCountOfMethodHeader: methodHeader. numArgs := self argumentCountOfMethodHeader: methodHeader. rcvr := self stackValue: numArgs. "could new rcvr be set at point of send?" self assert: (objectMemory isOopForwarded: rcvr) not. (activateCogMethod + and: [instructionPointer asUnsignedInteger >= objectMemory startOfMemory]) ifTrue: - and: [instructionPointer >= objectMemory startOfMemory]) ifTrue: [self iframeSavedIP: framePointer put: instructionPointer. instructionPointer := cogit ceReturnToInterpreterPC]. self push: instructionPointer. self push: framePointer. framePointer := stackPointer. initialIP := self initialPCForHeader: methodHeader method: newMethod. activateCogMethod ifTrue: [self push: cogMethod asUnsignedInteger. self push: objectMemory nilObject. "FoxThisContext field" instructionPointer := cogMethod asUnsignedInteger + cogMethod stackCheckOffset] ifFalse: [self push: newMethod. self setMethod: newMethod methodHeader: methodHeader. self push: objectMemory nilObject. "FoxThisContext field" self push: (self encodeFrameFieldHasContext: false isBlock: false numArgs: numArgs). self push: 0. "FoxIFSavedIP" instructionPointer := initialIP - 1]. self push: rcvr. "clear remaining temps to nil" numArgs+1 to: numTemps do: [:i | self push: objectMemory nilObject]. (self methodHeaderHasPrimitive: methodHeader) ifTrue: ["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 := initialIP + (self sizeOfCallPrimitiveBytecode: methodHeader). activateCogMethod ifFalse: [instructionPointer := initialIP]. primFailCode ~= 0 ifTrue: [(objectMemory byteAt: initialIP + 1) = (self longStoreBytecodeForHeader: methodHeader) ifTrue: [errorCode := self getErrorObjectFromPrimFailCode. self stackTopPut: errorCode "nil if primFailCode == 1, or primFailCode"]. primFailCode := 0]]. ^methodHeader! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'initialization') ----- initializeBytecodeTableForNewspeakV3PlusClosures "StackInterpreter initializeBytecodeTableForNewspeakV3PlusClosures" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForNewsqueakV3. LongStoreBytecode := 129. self table: BytecodeTable from: #( ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushTemporaryVariableBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 95 pushLiteralVariableBytecode) ( 96 103 storeAndPopReceiverVariableBytecode) (104 111 storeAndPopTemporaryVariableBytecode) (112 pushReceiverBytecode) (113 pushConstantTrueBytecode) (114 pushConstantFalseBytecode) (115 pushConstantNilBytecode) (116 pushConstantMinusOneBytecode) (117 pushConstantZeroBytecode) (118 pushConstantOneBytecode) (119 pushConstantTwoBytecode) (120 returnReceiver) (121 returnTrue) (122 returnFalse) (123 returnNil) (124 returnTopFromMethod) (125 returnTopFromBlock) "2 of the 3 Newspeak bytecodes" (126 dynamicSuperSendBytecode) (127 pushImplicitReceiverBytecode) (128 extendedPushBytecode) (129 extendedStoreBytecode) (130 extendedStoreAndPopBytecode) (131 singleExtendedSendBytecode) (132 doubleExtendedDoAnythingBytecode) (133 singleExtendedSuperBytecode) (134 secondExtendedSendBytecode) (135 popStackBytecode) (136 duplicateTopBytecode) (137 pushActiveContextBytecode) + (138 pushNewArrayBytecode)), - (138 pushNewArrayBytecode) + ((initializationOptions at: #SpurObjectMemory ifAbsent: [false]) + ifTrue: [#((139 callPrimitiveBytecode))] "V3PlusClosures on Spur" + ifFalse: [#((139 pushExplicitOuterReceiverBytecode))]), "Newspeak on V3" - "The last of 3 Newspeak bytecodes" - (139 pushExplicitOuterReceiverBytecode) + #( (140 pushRemoteTempLongBytecode) (141 storeRemoteTempLongBytecode) (142 storeAndPopRemoteTempLongBytecode) (143 pushClosureCopyCopiedValuesBytecode) (144 151 shortUnconditionalJump) (152 159 shortConditionalJumpFalse) (160 167 longUnconditionalJump) (168 171 longJumpIfTrue) (172 175 longJumpIfFalse) "176-191 were sendArithmeticSelectorBytecode" (176 bytecodePrimAdd) (177 bytecodePrimSubtract) (178 bytecodePrimLessThan) (179 bytecodePrimGreaterThan) (180 bytecodePrimLessOrEqual) (181 bytecodePrimGreaterOrEqual) (182 bytecodePrimEqual) (183 bytecodePrimNotEqual) (184 bytecodePrimMultiply) (185 bytecodePrimDivide) (186 bytecodePrimMod) (187 bytecodePrimMakePoint) (188 bytecodePrimBitShift) (189 bytecodePrimDiv) (190 bytecodePrimBitAnd) (191 bytecodePrimBitOr) "192-207 were sendCommonSelectorBytecode" (192 bytecodePrimAt) (193 bytecodePrimAtPut) (194 bytecodePrimSize) (195 bytecodePrimNext) (196 bytecodePrimNextPut) (197 bytecodePrimAtEnd) (198 bytecodePrimIdentical) (199 bytecodePrimClass) (200 bytecodePrimSpecialSelector24) (201 bytecodePrimValue) (202 bytecodePrimValueWithArg) (203 bytecodePrimDo) (204 bytecodePrimNew) (205 bytecodePrimNewWithArg) (206 bytecodePrimPointX) (207 bytecodePrimPointY) (208 223 sendLiteralSelector0ArgsBytecode) (224 239 sendLiteralSelector1ArgBytecode) (240 255 sendLiteralSelector2ArgsBytecode) )! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSqueakV3PlusClosures (in category 'initialization') ----- initializeBytecodeTableForSqueakV3PlusClosures "StackInterpreter initializeBytecodeTableForSqueakV3PlusClosures" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForV3PlusClosures. LongStoreBytecode := 129. self table: BytecodeTable from: #( ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushTemporaryVariableBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 95 pushLiteralVariableBytecode) ( 96 103 storeAndPopReceiverVariableBytecode) (104 111 storeAndPopTemporaryVariableBytecode) (112 pushReceiverBytecode) (113 pushConstantTrueBytecode) (114 pushConstantFalseBytecode) (115 pushConstantNilBytecode) (116 pushConstantMinusOneBytecode) (117 pushConstantZeroBytecode) (118 pushConstantOneBytecode) (119 pushConstantTwoBytecode) (120 returnReceiver) (121 returnTrue) (122 returnFalse) (123 returnNil) (124 returnTopFromMethod) (125 returnTopFromBlock) (126 127 unknownBytecode) (128 extendedPushBytecode) (129 extendedStoreBytecode) (130 extendedStoreAndPopBytecode) (131 singleExtendedSendBytecode) (132 doubleExtendedDoAnythingBytecode) (133 singleExtendedSuperBytecode) (134 secondExtendedSendBytecode) (135 popStackBytecode) (136 duplicateTopBytecode) (137 pushActiveContextBytecode) + (138 pushNewArrayBytecode)), + + ((initializationOptions at: #SpurObjectMemory ifAbsent: [false]) + ifTrue: [#((139 callPrimitiveBytecode))] "V3PlusClosures on Spur" + ifFalse: [#((139 unknownBytecode))]), "V3PlusClosures on V3" + + #( - (138 pushNewArrayBytecode) - (139 unknownBytecode) (140 pushRemoteTempLongBytecode) (141 storeRemoteTempLongBytecode) (142 storeAndPopRemoteTempLongBytecode) (143 pushClosureCopyCopiedValuesBytecode) (144 151 shortUnconditionalJump) (152 159 shortConditionalJumpFalse) (160 167 longUnconditionalJump) (168 171 longJumpIfTrue) (172 175 longJumpIfFalse) "176-191 were sendArithmeticSelectorBytecode" (176 bytecodePrimAdd) (177 bytecodePrimSubtract) (178 bytecodePrimLessThan) (179 bytecodePrimGreaterThan) (180 bytecodePrimLessOrEqual) (181 bytecodePrimGreaterOrEqual) (182 bytecodePrimEqual) (183 bytecodePrimNotEqual) (184 bytecodePrimMultiply) (185 bytecodePrimDivide) (186 bytecodePrimMod) (187 bytecodePrimMakePoint) (188 bytecodePrimBitShift) (189 bytecodePrimDiv) (190 bytecodePrimBitAnd) (191 bytecodePrimBitOr) "192-207 were sendCommonSelectorBytecode" (192 bytecodePrimAt) (193 bytecodePrimAtPut) (194 bytecodePrimSize) (195 bytecodePrimNext) (196 bytecodePrimNextPut) (197 bytecodePrimAtEnd) (198 bytecodePrimIdentical) (199 bytecodePrimClass) (200 bytecodePrimSpecialSelector24) (201 bytecodePrimValue) (202 bytecodePrimValueWithArg) (203 bytecodePrimDo) (204 bytecodePrimNew) (205 bytecodePrimNewWithArg) (206 bytecodePrimPointX) (207 bytecodePrimPointY) (208 223 sendLiteralSelector0ArgsBytecode) (224 239 sendLiteralSelector1ArgBytecode) (240 255 sendLiteralSelector2ArgsBytecode) )! Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackInterpreter>>callPrimitiveBytecode (in category 'miscellaneous bytecodes') ----- callPrimitiveBytecode "V4: 249 11111001 i i i i i i i i jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256) + SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + V3/Spur: 139 10001011 i i i i i i i i jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256)" + "Note that we simply skip a callPrimitiveBytecode at the start of a method + that contains a primitive. This because methods like Context(Part)>>reset + have to be updated to skip the callPrimtiive bytecode otherwise." - SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution." self cppIf: SistaVM ifTrue: + [| byte1 byte2 prim header | - [| byte1 byte2 prim | byte1 := self fetchByte. byte2 := self fetchByte. self fetchNextBytecode. byte2 < 128 ifTrue: + [header := self methodHeaderOf: method. + ((self methodHeaderHasPrimitive: header) + and: [localIP = (self initialPCForHeader: header method: method) + (self sizeOfCallPrimitiveBytecode: header)]) ifTrue: + [^self]. + localIP := localIP - 3. - [localIP := localIP - 3. ^self respondToUnknownBytecode]. prim := byte2 - 128 << 8 + byte1. prim < 1000 ifTrue: [^self nullaryInlinePrimitive: prim]. prim < 2000 ifTrue: [^self unaryInlinePrimitive: prim - 1000]. prim < 3000 ifTrue: [^self binaryInlinePrimitive: prim - 2000]. prim < 4000 ifTrue: [^self trinaryInlinePrimitive: prim - 3000]. localIP := localIP - 3. ^self respondToUnknownBytecode] ifFalse: + [| header | + header := self methodHeaderOf: method. + ((self methodHeaderHasPrimitive: header) + and: [localIP = (self initialPCForHeader: header method: method)]) + ifTrue: + [localIP := localIP + (self sizeOfCallPrimitiveBytecode: header). + ^self fetchNextBytecode] + ifFalse: + [^self respondToUnknownBytecode]]! - [self error: 'callPrimitiveBytecode should not be evaluated. method activation should step beyond this bytecode.'] - - "We could make it a noop and not skip it in {foo}ActivateMethod, as in: - - localIP := localIP + 3. - self fetchNextBytecode - - But for now, having {foo}ActivateMethod skip it makes it available for invoking embedded primitives."! Item was changed: ----- Method: StackInterpreter>>validInstructionPointer:inFrame: (in category 'debug support') ----- validInstructionPointer: anInstrPointer inFrame: fp <var: #anInstrPointer type: #usqInt> <var: #fp type: #'char *'> <inline: false> + "Note that we accept anInstrPointer pointing to a callPrimitiveBytecode + at the start of a method that contains a primitive. This because methods like + Context(Part)>>reset have to be updated to skip the callPrimtiive bytecode otherwise." ^self validInstructionPointer: anInstrPointer inMethod: (self frameMethodObject: fp) framePointer: fp! Item was changed: ----- Method: StackInterpreter>>validInstructionPointer:inMethod:framePointer: (in category 'debug support') ----- validInstructionPointer: theInstrPointer inMethod: aMethod framePointer: fp <var: #theInstrPointer type: #usqInt> <var: #aMethod type: #usqInt> <var: #fp type: #'char *'> + "Note that we accept anInstrPointer pointing to a callPrimitiveBytecode + at the start of a method that contains a primitive. This because methods like + Context(Part)>>reset have to be updated to skip the callPrimtiive bytecode otherwise." - | methodHeader | - objectMemory hasSpurMemoryManagerAPI ifTrue: - [methodHeader := self noAssertHeaderOf: aMethod. "-1 for pre-increment in fetchNextBytecode" - ^theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop - 1) - and: [theInstrPointer < (aMethod + (objectMemory numBytesOf: aMethod) + BaseHeaderSize - 1) - and: ["If the method starts with a CallPrimitive opcode the instruction pointer should be past it." - ((self alternateHeaderHasPrimitiveFlag: methodHeader) - and: [theInstrPointer < (aMethod - + BytesPerOop - 1 - + (objectMemory lastPointerOf: aMethod) - + (self sizeOfCallPrimitiveBytecode: methodHeader))]) - not]]]. - MULTIPLEBYTECODESETS ifTrue: - [methodHeader := self noAssertHeaderOf: aMethod. "-1 for pre-increment in fetchNextBytecode" - ^theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop - 1) - and: [theInstrPointer < (aMethod + (objectMemory numBytesOf: aMethod) + BaseHeaderSize - 1) - and: ["If the method starts with a CallPrimitive opcode the instruction pointer should be past it." - ((self headerIndicatesAlternateBytecodeSet: methodHeader) - and: [(self alternateHeaderHasPrimitiveFlag: methodHeader) - and: [theInstrPointer < (aMethod - + BytesPerOop - 1 - + (objectMemory lastPointerOf: aMethod) - + (self sizeOfCallPrimitiveBytecode: methodHeader))]]) - not]]]. "-1 for pre-increment in fetchNextBytecode" ^theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + objectMemory bytesPerOop - 1) and: [theInstrPointer < (aMethod + (objectMemory numBytesOf: aMethod) + objectMemory baseHeaderSize - 1)]!

1 0

CogVM on FreeBSD
by Holger Hans Peter Freyther 29 Sep '14

29 Sep '14

Good Morning, I wonder what the state of the CogVM is on FreeBSD (9, 10)? The FreeBSD port seems to build the plain squeakvm and not the CogVM? kind regards holger

4 7

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.883.mcz
by Ryan Macnak 27 Sep '14

27 Sep '14

On Wed, Sep 24, 2014 at 6:35 PM, <commits(a)source.squeak.org> wrote: > > Spur: > Change become to flush method caches for > becommed classes. > > I'm not sure this is necessary but strangely the new > code is faster than 882 for the Newspeak bootstrap. > So I'm committing this to allow me to compare the > two. I think this is a good idea - atomic install had to invoke the flush primitive after the bulk become anyway. Now the atomicity of the two operations isn't a concern.

1 0

VM Maker: Cog-eem.208.mcz
by commits＠source.squeak.org 27 Sep '14

27 Sep '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.208.mcz ==================== Summary ==================== Name: Cog-eem.208 Author: eem Time: 27 September 2014, 1:16:00.83 pm UUID: b30c2acd-4b7d-41c1-83c3-f1ac426af8c6 Ancestors: Cog-eem.207 Implement patchAndUploadUnpatchedInTrunk that provides patched versions of the as-yet-unpatched packages that are modified for Spur. =============== Diff against Cog-eem.207 =============== Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchAndUploadUnpatchedInTrunk (in category 'patching') ----- + patchAndUploadUnpatchedInTrunk + "Look for unbranched versions in the default repository that are newer than the + latest patched versions there-in. Download and patch them and upload the patched + versions." + "(SpurBootstrapMonticelloPackagePatcher new + from: 'spurpackages' + to: 'trunkpackages') + patchAndUploadUnpatchedInTrunk" + | trunk sourceRepo | + sourceDir assureExistence; deleteLocalFiles. + destDir assureExistence; deleteLocalFiles. + sourceRepo := MCDirectoryRepository directory: sourceDir. + (trunk := self trunk) cacheAllFileNamesDuring: + [| latestBranches latestUnbranched | + latestBranches := self packagesAndPatches keys collect: + [:package| + (trunk versionNamesForPackageNamed: package name, '.spur') detectMax: [:vn | vn asMCVersionName versionNumber]]. + latestUnbranched := latestBranches collect: [:verName| (verName copyReplaceAll: '.spur' with: '') asMCVersionName]. + (trunk possiblyNewerVersionsOfAnyOf: latestUnbranched) do: + [:unpatched| + sourceRepo storeVersion: (trunk versionNamed: unpatched)]. + self patchAsNeeded. + self uploadFrom: (MCDirectoryRepository directory: destDir) to: trunk]!

1 0

New Cog VMs available
by Eliot Miranda 27 Sep '14

27 Sep '14

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3083 CogVM source as per VMMaker.oscog-eem.886/r3083 Fix regression in V3 become youngReferrers management in VMMaker.oscog-eem.882. We /must/ prune young referrers if mapObjectReferencesInMachineCodeForBecome removes a cog method from youngReferrers because it may get added back and youngReferrers cannot contain duplicates. Spur: Fix bug in sweepToFollowForwardersForPigCompact which failed to update and answer lowest forwarder. Fixes numForwarders == 0 assert failures. Fix bug with become and class table not removing classes which become causes them to be unhashed. Fix bogus assert fail in synchronousSignal:. Refactor following code into ensureSemaphoreForwardedThroughContext: and fix the assert there-in. Use rawOverflowSlotsOf: in bytesInObject:. Make a little more progress on Spur image segment support. Provide a classTableEntriesDo: and use it to compute an arrayOfUnmarkedClasses. Cogit: Make sure voidImplicitReceiverCacheAt: sets codeModified if IRCs are inline. Make sure freeMethod: clears cmRefersToYoung Fix assert in cogitPostGCAction: that would fire erroneously in Spur become. Move evaluation of Cogit primitive desacriptor enabled function from initialization to just-in-time, and add enablers on SmallInteger primitives to ensure they are applied only to SmallInteger receivers (falling back to interpreter prims if not). Hence fix Cog for 4.1 (e.g. MuO) images. Back out of saneMethodClassAssociation assert in initialPCForHeader:method:. Newspeak falls foul of this. Make sure that the method is set on returning from a callback. Fixes MNUs of atAddress: in exampleCqsort in the stack VMs. Fix bugs in scripts and Windows manifests. -- best, Eliot

1 0

Re: [squeak-dev] What is the upper memory limits of Cog?
by Eliot Miranda 27 Sep '14

27 Sep '14

Hi Chris, it depends... First of all, 32-bit linux only provides 3Gb of address space to user processes, the upper quarter being used to map the kernel into the user's address space. Look at the stack pointer and you'll see it starts at 0xbfffxxxx, not 0xffffxxxx. Apparently there are ways around this but I can't find good references for this. e.g. this is an unhelpful page, talking about total system address space, not per-process address space: http://en.wikipedia.org/wiki/3_GB_barrier. Second of all, the VM shares the address space with other components in the program, especially X11 which uses a lot of address space. Running headless should allow you to gro a little bit more. In my recent experience on linux one can indeed start Cog V3 with about 1.9Gb. Spur can grow to about 2.9Gb. The V3 memory manager requires a contiguous heap, which forces preallocation. This is a serious problem, but one that Spur solves. Spur has a segmented memory model, and so can grow the heap dynamically. But the fundamental problem is that linux only provides 3Gb per process. So until one has a 64-bit Spur heap size will be limited to 2.9Gb or there abouts on linux. Is this clear enough? For more, see my message announcing the availability of the 3018 VMs. From that message I wrote: Here's my test script: | them | them := OrderedCollection new. [[them addLast: (ByteArray new: 16000000). Transcript cr; print: (Smalltalk vmParameterAt: 3) / (1024*1024.0) maxDecimalPlaces: 1; flush] repeat] on: OutOfMemory do: [:ex| 2 to: them size by: 2 do: [:i| them at: i put: nil. Smalltalk garbageCollect]]. Transcript cr; print: (Smalltalk vmParameterAt: 3) / (1024*1024.0) maxDecimalPlaces: 1; flush. them := nil. Smalltalk garbageCollect. Transcript cr; print: (Smalltalk vmParameterAt: 3) / (1024*1024.0) maxDecimalPlaces: 1; flush On Thu, Sep 25, 2014 at 12:55 PM, Chris Muller <asqueaker(a)gmail.com> wrote: > I have a need for an image larger than 2GB. Eliot, I thought I > remember this subject coming up recently that, for Linux, the limit > was increased to 3GB or 4GB or was I just dreaming? I can't seem to > find the thread and my own experiements with -mmap seem to cap at > 2000m.. > > Maybe it was a new Spur-specific capability? > -- best, Eliot

3 3

Re: [Pharo-dev] catching FFI errors
by Eliot Miranda 26 Sep '14

26 Sep '14

Hi Ben, On Sep 25, 2014, at 5:50 PM, Ben Coman <btc(a)openInWorld.com> wrote: > > I had a brief moment wondering about the general problem we have when calling out through FFI that we expose ourselves to bugs in the external library that crash the Image. I wonder... > > 1. Debuggers like gdb can run a program that crashes, without themselves itself crashing. Could our FFI calls be wrapped in similar mechanism? > > 2. Languages have exception handling, so that errors like divide by zero can be caught. Could our FFI calls be wrapped in similar mechanism? > cheers -ben one thing that is pretty straight-forward to do is to catch and report errors during FFI calls as primitive failures with error codes. I added this to the VisualWorks VM a while ago It works like this: 1. The VM installs a first-level exception handler (windows) or signal handlers for SIGSEGV et al (unix). (This is something the VM already does). 2. When an FFI call out is made the VM can find the activation they made an FDI call out. It must be able to do this if it is to handle a callback. 3. An FFI call out is modified to set a flag, eg inFFICall, that is tested by the first-level exception handler. The flag is cleared when the FFI call completes or cleared when taking a callback and restored when the callback returns. 4. When the first level exception/signal handler is invoked it tests the inFFICall flag. If unset it does what it always did (exit, do nothing, etc). If the flag is set it collects the error information, located the FFI activation for the FFI call, does a long jump that returns from the FFI call as a primitive failure, supplying the error information. Now this is useful because the VM doesn't crash (provided the error was localized in its effects and didnt eg corrupt the heap), and hence easy for the developer to find out which FFI call provoked the error, but not as useful as catching the error in gdb. The exception info is typically an exception code and an address, which may be difficult for the programmer to decode. Hence the mechanism needs to be made optional, typically in by default, and then disabled to investigate under gdb. Does this sound useful? Eliot (phone)

2 2

[commit][3084] CogVM source as per VMMaker.oscog-eem.885
by commits＠squeakvm.org 26 Sep '14

26 Sep '14

Revision: 3084 Author: eliot Date: 2014-09-25 16:12:18 -0700 (Thu, 25 Sep 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.885 Fix regression in V# become youngReferrers management in VMMaker.oscog-eem.882. We /must/ prune young referrers if mapObjectReferencesInMachineCodeForBecome removes a cog method from youngReferrers because it may get added back and youngReferrers cannot contain duplicates. Fix potential bug in Spur become argument validation. Check for immediates needs to come /after/ following forwarders since an object can become-forward to an immediate. Fix cPICHasForwardedClass:; this did /not/ enumerate the classIndices in a Spur Closed PIC. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/revertIfEssentiallyUnchanged branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/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 2014-09-25 23:02:22 UTC (rev 3083) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-09-25 23:12:18 UTC (rev 3084) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a from - StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -12553,7 +12553,7 @@ { sqInt *address; sqInt *address1; - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt cacheTagMarked; @@ -12723,7 +12723,7 @@ static sqInt markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt class; @@ -13814,7 +13814,7 @@ static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt entryPoint; @@ -14583,7 +14583,7 @@ static void voidImplicitReceiverCacheAt(sqInt mcpc) { - usqInt cacheAddress; + sqInt cacheAddress; assert(NumOopsPerIRC == 2); cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd)); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-09-25 23:02:22 UTC (rev 3083) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-09-25 23:12:18 UTC (rev 3084) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-09-25 23:12:18 UTC (rev 3084) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a from - CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -108,6 +108,7 @@ #define AtCacheSize 2 #define AtCacheTotalSize 64 #define AtPutBase 32 +#define BecameActiveClassFlag 8 #define BecameCompiledMethodFlag 2 #define Byte0Mask 0xFF #define Byte1Mask 0xFF00 @@ -852,7 +853,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2085,7 +2086,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.886"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.885"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -34936,6 +34937,7 @@ sqInt anArray2; sqInt anArray3; sqInt c; + sqInt c1; sqInt contextSize; sqInt fieldOffset; sqInt first; @@ -34956,6 +34958,8 @@ sqInt i; sqInt i1; sqInt i2; + sqInt i3; + sqInt i4; sqInt iLimiT; sqInt iLimiT1; sqInt last; @@ -34981,6 +34985,7 @@ sqInt oop21; sqInt procLists; sqInt s; + sqInt s1; sqInt sched; sqInt schedAssoc; sqInt sp; @@ -36766,15 +36771,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -36785,7 +36792,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36800,7 +36821,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36854,18 +36875,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38737,7 +38758,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-09-25 23:02:22 UTC (rev 3083) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-09-25 23:12:18 UTC (rev 3084) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-25 23:12:18 UTC (rev 3084) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a from - CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -111,6 +111,7 @@ #define AtCacheSize 2 #define AtCacheTotalSize 64 #define AtPutBase 32 +#define BecameActiveClassFlag 8 #define BecameCompiledMethodFlag 2 #define Byte0Mask 0xFF #define Byte1Mask 0xFF00 @@ -855,7 +856,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2088,7 +2089,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.886"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.885"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -34945,6 +34946,7 @@ sqInt anArray2; sqInt anArray3; sqInt c; + sqInt c1; sqInt contextSize; sqInt fieldOffset; sqInt first; @@ -34965,6 +34967,8 @@ sqInt i; sqInt i1; sqInt i2; + sqInt i3; + sqInt i4; sqInt iLimiT; sqInt iLimiT1; sqInt last; @@ -34990,6 +34994,7 @@ sqInt oop21; sqInt procLists; sqInt s; + sqInt s1; sqInt sched; sqInt schedAssoc; sqInt sp; @@ -36775,15 +36780,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -36794,7 +36801,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36809,7 +36830,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36863,18 +36884,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38746,7 +38767,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-09-25 23:02:22 UTC (rev 3083) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-09-25 23:12:18 UTC (rev 3084) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a from - StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -625,6 +625,7 @@ static void compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil) NoDbgRegParms; static void computeEntryOffsets(void); static void computeMaximumSizes(void); +static sqInt cPICHasForwardedClass(CogMethod *cPIC) NoDbgRegParms; static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms; static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms; static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms; @@ -777,11 +778,13 @@ static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); void unlinkAllSends(void); +static sqInt unlinkIfForwardedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity) NoDbgRegParms; static sqInt unlinkIfFreeOrLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector) NoDbgRegParms; static sqInt unlinkIfLinkedSendToFreepcignored(sqInt annotation, char *mcpc, sqInt superfluity) NoDbgRegParms; static sqInt unlinkIfLinkedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity) NoDbgRegParms; static sqInt unlinkIfLinkedSendpcto(sqInt annotation, char *mcpc, sqInt theCogMethod) NoDbgRegParms; void unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector); +void unlinkSendsToForwardedClasses(void); void unlinkSendsToFree(void); void unlinkSendsToandFreeIf(sqInt targetMethodObject, sqInt freeIfTrue); static sqInt updateMaybeObjRefAt(sqInt mcpc) NoDbgRegParms; @@ -10141,6 +10144,24 @@ } static sqInt +cPICHasForwardedClass(CogMethod *cPIC) +{ + sqInt classIndex; + sqInt i; + sqInt pc; + + pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); + for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { + classIndex = inlineCacheTagAt(backEnd, pc); + if (isForwardedClassIndex(classIndex)) { + return 1; + } + pc += cPICCaseSize; + } + return 0; +} + +static sqInt cPICHasFreedTargets(CogMethod *cPIC) { sqInt entryPoint; @@ -14001,6 +14022,63 @@ } static sqInt +unlinkIfForwardedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity) +{ + usqInt cacheAddress; + sqInt entryPoint; + sqInt sendTable; + sqInt *sendTable1; + sqInt targetMethod; + CogMethod *targetMethod1; + sqInt unlinkedRoutine; + + if ((annotation == IsSendCall) + || (annotation == IsNSSendCall)) { + entryPoint = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); + if (entryPoint > methodZoneBase) { + + /* It's a linked send, but maybe a super send or linked to an OpenPIC, in which case the cache tag will be a selector.... */ + + if (isForwardedClassIndex(inlineCacheTagAt(backEnd, mcpc))) { + /* begin targetMethodAndSendTableFor:into: */ + if ((entryPoint & entryPointMask) == checkedEntryAlignment) { + targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); + sendTable1 = sendTrampolines; + } + else { + if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) { + targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset)); + sendTable1 = dynamicSuperSendTrampolines; + } + else { + targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset)); + sendTable1 = superSendTrampolines; + } + } + + /* begin unlinkSendAt:targetMethod:sendTable: */ + unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; + rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); + codeModified = 1; + + } + } + else { + if (entryPoint == ceImplicitReceiverTrampoline) { + assert(NumOopsPerIRC == 2); + cacheAddress = implicitReceiveCacheAt(backEnd, mcpc); + if ((isForwardedClassIndex(unalignedLongAt(backEnd, cacheAddress))) + || (isForwardedClassIndex(unalignedLongAt(backEnd, cacheAddress + BytesPerOop)))) { + voidImplicitReceiverCacheAt(mcpc); + } + } + + } + } + return 0; +} + +static sqInt unlinkIfFreeOrLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector) { sqInt entryPoint; @@ -14295,6 +14373,72 @@ } +/* Unlink all sends in cog methods whose class tag is that of a forwarded + class. + */ + +void +unlinkSendsToForwardedClasses(void) +{ + CogMethod *cogMethod; + sqInt freedPIC; + sqInt map; + sqInt mapByte; + sqInt mcpc; + sqInt result; + + if (!(methodZoneBase)) { + return; + } + cogMethod = ((CogMethod *) methodZoneBase); + codeModified = (freedPIC = 0); + while (cogMethod < (limitZony())) { + if (((cogMethod->cmType)) == CMMethod) { + /* begin mapFor:performUntil:arg: */ + mcpc = (((sqInt)cogMethod)) + cmNoCheckEntryOffset; + map = ((((usqInt)cogMethod)) + ((cogMethod->blockSize))) - 1; + while (((mapByte = byteAt(map))) != MapEnd) { + if (mapByte >= FirstAnnotation) { + mcpc += mapByte & DisplacementMask; + result = unlinkIfForwardedSendpcignored((((usqInt) mapByte) >> AnnotationShift), (((char *) mcpc)), 0); + if (result != 0) { + result; + goto l1; + } + } + else { + mcpc += (mapByte >= DisplacementX2N + ? (mapByte - DisplacementX2N) << AnnotationShift + : mapByte); + } + map -= 1; + } + 0; + l1: /* end mapFor:performUntil:arg: */; + } + else { + if ((((cogMethod->cmType)) == CMClosedPIC) + && (cPICHasForwardedClass(cogMethod))) { + freeMethod(cogMethod); + freedPIC = 1; + } + } + cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); + } + if (freedPIC) { + unlinkSendsToFree(); + } + else { + if (codeModified) { + + /* After possibly updating inline caches we need to flush the icache. */ + + flushICacheFromto(processor, methodZoneBase, ((sqInt)(limitZony()))); + } + } +} + + /* Unlink all sends in cog methods to free methods and/or pics. */ void Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-09-25 23:02:22 UTC (rev 3083) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-09-25 23:12:18 UTC (rev 3084) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a */ @@ -69,6 +69,7 @@ sqInt traceLinkedSendOffset(void); void unlinkAllSends(void); void unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector); +void unlinkSendsToForwardedClasses(void); void unlinkSendsToFree(void); void unlinkSendsToandFreeIf(sqInt targetMethodObject, sqInt freeIfTrue); void addAllToYoungReferrers(void); Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-09-25 23:12:18 UTC (rev 3084) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a from - CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -134,6 +134,7 @@ #define AtCacheSize 2 #define AtCacheTotalSize 64 #define AtPutBase 32 +#define BecameActiveClassFlag 8 #define BecameCompiledMethodFlag 2 #define BecamePointerObjectFlag 1 #define BitsPerByte 8 @@ -803,6 +804,7 @@ usqInt freeStartAddress(void); usqInt getScavengeThreshold(void); static sqLong headerWhileForwardingOf(sqInt aCompiledMethodObjOop) NoDbgRegParms; +sqInt isForwardedClassIndex(sqInt maybeClassIndex); sqInt isImmediateClass(sqInt classObj); sqInt isReallyYoungObject(sqInt objOop); sqInt methodHeaderOf(sqInt methodObj); @@ -1559,11 +1561,11 @@ _iss sqInt tempOop; _iss sqInt classTableIndex; _iss usqInt lastFreeChunk; +_iss sqInt becomeEffectsFlags; _iss SpurNewSpaceSpace eden; _iss sqInt ephemeronList; _iss usqInt freeOldSpaceStart; _iss sqInt tenureThreshold; -_iss sqInt becomeEffectsFlags; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; @@ -2326,7 +2328,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.886"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.885"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5618,6 +5620,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l293; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5635,7 +5638,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l293: /* end baseFrameReturn */; goto l292; } @@ -38723,7 +38726,29 @@ return long64At(aCompiledMethodObjOop); } + +/* A lenient tester of forwarded class indices for inline cache management in + the Cogit. + */ + sqInt +isForwardedClassIndex(sqInt maybeClassIndex) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classTablePage; + sqInt entry; + + if ((((usqInt)maybeClassIndex)) >= (1 << (22 - 10))) { + return 0; + } + classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) maybeClassIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + return 0; + } + entry = longAt((classTablePage + (BaseHeaderSize)) + ((maybeClassIndex & ((1 << 10) - 1)) << 2)); + return ((longAt(entry)) & (0x3FFFFF - 8)) == 0; +} + +sqInt isImmediateClass(sqInt classObj) { return ((((usqInt) (((longAt((classObj + (BaseHeaderSize)) + (InstanceSpecificationIndex << 2))) >> 1))) >> 16) & 0x1F) == 7; @@ -42136,14 +42161,19 @@ /* Answer the appropriate become effect flags for objOop, or 0 if none. - The effect flags affect how much work is done after the become in - following forwarding pointers. */ + The effect flags determine how much work is done after the become + in following forwarding pointers, voiding method caches, etc. */ static sqInt becomeEffectFlagsFor(sqInt objOop) { + sqInt hash; + return (((((usqInt) (longAt(objOop))) >> 24) & 0x1F) <= 5 - ? BecamePointerObjectFlag + ? ((((hash = (longAt(objOop + 4)) & 0x3FFFFF)) != 0) + && ((classAtIndex(hash)) == objOop) + ? BecamePointerObjectFlag + BecameActiveClassFlag + : BecamePointerObjectFlag) : (((((usqInt) (longAt(objOop))) >> 24) & 0x1F) >= 24 ? BecameCompiledMethodFlag : 0)); @@ -42172,8 +42202,8 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt copyHashFlag) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt c; + sqInt c1; sqInt classOrNil; - sqInt classTablePage; sqInt clone1; sqInt clone2; sqInt contextSize; @@ -42199,6 +42229,8 @@ sqInt i3; sqInt i4; sqInt i5; + sqInt i6; + sqInt i7; sqInt iLimiT; sqInt iLimiT1; sqInt iLimiT2; @@ -42262,13 +42294,13 @@ sqInt referent8; sqInt referent9; sqInt s; + sqInt s1; sqInt sched; sqInt schedAssoc; sqInt sp; sqInt sp1; sqInt temp1; sqInt temp2; - sqInt tmp; sqInt xArray; assert(GIV(becomeEffectsFlags) == 0); @@ -42333,11 +42365,8 @@ effectsFlags = 0; while (fieldOffset >= (BaseHeaderSize)) { oop = longAt(array1 + fieldOffset); - if ((oop & 3) != 0) { - ec = PrimErrInappropriate; - goto l3; - } - if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { + if (((oop & 3) == 0) + && (((longAt(oop)) & 0x3FFFFF) == 8)) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(oop)); referent5 = longAt((oop + (BaseHeaderSize)) + (0 << 2)); @@ -42348,17 +42377,18 @@ oop = referent5; longAtput(array1 + fieldOffset, oop); } + if ((oop & 3) != 0) { + ec = PrimErrInappropriate; + goto l3; + } if (((((usqInt) (longAt(oop))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; goto l3; } effectsFlags = effectsFlags | (becomeEffectFlagsFor(oop)); oop = longAt(array2 + fieldOffset); - if ((oop & 3) != 0) { - ec = PrimErrInappropriate; - goto l3; - } - if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { + if (((oop & 3) == 0) + && (((longAt(oop)) & 0x3FFFFF) == 8)) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(oop)); referent11 = longAt((oop + (BaseHeaderSize)) + (0 << 2)); @@ -42369,6 +42399,10 @@ oop = referent11; longAtput(array2 + fieldOffset, oop); } + if ((oop & 3) != 0) { + ec = PrimErrInappropriate; + goto l3; + } if (((((usqInt) (longAt(oop))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; goto l3; @@ -42427,11 +42461,8 @@ effectsFlags1 = 0; while (fieldOffset1 >= (BaseHeaderSize)) { oop1 = longAt(array1 + fieldOffset1); - if ((oop1 & 3) != 0) { - ec = PrimErrInappropriate; - goto l6; - } - if (((longAt(oop1)) & (0x3FFFFF - 8)) == 0) { + if (((oop1 & 3) == 0) + && (((longAt(oop1)) & 0x3FFFFF) == 8)) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(oop1)); referent6 = longAt((oop1 + (BaseHeaderSize)) + (0 << 2)); @@ -42442,6 +42473,10 @@ oop1 = referent6; longAtput(array1 + fieldOffset1, oop1); } + if ((oop1 & 3) != 0) { + ec = PrimErrInappropriate; + goto l6; + } if (((((usqInt) (longAt(oop1))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; goto l6; @@ -42498,26 +42533,25 @@ obj2 = objOop3; if (obj1 != obj2) { /* begin doBecome:and:copyHash: */ - if (!copyHashFlag) { - - /* in-lined - classIndex := (self isInClassTable: obj) ifTrue: [self rawHashBitsOf: obj] ifFalse: [0] - for speed. */ - - o1ClassIndex = (longAt(obj1 + 4)) & 0x3FFFFF; - if ((o1ClassIndex != 0) - && ((classAtIndex(o1ClassIndex)) != obj1)) { - o1ClassIndex = 0; - } - o2ClassIndex = (longAt(obj2 + 4)) & 0x3FFFFF; - if ((o2ClassIndex != 0) - && ((classAtIndex(o2ClassIndex)) != obj2)) { - o2ClassIndex = 0; - } + o1ClassIndex = (longAt(obj1 + 4)) & 0x3FFFFF; + if ((o1ClassIndex != 0) + && ((classAtIndex(o1ClassIndex)) != obj1)) { + o1ClassIndex = 0; } - if ((numSlotsOf(obj1)) == (numSlotsOf(obj2))) { + o2ClassIndex = (longAt(obj2 + 4)) & 0x3FFFFF; + if ((o2ClassIndex != 0) + && ((classAtIndex(o2ClassIndex)) != obj2)) { + o2ClassIndex = 0; + } + if (((numSlotsOf(obj1)) == (numSlotsOf(obj2))) + && ((o1ClassIndex == 0) + && (o2ClassIndex == 0))) { /* begin inPlaceBecome:and:copyHashFlag: */ assert((numSlotsOf(obj1)) == (numSlotsOf(obj2))); + assert(((rawHashBitsOf(obj1)) == 0) + || ((classOrNilAtIndex(rawHashBitsOf(obj1))) != obj1)); + assert(((rawHashBitsOf(obj2)) == 0) + || ((classOrNilAtIndex(rawHashBitsOf(obj2))) != obj2)); temp1 = ((((usqInt) (longAt(obj1))) >> 29) & 1) != 0; temp2 = ((((usqInt) (longAt(obj2))) >> 29) & 1) != 0; headerTemp = long64At(obj1); @@ -42545,15 +42579,15 @@ longAtput(obj2 + 4, ((((longAt(obj2 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + temp1); } o1HasYoung = (o2HasYoung = 0); - for (i5 = 0, iLimiT4 = ((numSlotsOf(obj1)) - 1); i5 <= iLimiT4; i5 += 1) { - temp1 = longAt((obj1 + (BaseHeaderSize)) + (i5 << 2)); - temp2 = longAt((obj2 + (BaseHeaderSize)) + (i5 << 2)); + for (i7 = 0, iLimiT4 = ((numSlotsOf(obj1)) - 1); i7 <= iLimiT4; i7 += 1) { + temp1 = longAt((obj1 + (BaseHeaderSize)) + (i7 << 2)); + temp2 = longAt((obj2 + (BaseHeaderSize)) + (i7 << 2)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(obj1))); - longAtput((obj1 + (BaseHeaderSize)) + (i5 << 2), temp2); + longAtput((obj1 + (BaseHeaderSize)) + (i7 << 2), temp2); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(obj2))); - longAtput((obj2 + (BaseHeaderSize)) + (i5 << 2), temp1); + longAtput((obj2 + (BaseHeaderSize)) + (i7 << 2), temp1); if (((temp2 & 3) == 0) && ((((usqInt) temp2)) < (((usqInt) GIV(newSpaceLimit))))) { o1HasYoung = 1; @@ -42585,11 +42619,7 @@ } } } - assert((o1ClassIndex == 0) - || ((rawHashBitsOf(classAtIndex(o1ClassIndex))) == o1ClassIndex)); - assert((o2ClassIndex == 0) - || ((rawHashBitsOf(classAtIndex(o2ClassIndex))) == o2ClassIndex)); - goto l9; + goto l8; } /* begin outOfPlaceBecome:and:copyHashFlag: */ clone1 = (((longAt(obj1)) & 0x3FFFFF) == ClassMethodContextCompactIndex @@ -42677,29 +42707,16 @@ GIV(becomeEffectsFlags) = GIV(becomeEffectsFlags) | OldBecameNewFlag; } if (copyHashFlag) { - goto l9; + goto l8; } if (o1ClassIndex != 0) { if (o2ClassIndex != 0) { - - /* both were in the table; just swap entries */ - - /* begin classAtIndex: */ - assert((o1ClassIndex <= (tagMask())) - || (o1ClassIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) o1ClassIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - tmp = null; - goto l8; - } - tmp = longAt((classTablePage + (BaseHeaderSize)) + ((o1ClassIndex & ((1 << 10) - 1)) << 2)); - l8: /* end classAtIndex: */; classAtIndexput(o1ClassIndex, obj2); - classAtIndexput(o2ClassIndex, tmp); + classAtIndexput(o2ClassIndex, obj1); } else { - /* o2 wasn't in the table; put it there */ + /* o2 wasn't in the table; set its hash */ /* begin followForwarded: */ assert(isUnambiguouslyForwarder(obj1)); @@ -42714,11 +42731,13 @@ flag("endianness"); assert(((o1ClassIndex >= 0) && (o1ClassIndex <= (identityHashHalfWordMask())))); longAtput(newObj2 + 4, ((((longAt(newObj2 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + o1ClassIndex); - classAtIndexput(o1ClassIndex, newObj2); } } else { if (o2ClassIndex != 0) { + + /* o1 wasn't in the table; set its hash */ + /* begin followForwarded: */ assert(isUnambiguouslyForwarder(obj2)); referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); @@ -42732,10 +42751,9 @@ flag("endianness"); assert(((o2ClassIndex >= 0) && (o2ClassIndex <= (identityHashHalfWordMask())))); longAtput(newObj1 + 4, ((((longAt(newObj1 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + o2ClassIndex); - classAtIndexput(o2ClassIndex, newObj1); } } - l9: /* end doBecome:and:copyHash: */; + l8: /* end doBecome:and:copyHash: */; /* begin followField:ofObject: */ objOop = longAt((array1 + (BaseHeaderSize)) + (i << 2)); if (((objOop & 3) == 0) @@ -42861,63 +42879,15 @@ GIV(specialObjectsOop) = referent; } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); - /* begin postBecomeScanClassTable: */ - assert(validClassTableRootPages()); - if (!(GIV(becomeEffectsFlags) & BecamePointerObjectFlag)) { - goto l7; - } - for (i4 = 0; i4 < GIV(numClassTablePages); i4 += 1) { - page = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (i4 << 2)); - assert(!(isForwarded(page))); - for (j = 0, jLimiT = ((numSlotsOf(page)) - 1); j <= jLimiT; j += 1) { - classOrNil = longAt((page + (BaseHeaderSize)) + (j << 2)); - if (classOrNil != GIV(nilObj)) { - if (((longAt(classOrNil)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(classOrNil)); - referent8 = longAt((classOrNil + (BaseHeaderSize)) + (0 << 2)); - while (((referent8 & 3) == 0) - && (((longAt(referent8)) & 0x3FFFFF) == 8)) { - referent8 = longAt((referent8 + (BaseHeaderSize)) + (0 << 2)); - } - classOrNil = referent8; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(page))); - if (isOldObject(page)) { - - /* most stores into young objects */ - - if (((classOrNil & 3) == 0) - && ((((usqInt) classOrNil)) < (((usqInt) GIV(newSpaceLimit))))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(page))) >> 29) & 1) != 0)) { - remember(page); - } - } - } - longAtput((page + (BaseHeaderSize)) + (j << 2), classOrNil); - } - if (((longAt(classOrNil + 4)) & 0x3FFFFF) == 0) { - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(page))); - longAtput((page + (BaseHeaderSize)) + (j << 2), GIV(nilObj)); - if (((i4 << 10) + j) < GIV(classTableIndex)) { - GIV(classTableIndex) = (i4 << 10) + j; - } - } - } - } - } -l7: /* end postBecomeScanClassTable: */; /* begin postBecomeAction: */ followForwardingPointersInStackZone(GIV(becomeEffectsFlags)); if (GIV(becomeEffectsFlags) != 0) { if (GIV(becomeEffectsFlags) & BecameCompiledMethodFlag) { /* begin followForwardedMethodsInMethodCache */ - for (i2 = 0; i2 < MethodCacheSize; i2 += MethodCacheEntrySize) { - c = GIV(methodCache)[i2 + MethodCacheClass]; - s = GIV(methodCache)[i2 + MethodCacheSelector]; - m = GIV(methodCache)[i2 + MethodCacheMethod]; + for (i4 = 0; i4 < MethodCacheSize; i4 += MethodCacheEntrySize) { + c = GIV(methodCache)[i4 + MethodCacheClass]; + s = GIV(methodCache)[i4 + MethodCacheSelector]; + m = GIV(methodCache)[i4 + MethodCacheMethod]; if ((c != 0) && ((s != 0) && ((m != 0) @@ -42931,12 +42901,31 @@ referent4 = longAt((referent4 + (BaseHeaderSize)) + (0 << 2)); } m = referent4; - GIV(methodCache)[i2 + MethodCacheMethod] = m; + GIV(methodCache)[i4 + MethodCacheMethod] = m; } } /* begin followForwardedMethodsInMethodZone */ followForwardedMethods(); } + if (GIV(becomeEffectsFlags) & BecameActiveClassFlag) { + /* begin flushBecommedClassesInMethodCache */ + for (i2 = 0; i2 < MethodCacheSize; i2 += MethodCacheEntrySize) { + c1 = GIV(methodCache)[i2 + MethodCacheClass]; + s1 = GIV(methodCache)[i2 + MethodCacheSelector]; + if ((c1 != 0) + && ((s1 != 0) + && (isForwarded(classOrNilAtIndex(c1))))) { + GIV(methodCache)[i2 + MethodCacheClass] = 0; + GIV(methodCache)[i2 + MethodCacheSelector] = 0; + } + } + /* begin flushAtCache */ + for (i11 = 1; i11 <= AtCacheTotalSize; i11 += 1) { + GIV(atCache)[i11] = 0; + } + /* begin flushBecommedClassesInMethodZone */ + unlinkSendsToForwardedClasses(); + } /* begin followForwardingPointersInScheduler */ /* the GC follows pointers in the special objects array for us. */ @@ -42957,12 +42946,12 @@ objOop51 = fixFollowedFieldofObjectwithInitialValue(ProcessListsIndex, sched, objOop51); } procLists = objOop51; - for (i11 = 0, iLimiT2 = ((numSlotsOf(procLists)) - 1); i11 <= iLimiT2; i11 += 1) { + for (i3 = 0, iLimiT2 = ((numSlotsOf(procLists)) - 1); i3 <= iLimiT2; i3 += 1) { /* begin followObjField:ofObject: */ - objOop11 = longAt((procLists + (BaseHeaderSize)) + (i11 << 2)); + objOop11 = longAt((procLists + (BaseHeaderSize)) + (i3 << 2)); assert(isNonImmediate(objOop11)); if (((longAt(objOop11)) & (0x3FFFFF - 8)) == 0) { - objOop11 = fixFollowedFieldofObjectwithInitialValue(i11, procLists, objOop11); + objOop11 = fixFollowedFieldofObjectwithInitialValue(i3, procLists, objOop11); } list = objOop11; /* begin followObjField:ofObject: */ @@ -43126,9 +43115,9 @@ } longAtput((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ExternalObjectsArray << 2), xArray); } - for (i3 = 0, iLimiT3 = ((numSlotsOf(xArray)) - 1); i3 <= iLimiT3; i3 += 1) { + for (i5 = 0, iLimiT3 = ((numSlotsOf(xArray)) - 1); i5 <= iLimiT3; i5 += 1) { /* begin followSemaphoreIn:at: */ - obj = longAt((xArray + (BaseHeaderSize)) + (i3 << 2)); + obj = longAt((xArray + (BaseHeaderSize)) + (i5 << 2)); if (((longAt(obj)) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(obj)); @@ -43152,7 +43141,7 @@ } } } - longAtput((xArray + (BaseHeaderSize)) + (i3 << 2), obj); + longAtput((xArray + (BaseHeaderSize)) + (i5 << 2), obj); } } /* begin followForwardingPointersInProfileState */ @@ -43194,6 +43183,54 @@ cogitPostGCAction(GIV(gcMode)); GIV(lastCoggableInterpretedBlockMethod) = (GIV(lastUncoggableInterpretedBlockMethod) = null); GIV(gcMode) = 0; + /* begin postBecomeScanClassTable: */ + assert(validClassTableRootPages()); + if (!(GIV(becomeEffectsFlags) & BecamePointerObjectFlag)) { + goto l7; + } + for (i6 = 0; i6 < GIV(numClassTablePages); i6 += 1) { + page = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (i6 << 2)); + assert(!(isForwarded(page))); + for (j = 0, jLimiT = ((numSlotsOf(page)) - 1); j <= jLimiT; j += 1) { + classOrNil = longAt((page + (BaseHeaderSize)) + (j << 2)); + if (classOrNil != GIV(nilObj)) { + if (((longAt(classOrNil)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(classOrNil)); + referent8 = longAt((classOrNil + (BaseHeaderSize)) + (0 << 2)); + while (((referent8 & 3) == 0) + && (((longAt(referent8)) & 0x3FFFFF) == 8)) { + referent8 = longAt((referent8 + (BaseHeaderSize)) + (0 << 2)); + } + classOrNil = referent8; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(page))); + if (isOldObject(page)) { + + /* most stores into young objects */ + + if (((classOrNil & 3) == 0) + && ((((usqInt) classOrNil)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(page))) >> 29) & 1) != 0)) { + remember(page); + } + } + } + longAtput((page + (BaseHeaderSize)) + (j << 2), classOrNil); + } + if (((longAt(classOrNil + 4)) & 0x3FFFFF) == 0) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(page))); + longAtput((page + (BaseHeaderSize)) + (j << 2), GIV(nilObj)); + if (((i6 << 10) + j) < GIV(classTableIndex)) { + GIV(classTableIndex) = (i6 << 10) + j; + } + } + } + } + } +l7: /* end postBecomeScanClassTable: */; GIV(becomeEffectsFlags) = 0; assert(validClassTableHashes()); if ((checkForLeaks & 4) != 0) { @@ -51174,8 +51211,10 @@ printInvalidClassTableEntries(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classOrNil; + sqInt classOrNil1; sqInt hash; sqInt i; + sqInt index; sqInt j; sqInt jLimiT; sqInt page; @@ -51186,18 +51225,20 @@ printf("\n"); return; } + /* begin classTableEntriesDo: */ for (i = 0; i < GIV(numClassTablePages); i += 1) { page = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (i << 2)); for (j = 0, jLimiT = ((1 << 10) - 1); j <= jLimiT; j += 1) { - classOrNil = longAt((page + (BaseHeaderSize)) + (j << 2)); - if (classOrNil != GIV(nilObj)) { - if ((((longAt(classOrNil)) & (0x3FFFFF - 8)) == 0) - || ((((hash = (longAt(classOrNil + 4)) & 0x3FFFFF)) == 0) - || ((noCheckClassAtIndex(hash)) != classOrNil))) { + classOrNil1 = longAt((page + (BaseHeaderSize)) + (j << 2)); + if (classOrNil1 != GIV(nilObj)) { + index = (i << 10) + j; + if ((((longAt(classOrNil1)) & (0x3FFFFF - 8)) == 0) + || ((((hash = (longAt(classOrNil1 + 4)) & 0x3FFFFF)) == 0) + || ((noCheckClassAtIndex(hash)) != classOrNil1))) { print("entry "); - printHex((i * (1 << 10)) + j); + printHex(index); print(" oop "); - printHex(classOrNil); + printHex(classOrNil1); print(" hash "); printHex(hash); print(" => "); @@ -51205,6 +51246,7 @@ /* begin cr */ printf("\n"); } + } } } Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-09-25 23:02:22 UTC (rev 3083) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-09-25 23:12:18 UTC (rev 3084) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a */ @@ -121,6 +121,7 @@ void ensureNoForwardedLiteralsIn(sqInt aMethodObj); usqInt freeStartAddress(void); usqInt getScavengeThreshold(void); +sqInt isForwardedClassIndex(sqInt maybeClassIndex); sqInt isImmediateClass(sqInt classObj); sqInt isReallyYoungObject(sqInt objOop); sqInt methodHeaderOf(sqInt methodObj); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-25 23:12:18 UTC (rev 3084) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a from - CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac + CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -137,6 +137,7 @@ #define AtCacheSize 2 #define AtCacheTotalSize 64 #define AtPutBase 32 +#define BecameActiveClassFlag 8 #define BecameCompiledMethodFlag 2 #define BecamePointerObjectFlag 1 #define BitsPerByte 8 @@ -806,6 +807,7 @@ usqInt freeStartAddress(void); usqInt getScavengeThreshold(void); static sqLong headerWhileForwardingOf(sqInt aCompiledMethodObjOop) NoDbgRegParms; +sqInt isForwardedClassIndex(sqInt maybeClassIndex); sqInt isImmediateClass(sqInt classObj); sqInt isReallyYoungObject(sqInt objOop); sqInt methodHeaderOf(sqInt methodObj); @@ -1562,11 +1564,11 @@ _iss sqInt tempOop; _iss sqInt classTableIndex; _iss usqInt lastFreeChunk; +_iss sqInt becomeEffectsFlags; _iss SpurNewSpaceSpace eden; _iss sqInt ephemeronList; _iss usqInt freeOldSpaceStart; _iss sqInt tenureThreshold; -_iss sqInt becomeEffectsFlags; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; @@ -2329,7 +2331,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.886"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.885"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5627,6 +5629,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l293; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5644,7 +5647,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l293: /* end baseFrameReturn */; goto l292; } @@ -38732,7 +38735,29 @@ return long64At(aCompiledMethodObjOop); } + +/* A lenient tester of forwarded class indices for inline cache management in + the Cogit. + */ + sqInt +isForwardedClassIndex(sqInt maybeClassIndex) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classTablePage; + sqInt entry; + + if ((((usqInt)maybeClassIndex)) >= (1 << (22 - 10))) { + return 0; + } + classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) maybeClassIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + return 0; + } + entry = longAt((classTablePage + (BaseHeaderSize)) + ((maybeClassIndex & ((1 << 10) - 1)) << 2)); + return ((longAt(entry)) & (0x3FFFFF - 8)) == 0; +} + +sqInt isImmediateClass(sqInt classObj) { return ((((usqInt) (((longAt((classObj + (BaseHeaderSize)) + (InstanceSpecificationIndex << 2))) >> 1))) >> 16) & 0x1F) == 7; @@ -42145,14 +42170,19 @@ /* Answer the appropriate become effect flags for objOop, or 0 if none. - The effect flags affect how much work is done after the become in - following forwarding pointers. */ + The effect flags determine how much work is done after the become + in following forwarding pointers, voiding method caches, etc. */ static sqInt becomeEffectFlagsFor(sqInt objOop) { + sqInt hash; + return (((((usqInt) (longAt(objOop))) >> 24) & 0x1F) <= 5 - ? BecamePointerObjectFlag + ? ((((hash = (longAt(objOop + 4)) & 0x3FFFFF)) != 0) + && ((classAtIndex(hash)) == objOop) + ? BecamePointerObjectFlag + BecameActiveClassFlag + : BecamePointerObjectFlag) : (((((usqInt) (longAt(objOop))) >> 24) & 0x1F) >= 24 ? BecameCompiledMethodFlag : 0)); @@ -42181,8 +42211,8 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt copyHashFlag) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt c; + sqInt c1; sqInt classOrNil; - sqInt classTablePage; sqInt clone1; sqInt clone2; sqInt contextSize; @@ -42208,6 +42238,8 @@ sqInt i3; sqInt i4; sqInt i5; + sqInt i6; + sqInt i7; sqInt iLimiT; sqInt iLimiT1; sqInt iLimiT2; @@ -42271,13 +42303,13 @@ sqInt referent8; sqInt referent9; sqInt s; + sqInt s1; sqInt sched; sqInt schedAssoc; sqInt sp; sqInt sp1; sqInt temp1; sqInt temp2; - sqInt tmp; sqInt xArray; assert(GIV(becomeEffectsFlags) == 0); @@ -42342,11 +42374,8 @@ effectsFlags = 0; while (fieldOffset >= (BaseHeaderSize)) { oop = longAt(array1 + fieldOffset); - if ((oop & 3) != 0) { - ec = PrimErrInappropriate; - goto l3; - } - if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { + if (((oop & 3) == 0) + && (((longAt(oop)) & 0x3FFFFF) == 8)) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(oop)); referent5 = longAt((oop + (BaseHeaderSize)) + (0 << 2)); @@ -42357,17 +42386,18 @@ oop = referent5; longAtput(array1 + fieldOffset, oop); } + if ((oop & 3) != 0) { + ec = PrimErrInappropriate; + goto l3; + } if (((((usqInt) (longAt(oop))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; goto l3; } effectsFlags = effectsFlags | (becomeEffectFlagsFor(oop)); oop = longAt(array2 + fieldOffset); - if ((oop & 3) != 0) { - ec = PrimErrInappropriate; - goto l3; - } - if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { + if (((oop & 3) == 0) + && (((longAt(oop)) & 0x3FFFFF) == 8)) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(oop)); referent11 = longAt((oop + (BaseHeaderSize)) + (0 << 2)); @@ -42378,6 +42408,10 @@ oop = referent11; longAtput(array2 + fieldOffset, oop); } + if ((oop & 3) != 0) { + ec = PrimErrInappropriate; + goto l3; + } if (((((usqInt) (longAt(oop))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; goto l3; @@ -42436,11 +42470,8 @@ effectsFlags1 = 0; while (fieldOffset1 >= (BaseHeaderSize)) { oop1 = longAt(array1 + fieldOffset1); - if ((oop1 & 3) != 0) { - ec = PrimErrInappropriate; - goto l6; - } - if (((longAt(oop1)) & (0x3FFFFF - 8)) == 0) { + if (((oop1 & 3) == 0) + && (((longAt(oop1)) & 0x3FFFFF) == 8)) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(oop1)); referent6 = longAt((oop1 + (BaseHeaderSize)) + (0 << 2)); @@ -42451,6 +42482,10 @@ oop1 = referent6; longAtput(array1 + fieldOffset1, oop1); } @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3083] CogVM source as per VMMaker.oscog-eem.886
by commits＠squeakvm.org 26 Sep '14

26 Sep '14

Revision: 3083 Author: eliot Date: 2014-09-25 16:02:22 -0700 (Thu, 25 Sep 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.886 Fix regression in V# become youngReferrers management in VMMaker.oscog-eem.882. We /must/ prune young referrers if mapObjectReferencesInMachineCodeForBecome removes a cog method from youngReferrers because it may get added back and youngReferrers cannot contain duplicates. Commit this separate from VMMaker.oscog-eem.885 to have it separate from the flush caches on Spur become changes from VMMaker.oscog-eem.883/884. To be clear, this is a branch. The head is 885. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/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 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -12115,6 +12115,7 @@ } cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } + pruneYoungReferrers(); if (freedPIC) { unlinkSendsToFree(); } @@ -12552,7 +12553,7 @@ { sqInt *address; sqInt *address1; - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt cacheTagMarked; @@ -12722,7 +12723,7 @@ static sqInt markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt class; @@ -13813,7 +13814,7 @@ static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) { - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt entryPoint; @@ -14582,7 +14583,7 @@ static void voidImplicitReceiverCacheAt(sqInt mcpc) { - sqInt cacheAddress; + usqInt cacheAddress; assert(NumOopsPerIRC == 2); cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd)); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -852,7 +852,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2085,7 +2085,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.882"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.886"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36766,17 +36766,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36787,21 +36785,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36816,7 +36800,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36870,18 +36854,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38753,7 +38737,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -855,7 +855,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2088,7 +2088,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.882"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.886"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36775,17 +36775,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36796,21 +36794,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36825,7 +36809,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36879,18 +36863,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38762,7 +38746,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -12222,6 +12222,7 @@ } cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } + pruneYoungReferrers(); if (freedPIC) { unlinkSendsToFree(); } @@ -12560,7 +12561,7 @@ static sqInt markLiteralspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt class; @@ -13713,7 +13714,7 @@ static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) { - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt entryPoint; @@ -14466,7 +14467,7 @@ static void voidImplicitReceiverCacheAt(sqInt mcpc) { - sqInt cacheAddress; + usqInt cacheAddress; assert(NumOopsPerIRC == 2); cacheAddress = implicitReceiveCacheAt(backEnd, mcpc); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2326,7 +2326,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.882"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.886"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2329,7 +2329,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.882"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.886"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - StackInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + StackInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2075,7 +2075,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.882"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.886"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - StackInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + StackInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2072,7 +2072,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.882"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.886"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Sep 25 10:52:08 PDT 2014 + Thu Sep 25 15:59:19 PDT 2014 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/sistasrc/vm/cogit.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -11823,6 +11823,7 @@ } cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } + pruneYoungReferrers(); if (freedPIC) { unlinkSendsToFree(); } Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/sistasrc/vm/cogit.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -851,7 +851,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2082,7 +2082,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.882]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.886]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36845,17 +36845,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36866,21 +36864,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36895,7 +36879,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36949,18 +36933,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38832,7 +38816,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -854,7 +854,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2085,7 +2085,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.882]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.886]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36854,17 +36854,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36875,21 +36873,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36904,7 +36888,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36958,18 +36942,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38841,7 +38825,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -11949,6 +11949,7 @@ } cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } + pruneYoungReferrers(); if (freedPIC) { unlinkSendsToFree(); } Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1134,7 +1134,7 @@ static void restoreObjectsFromtofromto(sqInt firstIn, sqInt lastIn, sqInt firstSeg, sqInt limitSeg) NoDbgRegParms; static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms; static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms; -static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); @@ -2325,7 +2325,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.882]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.886]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5623,7 +5623,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l293; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5641,7 +5640,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l293: /* end baseFrameReturn */; goto l292; } @@ -52094,7 +52093,7 @@ zero if no change was possible. */ -static usqInt +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1137,7 +1137,7 @@ static void restoreObjectsFromtofromto(sqInt firstIn, sqInt lastIn, sqInt firstSeg, sqInt limitSeg) NoDbgRegParms; static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms; static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms; -static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); @@ -2328,7 +2328,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.882]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.886]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5632,7 +5632,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l293; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5650,7 +5649,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l293: /* end baseFrameReturn */; goto l292; } @@ -52103,7 +52102,7 @@ zero if no change was possible. */ -static usqInt +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spursrc/vm/cogit.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -11692,6 +11692,7 @@ } cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } + pruneYoungReferrers(); if (freedPIC) { unlinkSendsToFree(); } Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spursrc/vm/cogit.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spursrc/vm/cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2315,7 +2315,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.882]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.886]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spursrc/vm/cointerp.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2318,7 +2318,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.882]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.886]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - StackInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + StackInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2067,7 +2067,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.882]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.886]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/spurstacksrc/vm/interp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - StackInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + StackInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2064,7 +2064,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.882]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.886]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/src/vm/cogit.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -11568,6 +11568,7 @@ } cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } + pruneYoungReferrers(); if (freedPIC) { unlinkSendsToFree(); } Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/src/vm/cogit.h 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGenerator VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) +++ branches/Cog/src/vm/cointerp.c 2014-09-25 23:02:22 UTC (rev 3083) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac from - CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d + CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.886 uuid: fb69945a-ff92-425c-9f6e-e2d9bba462ac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2074,7 +2074,7 @@ @@ Diff output truncated at 50000 characters. @@

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