Vm-dev July 2013

vm-dev@lists.squeakfoundation.org

20 participants
104 discussions

[commit][2756] CogVM source as per VMMaker.oscog-eem.309.
by commits＠squeakvm.org 24 Jul '13

24 Jul '13

Revision: 2756 Author: eliot Date: 2013-07-24 12:46:12 -0700 (Wed, 24 Jul 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.309. Use assertValidStackedInstructionPointers: in primitiveTerminateTo. Fix the assert to use framePointer when on current page and instructionPointer ~= 0. Fix assertValidStackedInstructionPointersIn:line: usage in commenceCogCompiledCodeCompaction. Simplify relocateCallBeforeReturnPC:by: and elide bogus use of signedIntToLong there-in. Add a guard to findClassOfMethod:forReceiver:. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGenerator VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f from - StackToRegisterMappingCogit VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + StackToRegisterMappingCogit VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -16792,14 +16792,9 @@ byteAtput(retpc - 2, (((usqInt) distance) >> 16) & 255); byteAtput(retpc - 3, (((usqInt) distance) >> 8) & 255); byteAtput(retpc - 4, distance & 255); - if (0) { - assert((((usqInt) (callTargetFromReturnAddress(self_in_relocateCallBeforeReturnPCby, retpc)))) >= (minCallAddress())); + if (!(asserta((callTargetFromReturnAddress(self_in_relocateCallBeforeReturnPCby, retpc)) >= (minCallAddress())))) { + error("relocating call to invalid address"); } - else { - if (!((((usqInt) (callTargetFromReturnAddress(self_in_relocateCallBeforeReturnPCby, retpc)))) >= (minCallAddress()))) { - error("relocating call to invalid address"); - } - } } } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGenerator VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGenerator VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f from - CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1978,7 +1978,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.308"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.309"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13491,22 +13491,36 @@ static sqInt assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT char *callerFP; sqInt methodField; sqInt methodObj; sqInt prevFrameWasCogged; char *theFP; usqInt theIP; - char *theIPPtr; CogMethod *theMethod; if (!(assertal(!(isFree(aStackPage)), ln))) { return 0; } + + /* The top of stack of an inactive page is always the instructionPointer. + The top of stack of the active page may be the instructionPointer if it has been pushed, + which is indicated by a 0 instructionPointer. */ + prevFrameWasCogged = 0; - theIPPtr = (aStackPage->headSP); - theFP = (aStackPage->headFP); + if ((GIV(stackPage) == aStackPage) + && (GIV(instructionPointer) != 0)) { + theIP = GIV(instructionPointer); + theFP = GIV(framePointer); + } + else { + theIP = ((usqInt)(longAt((aStackPage->headSP)))); + theFP = (aStackPage->headFP); + if (GIV(stackPage) == aStackPage) { + assert(GIV(framePointer) == theFP); + } + } while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { /* begin mframeHomeMethod: */ @@ -13517,7 +13531,6 @@ } theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; - theIP = ((usqInt)(longAt(theIPPtr))); assertl((theIP == (ceCannotResumePC())) || (asserta((theIP >= (((usqInt)theMethod))) && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); @@ -13527,7 +13540,6 @@ /* assert-check the interpreter frame. */ - theIP = ((usqInt)(longAt(theIPPtr))); /* begin iframeMethod: */ methodObj = ((usqInt) (longAt(theFP + FoxMethod))); if (prevFrameWasCogged) { @@ -13540,10 +13552,11 @@ && (theIP < ((methodObj + (byteLengthOf(methodObj))) + BaseHeaderSize)), ln); prevFrameWasCogged = 0; } + theIP = ((usqInt)(longAt(theFP + FoxCallerSavedIP))); if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; - theIPPtr = theFP + FoxCallerSavedIP; theFP = callerFP; } + assertl(theIP == (ceBaseFrameReturnPC()), ln); return 1; } @@ -17579,7 +17592,6 @@ } assertValidStackedInstructionPointers(__LINE__); compactCogCompiledCode(); - assertValidStackedInstructionPointers(__LINE__); if (GIV(instructionPointer) != 0) { /* begin popStack */ top = longAt(GIV(stackPointer)); @@ -17590,6 +17602,7 @@ && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); (GIV(stackPage)->headSP = GIV(stackPointer)); } + assertValidStackedInstructionPointers(__LINE__); GIV(statCodeCompactionCount) += 1; GIV(statCodeCompactionUsecs) += (ioUTCMicrosecondsNow()) - startTime; if (checkForLeaks != 0) { @@ -21198,10 +21211,11 @@ } } } - if (!(((meth & 3) == 0) - && (((((usqInt)meth)) >= (startOfMemory())) - && (((((usqInt)meth)) < GIV(freeStart)) - && (((longAt(meth)) & TypeMask) != HeaderTypeGC))))) { + if (!((((meth & 3) == 0) + && (((((usqInt)meth)) >= (startOfMemory())) + && (((((usqInt)meth)) < GIV(freeStart)) + && (((longAt(meth)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(meth))) >> 8) & 15) >= 12))) { return GIV(nilObj); } return findClassContainingMethodstartingAt(meth, methodClassOf(meth)); @@ -43264,6 +43278,7 @@ theFP = pointerForOop(value2 - 1); if ((theFP == GIV(framePointer)) && (pageToStopOn == GIV(stackPage))) { + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); if ((frameCallerFP(theFP)) != contextsFP) { /* begin frameStackedReceiverOffsetNumArgs: */ numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) @@ -43325,6 +43340,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } @@ -43367,6 +43383,7 @@ else { currentCtx = longAt((thisCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord)); } + assertValidStackedInstructionPointers(__LINE__); if (contexthasSender(thisCtx, aContextOrNil)) { /* Need to walk the stack freeing stack pages and nilling contexts. */ @@ -43517,6 +43534,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointers(__LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); } @@ -45018,10 +45036,11 @@ } } } - if (!(((aMethod & 3) == 0) - && (((((usqInt)aMethod)) >= (startOfMemory())) - && (((((usqInt)aMethod)) < GIV(freeStart)) - && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC))))) { + if (!((((aMethod & 3) == 0) + && (((((usqInt)aMethod)) >= (startOfMemory())) + && (((((usqInt)aMethod)) < GIV(freeStart)) + && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(aMethod))) >> 8) & 15) >= 12))) { methClass = GIV(nilObj); goto l1; } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-24 19:46:12 UTC (rev 2756) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f from - CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1981,7 +1981,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.308"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.309"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13500,22 +13500,36 @@ static sqInt assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT char *callerFP; sqInt methodField; sqInt methodObj; sqInt prevFrameWasCogged; char *theFP; usqInt theIP; - char *theIPPtr; CogMethod *theMethod; if (!(assertal(!(isFree(aStackPage)), ln))) { return 0; } + + /* The top of stack of an inactive page is always the instructionPointer. + The top of stack of the active page may be the instructionPointer if it has been pushed, + which is indicated by a 0 instructionPointer. */ + prevFrameWasCogged = 0; - theIPPtr = (aStackPage->headSP); - theFP = (aStackPage->headFP); + if ((GIV(stackPage) == aStackPage) + && (GIV(instructionPointer) != 0)) { + theIP = GIV(instructionPointer); + theFP = GIV(framePointer); + } + else { + theIP = ((usqInt)(longAt((aStackPage->headSP)))); + theFP = (aStackPage->headFP); + if (GIV(stackPage) == aStackPage) { + assert(GIV(framePointer) == theFP); + } + } while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { /* begin mframeHomeMethod: */ @@ -13526,7 +13540,6 @@ } theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; - theIP = ((usqInt)(longAt(theIPPtr))); assertl((theIP == (ceCannotResumePC())) || (asserta((theIP >= (((usqInt)theMethod))) && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); @@ -13536,7 +13549,6 @@ /* assert-check the interpreter frame. */ - theIP = ((usqInt)(longAt(theIPPtr))); /* begin iframeMethod: */ methodObj = ((usqInt) (longAt(theFP + FoxMethod))); if (prevFrameWasCogged) { @@ -13549,10 +13561,11 @@ && (theIP < ((methodObj + (byteLengthOf(methodObj))) + BaseHeaderSize)), ln); prevFrameWasCogged = 0; } + theIP = ((usqInt)(longAt(theFP + FoxCallerSavedIP))); if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; - theIPPtr = theFP + FoxCallerSavedIP; theFP = callerFP; } + assertl(theIP == (ceBaseFrameReturnPC()), ln); return 1; } @@ -17588,7 +17601,6 @@ } assertValidStackedInstructionPointers(__LINE__); compactCogCompiledCode(); - assertValidStackedInstructionPointers(__LINE__); if (GIV(instructionPointer) != 0) { /* begin popStack */ top = longAt(GIV(stackPointer)); @@ -17599,6 +17611,7 @@ && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); (GIV(stackPage)->headSP = GIV(stackPointer)); } + assertValidStackedInstructionPointers(__LINE__); GIV(statCodeCompactionCount) += 1; GIV(statCodeCompactionUsecs) += (ioUTCMicrosecondsNow()) - startTime; if (checkForLeaks != 0) { @@ -21207,10 +21220,11 @@ } } } - if (!(((meth & 3) == 0) - && (((((usqInt)meth)) >= (startOfMemory())) - && (((((usqInt)meth)) < GIV(freeStart)) - && (((longAt(meth)) & TypeMask) != HeaderTypeGC))))) { + if (!((((meth & 3) == 0) + && (((((usqInt)meth)) >= (startOfMemory())) + && (((((usqInt)meth)) < GIV(freeStart)) + && (((longAt(meth)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(meth))) >> 8) & 15) >= 12))) { return GIV(nilObj); } return findClassContainingMethodstartingAt(meth, methodClassOf(meth)); @@ -43273,6 +43287,7 @@ theFP = pointerForOop(value2 - 1); if ((theFP == GIV(framePointer)) && (pageToStopOn == GIV(stackPage))) { + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); if ((frameCallerFP(theFP)) != contextsFP) { /* begin frameStackedReceiverOffsetNumArgs: */ numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) @@ -43334,6 +43349,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } @@ -43376,6 +43392,7 @@ else { currentCtx = longAt((thisCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord)); } + assertValidStackedInstructionPointers(__LINE__); if (contexthasSender(thisCtx, aContextOrNil)) { /* Need to walk the stack freeing stack pages and nilling contexts. */ @@ -43526,6 +43543,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointers(__LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); } @@ -45027,10 +45045,11 @@ } } } - if (!(((aMethod & 3) == 0) - && (((((usqInt)aMethod)) >= (startOfMemory())) - && (((((usqInt)aMethod)) < GIV(freeStart)) - && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC))))) { + if (!((((aMethod & 3) == 0) + && (((((usqInt)aMethod)) >= (startOfMemory())) + && (((((usqInt)aMethod)) < GIV(freeStart)) + && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(aMethod))) >> 8) & 15) >= 12))) { methClass = GIV(nilObj); goto l1; } Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/nscogsrc/vm/interp.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jul 23 17:29:18 PDT 2013 + Wed Jul 24 12:45:36 PDT 2013 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/cogit.c 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGenerator VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f from - StackToRegisterMappingCogit VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + StackToRegisterMappingCogit VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -15436,14 +15436,9 @@ byteAtput(retpc - 2, (((usqInt) distance) >> 16) & 255); byteAtput(retpc - 3, (((usqInt) distance) >> 8) & 255); byteAtput(retpc - 4, distance & 255); - if (0) { - assert((((usqInt) (callTargetFromReturnAddress(self_in_relocateCallBeforeReturnPCby, retpc)))) >= (minCallAddress())); + if (!(asserta((callTargetFromReturnAddress(self_in_relocateCallBeforeReturnPCby, retpc)) >= (minCallAddress())))) { + error("relocating call to invalid address"); } - else { - if (!((((usqInt) (callTargetFromReturnAddress(self_in_relocateCallBeforeReturnPCby, retpc)))) >= (minCallAddress()))) { - error("relocating call to invalid address"); - } - } } } Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/cogit.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGenerator VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/cogmethod.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGenerator VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/cointerp.c 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f from - CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1968,7 +1968,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.308]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.309]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -9596,22 +9596,36 @@ static sqInt assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT char *callerFP; sqInt methodField; sqInt methodObj; sqInt prevFrameWasCogged; char *theFP; usqInt theIP; - char *theIPPtr; CogMethod *theMethod; if (!(assertal(!(isFree(aStackPage)), ln))) { return 0; } + + /* The top of stack of an inactive page is always the instructionPointer. + The top of stack of the active page may be the instructionPointer if it has been pushed, + which is indicated by a 0 instructionPointer. */ + prevFrameWasCogged = 0; - theIPPtr = (aStackPage->headSP); - theFP = (aStackPage->headFP); + if ((GIV(stackPage) == aStackPage) + && (GIV(instructionPointer) != 0)) { + theIP = GIV(instructionPointer); + theFP = GIV(framePointer); + } + else { + theIP = ((usqInt)(longAt((aStackPage->headSP)))); + theFP = (aStackPage->headFP); + if (GIV(stackPage) == aStackPage) { + assert(GIV(framePointer) == theFP); + } + } while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { /* begin mframeHomeMethod: */ @@ -9622,7 +9636,6 @@ } theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; - theIP = ((usqInt)(longAt(theIPPtr))); assertl((theIP == (ceCannotResumePC())) || (asserta((theIP >= (((usqInt)theMethod))) && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); @@ -9632,7 +9645,6 @@ /* assert-check the interpreter frame. */ - theIP = ((usqInt)(longAt(theIPPtr))); /* begin iframeMethod: */ methodObj = ((usqInt) (longAt(theFP + FoxMethod))); if (prevFrameWasCogged) { @@ -9645,10 +9657,11 @@ && (theIP < ((methodObj + (byteLengthOf(methodObj))) + BaseHeaderSize)), ln); prevFrameWasCogged = 0; } + theIP = ((usqInt)(longAt(theFP + FoxCallerSavedIP))); if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; - theIPPtr = theFP + FoxCallerSavedIP; theFP = callerFP; } + assertl(theIP == (ceBaseFrameReturnPC()), ln); return 1; } @@ -13504,7 +13517,6 @@ } assertValidStackedInstructionPointers(__LINE__); compactCogCompiledCode(); - assertValidStackedInstructionPointers(__LINE__); if (GIV(instructionPointer) != 0) { /* begin popStack */ top = longAt(GIV(stackPointer)); @@ -13515,6 +13527,7 @@ && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); (GIV(stackPage)->headSP = GIV(stackPointer)); } + assertValidStackedInstructionPointers(__LINE__); GIV(statCodeCompactionCount) += 1; GIV(statCodeCompactionUsecs) += (ioUTCMicrosecondsNow()) - startTime; if (checkForLeaks != 0) { @@ -17029,10 +17042,11 @@ } } } - if (!(((meth & 3) == 0) - && (((((usqInt)meth)) >= (startOfMemory())) - && (((((usqInt)meth)) < GIV(freeStart)) - && (((longAt(meth)) & TypeMask) != HeaderTypeGC))))) { + if (!((((meth & 3) == 0) + && (((((usqInt)meth)) >= (startOfMemory())) + && (((((usqInt)meth)) < GIV(freeStart)) + && (((longAt(meth)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(meth))) >> 8) & 15) >= 12))) { return GIV(nilObj); } return findClassContainingMethodstartingAt(meth, methodClassOf(meth)); @@ -38751,6 +38765,7 @@ theFP = pointerForOop(value2 - 1); if ((theFP == GIV(framePointer)) && (pageToStopOn == GIV(stackPage))) { + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); if ((frameCallerFP(theFP)) != contextsFP) { /* begin frameStackedReceiverOffsetNumArgs: */ numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) @@ -38812,6 +38827,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } @@ -38854,6 +38870,7 @@ else { currentCtx = longAt((thisCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord)); } + assertValidStackedInstructionPointers(__LINE__); if (contexthasSender(thisCtx, aContextOrNil)) { /* Need to walk the stack freeing stack pages and nilling contexts. */ @@ -39004,6 +39021,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointers(__LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); } @@ -40500,10 +40518,11 @@ } } } - if (!(((aMethod & 3) == 0) - && (((((usqInt)aMethod)) >= (startOfMemory())) - && (((((usqInt)aMethod)) < GIV(freeStart)) - && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC))))) { + if (!((((aMethod & 3) == 0) + && (((((usqInt)aMethod)) >= (startOfMemory())) + && (((((usqInt)aMethod)) < GIV(freeStart)) + && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(aMethod))) >> 8) & 15) >= 12))) { methClass = GIV(nilObj); goto l1; } Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/cointerp.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/cointerpmt.c 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f from - CoInterpreterMT VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1290,8 +1290,8 @@ _iss char * framePointer; _iss StackPage * stackPage; _iss sqInt nilObj; +_iss usqInt instructionPointer; _iss usqInt freeStart; -_iss usqInt instructionPointer; _iss usqInt method; _iss sqInt argumentCount; _iss usqInt newMethod; @@ -2067,7 +2067,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.308]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.309]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -9697,22 +9697,36 @@ static sqInt assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT char *callerFP; sqInt methodField; sqInt methodObj; sqInt prevFrameWasCogged; char *theFP; usqInt theIP; - char *theIPPtr; CogMethod *theMethod; if (!(assertal(!(isFree(aStackPage)), ln))) { return 0; } + + /* The top of stack of an inactive page is always the instructionPointer. + The top of stack of the active page may be the instructionPointer if it has been pushed, + which is indicated by a 0 instructionPointer. */ + prevFrameWasCogged = 0; - theIPPtr = (aStackPage->headSP); - theFP = (aStackPage->headFP); + if ((GIV(stackPage) == aStackPage) + && (GIV(instructionPointer) != 0)) { + theIP = GIV(instructionPointer); + theFP = GIV(framePointer); + } + else { + theIP = ((usqInt)(longAt((aStackPage->headSP)))); + theFP = (aStackPage->headFP); + if (GIV(stackPage) == aStackPage) { + assert(GIV(framePointer) == theFP); + } + } while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { /* begin mframeHomeMethod: */ @@ -9723,7 +9737,6 @@ } theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; - theIP = ((usqInt)(longAt(theIPPtr))); assertl((theIP == (ceCannotResumePC())) || (asserta((theIP >= (((usqInt)theMethod))) && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); @@ -9733,7 +9746,6 @@ /* assert-check the interpreter frame. */ - theIP = ((usqInt)(longAt(theIPPtr))); /* begin iframeMethod: */ methodObj = ((usqInt) (longAt(theFP + FoxMethod))); if (prevFrameWasCogged) { @@ -9746,10 +9758,11 @@ && (theIP < ((methodObj + (byteLengthOf(methodObj))) + BaseHeaderSize)), ln); prevFrameWasCogged = 0; } + theIP = ((usqInt)(longAt(theFP + FoxCallerSavedIP))); if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; - theIPPtr = theFP + FoxCallerSavedIP; theFP = callerFP; } + assertl(theIP == (ceBaseFrameReturnPC()), ln); return 1; } @@ -13931,7 +13944,6 @@ } assertValidStackedInstructionPointers(__LINE__); compactCogCompiledCode(); - assertValidStackedInstructionPointers(__LINE__); if (GIV(instructionPointer) != 0) { /* begin popStack */ top = longAt(GIV(stackPointer)); @@ -13942,6 +13954,7 @@ && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); (GIV(stackPage)->headSP = GIV(stackPointer)); } + assertValidStackedInstructionPointers(__LINE__); GIV(statCodeCompactionCount) += 1; GIV(statCodeCompactionUsecs) += (ioUTCMicrosecondsNow()) - startTime; if (checkForLeaks != 0) { @@ -17711,10 +17724,11 @@ } } } - if (!(((meth & 3) == 0) - && (((((usqInt)meth)) >= (startOfMemory())) - && (((((usqInt)meth)) < GIV(freeStart)) - && (((longAt(meth)) & TypeMask) != HeaderTypeGC))))) { + if (!((((meth & 3) == 0) + && (((((usqInt)meth)) >= (startOfMemory())) + && (((((usqInt)meth)) < GIV(freeStart)) + && (((longAt(meth)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(meth))) >> 8) & 15) >= 12))) { return GIV(nilObj); } return findClassContainingMethodstartingAt(meth, methodClassOf(meth)); @@ -40120,6 +40134,7 @@ theFP = pointerForOop(value2 - 1); if ((theFP == GIV(framePointer)) && (pageToStopOn == GIV(stackPage))) { + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); if ((frameCallerFP(theFP)) != contextsFP) { /* begin frameStackedReceiverOffsetNumArgs: */ numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) @@ -40181,6 +40196,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } @@ -40223,6 +40239,7 @@ else { currentCtx = longAt((thisCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord)); } + assertValidStackedInstructionPointers(__LINE__); if (contexthasSender(thisCtx, aContextOrNil)) { /* Need to walk the stack freeing stack pages and nilling contexts. */ @@ -40373,6 +40390,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointers(__LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); } @@ -41887,10 +41905,11 @@ } } } - if (!(((aMethod & 3) == 0) - && (((((usqInt)aMethod)) >= (startOfMemory())) - && (((((usqInt)aMethod)) < GIV(freeStart)) - && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC))))) { + if (!((((aMethod & 3) == 0) + && (((((usqInt)aMethod)) >= (startOfMemory())) + && (((((usqInt)aMethod)) < GIV(freeStart)) + && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(aMethod))) >> 8) & 15) >= 12))) { methClass = GIV(nilObj); goto l1; } Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/cointerpmt.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-24 19:46:12 UTC (rev 2756) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f from - CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1971,7 +1971,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.308]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.309]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -9605,22 +9605,36 @@ static sqInt assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT char *callerFP; sqInt methodField; sqInt methodObj; sqInt prevFrameWasCogged; char *theFP; usqInt theIP; - char *theIPPtr; CogMethod *theMethod; if (!(assertal(!(isFree(aStackPage)), ln))) { return 0; } + + /* The top of stack of an inactive page is always the instructionPointer. + The top of stack of the active page may be the instructionPointer if it has been pushed, + which is indicated by a 0 instructionPointer. */ + prevFrameWasCogged = 0; - theIPPtr = (aStackPage->headSP); - theFP = (aStackPage->headFP); + if ((GIV(stackPage) == aStackPage) + && (GIV(instructionPointer) != 0)) { + theIP = GIV(instructionPointer); + theFP = GIV(framePointer); + } + else { + theIP = ((usqInt)(longAt((aStackPage->headSP)))); + theFP = (aStackPage->headFP); + if (GIV(stackPage) == aStackPage) { + assert(GIV(framePointer) == theFP); + } + } while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { /* begin mframeHomeMethod: */ @@ -9631,7 +9645,6 @@ } theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; - theIP = ((usqInt)(longAt(theIPPtr))); assertl((theIP == (ceCannotResumePC())) || (asserta((theIP >= (((usqInt)theMethod))) && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); @@ -9641,7 +9654,6 @@ /* assert-check the interpreter frame. */ - theIP = ((usqInt)(longAt(theIPPtr))); /* begin iframeMethod: */ methodObj = ((usqInt) (longAt(theFP + FoxMethod))); if (prevFrameWasCogged) { @@ -9654,10 +9666,11 @@ && (theIP < ((methodObj + (byteLengthOf(methodObj))) + BaseHeaderSize)), ln); prevFrameWasCogged = 0; } + theIP = ((usqInt)(longAt(theFP + FoxCallerSavedIP))); if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; - theIPPtr = theFP + FoxCallerSavedIP; theFP = callerFP; } + assertl(theIP == (ceBaseFrameReturnPC()), ln); return 1; } @@ -13513,7 +13526,6 @@ } assertValidStackedInstructionPointers(__LINE__); compactCogCompiledCode(); - assertValidStackedInstructionPointers(__LINE__); if (GIV(instructionPointer) != 0) { /* begin popStack */ top = longAt(GIV(stackPointer)); @@ -13524,6 +13536,7 @@ && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); (GIV(stackPage)->headSP = GIV(stackPointer)); } + assertValidStackedInstructionPointers(__LINE__); GIV(statCodeCompactionCount) += 1; GIV(statCodeCompactionUsecs) += (ioUTCMicrosecondsNow()) - startTime; if (checkForLeaks != 0) { @@ -17038,10 +17051,11 @@ } } } - if (!(((meth & 3) == 0) - && (((((usqInt)meth)) >= (startOfMemory())) - && (((((usqInt)meth)) < GIV(freeStart)) - && (((longAt(meth)) & TypeMask) != HeaderTypeGC))))) { + if (!((((meth & 3) == 0) + && (((((usqInt)meth)) >= (startOfMemory())) + && (((((usqInt)meth)) < GIV(freeStart)) + && (((longAt(meth)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(meth))) >> 8) & 15) >= 12))) { return GIV(nilObj); } return findClassContainingMethodstartingAt(meth, methodClassOf(meth)); @@ -38760,6 +38774,7 @@ theFP = pointerForOop(value2 - 1); if ((theFP == GIV(framePointer)) && (pageToStopOn == GIV(stackPage))) { + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); if ((frameCallerFP(theFP)) != contextsFP) { /* begin frameStackedReceiverOffsetNumArgs: */ numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) @@ -38821,6 +38836,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } @@ -38863,6 +38879,7 @@ else { currentCtx = longAt((thisCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord)); } + assertValidStackedInstructionPointers(__LINE__); if (contexthasSender(thisCtx, aContextOrNil)) { /* Need to walk the stack freeing stack pages and nilling contexts. */ @@ -39013,6 +39030,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointers(__LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); } @@ -40509,10 +40527,11 @@ } } } - if (!(((aMethod & 3) == 0) - && (((((usqInt)aMethod)) >= (startOfMemory())) - && (((((usqInt)aMethod)) < GIV(freeStart)) - && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC))))) { + if (!((((aMethod & 3) == 0) + && (((((usqInt)aMethod)) >= (startOfMemory())) + && (((((usqInt)aMethod)) < GIV(freeStart)) + && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(aMethod))) >> 8) & 15) >= 12))) { methClass = GIV(nilObj); goto l1; } Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-24 19:46:12 UTC (rev 2756) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f from - CoInterpreterMT VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1293,8 +1293,8 @@ _iss char * framePointer; _iss StackPage * stackPage; _iss sqInt nilObj; +_iss usqInt instructionPointer; _iss usqInt freeStart; -_iss usqInt instructionPointer; _iss usqInt method; _iss sqInt argumentCount; _iss usqInt newMethod; @@ -2070,7 +2070,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.308]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.309]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -9706,22 +9706,36 @@ static sqInt assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT char *callerFP; sqInt methodField; sqInt methodObj; sqInt prevFrameWasCogged; char *theFP; usqInt theIP; - char *theIPPtr; CogMethod *theMethod; if (!(assertal(!(isFree(aStackPage)), ln))) { return 0; } + + /* The top of stack of an inactive page is always the instructionPointer. + The top of stack of the active page may be the instructionPointer if it has been pushed, + which is indicated by a 0 instructionPointer. */ + prevFrameWasCogged = 0; - theIPPtr = (aStackPage->headSP); - theFP = (aStackPage->headFP); + if ((GIV(stackPage) == aStackPage) + && (GIV(instructionPointer) != 0)) { + theIP = GIV(instructionPointer); + theFP = GIV(framePointer); + } + else { + theIP = ((usqInt)(longAt((aStackPage->headSP)))); + theFP = (aStackPage->headFP); + if (GIV(stackPage) == aStackPage) { + assert(GIV(framePointer) == theFP); + } + } while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { /* begin mframeHomeMethod: */ @@ -9732,7 +9746,6 @@ } theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; - theIP = ((usqInt)(longAt(theIPPtr))); assertl((theIP == (ceCannotResumePC())) || (asserta((theIP >= (((usqInt)theMethod))) && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); @@ -9742,7 +9755,6 @@ /* assert-check the interpreter frame. */ - theIP = ((usqInt)(longAt(theIPPtr))); /* begin iframeMethod: */ methodObj = ((usqInt) (longAt(theFP + FoxMethod))); if (prevFrameWasCogged) { @@ -9755,10 +9767,11 @@ && (theIP < ((methodObj + (byteLengthOf(methodObj))) + BaseHeaderSize)), ln); prevFrameWasCogged = 0; } + theIP = ((usqInt)(longAt(theFP + FoxCallerSavedIP))); if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; - theIPPtr = theFP + FoxCallerSavedIP; theFP = callerFP; } + assertl(theIP == (ceBaseFrameReturnPC()), ln); return 1; } @@ -13940,7 +13953,6 @@ } assertValidStackedInstructionPointers(__LINE__); compactCogCompiledCode(); - assertValidStackedInstructionPointers(__LINE__); if (GIV(instructionPointer) != 0) { /* begin popStack */ top = longAt(GIV(stackPointer)); @@ -13951,6 +13963,7 @@ && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); (GIV(stackPage)->headSP = GIV(stackPointer)); } + assertValidStackedInstructionPointers(__LINE__); GIV(statCodeCompactionCount) += 1; GIV(statCodeCompactionUsecs) += (ioUTCMicrosecondsNow()) - startTime; if (checkForLeaks != 0) { @@ -17720,10 +17733,11 @@ } } } - if (!(((meth & 3) == 0) - && (((((usqInt)meth)) >= (startOfMemory())) - && (((((usqInt)meth)) < GIV(freeStart)) - && (((longAt(meth)) & TypeMask) != HeaderTypeGC))))) { + if (!((((meth & 3) == 0) + && (((((usqInt)meth)) >= (startOfMemory())) + && (((((usqInt)meth)) < GIV(freeStart)) + && (((longAt(meth)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(meth))) >> 8) & 15) >= 12))) { return GIV(nilObj); } return findClassContainingMethodstartingAt(meth, methodClassOf(meth)); @@ -40129,6 +40143,7 @@ theFP = pointerForOop(value2 - 1); if ((theFP == GIV(framePointer)) && (pageToStopOn == GIV(stackPage))) { + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); if ((frameCallerFP(theFP)) != contextsFP) { /* begin frameStackedReceiverOffsetNumArgs: */ numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) @@ -40190,6 +40205,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointersInline(GIV(stackPage), __LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } @@ -40232,6 +40248,7 @@ else { currentCtx = longAt((thisCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord)); } + assertValidStackedInstructionPointers(__LINE__); if (contexthasSender(thisCtx, aContextOrNil)) { /* Need to walk the stack freeing stack pages and nilling contexts. */ @@ -40382,6 +40399,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; null; + assertValidStackedInstructionPointers(__LINE__); assert(GIV(stackPage) == (mostRecentlyUsedPage())); } @@ -41896,10 +41914,11 @@ } } } - if (!(((aMethod & 3) == 0) - && (((((usqInt)aMethod)) >= (startOfMemory())) - && (((((usqInt)aMethod)) < GIV(freeStart)) - && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC))))) { + if (!((((aMethod & 3) == 0) + && (((((usqInt)aMethod)) >= (startOfMemory())) + && (((((usqInt)aMethod)) < GIV(freeStart)) + && (((longAt(aMethod)) & TypeMask) != HeaderTypeGC)))) + && (((((usqInt) (longAt(aMethod))) >> 8) & 15) >= 12))) { methClass = GIV(nilObj); goto l1; } Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/interp.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-07-24 17:31:47 UTC (rev 2755) +++ branches/Cog/src/vm/vmCallback.h 2013-07-24 19:46:12 UTC (rev 2756) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.309.mcz
by commits＠source.squeak.org 24 Jul '13

24 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.309.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.309 Author: eem Time: 24 July 2013, 12:34:18.688 pm UUID: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f Ancestors: VMMaker.oscog-eem.308 The Peugeot commit. Use assertValidStackedInstructionPointers: in primitiveTerminateTo. Fix the assert to use framePointer when on current page and instructionPointer ~= 0. Fix assertValidStackedInstructionPointersIn:line: usage in commenceCogCompiledCodeCompaction. Simplify relocateCallBeforeReturnPC:by: and elide bogus use of signedIntToLong there-in. Add a guard to findClassOfMethod:forReceiver:. =============== Diff against VMMaker.oscog-eem.308 =============== Item was changed: ----- Method: CoInterpreter>>assertValidStackedInstructionPointersIn:line: (in category 'debug support') ----- assertValidStackedInstructionPointersIn: aStackPage line: ln "Check that the stacked instruction pointers in the given page are correct. Checks the interpreter sender/machine code callee contract." <var: #aStackPage type: #'StackPage *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> - <var: #theIPPtr type: #'char *'> <var: #theIP type: #usqInt> <var: #theMethod type: #'CogMethod *'> <inline: false> + | prevFrameWasCogged theFP callerFP theMethod theIP methodObj | - | prevFrameWasCogged theFP callerFP theMethod theIP theIPPtr methodObj | (self asserta: (stackPages isFree: aStackPage) not l: ln) ifFalse: [^false]. prevFrameWasCogged := false. + "The top of stack of an inactive page is always the instructionPointer. + The top of stack of the active page may be the instructionPointer if it has been pushed, + which is indicated by a 0 instructionPointer." + (stackPage = aStackPage and: [instructionPointer ~= 0]) + ifTrue: + [theIP := instructionPointer. + theFP := framePointer] + ifFalse: + [theIP := (stackPages longAt: aStackPage headSP) asUnsignedInteger. + theFP := aStackPage headFP. + stackPage = aStackPage ifTrue: + [self assert: framePointer = theFP]]. - theIPPtr := aStackPage headSP. - theFP := aStackPage headFP. [(self isMachineCodeFrame: theFP) ifTrue: [theMethod := self mframeHomeMethod: theFP. - theIP := (stackPages longAt: theIPPtr) asUnsignedInteger. self assert: (theIP = cogit ceCannotResumePC or: [self asserta: (theIP >= theMethod asUnsignedInteger and: [theIP < (theMethod asUnsignedInteger + theMethod blockSize)])]) l: ln. prevFrameWasCogged := true] ifFalse: "assert-check the interpreter frame." + [methodObj := self iframeMethod: theFP. - [theIP := (stackPages longAt: theIPPtr) asUnsignedInteger. - methodObj := self iframeMethod: theFP. prevFrameWasCogged ifTrue: [self assert: theIP = cogit ceReturnToInterpreterPC l: ln]. theIP = cogit ceReturnToInterpreterPC ifTrue: [theIP := self iframeSavedIP: theFP]. self assert: (theIP >= (methodObj + (objectMemory lastPointerOf: methodObj) + BaseHeaderSize - 1) and: [theIP < (methodObj + (objectMemory byteLengthOf: methodObj) + BaseHeaderSize)]) l: ln. prevFrameWasCogged := false]. + theIP := (stackPages longAt: theFP + FoxCallerSavedIP) asUnsignedInteger. + (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: + [theFP := callerFP]. + self assert: theIP = cogit ceBaseFrameReturnPC l: ln. - (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: - [theIPPtr := theFP + FoxCallerSavedIP. - theFP := callerFP]. ^true! Item was changed: ----- Method: CoInterpreter>>commenceCogCompiledCodeCompaction (in category 'process primitive support') ----- commenceCogCompiledCodeCompaction | startTime | <var: #startTime type: #usqLong> cogCompiledCodeCompactionCalledFor := false. cogit recordEventTrace ifTrue: [self recordTrace: TraceCodeCompaction thing: TraceCodeCompaction source: 0]. startTime := self ioUTCMicrosecondsNow. "This can be called in a number of circumstances. The instructionPointer may contain a native pc that must be relocated. There may already be a pushed instructionPointer on stack. Clients ensure that instructionPointer is 0 if it should not be pushed and/or relocated. Pushing twice is a mistake because only the top one will be relocated." instructionPointer ~= 0 ifTrue: [self push: instructionPointer. self externalWriteBackHeadStackPointer]. self assertValidStackedInstructionPointers: #'__LINE__'. cogit compactCogCompiledCode. - self assertValidStackedInstructionPointers: #'__LINE__'. instructionPointer ~= 0 ifTrue: [instructionPointer := self popStack. self externalWriteBackHeadStackPointer]. + self assertValidStackedInstructionPointers: #'__LINE__'. statCodeCompactionCount := statCodeCompactionCount + 1. statCodeCompactionUsecs := statCodeCompactionUsecs + (self ioUTCMicrosecondsNow - startTime). objectMemory checkForLeaks ~= 0 ifTrue: [objectMemory clearLeakMapAndMapAccessibleObjects. self assert: (self checkCodeIntegrity: false)]! Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveTerminateTo (in category 'control primitives') ----- primitiveTerminateTo "Primitive. Terminate up the context stack from the receiver up to but not including the argument, if previousContext is on my Context stack. Make previousContext my sender. This prim has to shadow the code in ContextPart>terminateTo: to be correct. Override to ensure the caller's saved ip is correct, i.e. if an interpreter frame it may have to move to iframeSavedIP." | thisCtx currentCtx aContextOrNil contextsFP contextsSP contextsIP nextCntx stackedReceiverOffset theFP newFP newSP pageToStopOn thePage frameAbove | <var: #contextsFP type: #'char *'> <var: #theFP type: #'char *'> <var: #newFP type: #'char *'> <var: #newSP type: #'char *'> <var: #contextsIP type: #usqInt> <var: #frameAbove type: #'char *'> <var: #contextsSP type: #'char *'> <var: #source type: #'char *'> <var: #pageToStopOn type: #'StackPage *'> <var: #thePage type: #'StackPage *'> aContextOrNil := self stackTop. (aContextOrNil = objectMemory nilObject or: [objectMemory isContext: aContextOrNil]) ifFalse: [^self primitiveFail]. thisCtx := self stackValue: 1. thisCtx = aContextOrNil ifTrue: [^self primitiveFail]. "All stackPages need to have current head pointers to avoid confusion." self externalWriteBackHeadFramePointers. "If we're searching for aContextOrNil it might be on a stack page. Helps to know if we can free a whole page or not, or if we can short-cut the termination." (aContextOrNil ~= objectMemory nilObject and: [self isStillMarriedContext: aContextOrNil]) ifTrue: [contextsFP := self frameOfMarriedContext: aContextOrNil. pageToStopOn := stackPages stackPageFor: contextsFP] ifFalse: [pageToStopOn := 0]. "if thisCtx is married ensure it is a base frame. Then we can assign its sender." (self isStillMarriedContext: thisCtx) ifTrue: [theFP := self frameOfMarriedContext: thisCtx. "Optimize terminating thisContext. Move its frame down to be next to aContextOrNil's frame. Common in the exception system and so helps to be fast." (theFP = framePointer and: [pageToStopOn = stackPage]) ifTrue: + [self assertValidStackedInstructionPointersIn: stackPage line: #'__LINE__'. + (self frameCallerFP: theFP) ~= contextsFP ifTrue: - [(self frameCallerFP: theFP) ~= contextsFP ifTrue: [stackedReceiverOffset := self frameStackedReceiverOffset: theFP. frameAbove := self findFrameAbove: contextsFP inPage: pageToStopOn. contextsIP := (self frameCallerSavedIP: frameAbove) asUnsignedInteger. self assert: ((contextsIP asUnsignedInteger >= objectMemory startOfMemory) or: [contextsIP = cogit ceReturnToInterpreterPC]) == (self isMachineCodeFrame: contextsFP) not. newSP := self frameCallerSP: frameAbove. newFP := newSP - stackedReceiverOffset - BytesPerWord. theFP + stackedReceiverOffset to: stackPointer by: BytesPerWord negated do: [:source| newSP := newSP - BytesPerWord. stackPages longAt: newSP put: (stackPages longAt: source)]. stackPages longAt: newFP + FoxSavedFP put: contextsFP. "Ensure contract between machine-code callee and interpreter caller frames is preserved. Return pc needs to be ceReturnToInterpreterPC." ((self isMachineCodeFrame: newFP) and: [contextsIP >= objectMemory startOfMemory]) ifTrue: [self iframeSavedIP: contextsFP put: contextsIP. contextsIP := cogit ceReturnToInterpreterPC]. stackPages longAt: newFP + FoxCallerSavedIP put: contextsIP. self assert: (objectMemory isContext: thisCtx). objectMemory storePointerUnchecked: SenderIndex ofObject: thisCtx withValue: (self withSmallIntegerTags: newFP). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: thisCtx withValue: (self withSmallIntegerTags: contextsFP). framePointer := newFP. stackPointer := newSP]. + self pop: 1. + self assertValidStackedInstructionPointersIn: stackPage line: #'__LINE__'. + self assert: stackPage = stackPages mostRecentlyUsedPage. + ^nil]. - self pop: 1. - self assert: stackPage = stackPages mostRecentlyUsedPage. - ^nil]. theFP := self externalEnsureIsBaseFrame: theFP. "May cause a GC!!!!" currentCtx := self frameCallerContext: theFP. "May also reclaim aContextOrNil's page, hence..." (aContextOrNil ~= objectMemory nilObject and: [self isStillMarriedContext: aContextOrNil]) ifTrue: [contextsFP := self frameOfMarriedContext: aContextOrNil. pageToStopOn := stackPages stackPageFor: contextsFP] ifFalse: [pageToStopOn := 0]] ifFalse: [currentCtx := objectMemory fetchPointer: SenderIndex ofObject: thisCtx]. + self assertValidStackedInstructionPointers: #'__LINE__'. (self context: thisCtx hasSender: aContextOrNil) ifTrue: ["Need to walk the stack freeing stack pages and nilling contexts." [currentCtx = aContextOrNil or: [currentCtx = objectMemory nilObject]] whileFalse: [self assert: (objectMemory isContext: currentCtx). (self isMarriedOrWidowedContext: currentCtx) ifTrue: [theFP := self frameOfMarriedContext: currentCtx. thePage := stackPages stackPageFor: theFP. "If externalEnsureIsBaseFrame: above has moved thisContext to its own stack then we will always terminate to a frame on a different page. But if we are terminating some other context to a context somewhere on the current page we must save the active frames above that context. Things will look e.g. like this: thisCtx 499383332 s MethodContext(ContextPart)>resume: 499380484 s BlockClosure>ensure: 499377320 s MethodContext(ContextPart)>handleSignal: 499373760 s MethodContext(ContextPart)>handleSignal: 499372772 s MessageNotUnderstood(Exception)>signal 499369068 s CodeSimulationTests(Object)>doesNotUnderstand: absentMethod 499368708 s [] in CodeSimulationTests>testDNU (sender is 0xbffc2480 I CodeSimulationTests>runSimulated:) ------------ framePointer 0xbffc234c M MethodContext(ContextPart)>doPrimitive:method:receiver:args: 0xbffc2378 M MethodContext(ContextPart)>tryPrimitiveFor:receiver:args: 0xbffc23ac M MethodContext(ContextPart)>send:to:with:super: 0xbffc23e4 M MethodContext(ContextPart)>send:super:numArgs: 0xbffc2418 M MethodContext(InstructionStream)>interpretNextInstructionFor: 0xbffc2434 M MethodContext(ContextPart)>step 0xbffc2458 I MethodContext(ContextPart)>runSimulated:contextAtEachStep: ------------ (499368708's sender) 0xbffc2480 I CodeSimulationTests>runSimulated: 0xbffc249c M CodeSimulationTests>testDNU 0xbffc24bc I CodeSimulationTests(TestCase)>performTest 0xbffc24dc I [] in CodeSimulationTests(TestCase)>runCase aContextOrNil 0xbffc24fc M BlockClosure>ensure: 0xbffc2520 I CodeSimulationTests(TestCase)>runCase 0xbffc253c M [] in TestResult>runCase: When we find this case we move the frames above to a new page by making the frame above currentCtx a base frame, i.e. making 0xbffc2458 in the above example a base frame. But in this iteration of the loop we don't move down a frame i.e. currentCtx doesn't change on this iteration." thePage = stackPage ifTrue: [frameAbove := self findFrameAbove: theFP inPage: thePage. self assert: frameAbove ~= 0. frameAbove := self externalEnsureIsBaseFrame: frameAbove. "May cause a GC!!!! May also reclaim aContextOrNil's page, hence..." (aContextOrNil ~= objectMemory nilObject and: [self isStillMarriedContext: aContextOrNil]) ifTrue: [contextsFP := self frameOfMarriedContext: aContextOrNil. pageToStopOn := stackPages stackPageFor: contextsFP] ifFalse: [pageToStopOn := 0]] ifFalse: [thePage = pageToStopOn ifTrue: ["We're here. Cut back the stack to aContextOrNil's frame, push its instructionPointer if it's not already a head frame, and we're done." frameAbove := self findFrameAbove: contextsFP inPage: thePage. frameAbove ~= 0 ifTrue: [contextsSP := (self frameCallerSP: frameAbove) - BytesPerWord. stackPages longAt: contextsSP put: (self frameCallerSavedIP: frameAbove). self setHeadFP: contextsFP andSP: contextsSP inPage: thePage]. currentCtx := aContextOrNil] ifFalse: ["We can free the entire page without further ado." currentCtx := self frameCallerContext: thePage baseFP. "for a short time invariant is violated; assert follows" stackPages freeStackPageNoAssert: thePage]]] ifFalse: [nextCntx := objectMemory fetchPointer: SenderIndex ofObject: currentCtx. self markContextAsDead: currentCtx. currentCtx := nextCntx]]]. self assert: stackPages pageListIsWellFormed. (self isMarriedOrWidowedContext: thisCtx) ifTrue: [self assert: (self checkIsStillMarriedContext: thisCtx currentFP: framePointer). self assert: (self isBaseFrame: (self frameOfMarriedContext: thisCtx)). theFP := self frameOfMarriedContext: thisCtx. self frameCallerContext: theFP put: aContextOrNil] + ifFalse: + [objectMemory storePointer: SenderIndex ofObject: thisCtx withValue: aContextOrNil]. - ifFalse: [objectMemory storePointer: SenderIndex ofObject: thisCtx withValue: aContextOrNil]. self pop: 1. + self assertValidStackedInstructionPointers: #'__LINE__'. self assert: stackPage = stackPages mostRecentlyUsedPage! Item was changed: ----- Method: CogIA32Compiler>>relocateCallBeforeReturnPC:by: (in category 'inline cacheing') ----- relocateCallBeforeReturnPC: retpc by: delta | distance | delta ~= 0 ifTrue: [distance := ((objectMemory byteAt: retpc - 1) << 24) + ((objectMemory byteAt: retpc - 2) << 16) + ((objectMemory byteAt: retpc - 3) << 8) + (objectMemory byteAt: retpc - 4). distance := distance + delta. objectMemory byteAt: retpc - 1 put: (distance >> 24 bitAnd: 16rFF); byteAt: retpc - 2 put: (distance >> 16 bitAnd: 16rFF); byteAt: retpc - 3 put: (distance >> 8 bitAnd: 16rFF); byteAt: retpc - 4 put: (distance bitAnd: 16rFF). + (self asserta: (self callTargetFromReturnAddress: retpc) >= cogit minCallAddress) ifFalse: + [self error: 'relocating call to invalid address']]! - false - ifTrue: [self assert: (self callTargetFromReturnAddress: retpc) signedIntToLong >= cogit minCallAddress] - ifFalse: [(self callTargetFromReturnAddress: retpc) signedIntToLong >= cogit minCallAddress ifFalse: - [self error: 'relocating call to invalid address']]]! Item was changed: ----- Method: StackInterpreter>>findClassOfMethod:forReceiver: (in category 'debug support') ----- findClassOfMethod: meth forReceiver: rcvr | rclass | (objectMemory addressCouldBeOop: rcvr) ifTrue: [rclass := objectMemory fetchClassOf: rcvr. (self addressCouldBeClassObj: rclass) ifTrue: [rclass := self findClassContainingMethod: meth startingAt: rclass. rclass ~= objectMemory nilObject ifTrue: [^rclass]]]. + ((objectMemory addressCouldBeObj: meth) + and: [self isCompiledMethod: meth]) ifFalse: - (objectMemory addressCouldBeObj: meth) ifFalse: [^objectMemory nilObject]. ^self findClassContainingMethod: meth startingAt: (self methodClassOf: meth)!

1 0

LD_LIBRARY_PATH woes on a 32 bit Debian machine
by Frank Shearar 24 Jul '13

24 Jul '13

This is from a failed job on Tony Garnock-Jones' build slave. It's a Debian of some kind, 32 bit. Can't infer base LD_LIBRARY_PATH. Aborting. Try adding a line for /lib/i386-linux-gnu/i686/cmov/libc.so.6 (0xb7582000) to /home/tonyg/jenkins/workspace/ExternalPackages-Metacello/target/cogmt.r2749/cogmtlinux/bin/squeak. Please report your edit to squeak vm-dev. frank

3 4

[commit][2755] Update the unix launch scripts with yet another LD_LIBRARY_PATH entry.
by commits＠squeakvm.org 24 Jul '13

24 Jul '13

Revision: 2755 Author: eliot Date: 2013-07-24 10:31:47 -0700 (Wed, 24 Jul 2013) Log Message: ----------- Update the unix launch scripts with yet another LD_LIBRARY_PATH entry. Modified Paths: -------------- branches/Cog/platforms/unix/config/bin.squeak.sh.in branches/Cog/platforms/unix/config/squeak.sh.in Modified: branches/Cog/platforms/unix/config/bin.squeak.sh.in =================================================================== --- branches/Cog/platforms/unix/config/bin.squeak.sh.in 2013-07-24 00:31:56 UTC (rev 2754) +++ branches/Cog/platforms/unix/config/bin.squeak.sh.in 2013-07-24 17:31:47 UTC (rev 2755) @@ -14,7 +14,7 @@ # libc (e.g. through the FFI) then it must use the same version that the VM uses # and so it should take precedence over /lib libc. This is done by setting # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM. -LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> //'`" +LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> $[^ ]*$.*/\1/'`" case "$LIBC_SO" in /lib/libc*) SVMLLP="/lib:/usr/lib";; /lib32/libc*) SVMLLP="/lib32:/usr/lib32";; @@ -22,10 +22,12 @@ /lib/tls/libc*) SVMLLP="/lib/tls:/lib:/usr/lib/tls:/usr/lib";; /lib/i386-linux-gnu/libc*) \ SVMLLP="/lib/i386-linux-gnu:/lib:/usr/lib/i386-linux-gnu:/usr/lib";; +/lib/i386-linux-gnu/i686/cmov/libc*) \ + SVMLLP="/lib/i386-linux-gnu/i686/cmov:/lib:/usr/lib/i386-linux-gnu/i686/cmov:/usr/lib";; +/lib/386-linux-gnu/i686/cmov/libc*) \ + SVMLLP="/lib/386-linux-gnu/i686/cmov:/lib:/usr/lib/386-linux-gnu/i686/cmov:/usr/lib";; /lib/tls/i686/cmov/libc*) \ SVMLLP="/lib/tls/i686/cmov:/lib:/usr/lib/tls/i686/cmov:/usr/lib";; -/lib/386-linux-gnu/i686/cmov/libc*) \ - SVMLLP="/lib/386-linux-gnu/i686/cmov:/lib:/usr/lib/386-linux-gnu/i686/cmov:/usr/lib";; /lib/tls/i686/nosegneg/libc*) \ SVMLLP="/lib/i686/nosegneg/tls:/lib:/usr/lib/i686/nosegneg/tls:/usr/lib";; "") case `/bin/uname -m || /usr/bin/uname -m` in Modified: branches/Cog/platforms/unix/config/squeak.sh.in =================================================================== --- branches/Cog/platforms/unix/config/squeak.sh.in 2013-07-24 00:31:56 UTC (rev 2754) +++ branches/Cog/platforms/unix/config/squeak.sh.in 2013-07-24 17:31:47 UTC (rev 2755) @@ -14,7 +14,7 @@ # libc (e.g. through the FFI) then it must use the same version that the VM uses # and so it should take precedence over /lib libc. This is done by setting # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM. -LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> //'`" +LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> $[^ ]*$.*/\1/'`" case "$LIBC_SO" in /lib/libc*) SVMLLP="/lib:/usr/lib";; /lib32/libc*) SVMLLP="/lib32:/usr/lib32";; @@ -22,10 +22,12 @@ /lib/tls/libc*) SVMLLP="/lib/tls:/lib:/usr/lib/tls:/usr/lib";; /lib/i386-linux-gnu/libc*) \ SVMLLP="/lib/i386-linux-gnu:/lib:/usr/lib/i386-linux-gnu:/usr/lib";; +/lib/i386-linux-gnu/i686/cmov/libc*) \ + SVMLLP="/lib/i386-linux-gnu/i686/cmov:/lib:/usr/lib/i386-linux-gnu/i686/cmov:/usr/lib";; +/lib/386-linux-gnu/i686/cmov/libc*) \ + SVMLLP="/lib/386-linux-gnu/i686/cmov:/lib:/usr/lib/386-linux-gnu/i686/cmov:/usr/lib";; /lib/tls/i686/cmov/libc*) \ SVMLLP="/lib/tls/i686/cmov:/lib:/usr/lib/tls/i686/cmov:/usr/lib";; -/lib/386-linux-gnu/i686/cmov/libc*) \ - SVMLLP="/lib/386-linux-gnu/i686/cmov:/lib:/usr/lib/386-linux-gnu/i686/cmov:/usr/lib";; /lib/tls/i686/nosegneg/libc*) \ SVMLLP="/lib/i686/nosegneg/tls:/lib:/usr/lib/i686/nosegneg/tls:/usr/lib";; "") case `/bin/uname -m || /usr/bin/uname -m` in

1 0

[commit][2754] CogVM source as per VMMaker.oscog-eem.308
by commits＠squeakvm.org 24 Jul '13

24 Jul '13

Revision: 2754 Author: eliot Date: 2013-07-23 17:31:56 -0700 (Tue, 23 Jul 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.308 Add an assert that checks all the instructionPointers in all stack pages. Use the assert in code compaction. (tracking down a rare crash at Cadence). Beef up the assertValidExecutionPointe:r:s:imbar:line: assert for interpreted frames (i.e. check savedIP if pc is ceRetrnToInterpreter) Freshen the translation of some of the VM plugins (for loop limit issue). Add new run & single-step prims to the processor sumlator plugins so access to memory past freeStart can be checked if needed. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.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/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 from - BalloonEnginePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + BalloonEnginePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 " __DATE__ ; @@ -835,9 +835,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.235 (i)" + "B2DPlugin VMMaker.oscog-eem.307 (i)" #else - "B2DPlugin VMMaker.oscog-eem.235 (e)" + "B2DPlugin VMMaker.oscog-eem.307 (e)" #endif ; static int* objBuffer; @@ -7188,13 +7188,14 @@ sqInt bmWidth; sqInt formOop; sqInt i; + sqInt iLimiT; sqInt ppw; if (!(isArray(arrayOop))) { return 0; } formArray = arrayOop; - for (i = 0; i <= ((slotSizeOf(formArray)) - 1); i += 1) { + for (i = 0, iLimiT = ((slotSizeOf(formArray)) - 1); i <= iLimiT; i += 1) { formOop = fetchPointerofObject(i, formArray); if (isIntegerObject(formOop)) { return 0; Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 from - FilePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + FilePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 " __DATE__ ; @@ -176,9 +176,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.235 (i)" + "FilePlugin VMMaker.oscog-eem.307 (i)" #else - "FilePlugin VMMaker.oscog-eem.235 (e)" + "FilePlugin VMMaker.oscog-eem.307 (e)" #endif ; static void * sCCPfn; @@ -1077,10 +1077,9 @@ primitiveFileWrite(void) { sqInt array; - char *arrayIndex; - size_t byteSize; sqInt bytesWritten; size_t count; + size_t elementSize; SQFile *file; sqInt objectPointer; size_t startIndex; @@ -1098,29 +1097,21 @@ } file = firstIndexableField(objectPointer); l1: /* end fileValueOf: */; - if (!(isWordsOrBytes(array))) { - return primitiveFail(); + if ((failed()) + || (!(isWordsOrBytes(array)))) { + return primitiveFailFor(PrimErrBadArgument); } - if (isWords(array)) { - byteSize = 4; - } - else { - byteSize = 1; - } + elementSize = (isWords(array) + ? 4 + : 1); if (!((startIndex >= 1) && (((startIndex + count) - 1) <= (slotSizeOf(array))))) { - return primitiveFail(); + return primitiveFailFor(PrimErrBadIndex); } + bytesWritten = sqFileWriteFromAt(file, count * elementSize, ((char *) (firstIndexableField(array))), (startIndex - 1) * elementSize); if (!(failed())) { - - /* Note: adjust startIndex for zero-origin indexing */ - - arrayIndex = firstIndexableField(array); - bytesWritten = sqFileWriteFromAt(file, count * byteSize, arrayIndex, (startIndex - 1) * byteSize); + popthenPush(5, integerObjectOf(bytesWritten / elementSize)); } - if (!(failed())) { - popthenPush(5, integerObjectOf(bytesWritten / byteSize)); - } } EXPORT(sqInt) Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 from - LargeIntegersPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + LargeIntegersPlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 " __DATE__ ; @@ -175,9 +175,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.246 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.307 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.246 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.307 (e)" #endif ; static const int orOpIndex = 1; @@ -264,6 +264,7 @@ { sqInt class; sqInt ix; + sqInt ixLimiT; sqInt newBytes; unsigned char * pByte; sqInt val; @@ -279,7 +280,7 @@ newBytes = instantiateClassindexableSize(class, len); /* begin cCopyIntVal:toBytes: */ pByte = firstIndexableField(newBytes); - for (ix = 1; ix <= (cDigitLengthOfCSI(val)); ix += 1) { + for (ix = 1, ixLimiT = (cDigitLengthOfCSI(val)); ix <= ixLimiT; ix += 1) { pByte[ix - 1] = (cDigitOfCSIat(val, ix)); } } @@ -638,10 +639,11 @@ cCopyIntValtoBytes(sqInt val, sqInt bytes) { sqInt ix; + sqInt ixLimiT; unsigned char * pByte; pByte = firstIndexableField(bytes); - for (ix = 1; ix <= (cDigitLengthOfCSI(val)); ix += 1) { + for (ix = 1, ixLimiT = (cDigitLengthOfCSI(val)); ix <= ixLimiT; ix += 1) { pByte[ix - 1] = (cDigitOfCSIat(val, ix)); } } Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,13 +1,13 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + VMPluginCodeGenerator VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 from - MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + MiscPrimitivePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795 ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195\n\ +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9\n\ Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795\n\ ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ @@ -95,9 +95,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin VMMaker.oscog-eem.248 (i)" + "MiscPrimitivePlugin VMMaker.oscog-eem.307 (i)" #else - "MiscPrimitivePlugin VMMaker.oscog-eem.248 (e)" + "MiscPrimitivePlugin VMMaker.oscog-eem.307 (e)" #endif ; @@ -761,6 +761,7 @@ sqInt rcvr; sqInt start; sqInt startIndex; + sqInt startIndexLimiT; rcvr = stackValue(4); if (!(isBytes(stackValue(3)))) { @@ -790,7 +791,7 @@ pushInteger(0); return null; } - for (startIndex = start; startIndex <= (((sizeOfSTArrayFromCPrimitive(body + 1)) - (sizeOfSTArrayFromCPrimitive(key + 1))) + 1); startIndex += 1) { + for (startIndex = start, startIndexLimiT = (((sizeOfSTArrayFromCPrimitive(body + 1)) - (sizeOfSTArrayFromCPrimitive(key + 1))) + 1); startIndex <= startIndexLimiT; startIndex += 1) { index = 1; while ((matchTable[(asciiValue(body[(startIndex + index) - 1])) + 1]) == (matchTable[(asciiValue(key[index])) + 1])) { if (index == (sizeOfSTArrayFromCPrimitive(key + 1))) { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 from - CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -366,6 +366,8 @@ void assertValidExecutionPointers(usqInt lip, char *lifp, char *lisp); static void assertValidExecutionPointersimbarline(usqInt lip, char *lifp, char *lisp, sqInt inInterpreter, sqInt ln); void assertValidMachineCodeFrame(sqInt instrPtr); +static sqInt assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln); +static void assertValidStackedInstructionPointers(sqInt ln); static void assertValidStackLimits(sqInt ln); static void attemptToSwitchToMachineCode(sqInt bcpc); sqInt becomewith(sqInt array1, sqInt array2); @@ -1976,7 +1978,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.306"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.308"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13402,6 +13404,7 @@ CogMethod *cogMethod; sqInt methodField; sqInt methodField1; + sqInt savedIP; assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); @@ -13419,7 +13422,12 @@ if ((assertal((((usqInt)methodField)) > (startOfMemory()), ln)) && (assertal((((usqInt)methodField)) < (freeStart()), ln))) { - if (lip != (ceReturnToInterpreterPC())) { + if (lip == (ceReturnToInterpreterPC())) { + savedIP = longAt(lifp + FoxIFSavedIP); + assertl((savedIP >= (((methodField + (lastPointerOf(methodField))) + BaseHeaderSize) - 1)) + && (savedIP < ((methodField + (byteLengthOf(methodField))) + BaseHeaderSize)), ln); + } + else { assertl((lip >= (((methodField + (lastPointerOf(methodField))) + BaseHeaderSize) - 1)) && (lip < ((methodField + (byteLengthOf(methodField))) + BaseHeaderSize)), ln); } @@ -13478,6 +13486,88 @@ } +/* Check that the stacked instruction pointers in the given page are correct. + Checks the interpreter sender/machine code callee contract. */ + +static sqInt +assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln) +{ + char *callerFP; + sqInt methodField; + sqInt methodObj; + sqInt prevFrameWasCogged; + char *theFP; + usqInt theIP; + char *theIPPtr; + CogMethod *theMethod; + + if (!(assertal(!(isFree(aStackPage)), ln))) { + return 0; + } + prevFrameWasCogged = 0; + theIPPtr = (aStackPage->headSP); + theFP = (aStackPage->headFP); + while (1) { + if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { + /* begin mframeHomeMethod: */ + methodField = longAt(theFP + FoxMethod); + if ((methodField & MFMethodFlagIsBlockFlag) != 0) { + theMethod = cmHomeMethod(((CogBlockMethod *) (methodField & MFMethodMask))); + goto l1; + } + theMethod = ((CogMethod *) (methodField & MFMethodMask)); + l1: /* end mframeHomeMethod: */; + theIP = ((usqInt)(longAt(theIPPtr))); + assertl((theIP == (ceCannotResumePC())) + || (asserta((theIP >= (((usqInt)theMethod))) + && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); + prevFrameWasCogged = 1; + } + else { + + /* assert-check the interpreter frame. */ + + theIP = ((usqInt)(longAt(theIPPtr))); + /* begin iframeMethod: */ + methodObj = ((usqInt) (longAt(theFP + FoxMethod))); + if (prevFrameWasCogged) { + assertl(theIP == (ceReturnToInterpreterPC()), ln); + } + if (theIP == (ceReturnToInterpreterPC())) { + theIP = longAt(theFP + FoxIFSavedIP); + } + assertl((theIP >= (((methodObj + (lastPointerOf(methodObj))) + BaseHeaderSize) - 1)) + && (theIP < ((methodObj + (byteLengthOf(methodObj))) + BaseHeaderSize)), ln); + prevFrameWasCogged = 0; + } + if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; + theIPPtr = theFP + FoxCallerSavedIP; + theFP = callerFP; + } + return 1; +} + + +/* Check that the stacked instruction pointers in all pages are correct. + Checks the interpreter sender/machine code callee contract. + Written so it will be optimized away if not in an assert VM. */ + +static void +assertValidStackedInstructionPointers(sqInt ln) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt i; + StackPage *thePage; + + for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + /* begin stackPageAt: */ + thePage = stackPageAtpages(i, GIV(pages)); + if (!(isFree(thePage))) { + assertl(assertValidStackedInstructionPointersInline(thePage, ln), ln); + } + } +} + + /* Order in the stackLimit checks is important because stackLimit is smashed by interrupts. So always check for unsmashed value first to avoid race condition. @@ -14332,6 +14422,7 @@ char *sp1; char *sp2; char *sp3; + char *theFP; StackPage *thePage; sqInt value; @@ -14381,13 +14472,14 @@ Make the interior frame the top frame. */ /* begin findFrameAbove:inPage: */ + theFP = GIV(framePointer); fp = (thePage->headFP); - if (fp == GIV(framePointer)) { + if (fp == theFP) { frameAbove = 0; goto l1; } while (((callerFP = frameCallerFP(fp))) != 0) { - if (callerFP == GIV(framePointer)) { + if (callerFP == theFP) { frameAbove = fp; goto l1; } @@ -17485,7 +17577,9 @@ && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); (GIV(stackPage)->headSP = GIV(stackPointer)); } + assertValidStackedInstructionPointers(__LINE__); compactCogCompiledCode(); + assertValidStackedInstructionPointers(__LINE__); if (GIV(instructionPointer) != 0) { /* begin popStack */ top = longAt(GIV(stackPointer)); @@ -19659,7 +19753,6 @@ /* begin reverseBytesFrom:to: */ startAddr = startOfMemory(); stopAddr1 = freeStart(); - flag("Dan"); addr = startAddr; while ((((usqInt) addr)) < (((usqInt) stopAddr1))) { longAtput(addr, byteSwapped(longAt(addr))); @@ -19693,7 +19786,6 @@ } /* begin reverseBytesFrom:to: */ stopAddr11 = oop1 + (sizeBitsOf(oop1)); - flag("Dan"); addr2 = wordAddr; while ((((usqInt) addr2)) < (((usqInt) stopAddr11))) { longAtput(addr2, byteSwapped(longAt(addr2))); @@ -25548,7 +25640,6 @@ /* Not readable -- try again with reversed bytes... */ /* begin reverseBytesFrom:to: */ - flag("Dan"); addr1 = segmentWordArray + BaseHeaderSize; while ((((usqInt) addr1)) < (((usqInt) (endSeg + BytesPerWord)))) { longAtput(addr1, byteSwapped(longAt(addr1))); @@ -25566,7 +25657,6 @@ /* Still NG -- put things back and fail */ /* begin reverseBytesFrom:to: */ - flag("Dan"); addr = segmentWordArray + BaseHeaderSize; while ((((usqInt) addr)) < (((usqInt) (endSeg + BytesPerWord)))) { longAtput(addr, byteSwapped(longAt(addr))); @@ -25652,7 +25742,6 @@ } /* begin reverseBytesFrom:to: */ stopAddr1 = oop1 + (sizeBitsOf(oop1)); - flag("Dan"); addr2 = wordAddr; while ((((usqInt) addr2)) < (((usqInt) stopAddr1))) { longAtput(addr2, byteSwapped(longAt(addr2))); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 from - CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -369,6 +369,8 @@ void assertValidExecutionPointers(usqInt lip, char *lifp, char *lisp); static void assertValidExecutionPointersimbarline(usqInt lip, char *lifp, char *lisp, sqInt inInterpreter, sqInt ln); void assertValidMachineCodeFrame(sqInt instrPtr); +static sqInt assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln); +static void assertValidStackedInstructionPointers(sqInt ln); static void assertValidStackLimits(sqInt ln); static void attemptToSwitchToMachineCode(sqInt bcpc); sqInt becomewith(sqInt array1, sqInt array2); @@ -1979,7 +1981,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.306"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.308"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13411,6 +13413,7 @@ CogMethod *cogMethod; sqInt methodField; sqInt methodField1; + sqInt savedIP; assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); @@ -13428,7 +13431,12 @@ if ((assertal((((usqInt)methodField)) > (startOfMemory()), ln)) && (assertal((((usqInt)methodField)) < (freeStart()), ln))) { - if (lip != (ceReturnToInterpreterPC())) { + if (lip == (ceReturnToInterpreterPC())) { + savedIP = longAt(lifp + FoxIFSavedIP); + assertl((savedIP >= (((methodField + (lastPointerOf(methodField))) + BaseHeaderSize) - 1)) + && (savedIP < ((methodField + (byteLengthOf(methodField))) + BaseHeaderSize)), ln); + } + else { assertl((lip >= (((methodField + (lastPointerOf(methodField))) + BaseHeaderSize) - 1)) && (lip < ((methodField + (byteLengthOf(methodField))) + BaseHeaderSize)), ln); } @@ -13487,6 +13495,88 @@ } +/* Check that the stacked instruction pointers in the given page are correct. + Checks the interpreter sender/machine code callee contract. */ + +static sqInt +assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln) +{ + char *callerFP; + sqInt methodField; + sqInt methodObj; + sqInt prevFrameWasCogged; + char *theFP; + usqInt theIP; + char *theIPPtr; + CogMethod *theMethod; + + if (!(assertal(!(isFree(aStackPage)), ln))) { + return 0; + } + prevFrameWasCogged = 0; + theIPPtr = (aStackPage->headSP); + theFP = (aStackPage->headFP); + while (1) { + if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { + /* begin mframeHomeMethod: */ + methodField = longAt(theFP + FoxMethod); + if ((methodField & MFMethodFlagIsBlockFlag) != 0) { + theMethod = cmHomeMethod(((CogBlockMethod *) (methodField & MFMethodMask))); + goto l1; + } + theMethod = ((CogMethod *) (methodField & MFMethodMask)); + l1: /* end mframeHomeMethod: */; + theIP = ((usqInt)(longAt(theIPPtr))); + assertl((theIP == (ceCannotResumePC())) + || (asserta((theIP >= (((usqInt)theMethod))) + && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); + prevFrameWasCogged = 1; + } + else { + + /* assert-check the interpreter frame. */ + + theIP = ((usqInt)(longAt(theIPPtr))); + /* begin iframeMethod: */ + methodObj = ((usqInt) (longAt(theFP + FoxMethod))); + if (prevFrameWasCogged) { + assertl(theIP == (ceReturnToInterpreterPC()), ln); + } + if (theIP == (ceReturnToInterpreterPC())) { + theIP = longAt(theFP + FoxIFSavedIP); + } + assertl((theIP >= (((methodObj + (lastPointerOf(methodObj))) + BaseHeaderSize) - 1)) + && (theIP < ((methodObj + (byteLengthOf(methodObj))) + BaseHeaderSize)), ln); + prevFrameWasCogged = 0; + } + if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; + theIPPtr = theFP + FoxCallerSavedIP; + theFP = callerFP; + } + return 1; +} + + +/* Check that the stacked instruction pointers in all pages are correct. + Checks the interpreter sender/machine code callee contract. + Written so it will be optimized away if not in an assert VM. */ + +static void +assertValidStackedInstructionPointers(sqInt ln) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt i; + StackPage *thePage; + + for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + /* begin stackPageAt: */ + thePage = stackPageAtpages(i, GIV(pages)); + if (!(isFree(thePage))) { + assertl(assertValidStackedInstructionPointersInline(thePage, ln), ln); + } + } +} + + /* Order in the stackLimit checks is important because stackLimit is smashed by interrupts. So always check for unsmashed value first to avoid race condition. @@ -14341,6 +14431,7 @@ char *sp1; char *sp2; char *sp3; + char *theFP; StackPage *thePage; sqInt value; @@ -14390,13 +14481,14 @@ Make the interior frame the top frame. */ /* begin findFrameAbove:inPage: */ + theFP = GIV(framePointer); fp = (thePage->headFP); - if (fp == GIV(framePointer)) { + if (fp == theFP) { frameAbove = 0; goto l1; } while (((callerFP = frameCallerFP(fp))) != 0) { - if (callerFP == GIV(framePointer)) { + if (callerFP == theFP) { frameAbove = fp; goto l1; } @@ -17494,7 +17586,9 @@ && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); (GIV(stackPage)->headSP = GIV(stackPointer)); } + assertValidStackedInstructionPointers(__LINE__); compactCogCompiledCode(); + assertValidStackedInstructionPointers(__LINE__); if (GIV(instructionPointer) != 0) { /* begin popStack */ top = longAt(GIV(stackPointer)); @@ -19668,7 +19762,6 @@ /* begin reverseBytesFrom:to: */ startAddr = startOfMemory(); stopAddr1 = freeStart(); - flag("Dan"); addr = startAddr; while ((((usqInt) addr)) < (((usqInt) stopAddr1))) { longAtput(addr, byteSwapped(longAt(addr))); @@ -19702,7 +19795,6 @@ } /* begin reverseBytesFrom:to: */ stopAddr11 = oop1 + (sizeBitsOf(oop1)); - flag("Dan"); addr2 = wordAddr; while ((((usqInt) addr2)) < (((usqInt) stopAddr11))) { longAtput(addr2, byteSwapped(longAt(addr2))); @@ -25557,7 +25649,6 @@ /* Not readable -- try again with reversed bytes... */ /* begin reverseBytesFrom:to: */ - flag("Dan"); addr1 = segmentWordArray + BaseHeaderSize; while ((((usqInt) addr1)) < (((usqInt) (endSeg + BytesPerWord)))) { longAtput(addr1, byteSwapped(longAt(addr1))); @@ -25575,7 +25666,6 @@ /* Still NG -- put things back and fail */ /* begin reverseBytesFrom:to: */ - flag("Dan"); addr = segmentWordArray + BaseHeaderSize; while ((((usqInt) addr)) < (((usqInt) (endSeg + BytesPerWord)))) { longAtput(addr, byteSwapped(longAt(addr))); @@ -25661,7 +25751,6 @@ } /* begin reverseBytesFrom:to: */ stopAddr1 = oop1 + (sizeBitsOf(oop1)); - flag("Dan"); addr2 = wordAddr; while ((((usqInt) addr2)) < (((usqInt) stopAddr1))) { longAtput(addr2, byteSwapped(longAt(addr2))); Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/nscogsrc/vm/interp.h 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jul 18 12:44:57 PDT 2013 + Tue Jul 23 17:29:18 PDT 2013 Modified: branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 from - BalloonEnginePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + BalloonEnginePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 " __DATE__ ; @@ -835,9 +835,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.235 (i)" + "B2DPlugin VMMaker.oscog-eem.307 (i)" #else - "B2DPlugin VMMaker.oscog-eem.235 (e)" + "B2DPlugin VMMaker.oscog-eem.307 (e)" #endif ; static int* objBuffer; @@ -7188,13 +7188,14 @@ sqInt bmWidth; sqInt formOop; sqInt i; + sqInt iLimiT; sqInt ppw; if (!(isArray(arrayOop))) { return 0; } formArray = arrayOop; - for (i = 0; i <= ((slotSizeOf(formArray)) - 1); i += 1) { + for (i = 0, iLimiT = ((slotSizeOf(formArray)) - 1); i <= iLimiT; i += 1) { formOop = fetchPointerofObject(i, formArray); if (isIntegerObject(formOop)) { return 0; Modified: branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c =================================================================== --- branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,9 +1,12 @@ -/* Automatically generated from Squeak on {14 December 2012 . 1:58:06 pm} */ +/* Automatically generated by + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 + from + BochsIA32Plugin Cog-eem.61 uuid: 3dba03de-7a41-4da2-bdf4-d8276f5665da + */ +static char __buildInfo[] = "BochsIA32Plugin Cog-eem.61 uuid: 3dba03de-7a41-4da2-bdf4-d8276f5665da " __DATE__ ; -static char __buildInfo[] = "Generated on {14 December 2012 . 1:58:06 pm}. Compiled on "__DATE__ ; - #include <math.h> #include <stdio.h> #include <stdlib.h> @@ -54,7 +57,9 @@ EXPORT(sqInt) primitiveFlushICacheFromTo(void); EXPORT(sqInt) primitiveNewCPU(void); EXPORT(sqInt) primitiveResetCPU(void); +EXPORT(sqInt) primitiveRunInMemoryMinAddressMaxAddressReadWrite(void); EXPORT(sqInt) primitiveRunInMemoryMinimumAddressReadWrite(void); +EXPORT(sqInt) primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite(void); EXPORT(sqInt) primitiveSingleStepInMemoryMinimumAddressReadWrite(void); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); static sqInt sizeField(sqInt rcvr); @@ -116,9 +121,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BochsIA32Plugin 14 December 2012 (i)" + "BochsIA32Plugin Cog-eem.61 (i)" #else - "BochsIA32Plugin 14 December 2012 (e)" + "BochsIA32Plugin Cog-eem.61 (e)" #endif ; @@ -352,12 +357,68 @@ /* <Bitmap|ByteArray|WordArray> */ /* <Integer> */ /* <Integer> */ +/* <Integer> */ /* Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception. */ EXPORT(sqInt) +primitiveRunInMemoryMinAddressMaxAddressReadWrite(void) +{ + void *cpu; + sqInt cpuAlien; + unsigned long maxAddress; + sqInt maybeErr; + char *memory; + sqInt memorySize; + unsigned long minAddress; + unsigned long minWriteMaxExecAddress; + + success(isWordsOrBytes(stackValue(3))); + memory = ((char *) (firstIndexableField(stackValue(3)))); + minAddress = positive32BitValueOf(stackValue(2)); + maxAddress = positive32BitValueOf(stackValue(1)); + minWriteMaxExecAddress = positive32BitValueOf(stackValue(0)); + cpuAlien = stackValue(4); + if (failed()) { + return null; + } + if (((cpu = ((longAt(cpuAlien + BaseHeaderSize)) > 0 + ? (cpuAlien + BaseHeaderSize) + BytesPerOop + : longAt((cpuAlien + BaseHeaderSize) + BytesPerOop)))) == 0) { + primitiveFailFor(PrimErrBadReceiver); + return null; + } + prevInterruptCheckChain = setInterruptCheckChain(forceStopOnInterrupt); + if (prevInterruptCheckChain == (forceStopOnInterrupt)) { + prevInterruptCheckChain == 0; + } + memorySize = byteSizeOf(((sqInt)(long)(memory) - 4)); + maybeErr = runCPUInSizeMinAddressReadWrite(cpu, memory, ((memorySize < maxAddress) ? memorySize : maxAddress), minAddress, minWriteMaxExecAddress); + setInterruptCheckChain(prevInterruptCheckChain); + if (maybeErr != 0) { + primitiveFailFor(PrimErrInappropriate); + return null; + } + if (failed()) { + return null; + } + popthenPush(5, cpuAlien); + return null; +} + + +/* cpuAlien <BochsIA32Alien> */ +/* <Bitmap|ByteArray|WordArray> */ +/* <Integer> */ +/* <Integer> */ +/* Run the cpu using the first argument as the memory and the following + arguments defining valid addresses, running until it halts or hits an + exception. + */ + +EXPORT(sqInt) primitiveRunInMemoryMinimumAddressReadWrite(void) { void *cpu; @@ -403,11 +464,61 @@ /* <Bitmap|ByteArray|WordArray> */ /* <Integer> */ /* <Integer> */ +/* <Integer> */ /* Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses. */ EXPORT(sqInt) +primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite(void) +{ + void *cpu; + sqInt cpuAlien; + unsigned long maxAddress; + sqInt maybeErr; + char *memory; + sqInt memorySize; + unsigned long minAddress; + unsigned long minWriteMaxExecAddress; + + success(isWordsOrBytes(stackValue(3))); + memory = ((char *) (firstIndexableField(stackValue(3)))); + minAddress = positive32BitValueOf(stackValue(2)); + maxAddress = positive32BitValueOf(stackValue(1)); + minWriteMaxExecAddress = positive32BitValueOf(stackValue(0)); + cpuAlien = stackValue(4); + if (failed()) { + return null; + } + if (((cpu = ((longAt(cpuAlien + BaseHeaderSize)) > 0 + ? (cpuAlien + BaseHeaderSize) + BytesPerOop + : longAt((cpuAlien + BaseHeaderSize) + BytesPerOop)))) == 0) { + primitiveFailFor(PrimErrBadReceiver); + return null; + } + memorySize = byteSizeOf(((sqInt)(long)(memory) - 4)); + maybeErr = singleStepCPUInSizeMinAddressReadWrite(cpu, memory, ((memorySize < maxAddress) ? memorySize : maxAddress), minAddress, minWriteMaxExecAddress); + if (maybeErr != 0) { + primitiveFailFor(PrimErrInappropriate); + return null; + } + if (failed()) { + return null; + } + popthenPush(5, cpuAlien); + return null; +} + + +/* cpuAlien <BochsIA32Alien> */ +/* <Bitmap|ByteArray|WordArray> */ +/* <Integer> */ +/* <Integer> */ +/* Single-step the cpu using the first argument as the memory and the + following arguments defining valid addresses. + */ + +EXPORT(sqInt) primitiveSingleStepInMemoryMinimumAddressReadWrite(void) { void *cpu; @@ -525,7 +636,9 @@ {"BochsIA32Plugin", "primitiveFlushICacheFromTo", (void*)primitiveFlushICacheFromTo}, {"BochsIA32Plugin", "primitiveNewCPU", (void*)primitiveNewCPU}, {"BochsIA32Plugin", "primitiveResetCPU", (void*)primitiveResetCPU}, + {"BochsIA32Plugin", "primitiveRunInMemoryMinAddressMaxAddressReadWrite", (void*)primitiveRunInMemoryMinAddressMaxAddressReadWrite}, {"BochsIA32Plugin", "primitiveRunInMemoryMinimumAddressReadWrite", (void*)primitiveRunInMemoryMinimumAddressReadWrite}, + {"BochsIA32Plugin", "primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite", (void*)primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite}, {"BochsIA32Plugin", "primitiveSingleStepInMemoryMinimumAddressReadWrite", (void*)primitiveSingleStepInMemoryMinimumAddressReadWrite}, {"BochsIA32Plugin", "setInterpreter", (void*)setInterpreter}, {NULL, NULL, NULL} Modified: branches/Cog/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/src/plugins/FilePlugin/FilePlugin.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/src/plugins/FilePlugin/FilePlugin.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 from - FilePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + FilePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 " __DATE__ ; @@ -176,9 +176,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.235 (i)" + "FilePlugin VMMaker.oscog-eem.307 (i)" #else - "FilePlugin VMMaker.oscog-eem.235 (e)" + "FilePlugin VMMaker.oscog-eem.307 (e)" #endif ; static void * sCCPfn; @@ -1077,10 +1077,9 @@ primitiveFileWrite(void) { sqInt array; - char *arrayIndex; - size_t byteSize; sqInt bytesWritten; size_t count; + size_t elementSize; SQFile *file; sqInt objectPointer; size_t startIndex; @@ -1098,29 +1097,21 @@ } file = firstIndexableField(objectPointer); l1: /* end fileValueOf: */; - if (!(isWordsOrBytes(array))) { - return primitiveFail(); + if ((failed()) + || (!(isWordsOrBytes(array)))) { + return primitiveFailFor(PrimErrBadArgument); } - if (isWords(array)) { - byteSize = 4; - } - else { - byteSize = 1; - } + elementSize = (isWords(array) + ? 4 + : 1); if (!((startIndex >= 1) && (((startIndex + count) - 1) <= (slotSizeOf(array))))) { - return primitiveFail(); + return primitiveFailFor(PrimErrBadIndex); } + bytesWritten = sqFileWriteFromAt(file, count * elementSize, ((char *) (firstIndexableField(array))), (startIndex - 1) * elementSize); if (!(failed())) { - - /* Note: adjust startIndex for zero-origin indexing */ - - arrayIndex = firstIndexableField(array); - bytesWritten = sqFileWriteFromAt(file, count * byteSize, arrayIndex, (startIndex - 1) * byteSize); + popthenPush(5, integerObjectOf(bytesWritten / elementSize)); } - if (!(failed())) { - popthenPush(5, integerObjectOf(bytesWritten / byteSize)); - } } EXPORT(sqInt) Modified: branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c =================================================================== --- branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,9 +1,12 @@ -/* Automatically generated from Squeak on {14 December 2012 . 1:58:09 pm} */ +/* Automatically generated by + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 + from + GdbARMPlugin Cog-eem.61 uuid: 3dba03de-7a41-4da2-bdf4-d8276f5665da + */ +static char __buildInfo[] = "GdbARMPlugin Cog-eem.61 uuid: 3dba03de-7a41-4da2-bdf4-d8276f5665da " __DATE__ ; -static char __buildInfo[] = "Generated on {14 December 2012 . 1:58:09 pm}. Compiled on "__DATE__ ; - #include <math.h> #include <stdio.h> #include <stdlib.h> @@ -54,7 +57,9 @@ EXPORT(sqInt) primitiveFlushICacheFromTo(void); EXPORT(sqInt) primitiveNewCPU(void); EXPORT(sqInt) primitiveResetCPU(void); +EXPORT(sqInt) primitiveRunInMemoryMinAddressMaxAddressReadWrite(void); EXPORT(sqInt) primitiveRunInMemoryMinimumAddressReadWrite(void); +EXPORT(sqInt) primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite(void); EXPORT(sqInt) primitiveSingleStepInMemoryMinimumAddressReadWrite(void); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); static sqInt sizeField(sqInt rcvr); @@ -116,9 +121,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GdbARMPlugin 14 December 2012 (i)" + "GdbARMPlugin Cog-eem.61 (i)" #else - "GdbARMPlugin 14 December 2012 (e)" + "GdbARMPlugin Cog-eem.61 (e)" #endif ; @@ -352,12 +357,68 @@ /* <Bitmap|ByteArray|WordArray> */ /* <Integer> */ /* <Integer> */ +/* <Integer> */ /* Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception. */ EXPORT(sqInt) +primitiveRunInMemoryMinAddressMaxAddressReadWrite(void) +{ + void *cpu; + sqInt cpuAlien; + unsigned long maxAddress; + sqInt maybeErr; + char *memory; + sqInt memorySize; + unsigned long minAddress; + unsigned long minWriteMaxExecAddress; + + success(isWordsOrBytes(stackValue(3))); + memory = ((char *) (firstIndexableField(stackValue(3)))); + minAddress = positive32BitValueOf(stackValue(2)); + maxAddress = positive32BitValueOf(stackValue(1)); + minWriteMaxExecAddress = positive32BitValueOf(stackValue(0)); + cpuAlien = stackValue(4); + if (failed()) { + return null; + } + if (((cpu = ((longAt(cpuAlien + BaseHeaderSize)) > 0 + ? (cpuAlien + BaseHeaderSize) + BytesPerOop + : longAt((cpuAlien + BaseHeaderSize) + BytesPerOop)))) == 0) { + primitiveFailFor(PrimErrBadReceiver); + return null; + } + prevInterruptCheckChain = setInterruptCheckChain(forceStopOnInterrupt); + if (prevInterruptCheckChain == (forceStopOnInterrupt)) { + prevInterruptCheckChain == 0; + } + memorySize = byteSizeOf(((sqInt)(long)(memory) - 4)); + maybeErr = runCPUInSizeMinAddressReadWrite(cpu, memory, ((memorySize < maxAddress) ? memorySize : maxAddress), minAddress, minWriteMaxExecAddress); + setInterruptCheckChain(prevInterruptCheckChain); + if (maybeErr != 0) { + primitiveFailFor(PrimErrInappropriate); + return null; + } + if (failed()) { + return null; + } + popthenPush(5, cpuAlien); + return null; +} + + +/* cpuAlien <GdbARMAlien> */ +/* <Bitmap|ByteArray|WordArray> */ +/* <Integer> */ +/* <Integer> */ +/* Run the cpu using the first argument as the memory and the following + arguments defining valid addresses, running until it halts or hits an + exception. + */ + +EXPORT(sqInt) primitiveRunInMemoryMinimumAddressReadWrite(void) { void *cpu; @@ -403,11 +464,61 @@ /* <Bitmap|ByteArray|WordArray> */ /* <Integer> */ /* <Integer> */ +/* <Integer> */ /* Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses. */ EXPORT(sqInt) +primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite(void) +{ + void *cpu; + sqInt cpuAlien; + unsigned long maxAddress; + sqInt maybeErr; + char *memory; + sqInt memorySize; + unsigned long minAddress; + unsigned long minWriteMaxExecAddress; + + success(isWordsOrBytes(stackValue(3))); + memory = ((char *) (firstIndexableField(stackValue(3)))); + minAddress = positive32BitValueOf(stackValue(2)); + maxAddress = positive32BitValueOf(stackValue(1)); + minWriteMaxExecAddress = positive32BitValueOf(stackValue(0)); + cpuAlien = stackValue(4); + if (failed()) { + return null; + } + if (((cpu = ((longAt(cpuAlien + BaseHeaderSize)) > 0 + ? (cpuAlien + BaseHeaderSize) + BytesPerOop + : longAt((cpuAlien + BaseHeaderSize) + BytesPerOop)))) == 0) { + primitiveFailFor(PrimErrBadReceiver); + return null; + } + memorySize = byteSizeOf(((sqInt)(long)(memory) - 4)); + maybeErr = singleStepCPUInSizeMinAddressReadWrite(cpu, memory, ((memorySize < maxAddress) ? memorySize : maxAddress), minAddress, minWriteMaxExecAddress); + if (maybeErr != 0) { + primitiveFailFor(PrimErrInappropriate); + return null; + } + if (failed()) { + return null; + } + popthenPush(5, cpuAlien); + return null; +} + + +/* cpuAlien <GdbARMAlien> */ +/* <Bitmap|ByteArray|WordArray> */ +/* <Integer> */ +/* <Integer> */ +/* Single-step the cpu using the first argument as the memory and the + following arguments defining valid addresses. + */ + +EXPORT(sqInt) primitiveSingleStepInMemoryMinimumAddressReadWrite(void) { void *cpu; @@ -525,7 +636,9 @@ {"GdbARMPlugin", "primitiveFlushICacheFromTo", (void*)primitiveFlushICacheFromTo}, {"GdbARMPlugin", "primitiveNewCPU", (void*)primitiveNewCPU}, {"GdbARMPlugin", "primitiveResetCPU", (void*)primitiveResetCPU}, + {"GdbARMPlugin", "primitiveRunInMemoryMinAddressMaxAddressReadWrite", (void*)primitiveRunInMemoryMinAddressMaxAddressReadWrite}, {"GdbARMPlugin", "primitiveRunInMemoryMinimumAddressReadWrite", (void*)primitiveRunInMemoryMinimumAddressReadWrite}, + {"GdbARMPlugin", "primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite", (void*)primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite}, {"GdbARMPlugin", "primitiveSingleStepInMemoryMinimumAddressReadWrite", (void*)primitiveSingleStepInMemoryMinimumAddressReadWrite}, {"GdbARMPlugin", "setInterpreter", (void*)setInterpreter}, {NULL, NULL, NULL} Modified: branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 from - LargeIntegersPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + LargeIntegersPlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 " __DATE__ ; @@ -175,9 +175,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.246 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.307 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.246 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.307 (e)" #endif ; static const int orOpIndex = 1; @@ -264,6 +264,7 @@ { sqInt class; sqInt ix; + sqInt ixLimiT; sqInt newBytes; unsigned char * pByte; sqInt val; @@ -279,7 +280,7 @@ newBytes = instantiateClassindexableSize(class, len); /* begin cCopyIntVal:toBytes: */ pByte = firstIndexableField(newBytes); - for (ix = 1; ix <= (cDigitLengthOfCSI(val)); ix += 1) { + for (ix = 1, ixLimiT = (cDigitLengthOfCSI(val)); ix <= ixLimiT; ix += 1) { pByte[ix - 1] = (cDigitOfCSIat(val, ix)); } } @@ -638,10 +639,11 @@ cCopyIntValtoBytes(sqInt val, sqInt bytes) { sqInt ix; + sqInt ixLimiT; unsigned char * pByte; pByte = firstIndexableField(bytes); - for (ix = 1; ix <= (cDigitLengthOfCSI(val)); ix += 1) { + for (ix = 1, ixLimiT = (cDigitLengthOfCSI(val)); ix <= ixLimiT; ix += 1) { pByte[ix - 1] = (cDigitOfCSIat(val, ix)); } } Modified: branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,13 +1,13 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + VMPluginCodeGenerator VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 from - MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + MiscPrimitivePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795 ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195\n\ +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.307 uuid: 737feb1e-5228-463a-8f3e-0f55f10fc3c9\n\ Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795\n\ ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ @@ -95,9 +95,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin VMMaker.oscog-eem.248 (i)" + "MiscPrimitivePlugin VMMaker.oscog-eem.307 (i)" #else - "MiscPrimitivePlugin VMMaker.oscog-eem.248 (e)" + "MiscPrimitivePlugin VMMaker.oscog-eem.307 (e)" #endif ; @@ -761,6 +761,7 @@ sqInt rcvr; sqInt start; sqInt startIndex; + sqInt startIndexLimiT; rcvr = stackValue(4); if (!(isBytes(stackValue(3)))) { @@ -790,7 +791,7 @@ pushInteger(0); return null; } - for (startIndex = start; startIndex <= (((sizeOfSTArrayFromCPrimitive(body + 1)) - (sizeOfSTArrayFromCPrimitive(key + 1))) + 1); startIndex += 1) { + for (startIndex = start, startIndexLimiT = (((sizeOfSTArrayFromCPrimitive(body + 1)) - (sizeOfSTArrayFromCPrimitive(key + 1))) + 1); startIndex <= startIndexLimiT; startIndex += 1) { index = 1; while ((matchTable[(asciiValue(body[(startIndex + index) - 1])) + 1]) == (matchTable[(asciiValue(key[index])) + 1])) { if (index == (sizeOfSTArrayFromCPrimitive(key + 1))) { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-07-18 19:45:39 UTC (rev 2753) +++ branches/Cog/src/vm/cointerp.c 2013-07-24 00:31:56 UTC (rev 2754) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 from - CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea + CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.308 uuid: 66681ccb-5127-4525-a519-55ee71410844 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -363,6 +363,8 @@ void assertValidExecutionPointers(usqInt lip, char *lifp, char *lisp); static void assertValidExecutionPointersimbarline(usqInt lip, char *lifp, char *lisp, sqInt inInterpreter, sqInt ln); void assertValidMachineCodeFrame(sqInt instrPtr); +static sqInt assertValidStackedInstructionPointersInline(StackPage *aStackPage, sqInt ln); +static void assertValidStackedInstructionPointers(sqInt ln); static void assertValidStackLimits(sqInt ln); static void attemptToSwitchToMachineCode(sqInt bcpc); sqInt becomewith(sqInt array1, sqInt array2); @@ -1966,7 +1968,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.306]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.308]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -9508,6 +9510,7 @@ CogMethod *cogMethod; sqInt methodField; sqInt methodField1; + sqInt savedIP; assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.308.mcz
by commits＠source.squeak.org 24 Jul '13

24 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.308.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.308 Author: eem Time: 23 July 2013, 5:20:45.148 pm UUID: 66681ccb-5127-4525-a519-55ee71410844 Ancestors: VMMaker.oscog-eem.307 Add an assert that checks all the instructionPointers in all stack pages. Use the assert in code compaction. (tracking down a rare crash at Cadence). Fix the assert in CogIA32Compiler>>relocateCallBeforeReturnPC:by: that was being triggered by relocating calls to ceSendFromInlineCacheMiss: in open PICs. Do this by making simulated addresses +ve, i.e. putting them in the top of the bottom half of the address space, not the top of the address space, to clear their sign bits. Beef up the assertValidExecutionPointe:r:s:imbar:line: assert for interpreted frames (i.e. check savedIP if pc is ceRetrnToInterpreter) =============== Diff against VMMaker.oscog-eem.307 =============== Item was changed: ----- Method: CoInterpreter>>assertValidExecutionPointe:r:s:imbar:line: (in category 'debug support') ----- assertValidExecutionPointe: lip r: lifp s: lisp imbar: inInterpreter line: ln <var: #lip type: #usqInt> <var: #lifp type: #'char *'> <var: #lisp type: #'char *'> + | methodField cogMethod savedIP | - | methodField cogMethod | <var: #cogMethod type: #'CogMethod *'> self assert: stackPage = (stackPages stackPageFor: lifp) l: ln. self assert: stackPage = stackPages mostRecentlyUsedPage l: ln. self assert: (self deferStackLimitSmashAround: #assertValidStackLimits: asSymbol with: ln). self assert: lifp < stackPage baseAddress l: ln. self assert: lisp < lifp l: ln. self assert: lifp > lisp l: ln. self assert: lisp >= (stackPage realStackLimit - self stackLimitOffset) l: ln. self assert: (lifp - lisp) < LargeContextSize l: ln. methodField := self frameMethodField: lifp. inInterpreter ifTrue: [self assert: (self isMachineCodeFrame: lifp) not l: ln. self assert: method = methodField l: ln. self cppIf: MULTIPLEBYTECODESETS ifTrue: [self assert: (self methodUsesAlternateBytecodeSet: method) = (bytecodeSetSelector = 256) l: ln]. ((self asserta: methodField asUnsignedInteger > objectMemory startOfMemory l: ln) and: [self asserta: methodField asUnsignedInteger < objectMemory freeStart l: ln]) ifTrue: + [lip = cogit ceReturnToInterpreterPC + ifTrue: + [savedIP := self iframeSavedIP: lifp. + self assert: (savedIP >= (methodField + (objectMemory lastPointerOf: methodField) + BaseHeaderSize - 1) + and: [savedIP < (methodField + (objectMemory byteLengthOf: methodField) + BaseHeaderSize)]) + l: ln] + ifFalse: + [self assert: (lip >= (methodField + (objectMemory lastPointerOf: methodField) + BaseHeaderSize - 1) - [lip ~= cogit ceReturnToInterpreterPC ifTrue: - [self assert: (lip >= (methodField + (objectMemory lastPointerOf: methodField) + BaseHeaderSize - 1) and: [lip < (methodField + (objectMemory byteLengthOf: methodField) + BaseHeaderSize)]) + l: ln]]. - l: ln]]. self assert: ((self iframeIsBlockActivation: lifp) or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self iframeReceiver: lifp)]) l: ln] ifFalse: [self assert: (self isMachineCodeFrame: lifp) l: ln. ((self asserta: methodField asUnsignedInteger >= cogit minCogMethodAddress l: ln) and: [self asserta: methodField asUnsignedInteger < cogit maxCogMethodAddress l: ln]) ifTrue: [cogMethod := self mframeHomeMethod: lifp. self assert: (lip > (methodField + ((self mframeIsBlockActivation: lifp) ifTrue: [self sizeof: CogBlockMethod] ifFalse: [self sizeof: CogMethod])) and: [lip < (methodField + cogMethod blockSize)]) l: ln]. self assert: ((self mframeIsBlockActivation: lifp) or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self mframeReceiver: lifp)]) l: ln]. (self isBaseFrame: lifp) ifTrue: [self assert: (self frameHasContext: lifp) l: ln. self assert: (self frameContext: lifp) = (stackPages longAt: stackPage baseAddress - BytesPerWord) l: ln]! Item was added: + ----- Method: CoInterpreter>>assertValidStackedInstructionPointers: (in category 'debug support') ----- + assertValidStackedInstructionPointers: ln + "Check that the stacked instruction pointers in all pages are correct. + Checks the interpreter sender/machine code callee contract. + Written so it will be optimized away if not in an assert VM." + | thePage | + <inline: false> + <var: #thePage type: #'StackPage *'> + 0 to: numStackPages - 1 do: + [:i| + thePage := stackPages stackPageAt: i. + (stackPages isFree: thePage) ifFalse: + [self assert: (self assertValidStackedInstructionPointersIn: thePage line: ln) l: ln]]! Item was added: + ----- Method: CoInterpreter>>assertValidStackedInstructionPointersIn:line: (in category 'debug support') ----- + assertValidStackedInstructionPointersIn: aStackPage line: ln + "Check that the stacked instruction pointers in the given page are correct. + Checks the interpreter sender/machine code callee contract." + <var: #aStackPage type: #'StackPage *'> + <var: #theFP type: #'char *'> + <var: #callerFP type: #'char *'> + <var: #theIPPtr type: #'char *'> + <var: #theIP type: #usqInt> + <var: #theMethod type: #'CogMethod *'> + <inline: false> + | prevFrameWasCogged theFP callerFP theMethod theIP theIPPtr methodObj | + (self asserta: (stackPages isFree: aStackPage) not l: ln) ifFalse: + [^false]. + prevFrameWasCogged := false. + theIPPtr := aStackPage headSP. + theFP := aStackPage headFP. + [(self isMachineCodeFrame: theFP) + ifTrue: + [theMethod := self mframeHomeMethod: theFP. + theIP := (stackPages longAt: theIPPtr) asUnsignedInteger. + self assert: (theIP = cogit ceCannotResumePC + or: [self asserta: (theIP >= theMethod asUnsignedInteger + and: [theIP < (theMethod asUnsignedInteger + theMethod blockSize)])]) + l: ln. + prevFrameWasCogged := true] + ifFalse: "assert-check the interpreter frame." + [theIP := (stackPages longAt: theIPPtr) asUnsignedInteger. + methodObj := self iframeMethod: theFP. + prevFrameWasCogged ifTrue: + [self assert: theIP = cogit ceReturnToInterpreterPC l: ln]. + theIP = cogit ceReturnToInterpreterPC ifTrue: + [theIP := self iframeSavedIP: theFP]. + self assert: (theIP >= (methodObj + (objectMemory lastPointerOf: methodObj) + BaseHeaderSize - 1) + and: [theIP < (methodObj + (objectMemory byteLengthOf: methodObj) + BaseHeaderSize)]) + l: ln. + prevFrameWasCogged := false]. + (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: + [theIPPtr := theFP + FoxCallerSavedIP. + theFP := callerFP]. + ^true! Item was changed: ----- Method: CoInterpreter>>commenceCogCompiledCodeCompaction (in category 'process primitive support') ----- commenceCogCompiledCodeCompaction | startTime | <var: #startTime type: #usqLong> cogCompiledCodeCompactionCalledFor := false. cogit recordEventTrace ifTrue: [self recordTrace: TraceCodeCompaction thing: TraceCodeCompaction source: 0]. startTime := self ioUTCMicrosecondsNow. "This can be called in a number of circumstances. The instructionPointer may contain a native pc that must be relocated. There may already be a pushed instructionPointer on stack. Clients ensure that instructionPointer is 0 if it should not be pushed and/or relocated. Pushing twice is a mistake because only the top one will be relocated." instructionPointer ~= 0 ifTrue: [self push: instructionPointer. self externalWriteBackHeadStackPointer]. + self assertValidStackedInstructionPointers: #'__LINE__'. cogit compactCogCompiledCode. + self assertValidStackedInstructionPointers: #'__LINE__'. instructionPointer ~= 0 ifTrue: [instructionPointer := self popStack. self externalWriteBackHeadStackPointer]. statCodeCompactionCount := statCodeCompactionCount + 1. statCodeCompactionUsecs := statCodeCompactionUsecs + (self ioUTCMicrosecondsNow - startTime). objectMemory checkForLeaks ~= 0 ifTrue: [objectMemory clearLeakMapAndMapAccessibleObjects. self assert: (self checkCodeIntegrity: false)]! Item was changed: ----- Method: Cogit>>addressSpaceMask (in category 'accessing') ----- addressSpaceMask <doNotGenerate> + "Quad-byte-align, because the ARM requires 4-byte aligned jump & call targets." + ^((1 << (8 * BytesPerWord)) - 1) bitAnd: -4! - "The first parenthesis generates a word of ones, -3 removes the two lowest bits because of ARM's requirement to have 4-aligned jumping addresses" - ^((1 << (8 * BytesPerWord)) - 1) - 3! Item was added: + ----- Method: Cogit>>allButTopBitOfAddressSpaceMask (in category 'accessing') ----- + allButTopBitOfAddressSpaceMask + <doNotGenerate> + "Quad-byte-align, because the ARM requires 4-byte aligned jump & call targets." + ^((1 << (8 * BytesPerWord - 1)) - 1) bitAnd: -4! Item was changed: ----- Method: Cogit>>mapPrimitive:withIndexToUniqueAddress: (in category 'simulation only') ----- mapPrimitive: primitiveRoutine "<Symbol>" withIndexToUniqueAddress: primitiveIndex "<SmallInteger>" | uniqueAddress | <doNotGenerate> self assert: (primitiveRoutine isSymbol or: [primitiveRoutine isBlock]). + uniqueAddress := -1 - methodZoneBase - (primitiveIndex * 4) - 16r1000 bitAnd: self allButTopBitOfAddressSpaceMask. - uniqueAddress := -1 - methodZoneBase - (primitiveIndex * 4) - 16r1000 bitAnd: self addressSpaceMask. simulatedTrampolines at: uniqueAddress ifAbsentPut: [primitiveRoutine isSymbol ifTrue: [MessageSend receiver: coInterpreter selector: primitiveRoutine] ifFalse: [primitiveRoutine]]. ^uniqueAddress! Item was changed: ----- Method: Cogit>>printMethodHeader:on: (in category 'disassembly') ----- printMethodHeader: cogMethod on: aStream <doNotGenerate> self cCode: '' inSmalltalk: [cogMethod isInteger ifTrue: [^self printMethodHeader: (self cogMethodOrBlockSurrogateAt: cogMethod) on: aStream]]. aStream ensureCr. cogMethod asInteger printOn: aStream base: 16. aStream crtab. + cogMethod cmType = CMMethod ifTrue: + [aStream nextPutAll: 'objhdr: '. + cogMethod objectHeader printOn: aStream base: 16]. + cogMethod cmType = CMBlock ifTrue: + [aStream nextPutAll: 'homemth: '. + cogMethod cmHomeMethod asUnsignedInteger printOn: aStream base: 16. + aStream crtab; nextPutAll: 'startpc: '; print: cogMethod startpc]. - cogMethod cmType = CMMethod - ifTrue: - [aStream nextPutAll: 'objhdr: '. - cogMethod objectHeader printOn: aStream base: 16] - ifFalse: - [aStream nextPutAll: 'homemth: '. - cogMethod cmHomeMethod asUnsignedInteger printOn: aStream base: 16. - aStream crtab; nextPutAll: 'startpc: '; print: cogMethod startpc]. aStream crtab; nextPutAll: 'nArgs: '; print: cogMethod cmNumArgs; tab; nextPutAll: 'type: '; print: cogMethod cmType. (cogMethod cmType ~= 0 and: [cogMethod cmType ~= CMBlock]) ifTrue: [aStream crtab; nextPutAll: 'blksiz: '. cogMethod blockSize printOn: aStream base: 16. aStream crtab; nextPutAll: 'method: '. cogMethod methodObject printOn: aStream base: 16. aStream crtab; nextPutAll: 'mthhdr: '. cogMethod methodHeader printOn: aStream base: 16. aStream crtab; nextPutAll: 'selctr: '. cogMethod selector printOn: aStream base: 16. (coInterpreter lookupAddress: cogMethod selector) ifNotNil: [:string| aStream nextPut: $=; nextPutAll: string]. aStream crtab; nextPutAll: 'blkentry: '. cogMethod blockEntryOffset printOn: aStream base: 16. cogMethod blockEntryOffset ~= 0 ifTrue: [aStream nextPutAll: ' => '. cogMethod asInteger + cogMethod blockEntryOffset printOn: aStream base: 16]]. cogMethod cmType = CMClosedPIC ifTrue: [aStream crtab; nextPutAll: 'cPICNumCases: '. cogMethod cPICNumCases printOn: aStream base: 16.] ifFalse: [aStream crtab; nextPutAll: 'stackCheckOffset: '. cogMethod stackCheckOffset printOn: aStream base: 16. cogMethod stackCheckOffset > 0 ifTrue: [aStream nextPut: $/. cogMethod asInteger + cogMethod stackCheckOffset printOn: aStream base: 16]. cogMethod cmType ~= CMBlock ifTrue: [aStream crtab; nextPutAll: 'cmRefersToYoung: '; nextPutAll: (cogMethod cmRefersToYoung ifTrue: ['yes'] ifFalse: ['no'])]. cogMethod cmType = CMMethod ifTrue: [([cogMethod numCounters] on: MessageNotUnderstood do: [:ex| nil]) ifNotNil: [:nc| aStream crtab; nextPutAll: 'numCounters: '; print: nc]]]. aStream cr; flush! Item was changed: ----- Method: Cogit>>simulatedAddressFor: (in category 'initialization') ----- simulatedAddressFor: anObject "Answer a simulated address for a block or a symbol. This is an address that can be called, read or written by generated machine code, and will be mapped + into a Smalltalk message send or block evaluation. + + N.B. These addresses are at the top end of the bottom half of the address space + so that they don't have the sign bit set and so will not look like negative numbers." - into a Smalltalk message send or block evaluation." <doNotGenerate> ^simulatedAddresses at: anObject + ifAbsentPut: [(simulatedAddresses size + 101 * BytesPerWord) negated bitAnd: self allButTopBitOfAddressSpaceMask]! - ifAbsentPut: [(simulatedAddresses size + 101 * BytesPerWord) negated bitAnd: self addressSpaceMask]!

1 0

Ancient Mantis Report - 1650 PrimitiveScanCharacters
by tim Rowledge 21 Jul '13

21 Jul '13

Clearing out old bug reports can be very alarming. Take this one - http://bugs.squeak.org/view.php?id=1650 Between 3.7 & 3.8 the shape of CharacterScanner was changed in such a way that the scan characters primitive (much beloved by us ancient and gray vm hackers) cold not work. That's what, 9 years ago? I'm not sure what the best 'fix' is. Fix the prim? Fix the image? Drop the prim entirely from the current images? But really - changing a core vm-known class so the vm doesn't know it any more? Ouch. Bad programmer. Sit in the naughty corner! tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Useful random insult:- Has an inferiority complex, but not a very good one.

1 0

StackVM works on my Pi.
by Casey Ransberger 21 Jul '13

21 Jul '13

The LD_LIBRARY_PATH / ldd issue is explained to my satisfaction in that the problem is actually the "squeak" script, nothing else; ldd isn't returning what the script expects, so it's confused. http://code.google.com/p/cog/issues/detail?id=116 The workaround is to start the binary directly and name an image. No problem. Incidentally finds the sources file just fine. Thanks for the help. There is one oddity: when I started it, parts of the window were black. There was a longish pause, and then I could click on things. Moving the window caused the screen beneath it to be redrawn. At first I thought it was because it didn't find the sources (I've seen it do that when it couldn't find sources,) but I don't see an error dialogue and I see source code. BitBlt bug? -- Casey Ransberger

1 0

StackVM builds for RaspberryPi
by tim Rowledge 21 Jul '13

21 Jul '13

At last I have a repeatable and intelligible script for making a StackVM for a Pi/Raspbian. It doesn't have the fast bitlbt included because {insert rant about insane automake, incomprehensible configurations etc here}. The actual changes needed are small enough, but some 'interesting' configuration incantations have to be used, you must build a new set of generated sources (the set stored in svn are for a full Cog system) and you have to wear magic underpants. I can't commit the small changes because they would afflict other platforms adversely. If anyone would like to try replicating the process on their own Pi, I would be very happy to provide all the info. The result runs a bit faster than the plain interpreter in benchmark terms but seems to be much more UI responsive, which is nice. It is at least a decent step to a full Cog/Pi. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Managing programmers is like herding cats.

3 20

[Cog] primitiveLoadImageSegment fails
by Bert Freudenberg 20 Jul '13

20 Jul '13

That's primitive 99. With an updated Squeak trunk image I can load this project fine in the interpreter: http://etoys.squeak.org/svn/trunk/Etoys/Home.007.pr On Cog the primitive fails. Any idea what might be wrong? - Bert -

2 3

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2013