Vm-dev July 2013

vm-dev@lists.squeakfoundation.org

20 participants
104 discussions

Cog: Possible caveat with ioProcessEvents on linux
by Igor Stasenko 30 Jul '13

30 Jul '13

Yesterday we were hacking VM with Laurent, to implement idea which i talked about before: - replace direct call to ioProcessEvents with call to ioProcessEventsPtr (a function pointer), but only if its not nil. That gives a possibility to replace or completely suppress VM's default event handling. But after simple changes, and putting null value to that pointer, we discovered that image still responds and keeps handling events, like nothing happen. We found that X11 driver uses AIO callbacks which get called any time something happen with Display file descriptor. That mean following: - any X11 event get handled immediately as it appears in queue (which is pretty neat) - the call to ioProcessEvents() during interrupt check is not necessary (as well as in many other places) - the inIOProcessEvents flag won't work as advertized because it is completely ignored, since events handled via callbacks. we made changes to honor ioProcessEventsPtr, and actually call it, instead handleEvents() in aio callback. Comments? -- Best regards, Igor Stasenko.

1 0

[commit][2760] CogVM source as per VMMaker.oscog-eem.314
by commits＠squeakvm.org 30 Jul '13

30 Jul '13

Revision: 2760 Author: eliot Date: 2013-07-29 15:32:45 -0700 (Mon, 29 Jul 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.314 Fix bug in transferTo:(from:) when doing a code compaction when ensuring there is a machine code method when switching to a process whose context has a machine code pc. Add an assert to commenceCogCompiledCodeCompaction to catch the actual bug (pushing the instructionPointer twice). Improve inlining via inlineSend:directReturn:exitVar:in: by refactoring argAssignmentsFor:args:in:'s innards. Now global variables are inlined if they are only read within the code being inlined. Implement warningat in term of warning so one only has to remember to set a breakpoint in warning, not both. Modified Paths: -------------- 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/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/ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog ___________________________________________________________________ Modified: svn:ignore - ChangeHistory MVALOG README.* *.app *.dmg *.msi *.tgz *.zip cogastlinux cogdbglinux coglinux cogmtlinux cogwin cogmtwin nsvmlinux nsvmlinuxast nsvmlinuxdbg nsvmwin + ChangeHistory MVALOG README.* *.app *.dmg *.msi *.tgz *.zip cogastlinux cogastlinuxpt cogdbglinux cogdbglinuxpt coglinux coglinuxpt cogmtlinux cogwin cogmtwin nsvmlinux nsvmlinuxpt nsvmlinuxast nsvmlinuxastpt nsvmlinuxdbg nsvmlinuxdbgpt nsvmwin Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-07-25 23:57:06 UTC (rev 2759) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-29 22:32:45 UTC (rev 2760) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.314 uuid: e8cba0d1-78b9-4058-820f-62d6e02e180b from - CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 + CoInterpreter VMMaker.oscog-eem.314 uuid: e8cba0d1-78b9-4058-820f-62d6e02e180b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.314 uuid: e8cba0d1-78b9-4058-820f-62d6e02e180b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -41,7 +41,13 @@ } void warningat(char *s, int l) { /* ditto with line number. */ - printf("\n%s %d\n", s,l); +#if 0 + printf("\n%s %d\n", s, l); +#else /* use alloca to call warning so one does not have to remember to set two breakpoints... */ + char *sl = alloca(strlen(s) + 16); + sprintf(sl, "%s %d", s, l); + warning(sl); +#endif } #pragma auto_inline on @@ -1979,7 +1985,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.312"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.314"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4137,7 +4143,6 @@ /* commonReturn */ { sqInt aMethodObj; - StackPage *aPage; sqInt callerContextOrNil; sqInt callerContextOrNil1; sqInt callerContextOrNil2; @@ -4366,8 +4371,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); /* begin freeStackPage: */ - aPage = GIV(stackPage); - freeStackPageNoAssert(aPage); + freeStackPageNoAssert(GIV(stackPage)); assert(pageListIsWellFormed()); while (!((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage))) { @@ -14436,7 +14440,6 @@ char *sp1; char *sp2; char *sp3; - char *theFP; StackPage *thePage; sqInt value; @@ -14486,14 +14489,13 @@ Make the interior frame the top frame. */ /* begin findFrameAbove:inPage: */ - theFP = GIV(framePointer); fp = (thePage->headFP); - if (fp == theFP) { + if (fp == GIV(framePointer)) { frameAbove = 0; goto l1; } while (((callerFP = frameCallerFP(fp))) != 0) { - if (callerFP == theFP) { + if (callerFP == GIV(framePointer)) { frameAbove = fp; goto l1; } @@ -14705,8 +14707,6 @@ sqInt ceDynamicSuperSendtonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aMethodObj; - sqInt aMethodOop; sqInt canLinkCacheTag; sqInt ccIndex; sqInt ccIndex1; @@ -14758,8 +14758,7 @@ /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(1ifAppropriateCompileToNativeCodeselector); - aMethodObj = GIV(newMethod); - methodHeader = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { /* makeBaseFrame: can create cog methods with nil selectors. */ @@ -14773,10 +14772,10 @@ if ((((((sqInt) methodHeader)) < 0 ? (((usqInt) methodHeader) >> 1) & 65535 : (((usqInt) methodHeader) >> 10) & 255)) <= maxLiteralCountForCompile) { - cogselector(aMethodObj, selector); + cogselector(GIV(newMethod), selector); } else { - maybeFlagMethodAsInterpreted(aMethodObj); + maybeFlagMethodAsInterpreted(GIV(newMethod)); } } } @@ -14790,8 +14789,7 @@ && ((((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12) && (isCogMethodReference(longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))))) { /* begin cogMethodOf: */ - aMethodOop = GIV(newMethod); - methodHeader1 = longAt((aMethodOop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader1 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); assert((isNonIntegerObject(methodHeader1)) && ((((usqInt)methodHeader1)) < (startOfMemory()))); cogMethod = ((CogMethod *) methodHeader1); @@ -14897,11 +14895,9 @@ sqInt firstBytecode; sqInt methodHeader; sqInt methodHeader1; - sqInt object; sqInt primBits; sqInt primitiveIndex; char *sp; - sqInt theClass; sqInt top; assert(((rcvr & 1)) @@ -14927,8 +14923,7 @@ && ((((((usqInt) (longAt(aMethodObj))) >> 8) & 15) >= 12) && (isCogMethodReference(longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))))) { /* begin push: */ - object = GIV(instructionPointer); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; executeCogMethodFromUnlinkedSendwithReceiver(cogMethodOf(aMethodObj), rcvr); assert(0); @@ -14950,7 +14945,6 @@ : ((primBits = ((usqInt) methodHeader) >> 1), (primBits & 511) + ((((usqInt) primBits) >> 19) & 512))); /* begin functionPointerFor:inClass: */ - theClass = GIV(nilObj); primitiveFunctionPointer = ((void (*)(void)) ((primitiveIndex > MaxPrimitiveIndex ? 0 : primitiveTable[primitiveIndex]))); @@ -14974,7 +14968,6 @@ sqInt ceNonLocalReturn(sqInt returnValue) { DECL_MAYBE_SQ_GLOBAL_STRUCT - StackPage *aPage; sqInt callerContextOrNil; sqInt callerContextOrNil1; sqInt callerContextOrNil2; @@ -15209,8 +15202,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); /* begin freeStackPage: */ - aPage = GIV(stackPage); - freeStackPageNoAssert(aPage); + freeStackPageNoAssert(GIV(stackPage)); assert(pageListIsWellFormed()); while (1) { assert(isContext(currentCtx)); @@ -15299,18 +15291,16 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aMethodObj; char *sp; - StackPage *thePage; assert(((anOop & 1)) || (addressCouldBeObj(anOop))); flag("are you really sure setStackPageAndLimit: is needed?"); /* begin setStackPageAndLimit: */ - thePage = GIV(stackPage); - GIV(stackPage) = thePage; + GIV(stackPage) = GIV(stackPage); if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { GIV(stackLimit) = (GIV(stackPage)->stackLimit); } - markStackPageMostRecentlyUsed(thePage); + markStackPageMostRecentlyUsed(GIV(stackPage)); assert(!(isMachineCodeFrame(GIV(framePointer)))); /* begin setMethod: */ /* begin iframeMethod: */ @@ -15345,7 +15335,6 @@ sqInt ceSendAborttonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aMethodObj; sqInt ccIndex; sqInt class; CogMethod *cogMethod; @@ -15378,8 +15367,7 @@ /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(2ifAppropriateCompileToNativeCodeselector); - aMethodObj = GIV(newMethod); - methodHeader = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { /* makeBaseFrame: can create cog methods with nil selectors. */ @@ -15393,10 +15381,10 @@ if ((((((sqInt) methodHeader)) < 0 ? (((usqInt) methodHeader) >> 1) & 65535 : (((usqInt) methodHeader) >> 10) & 255)) <= maxLiteralCountForCompile) { - cogselector(aMethodObj, selector); + cogselector(GIV(newMethod), selector); } else { - maybeFlagMethodAsInterpreted(aMethodObj); + maybeFlagMethodAsInterpreted(GIV(newMethod)); } } } @@ -15429,7 +15417,6 @@ sqInt ceSendFromInLineCacheMiss(CogMethod *oPIC) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aMethodObj; sqInt ccIndex; sqInt class; CogMethod *cogMethod; @@ -15465,9 +15452,8 @@ /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(3ifAppropriateCompileToNativeCodeselector); - aMethodObj = GIV(newMethod); selector = (oPIC->selector); - methodHeader = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { /* makeBaseFrame: can create cog methods with nil selectors. */ @@ -15481,10 +15467,10 @@ if ((((((sqInt) methodHeader)) < 0 ? (((usqInt) methodHeader) >> 1) & 65535 : (((usqInt) methodHeader) >> 10) & 255)) <= maxLiteralCountForCompile) { - cogselector(aMethodObj, selector); + cogselector(GIV(newMethod), selector); } else { - maybeFlagMethodAsInterpreted(aMethodObj); + maybeFlagMethodAsInterpreted(GIV(newMethod)); } } } @@ -15548,8 +15534,6 @@ sqInt ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aMethodObj; - sqInt aMethodOop; sqInt canLinkCacheTag; sqInt ccIndex; sqInt class; @@ -15601,8 +15585,7 @@ /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(4ifAppropriateCompileToNativeCodeselector); - aMethodObj = GIV(newMethod); - methodHeader = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { /* makeBaseFrame: can create cog methods with nil selectors. */ @@ -15616,10 +15599,10 @@ if ((((((sqInt) methodHeader)) < 0 ? (((usqInt) methodHeader) >> 1) & 65535 : (((usqInt) methodHeader) >> 10) & 255)) <= maxLiteralCountForCompile) { - cogselector(aMethodObj, selector); + cogselector(GIV(newMethod), selector); } else { - maybeFlagMethodAsInterpreted(aMethodObj); + maybeFlagMethodAsInterpreted(GIV(newMethod)); } } } @@ -15640,8 +15623,7 @@ && ((((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12) && (isCogMethodReference(longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))))) { /* begin cogMethodOf: */ - aMethodOop = GIV(newMethod); - methodHeader1 = longAt((aMethodOop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader1 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); assert((isNonIntegerObject(methodHeader1)) && ((((usqInt)methodHeader1)) < (startOfMemory()))); cogMethod = ((CogMethod *) methodHeader1); @@ -17588,6 +17570,10 @@ startTime = ioUTCMicrosecondsNow(); if (GIV(instructionPointer) != 0) { + + /* better not have already been pushed */ + + assert((((usqInt)(stackTop()))) != GIV(instructionPointer)); /* begin push: */ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; @@ -18318,10 +18304,12 @@ sqInt i; sqInt newClosure; sqInt newClosure1; + char *theSP; assert(isMachineCodeFrame(GIV(framePointer))); /* begin ensureFrameIsMarried:SP: */ VM_LABEL(13ensureFrameIsMarriedSP); + theSP = GIV(stackPointer) + ((1 + numCopied) * BytesPerWord); if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) ? ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 : (byteAt((GIV(framePointer) + FoxIFrameFlags) + 2)) != 0)) { @@ -18329,7 +18317,7 @@ context = longAt(GIV(framePointer) + FoxThisContext); goto l1; } - context = marryFrameSP(GIV(framePointer), GIV(stackPointer) + ((1 + numCopied) * BytesPerWord)); + context = marryFrameSP(GIV(framePointer), theSP); l1: /* end ensureFrameIsMarried:SP: */; /* begin closureIn:numArgs:instructionPointer:numCopiedValues: */ VM_LABEL(2closureInnumArgsinstructionPointernumCopiedValues); @@ -23998,11 +23986,9 @@ static void initializeMemoryFirstFree(sqInt firstFree) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt end; sqInt fwdBlockBytes; usqInt i; sqInt newEndOfMemory; - usqInt start; sqInt totalReserve; fwdBlockBytes = GIV(totalObjectCount) & ((WordMask - BytesPerWord) + 1); @@ -24030,10 +24016,8 @@ GIV(freeStart) = firstFree; GIV(scavengeThreshold) = (((GIV(freeStart) + GIV(edenBytes)) < GIV(reserveStart)) ? (GIV(freeStart) + GIV(edenBytes)) : GIV(reserveStart)); /* begin maybeFillWithAllocationCheckFillerFrom:to: */ - start = GIV(freeStart); - end = GIV(scavengeThreshold); if (AllocationCheckFiller != 0) { - for (i = start; i <= end; i += BytesPerWord) { + for (i = GIV(freeStart); i <= GIV(scavengeThreshold); i += BytesPerWord) { longAtput(i, (AllocationCheckFiller == 182275669 ? i : AllocationCheckFiller)); @@ -27652,7 +27636,6 @@ sqInt methodHeader1; sqInt numLiterals; sqInt numLiterals1; - sqInt oop1; sqInt parentField; void *pointer; void *pointer1; @@ -27839,8 +27822,7 @@ goto l2; } /* begin lastPointerOf:recordWeakRoot: */ - oop1 = child; - header3 = longAt(oop1); + header3 = longAt(child); fmt = (((usqInt) header3) >> 8) & 15; if (fmt <= 4) { if (fmt >= 3) { @@ -27853,18 +27835,18 @@ if (!(((GIV(weakRootCount) += 1)) <= WeakRootTableSize)) { error("weakRoots table overflow"); } - GIV(weakRoots)[GIV(weakRootCount)] = oop1; + GIV(weakRoots)[GIV(weakRootCount)] = child; } - lastFieldOffset1 = (nonWeakFieldsOf(oop1)) << ShiftForWord; + lastFieldOffset1 = (nonWeakFieldsOf(child)) << ShiftForWord; goto l5; } if (((((usqInt) header3) >> 12) & 31) == ClassMethodContextCompactIndex) { /* begin setTraceFlagOnContextsFramesPageIfNeeded: */ - if ((((longAt((oop1 + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(oop1)))) { + if ((((longAt((child + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(child)))) { /* begin stackPageFor: */ /* begin frameOfMarriedContext: */ - value = longAt((oop1 + BaseHeaderSize) + (SenderIndex << ShiftForWord)); + value = longAt((child + BaseHeaderSize) + (SenderIndex << ShiftForWord)); /* begin withoutSmallIntegerTags: */ assert((value & 1)); pointer = ((char *) (pointerForOop(value - 1))); @@ -27879,28 +27861,28 @@ } } /* begin fetchStackPointerOf: */ - sp = longAt((oop1 + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + sp = longAt((child + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); if (!((sp & 1))) { contextSize = 0; goto l4; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(oop1))); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(child))); contextSize = (sp >> 1); l4: /* end fetchStackPointerOf: */; - assert((ReceiverIndex + contextSize) < (lengthOfbaseHeaderformat(oop1, header3, fmt))); + assert((ReceiverIndex + contextSize) < (lengthOfbaseHeaderformat(child, header3, fmt))); lastFieldOffset1 = (CtxtTempFrameStart + contextSize) * BytesPerWord; goto l5; } } /* begin sizeBitsOfSafe: */ - header11 = longAt(oop1); + header11 = longAt(child); type1 = ((header11 & SizeMask) == 0 ? HeaderTypeSizeAndClass : ((header11 & CompactClassMask) == 0 ? HeaderTypeClass : HeaderTypeShort)); sz = (type1 == HeaderTypeSizeAndClass - ? (longAt(oop1 - (BytesPerWord * 2))) & AllButTypeMask + ? (longAt(child - (BytesPerWord * 2))) & AllButTypeMask : header11 & SizeMask); lastFieldOffset1 = sz - BaseHeaderSize; goto l5; @@ -27911,7 +27893,7 @@ } /* begin literalCountOfHeader: */ /* begin headerOf: */ - methodHeader = longAt((oop1 + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = longAt((child + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); headerPointer = (isCogMethodReference(methodHeader) ? (assert(((((CogMethod *) methodHeader)->objectHeader)) == (nullHeaderForMachineCodeMethod())), (((CogMethod *) methodHeader)->methodHeader)) @@ -31615,6 +31597,7 @@ sqInt frameNumArgs1; sqInt i; sqInt methodHeader; + sqInt methodPointer; sqInt newCopy; sqInt objHeader; sqInt rcvr; @@ -31687,7 +31670,8 @@ /* begin rawHeaderOf:put: */ /* begin headerOf: */ - methodHeader = longAt(((longAt(GIV(stackPointer))) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodPointer = longAt(GIV(stackPointer)); + methodHeader = longAt((methodPointer + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); cogMethodOrMethodHeader = (isCogMethodReference(methodHeader) ? (assert(((((CogMethod *) methodHeader)->objectHeader)) == (nullHeaderForMachineCodeMethod())), (((CogMethod *) methodHeader)->methodHeader)) @@ -37831,7 +37815,6 @@ static void primitiveInterruptSemaphore(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt anObject; sqInt arg; sqInt ccIndex; sqInt top; @@ -37854,12 +37837,11 @@ } else { /* begin splObj:put: */ - anObject = GIV(nilObj); /* begin storePointer:ofObject:withValue: */ if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(GIV(specialObjectsOop), anObject); + possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj)); } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << ShiftForWord), anObject); + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << ShiftForWord), GIV(nilObj)); } } @@ -37874,8 +37856,6 @@ sqInt ccIndex; sqInt i; sqInt lookupClass; - sqInt object; - sqInt object1; sqInt runArgs; sqInt runReceiver; char *sp; @@ -37900,12 +37880,10 @@ GIV(stackPointer) += BytesPerWord; runReceiver = top; /* begin push: */ - object = GIV(newMethod); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); GIV(stackPointer) = sp; /* begin push: */ - object1 = GIV(messageSelector); - longAtput((sp1 = GIV(stackPointer) - BytesPerWord), object1); + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), GIV(messageSelector)); GIV(stackPointer) = sp1; /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), runArgs); @@ -38594,7 +38572,6 @@ sqInt activeContext; sqInt ccIndex; sqInt flushState; - sqInt object; sqInt sema; char *sp; @@ -38626,8 +38603,7 @@ } if (flushState) { /* begin push: */ - object = GIV(instructionPointer); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; activeContext = voidVMStateForSnapshot(); marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); @@ -38652,7 +38628,6 @@ static void primitiveLowSpaceSemaphore(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt anObject; sqInt arg; sqInt ccIndex; sqInt top; @@ -38675,12 +38650,11 @@ } else { /* begin splObj:put: */ - anObject = GIV(nilObj); /* begin storePointer:ofObject:withValue: */ if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(GIV(specialObjectsOop), anObject); + possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj)); } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << ShiftForWord), anObject); + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << ShiftForWord), GIV(nilObj)); } } @@ -40396,7 +40370,6 @@ sqInt activeContext; sqInt ccIndex; sqInt flushState; - sqInt object; sqInt sema; char *sp; @@ -40433,8 +40406,7 @@ GIV(profileSemaphore) = sema; if (flushState) { /* begin push: */ - object = GIV(instructionPointer); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; activeContext = voidVMStateForSnapshot(); marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); @@ -42015,9 +41987,7 @@ sqInt deltaMsecs; usqInt msecs; sqInt msecsObj; - sqInt oop; sqInt sema; - sqInt valuePointer; msecsObj = longAt(GIV(stackPointer)); sema = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -42047,12 +42017,10 @@ } else { /* begin storePointer:ofObject:withValue: */ - oop = GIV(specialObjectsOop); - valuePointer = GIV(nilObj); - if ((((usqInt) oop)) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(oop, valuePointer); + if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) { + possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj)); } - longAtput((oop + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), valuePointer); + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), GIV(nilObj)); GIV(nextWakeupUsecs) = 0; } /* begin pop: */ @@ -42069,11 +42037,9 @@ primitiveSignalAtUTCMicroseconds(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; - sqInt oop; sqInt sema; usqLong usecs; sqInt usecsObj; - sqInt valuePointer; usecsObj = longAt(GIV(stackPointer)); sema = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -42099,12 +42065,10 @@ } else { /* begin storePointer:ofObject:withValue: */ - oop = GIV(specialObjectsOop); - valuePointer = GIV(nilObj); - if ((((usqInt) oop)) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(oop, valuePointer); + if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) { + possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj)); } - longAtput((oop + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), valuePointer); + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), GIV(nilObj)); GIV(nextWakeupUsecs) = 0; } /* begin pop: */ @@ -43082,7 +43046,6 @@ char *sp; char *sp1; sqInt tempLink; - sqInt valuePointer; process = longAt(GIV(stackPointer)); if (process == (longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)))) { @@ -43177,11 +43140,10 @@ l1: /* end removeProcess:fromList: */; if (!GIV(primFailCode)) { /* begin storePointer:ofObject:withValue: */ - valuePointer = GIV(nilObj); if ((((usqInt) process)) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(process, valuePointer); + possibleRootStoreIntovalue(process, GIV(nilObj)); } - longAtput((process + BaseHeaderSize) + (MyListIndex << ShiftForWord), valuePointer); + longAtput((process + BaseHeaderSize) + (MyListIndex << ShiftForWord), GIV(nilObj)); /* begin pop:thenPush: */ longAtput((sp1 = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), myList); GIV(stackPointer) = sp1; @@ -48051,7 +48013,6 @@ EXPORT(sqInt) reestablishContextPriorToCallback(sqInt callbackContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT - StackPage *aPage; sqInt calloutContext; sqInt index; char *sp; @@ -48102,8 +48063,7 @@ if ((longAt(theFP + FoxSavedFP)) == 0) { /* begin freeStackPage: */ - aPage = GIV(stackPage); - freeStackPageNoAssert(aPage); + freeStackPageNoAssert(GIV(stackPage)); assert(pageListIsWellFormed()); } else { @@ -48376,7 +48336,6 @@ EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT - StackPage *aPage; sqInt calloutMethodContext; sqInt index; char *sp; @@ -48427,8 +48386,7 @@ if ((longAt(theFP + FoxSavedFP)) == 0) { /* begin freeStackPage: */ - aPage = GIV(stackPage); - freeStackPageNoAssert(aPage); + freeStackPageNoAssert(GIV(stackPage)); assert(pageListIsWellFormed()); } else { @@ -50311,8 +50269,6 @@ sqInt numArgs; sqInt numTemps; sqInt object; - sqInt object1; - sqInt object2; sqInt oop; sqInt oop1; sqInt oop2; @@ -50346,8 +50302,7 @@ (GIV(primFailCode) = PrimErrBadNumArgs); return; } /* begin push: */ - object2 = GIV(instructionPointer); - longAtput((sp12 = GIV(stackPointer) - BytesPerWord), object2); + longAtput((sp12 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp12; /* update state of active process */ @@ -50473,8 +50428,7 @@ marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); if (!GIV(primFailCode)) { /* begin push: */ - object = GIV(falseObj); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(falseObj)); GIV(stackPointer) = sp; } else { @@ -50536,7 +50490,7 @@ longAtput((sp3 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp3; /* begin push: */ - object1 = (VMBIGENDIAN + object = (VMBIGENDIAN ? ((1 + (numArgs << ((BytesPerWord * 8) - 8))) + ((0 ? 1 << ((BytesPerWord * 8) - 16) : 0))) + ((0 @@ -50547,7 +50501,7 @@ : 0))) + ((0 ? 1 << 24 : 0))); - longAtput((sp4 = GIV(stackPointer) - BytesPerWord), object1); + longAtput((sp4 = GIV(stackPointer) - BytesPerWord), object); GIV(stackPointer) = sp4; /* begin push: */ longAtput((sp5 = GIV(stackPointer) - BytesPerWord), 0); @@ -52418,9 +52372,9 @@ } -/* Record a process to be awoken on the next interpreter cycle. */ /* Record a process to be awoken on the next interpreter cycle. - Reimplement to record the source of the switch for debugging. */ + Reimplement to record the source of the switch for debugging, + and to cope with possible code compaction in makeBaseFrameFor:. */ static void transferTofrom(sqInt newProc, sqInt sourceCode) @@ -52430,20 +52384,14 @@ sqInt aProcess; sqInt index; StackPage *lastUsedPage; - char *lifp; - usqInt lip; - char *lisp; StackPage *lruOrFree; sqInt newContext; StackPage *newPage; - sqInt object; sqInt oldProc; sqInt sched; char *sp; - char *theFP; char *theFrame; StackPage *thePage; - char *theSP; sqInt top; sqInt value; @@ -52458,8 +52406,7 @@ } GIV(statProcessSwitch) += 1; /* begin push: */ - object = GIV(instructionPointer); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; /* begin externalWriteBackHeadFramePointers */ assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); @@ -52474,24 +52421,20 @@ (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); /* begin assertValidExecutionPointe:r:s: */ - lip = GIV(instructionPointer); - lifp = GIV(framePointer); - lisp = GIV(stackPointer); - assertValidExecutionPointersimbarline(lip, lifp, lisp, !((((usqInt)(longAt(lifp + FoxMethod)))) < (startOfMemory())), __LINE__); + assertValidExecutionPointersimbarline(GIV(instructionPointer), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); + GIV(instructionPointer) = 0; sched = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord)); oldProc = longAt((sched + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); /* begin ensureFrameIsMarried:SP: */ VM_LABEL(26ensureFrameIsMarriedSP); - theFP = GIV(framePointer); - theSP = GIV(stackPointer); - if (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 - : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { - assert(isContext(frameContext(theFP))); - activeContext = longAt(theFP + FoxThisContext); + if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) + ? ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((GIV(framePointer) + FoxIFrameFlags) + 2)) != 0)) { + assert(isContext(frameContext(GIV(framePointer)))); + activeContext = longAt(GIV(framePointer) + FoxThisContext); goto l1; } - activeContext = marryFrameSP(theFP, theSP); + activeContext = marryFrameSP(GIV(framePointer), GIV(stackPointer)); l1: /* end ensureFrameIsMarried:SP: */; /* begin storePointer:ofObject:withValue: */ if ((((usqInt) oldProc)) < (((usqInt) GIV(youngStart)))) { Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-25 23:57:06 UTC (rev 2759) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-29 22:32:45 UTC (rev 2760) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.314 uuid: e8cba0d1-78b9-4058-820f-62d6e02e180b */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-25 23:57:06 UTC (rev 2759) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-29 22:32:45 UTC (rev 2760) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.314 uuid: e8cba0d1-78b9-4058-820f-62d6e02e180b from - CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 + CoInterpreter VMMaker.oscog-eem.314 uuid: e8cba0d1-78b9-4058-820f-62d6e02e180b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.314 uuid: e8cba0d1-78b9-4058-820f-62d6e02e180b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -44,7 +44,13 @@ } void warningat(char *s, int l) { /* ditto with line number. */ - printf("\n%s %d\n", s,l); +#if 0 + printf("\n%s %d\n", s, l); +#else /* use alloca to call warning so one does not have to remember to set two breakpoints... */ + char *sl = alloca(strlen(s) + 16); + sprintf(sl, "%s %d", s, l); + warning(sl); +#endif } #pragma auto_inline on @@ -1982,7 +1988,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.312"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.314"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4146,7 +4152,6 @@ /* commonReturn */ { sqInt aMethodObj; - StackPage *aPage; sqInt callerContextOrNil; sqInt callerContextOrNil1; sqInt callerContextOrNil2; @@ -4375,8 +4380,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); /* begin freeStackPage: */ - aPage = GIV(stackPage); - freeStackPageNoAssert(aPage); + freeStackPageNoAssert(GIV(stackPage)); assert(pageListIsWellFormed()); while (!((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage))) { @@ -14445,7 +14449,6 @@ char *sp1; char *sp2; char *sp3; - char *theFP; StackPage *thePage; sqInt value; @@ -14495,14 +14498,13 @@ Make the interior frame the top frame. */ /* begin findFrameAbove:inPage: */ - theFP = GIV(framePointer); fp = (thePage->headFP); - if (fp == theFP) { + if (fp == GIV(framePointer)) { frameAbove = 0; goto l1; } while (((callerFP = frameCallerFP(fp))) != 0) { - if (callerFP == theFP) { + if (callerFP == GIV(framePointer)) { frameAbove = fp; goto l1; } @@ -14714,8 +14716,6 @@ sqInt ceDynamicSuperSendtonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aMethodObj; - sqInt aMethodOop; sqInt canLinkCacheTag; sqInt ccIndex; sqInt ccIndex1; @@ -14767,8 +14767,7 @@ /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(1ifAppropriateCompileToNativeCodeselector); - aMethodObj = GIV(newMethod); - methodHeader = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { /* makeBaseFrame: can create cog methods with nil selectors. */ @@ -14782,10 +14781,10 @@ if ((((((sqInt) methodHeader)) < 0 ? (((usqInt) methodHeader) >> 1) & 65535 : (((usqInt) methodHeader) >> 10) & 255)) <= maxLiteralCountForCompile) { - cogselector(aMethodObj, selector); + cogselector(GIV(newMethod), selector); } else { - maybeFlagMethodAsInterpreted(aMethodObj); + maybeFlagMethodAsInterpreted(GIV(newMethod)); } } } @@ -14799,8 +14798,7 @@ && ((((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12) && (isCogMethodReference(longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))))) { /* begin cogMethodOf: */ - aMethodOop = GIV(newMethod); - methodHeader1 = longAt((aMethodOop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader1 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); assert((isNonIntegerObject(methodHeader1)) && ((((usqInt)methodHeader1)) < (startOfMemory()))); cogMethod = ((CogMethod *) methodHeader1); @@ -14906,11 +14904,9 @@ sqInt firstBytecode; sqInt methodHeader; sqInt methodHeader1; - sqInt object; sqInt primBits; sqInt primitiveIndex; char *sp; - sqInt theClass; sqInt top; assert(((rcvr & 1)) @@ -14936,8 +14932,7 @@ && ((((((usqInt) (longAt(aMethodObj))) >> 8) & 15) >= 12) && (isCogMethodReference(longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))))) { /* begin push: */ - object = GIV(instructionPointer); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; executeCogMethodFromUnlinkedSendwithReceiver(cogMethodOf(aMethodObj), rcvr); assert(0); @@ -14959,7 +14954,6 @@ : ((primBits = ((usqInt) methodHeader) >> 1), (primBits & 511) + ((((usqInt) primBits) >> 19) & 512))); /* begin functionPointerFor:inClass: */ - theClass = GIV(nilObj); primitiveFunctionPointer = ((void (*)(void)) ((primitiveIndex > MaxPrimitiveIndex ? 0 : primitiveTable[primitiveIndex]))); @@ -14983,7 +14977,6 @@ sqInt ceNonLocalReturn(sqInt returnValue) { DECL_MAYBE_SQ_GLOBAL_STRUCT - StackPage *aPage; sqInt callerContextOrNil; sqInt callerContextOrNil1; sqInt callerContextOrNil2; @@ -15218,8 +15211,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); /* begin freeStackPage: */ - aPage = GIV(stackPage); - freeStackPageNoAssert(aPage); + freeStackPageNoAssert(GIV(stackPage)); assert(pageListIsWellFormed()); while (1) { assert(isContext(currentCtx)); @@ -15308,18 +15300,16 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aMethodObj; char *sp; - StackPage *thePage; assert(((anOop & 1)) || (addressCouldBeObj(anOop))); flag("are you really sure setStackPageAndLimit: is needed?"); /* begin setStackPageAndLimit: */ - thePage = GIV(stackPage); - GIV(stackPage) = thePage; + GIV(stackPage) = GIV(stackPage); if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { GIV(stackLimit) = (GIV(stackPage)->stackLimit); } - markStackPageMostRecentlyUsed(thePage); + markStackPageMostRecentlyUsed(GIV(stackPage)); assert(!(isMachineCodeFrame(GIV(framePointer)))); /* begin setMethod: */ /* begin iframeMethod: */ @@ -15354,7 +15344,6 @@ sqInt ceSendAborttonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aMethodObj; sqInt ccIndex; sqInt class; CogMethod *cogMethod; @@ -15387,8 +15376,7 @@ /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(2ifAppropriateCompileToNativeCodeselector); - aMethodObj = GIV(newMethod); - methodHeader = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { /* makeBaseFrame: can create cog methods with nil selectors. */ @@ -15402,10 +15390,10 @@ if ((((((sqInt) methodHeader)) < 0 ? (((usqInt) methodHeader) >> 1) & 65535 : (((usqInt) methodHeader) >> 10) & 255)) <= maxLiteralCountForCompile) { - cogselector(aMethodObj, selector); + cogselector(GIV(newMethod), selector); } else { - maybeFlagMethodAsInterpreted(aMethodObj); + maybeFlagMethodAsInterpreted(GIV(newMethod)); } } } @@ -15438,7 +15426,6 @@ sqInt ceSendFromInLineCacheMiss(CogMethod *oPIC) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aMethodObj; sqInt ccIndex; sqInt class; CogMethod *cogMethod; @@ -15474,9 +15461,8 @@ /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(3ifAppropriateCompileToNativeCodeselector); - aMethodObj = GIV(newMethod); selector = (oPIC->selector); - methodHeader = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { /* makeBaseFrame: can create cog methods with nil selectors. */ @@ -15490,10 +15476,10 @@ if ((((((sqInt) methodHeader)) < 0 ? (((usqInt) methodHeader) >> 1) & 65535 : (((usqInt) methodHeader) >> 10) & 255)) <= maxLiteralCountForCompile) { - cogselector(aMethodObj, selector); + cogselector(GIV(newMethod), selector); } else { - maybeFlagMethodAsInterpreted(aMethodObj); + maybeFlagMethodAsInterpreted(GIV(newMethod)); } } } @@ -15557,8 +15543,6 @@ sqInt ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aMethodObj; - sqInt aMethodOop; sqInt canLinkCacheTag; sqInt ccIndex; sqInt class; @@ -15610,8 +15594,7 @@ /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(4ifAppropriateCompileToNativeCodeselector); - aMethodObj = GIV(newMethod); - methodHeader = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { /* makeBaseFrame: can create cog methods with nil selectors. */ @@ -15625,10 +15608,10 @@ if ((((((sqInt) methodHeader)) < 0 ? (((usqInt) methodHeader) >> 1) & 65535 : (((usqInt) methodHeader) >> 10) & 255)) <= maxLiteralCountForCompile) { - cogselector(aMethodObj, selector); + cogselector(GIV(newMethod), selector); } else { - maybeFlagMethodAsInterpreted(aMethodObj); + maybeFlagMethodAsInterpreted(GIV(newMethod)); } } } @@ -15649,8 +15632,7 @@ && ((((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12) && (isCogMethodReference(longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))))) { /* begin cogMethodOf: */ - aMethodOop = GIV(newMethod); - methodHeader1 = longAt((aMethodOop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader1 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); assert((isNonIntegerObject(methodHeader1)) && ((((usqInt)methodHeader1)) < (startOfMemory()))); cogMethod = ((CogMethod *) methodHeader1); @@ -17597,6 +17579,10 @@ startTime = ioUTCMicrosecondsNow(); if (GIV(instructionPointer) != 0) { + + /* better not have already been pushed */ + + assert((((usqInt)(stackTop()))) != GIV(instructionPointer)); /* begin push: */ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; @@ -18327,10 +18313,12 @@ sqInt i; sqInt newClosure; sqInt newClosure1; + char *theSP; assert(isMachineCodeFrame(GIV(framePointer))); /* begin ensureFrameIsMarried:SP: */ VM_LABEL(13ensureFrameIsMarriedSP); + theSP = GIV(stackPointer) + ((1 + numCopied) * BytesPerWord); if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) ? ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 : (byteAt((GIV(framePointer) + FoxIFrameFlags) + 2)) != 0)) { @@ -18338,7 +18326,7 @@ context = longAt(GIV(framePointer) + FoxThisContext); goto l1; } - context = marryFrameSP(GIV(framePointer), GIV(stackPointer) + ((1 + numCopied) * BytesPerWord)); + context = marryFrameSP(GIV(framePointer), theSP); l1: /* end ensureFrameIsMarried:SP: */; /* begin closureIn:numArgs:instructionPointer:numCopiedValues: */ VM_LABEL(2closureInnumArgsinstructionPointernumCopiedValues); @@ -24007,11 +23995,9 @@ static void initializeMemoryFirstFree(sqInt firstFree) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt end; sqInt fwdBlockBytes; usqInt i; sqInt newEndOfMemory; - usqInt start; sqInt totalReserve; fwdBlockBytes = GIV(totalObjectCount) & ((WordMask - BytesPerWord) + 1); @@ -24039,10 +24025,8 @@ GIV(freeStart) = firstFree; GIV(scavengeThreshold) = (((GIV(freeStart) + GIV(edenBytes)) < GIV(reserveStart)) ? (GIV(freeStart) + GIV(edenBytes)) : GIV(reserveStart)); /* begin maybeFillWithAllocationCheckFillerFrom:to: */ - start = GIV(freeStart); - end = GIV(scavengeThreshold); if (AllocationCheckFiller != 0) { - for (i = start; i <= end; i += BytesPerWord) { + for (i = GIV(freeStart); i <= GIV(scavengeThreshold); i += BytesPerWord) { longAtput(i, (AllocationCheckFiller == 182275669 ? i : AllocationCheckFiller)); @@ -27661,7 +27645,6 @@ sqInt methodHeader1; sqInt numLiterals; sqInt numLiterals1; - sqInt oop1; sqInt parentField; void *pointer; void *pointer1; @@ -27848,8 +27831,7 @@ goto l2; } /* begin lastPointerOf:recordWeakRoot: */ - oop1 = child; - header3 = longAt(oop1); + header3 = longAt(child); fmt = (((usqInt) header3) >> 8) & 15; if (fmt <= 4) { if (fmt >= 3) { @@ -27862,18 +27844,18 @@ if (!(((GIV(weakRootCount) += 1)) <= WeakRootTableSize)) { error("weakRoots table overflow"); } - GIV(weakRoots)[GIV(weakRootCount)] = oop1; + GIV(weakRoots)[GIV(weakRootCount)] = child; } - lastFieldOffset1 = (nonWeakFieldsOf(oop1)) << ShiftForWord; + lastFieldOffset1 = (nonWeakFieldsOf(child)) << ShiftForWord; goto l5; } if (((((usqInt) header3) >> 12) & 31) == ClassMethodContextCompactIndex) { /* begin setTraceFlagOnContextsFramesPageIfNeeded: */ - if ((((longAt((oop1 + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(oop1)))) { + if ((((longAt((child + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(child)))) { /* begin stackPageFor: */ /* begin frameOfMarriedContext: */ - value = longAt((oop1 + BaseHeaderSize) + (SenderIndex << ShiftForWord)); + value = longAt((child + BaseHeaderSize) + (SenderIndex << ShiftForWord)); /* begin withoutSmallIntegerTags: */ assert((value & 1)); pointer = ((char *) (pointerForOop(value - 1))); @@ -27888,28 +27870,28 @@ } } /* begin fetchStackPointerOf: */ - sp = longAt((oop1 + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + sp = longAt((child + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); if (!((sp & 1))) { contextSize = 0; goto l4; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(oop1))); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(child))); contextSize = (sp >> 1); l4: /* end fetchStackPointerOf: */; - assert((ReceiverIndex + contextSize) < (lengthOfbaseHeaderformat(oop1, header3, fmt))); + assert((ReceiverIndex + contextSize) < (lengthOfbaseHeaderformat(child, header3, fmt))); lastFieldOffset1 = (CtxtTempFrameStart + contextSize) * BytesPerWord; goto l5; } } /* begin sizeBitsOfSafe: */ - header11 = longAt(oop1); + header11 = longAt(child); type1 = ((header11 & SizeMask) == 0 ? HeaderTypeSizeAndClass : ((header11 & CompactClassMask) == 0 ? HeaderTypeClass : HeaderTypeShort)); sz = (type1 == HeaderTypeSizeAndClass - ? (longAt(oop1 - (BytesPerWord * 2))) & AllButTypeMask + ? (longAt(child - (BytesPerWord * 2))) & AllButTypeMask : header11 & SizeMask); lastFieldOffset1 = sz - BaseHeaderSize; goto l5; @@ -27920,7 +27902,7 @@ } /* begin literalCountOfHeader: */ /* begin headerOf: */ - methodHeader = longAt((oop1 + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = longAt((child + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); headerPointer = (isCogMethodReference(methodHeader) ? (assert(((((CogMethod *) methodHeader)->objectHeader)) == (nullHeaderForMachineCodeMethod())), (((CogMethod *) methodHeader)->methodHeader)) @@ -31624,6 +31606,7 @@ sqInt frameNumArgs1; sqInt i; sqInt methodHeader; + sqInt methodPointer; sqInt newCopy; sqInt objHeader; sqInt rcvr; @@ -31696,7 +31679,8 @@ /* begin rawHeaderOf:put: */ /* begin headerOf: */ - methodHeader = longAt(((longAt(GIV(stackPointer))) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodPointer = longAt(GIV(stackPointer)); + methodHeader = longAt((methodPointer + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); cogMethodOrMethodHeader = (isCogMethodReference(methodHeader) ? (assert(((((CogMethod *) methodHeader)->objectHeader)) == (nullHeaderForMachineCodeMethod())), (((CogMethod *) methodHeader)->methodHeader)) @@ -37840,7 +37824,6 @@ static void primitiveInterruptSemaphore(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt anObject; sqInt arg; sqInt ccIndex; sqInt top; @@ -37863,12 +37846,11 @@ } else { /* begin splObj:put: */ - anObject = GIV(nilObj); /* begin storePointer:ofObject:withValue: */ if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(GIV(specialObjectsOop), anObject); + possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj)); } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << ShiftForWord), anObject); + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << ShiftForWord), GIV(nilObj)); } } @@ -37883,8 +37865,6 @@ sqInt ccIndex; sqInt i; sqInt lookupClass; - sqInt object; - sqInt object1; sqInt runArgs; sqInt runReceiver; char *sp; @@ -37909,12 +37889,10 @@ GIV(stackPointer) += BytesPerWord; runReceiver = top; /* begin push: */ - object = GIV(newMethod); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); GIV(stackPointer) = sp; /* begin push: */ - object1 = GIV(messageSelector); - longAtput((sp1 = GIV(stackPointer) - BytesPerWord), object1); + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), GIV(messageSelector)); GIV(stackPointer) = sp1; /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), runArgs); @@ -38603,7 +38581,6 @@ sqInt activeContext; sqInt ccIndex; sqInt flushState; - sqInt object; sqInt sema; char *sp; @@ -38635,8 +38612,7 @@ } if (flushState) { /* begin push: */ - object = GIV(instructionPointer); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; activeContext = voidVMStateForSnapshot(); marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); @@ -38661,7 +38637,6 @@ static void primitiveLowSpaceSemaphore(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt anObject; sqInt arg; sqInt ccIndex; sqInt top; @@ -38684,12 +38659,11 @@ } else { /* begin splObj:put: */ - anObject = GIV(nilObj); /* begin storePointer:ofObject:withValue: */ if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(GIV(specialObjectsOop), anObject); + possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj)); } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << ShiftForWord), anObject); + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << ShiftForWord), GIV(nilObj)); } } @@ -40405,7 +40379,6 @@ sqInt activeContext; sqInt ccIndex; sqInt flushState; - sqInt object; sqInt sema; char *sp; @@ -40442,8 +40415,7 @@ GIV(profileSemaphore) = sema; if (flushState) { /* begin push: */ - object = GIV(instructionPointer); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; activeContext = voidVMStateForSnapshot(); marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); @@ -42024,9 +41996,7 @@ sqInt deltaMsecs; usqInt msecs; sqInt msecsObj; - sqInt oop; sqInt sema; - sqInt valuePointer; msecsObj = longAt(GIV(stackPointer)); sema = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -42056,12 +42026,10 @@ } else { /* begin storePointer:ofObject:withValue: */ @@ Diff output truncated at 50000 characters. @@

1 0

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

30 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.314.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.314 Author: eem Time: 29 July 2013, 3:13:51.976 pm UUID: e8cba0d1-78b9-4058-820f-62d6e02e180b Ancestors: VMMaker.oscog-eem.312 Fix bug in transferTo:(from:) when doing a code compaction when ensuring there is a machine code method when switching to a process whose context has a machine code pc. Add an assert to commenceCogCompiledCodeCompaction to catch the actual bug (pushing the instructionPointer twice). Improve inlining via inlineSend:directReturn:exitVar:in: by refactoring argAssignmentsFor:args:in:'s innards. Now global variables are inlined if they are only read within the code being inlined. Implement warningat in term of warning so one only has to remember to set a breakpoint in warning, not both. =============== Diff against VMMaker.oscog-eem.312 =============== 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]. cogit recordPrimTrace ifTrue: [self fastLogPrim: TraceCodeCompaction]. 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: + ["better not have already been pushed" + self assert: self stackTop asUnsignedInteger ~= instructionPointer. + self push: instructionPointer. - [self push: instructionPointer. self externalWriteBackHeadStackPointer]. self assertValidStackedInstructionPointers: #'__LINE__'. cogit compactCogCompiledCode. 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: CoInterpreter>>transferTo:from: (in category 'process primitive support') ----- transferTo: newProc from: sourceCode "Record a process to be awoken on the next interpreter cycle. + Reimplement to record the source of the switch for debugging, + and to cope with possible code compaction in makeBaseFrameFor:." + | activeContext sched oldProc | - Reimplement to record the source of the switch for debugging." <inline: false> self recordContextSwitchFrom: self activeProcess in: sourceCode. + statProcessSwitch := statProcessSwitch + 1. + self push: instructionPointer. + self externalWriteBackHeadFramePointers. + self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer. + "ensureMethodIsCogged: in makeBaseFrameFor: in + externalSetStackPageAndPointersForSuspendedContextOfProcess: + below may do a code compaction. Nil instructionPointer to avoid it getting pushed twice." + instructionPointer := 0. + sched := self schedulerPointer. + oldProc := objectMemory fetchPointer: ActiveProcessIndex ofObject: sched. + activeContext := self ensureFrameIsMarried: framePointer SP: stackPointer. + objectMemory storePointer: SuspendedContextIndex ofObject: oldProc withValue: activeContext. + objectMemory storePointer: ActiveProcessIndex ofObject: sched withValue: newProc. + objectMemory storePointerUnchecked: MyListIndex ofObject: newProc withValue: objectMemory nilObject. + self externalSetStackPageAndPointersForSuspendedContextOfProcess: newProc! - super transferTo: newProc! Item was changed: ----- Method: StackInterpreter class>>preambleCCode (in category 'translation') ----- preambleCCode ^ '/* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off void warning(char *s) { /* Print an error message but don''t exit. */ printf("\n%s\n", s); } void warningat(char *s, int l) { /* ditto with line number. */ + #if 0 + printf("\n%s %d\n", s, l); + #else /* use alloca to call warning so one does not have to remember to set two breakpoints... */ + char *sl = alloca(strlen(s) + 16); + sprintf(sl, "%s %d", s, l); + warning(sl); + #endif - printf("\n%s %d\n", s,l); } #pragma auto_inline on void invalidCompactClassError(char *s) { /* Print a compact class index error message and exit. */ printf("\nClass %s does not have the required compact class index\n", s); exit(-1); } /* * Define sigsetjmp and siglongjmp to be the most minimal setjmp/longjmp available on the platform. */ #if WIN32 # define sigsetjmp(jb,ssmf) setjmp(jb) # define siglongjmp(jb,v) longjmp(jb,v) #else # define sigsetjmp(jb,ssmf) _setjmp(jb) # define siglongjmp(jb,v) _longjmp(jb,v) #endif '! Item was changed: ----- Method: TMethod>>argAssignmentsFor:args:in: (in category 'inlining') ----- argAssignmentsFor: meth args: argList in: aCodeGen "Return a collection of assignment nodes that assign the given argument expressions to the formal parameter variables of the given method." "Optimization: If the actual parameters are either constants or local variables in the target method (the receiver), substitute them directly into the body of meth. Note that global variables cannot be subsituted because the inlined method might depend on the exact ordering of side effects to the globals." | stmtList substitutionDict | stmtList := OrderedCollection new: 100. substitutionDict := Dictionary new: 100. meth args with: argList do: [ :argName :exprNode | + (self isNode: exprNode substitutableFor: argName inMethod: meth in: aCodeGen) - (self isSubstitutableNode: exprNode intoMethod: meth in: aCodeGen) ifTrue: [substitutionDict at: argName put: exprNode. locals remove: argName] ifFalse: [stmtList add: (TAssignmentNode new setVariable: (TVariableNode new setName: argName) expression: exprNode copy)]]. meth parseTree: (meth parseTree bindVariablesIn: substitutionDict). ^stmtList! Item was added: + ----- Method: TMethod>>isNode:substitutableFor:inMethod:in: (in category 'inlining') ----- + isNode: aNode substitutableFor: argName inMethod: targetMeth in: aCodeGen + "Answer true if the given parameter node is either a constant, a local variable, or a formal parameter of the receiver. Such parameter nodes may be substituted directly into the body of the method during inlining. Note that global variables cannot be subsituted into methods with possible side effects (i.e., methods that may assign to global variables) because the inlined method might depend on having the value of the global variable captured when it is passed in as an argument." + + | var | + aNode isConstant ifTrue: [^true]. + + aNode isVariable ifTrue: + [var := aNode name. + ((locals includes: var) or: [args includes: var]) ifTrue: [^true]. + (#(self true false nil) includes: var) ifTrue: [^true]. + "We can substitute any variable provided it is only read in the method being inlined." + (targetMeth isComplete + and: [targetMeth parseTree noneSatisfy: + [:node| + node isAssignment and: [node variable name = argName]]]) ifTrue: + [^true]. + (targetMeth maySubstituteGlobal: var in: aCodeGen) ifTrue: [^true]]. + + "For now allow literal blocks to be substituted. They better be accessed only + with value[:value:*] messages though!!" + aNode isStmtList ifTrue: [^true]. + + "scan expression tree; must contain only constants, builtin ops, and inlineable vars" + aNode nodesDo: [ :node | + node isSend ifTrue: [ + node isBuiltinOperator ifFalse: [^false]. + ]. + node isVariable ifTrue: [ + var := node name. + ((locals includes: var) or: + [(args includes: var) or: + [(#(self true false nil) includes: var) or: + [targetMeth maySubstituteGlobal: var in: aCodeGen]]]) ifFalse: [^false]. + ]. + (node isConstant or: [node isVariable or: [node isSend]]) ifFalse: [^false]. + ]. + + ^ true!

1 0

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

30 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.313.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.313 Author: eem Time: 29 July 2013, 3:07:32.118 pm UUID: 58726514-0b41-49ce-9174-607987d7ba38 Ancestors: VMMaker.oscog-eem.312 Fix bug in transferTo:(from:) when doing a code compaction when ensuring there is a machine code method when switching to a process whose context has a machine code pc. Improve inlining via inlineSend:directReturn:exitVar:in: by refactoring argAssignmentsFor:args:in:'s innards. Now global varaibles are inlined if they are only read within the code being inlined. =============== Diff against VMMaker.oscog-eem.312 =============== 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]. cogit recordPrimTrace ifTrue: [self fastLogPrim: TraceCodeCompaction]. 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: + ["better not have aready been pushed" + self assert: self stackTop asUnsignedInteger ~= instructionPointer. + self push: instructionPointer. - [self push: instructionPointer. self externalWriteBackHeadStackPointer]. self assertValidStackedInstructionPointers: #'__LINE__'. cogit compactCogCompiledCode. 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: CoInterpreter>>transferTo:from: (in category 'process primitive support') ----- transferTo: newProc from: sourceCode "Record a process to be awoken on the next interpreter cycle. + Reimplement to record the source of the switch for debugging, + and to cope with possible code compaction in makeBaseFrameFor:." + | activeContext sched oldProc | - Reimplement to record the source of the switch for debugging." <inline: false> self recordContextSwitchFrom: self activeProcess in: sourceCode. + statProcessSwitch := statProcessSwitch + 1. + self push: instructionPointer. + self externalWriteBackHeadFramePointers. + self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer. + "ensureMethodIsCogged: in makeBaseFrameFor: in + externalSetStackPageAndPointersForSuspendedContextOfProcess: + below may do a code compaction. Nil instructionPointer to avoid it getting pushed twice." + instructionPointer := 0. + sched := self schedulerPointer. + oldProc := objectMemory fetchPointer: ActiveProcessIndex ofObject: sched. + activeContext := self ensureFrameIsMarried: framePointer SP: stackPointer. + objectMemory storePointer: SuspendedContextIndex ofObject: oldProc withValue: activeContext. + objectMemory storePointer: ActiveProcessIndex ofObject: sched withValue: newProc. + objectMemory storePointerUnchecked: MyListIndex ofObject: newProc withValue: objectMemory nilObject. + self externalSetStackPageAndPointersForSuspendedContextOfProcess: newProc! - super transferTo: newProc! Item was changed: ----- Method: StackInterpreter class>>preambleCCode (in category 'translation') ----- preambleCCode ^ '/* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off void warning(char *s) { /* Print an error message but don''t exit. */ printf("\n%s\n", s); } void warningat(char *s, int l) { /* ditto with line number. */ + #if 0 + printf("\n%s %d\n", s, l); + #else /* use alloca to call warning so one does not have to remember to set two breakpoints... */ + char *sl = alloca(strlen(s) + 16); + sprintf(sl, "%s %d", s, l); + warning(sl); + #endif - printf("\n%s %d\n", s,l); } #pragma auto_inline on void invalidCompactClassError(char *s) { /* Print a compact class index error message and exit. */ printf("\nClass %s does not have the required compact class index\n", s); exit(-1); } /* * Define sigsetjmp and siglongjmp to be the most minimal setjmp/longjmp available on the platform. */ #if WIN32 # define sigsetjmp(jb,ssmf) setjmp(jb) # define siglongjmp(jb,v) longjmp(jb,v) #else # define sigsetjmp(jb,ssmf) _setjmp(jb) # define siglongjmp(jb,v) _longjmp(jb,v) #endif '! Item was changed: ----- Method: TMethod>>argAssignmentsFor:args:in: (in category 'inlining') ----- argAssignmentsFor: meth args: argList in: aCodeGen "Return a collection of assignment nodes that assign the given argument expressions to the formal parameter variables of the given method." "Optimization: If the actual parameters are either constants or local variables in the target method (the receiver), substitute them directly into the body of meth. Note that global variables cannot be subsituted because the inlined method might depend on the exact ordering of side effects to the globals." | stmtList substitutionDict | stmtList := OrderedCollection new: 100. substitutionDict := Dictionary new: 100. meth args with: argList do: [ :argName :exprNode | + (self isNode: exprNode substitutableFor: argName inMethod: meth in: aCodeGen) - (self isSubstitutableNode: exprNode intoMethod: meth in: aCodeGen) ifTrue: [substitutionDict at: argName put: exprNode. locals remove: argName] ifFalse: [stmtList add: (TAssignmentNode new setVariable: (TVariableNode new setName: argName) expression: exprNode copy)]]. meth parseTree: (meth parseTree bindVariablesIn: substitutionDict). ^stmtList! Item was added: + ----- Method: TMethod>>isNode:substitutableFor:inMethod:in: (in category 'inlining') ----- + isNode: aNode substitutableFor: argName inMethod: targetMeth in: aCodeGen + "Answer true if the given parameter node is either a constant, a local variable, or a formal parameter of the receiver. Such parameter nodes may be substituted directly into the body of the method during inlining. Note that global variables cannot be subsituted into methods with possible side effects (i.e., methods that may assign to global variables) because the inlined method might depend on having the value of the global variable captured when it is passed in as an argument." + + | var | + aNode isConstant ifTrue: [^true]. + + aNode isVariable ifTrue: + [var := aNode name. + ((locals includes: var) or: [args includes: var]) ifTrue: [^true]. + (#(self true false nil) includes: var) ifTrue: [^true]. + "We can substitute any variable provided it is only read in the method being inlined." + (targetMeth isComplete + and: [targetMeth parseTree noneSatisfy: + [:node| + node isAssignment and: [node variable name = argName]]]) ifTrue: + [^true]. + (targetMeth maySubstituteGlobal: var in: aCodeGen) ifTrue: [^true]]. + + "For now allow literal blocks to be substituted. They better be accessed only + with value[:value:*] messages though!!" + aNode isStmtList ifTrue: [^true]. + + "scan expression tree; must contain only constants, builtin ops, and inlineable vars" + aNode nodesDo: [ :node | + node isSend ifTrue: [ + node isBuiltinOperator ifFalse: [^false]. + ]. + node isVariable ifTrue: [ + var := node name. + ((locals includes: var) or: + [(args includes: var) or: + [(#(self true false nil) includes: var) or: + [targetMeth maySubstituteGlobal: var in: aCodeGen]]]) ifFalse: [^false]. + ]. + (node isConstant or: [node isVariable or: [node isSend]]) ifFalse: [^false]. + ]. + + ^ true!

1 0

[commit][2759] CogVM source as per VMMaker.oscog-eem.312
by commits＠squeakvm.org 26 Jul '13

26 Jul '13

Revision: 2759 Author: eliot Date: 2013-07-25 16:57:06 -0700 (Thu, 25 Jul 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.312 Add tracing of GCs and code compactions to primTraceLog. Modified Paths: -------------- 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/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/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-25 23:57:06 UTC (rev 2759) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 from - CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1056,6 +1056,7 @@ void printObjectsFromto(sqInt startAddress, sqInt endAddress); static void printOopShort(sqInt oop); void printOop(sqInt oop); +static void printPrimLogEntryAt(sqInt i); void printProcessStack(sqInt aProcess); void printProcsOnList(sqInt procList); void printReferencesTo(sqInt anOop); @@ -1239,9 +1240,9 @@ _iss usqInt memoryLimit; _iss usqInt endOfMemory; _iss StackPage * mostRecentlyUsedPage; +_iss unsigned char primTraceLogIndex; _iss sqInt numStackPages; _iss usqInt scavengeThreshold; -_iss unsigned char primTraceLogIndex; _iss sqLong nextProfileTick; _iss sqInt needGCFlag; _iss sqInt jmpDepth; @@ -1978,7 +1979,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.311"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.312"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -17573,6 +17574,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = TraceCodeCompaction; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } /* 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 @@ -18997,13 +19003,13 @@ } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { for (i = GIV(primTraceLogIndex); i <= (PrimTraceLogSize - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } } for (i = 0; i <= (GIV(primTraceLogIndex) - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } @@ -22318,6 +22324,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeFull == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -23659,6 +23673,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeIncr == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -46863,6 +46885,32 @@ } } +static void +printPrimLogEntryAt(sqInt i) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt intOrSelector; + + intOrSelector = GIV(primTraceLog)[i]; + if ((intOrSelector & 1)) { + if (intOrSelector == TraceIncrementalGC) { + print("**IncrementalGC**"); + return; + } + if (intOrSelector == TraceFullGC) { + print("**FullGC**"); + return; + } + if (intOrSelector == TraceCodeCompaction) { + print("**CompactCode**"); + return; + } + print("???"); + } + else { + safePrintStringOf(intOrSelector); + } +} + void printProcessStack(sqInt aProcess) { DECL_MAYBE_SQ_GLOBAL_STRUCT Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-25 23:57:06 UTC (rev 2759) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-25 23:57:06 UTC (rev 2759) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 from - CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1059,6 +1059,7 @@ void printObjectsFromto(sqInt startAddress, sqInt endAddress); static void printOopShort(sqInt oop); void printOop(sqInt oop); +static void printPrimLogEntryAt(sqInt i); void printProcessStack(sqInt aProcess); void printProcsOnList(sqInt procList); void printReferencesTo(sqInt anOop); @@ -1242,9 +1243,9 @@ _iss usqInt memoryLimit; _iss usqInt endOfMemory; _iss StackPage * mostRecentlyUsedPage; +_iss unsigned char primTraceLogIndex; _iss sqInt numStackPages; _iss usqInt scavengeThreshold; -_iss unsigned char primTraceLogIndex; _iss sqLong nextProfileTick; _iss sqInt needGCFlag; _iss sqInt jmpDepth; @@ -1981,7 +1982,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.311"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.312"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -17582,6 +17583,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = TraceCodeCompaction; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } /* 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 @@ -19006,13 +19012,13 @@ } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { for (i = GIV(primTraceLogIndex); i <= (PrimTraceLogSize - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } } for (i = 0; i <= (GIV(primTraceLogIndex) - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } @@ -22327,6 +22333,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeFull == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -23668,6 +23682,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeIncr == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -46872,6 +46894,32 @@ } } +static void +printPrimLogEntryAt(sqInt i) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt intOrSelector; + + intOrSelector = GIV(primTraceLog)[i]; + if ((intOrSelector & 1)) { + if (intOrSelector == TraceIncrementalGC) { + print("**IncrementalGC**"); + return; + } + if (intOrSelector == TraceFullGC) { + print("**FullGC**"); + return; + } + if (intOrSelector == TraceCodeCompaction) { + print("**CompactCode**"); + return; + } + print("???"); + } + else { + safePrintStringOf(intOrSelector); + } +} + void printProcessStack(sqInt aProcess) { DECL_MAYBE_SQ_GLOBAL_STRUCT Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/nscogsrc/vm/interp.h 2013-07-25 23:57:06 UTC (rev 2759) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-25 23:57:06 UTC (rev 2759) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jul 25 11:12:49 PDT 2013 + Thu Jul 25 16:56:39 PDT 2013 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/src/vm/cointerp.c 2013-07-25 23:57:06 UTC (rev 2759) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 from - CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1047,6 +1047,7 @@ void printObjectsFromto(sqInt startAddress, sqInt endAddress); static void printOopShort(sqInt oop); void printOop(sqInt oop); +static void printPrimLogEntryAt(sqInt i); void printProcessStack(sqInt aProcess); void printProcsOnList(sqInt procList); void printReferencesTo(sqInt anOop); @@ -1229,9 +1230,9 @@ _iss usqInt memoryLimit; _iss usqInt endOfMemory; _iss StackPage * mostRecentlyUsedPage; +_iss unsigned char primTraceLogIndex; _iss sqInt numStackPages; _iss usqInt scavengeThreshold; -_iss unsigned char primTraceLogIndex; _iss sqLong nextProfileTick; _iss sqInt needGCFlag; _iss sqInt jmpDepth; @@ -1968,7 +1969,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.311]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.312]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13498,6 +13499,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = TraceCodeCompaction; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } /* 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 @@ -14911,13 +14917,13 @@ } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { for (i = GIV(primTraceLogIndex); i <= (PrimTraceLogSize - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } } for (i = 0; i <= (GIV(primTraceLogIndex) - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } @@ -18142,6 +18148,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeFull == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -19274,6 +19288,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeIncr == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -42345,6 +42367,32 @@ } } +static void +printPrimLogEntryAt(sqInt i) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt intOrSelector; + + intOrSelector = GIV(primTraceLog)[i]; + if ((intOrSelector & 1)) { + if (intOrSelector == TraceIncrementalGC) { + print("**IncrementalGC**"); + return; + } + if (intOrSelector == TraceFullGC) { + print("**FullGC**"); + return; + } + if (intOrSelector == TraceCodeCompaction) { + print("**CompactCode**"); + return; + } + print("???"); + } + else { + safePrintStringOf(intOrSelector); + } +} + void printProcessStack(sqInt aProcess) { DECL_MAYBE_SQ_GLOBAL_STRUCT Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/src/vm/cointerp.h 2013-07-25 23:57:06 UTC (rev 2759) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/src/vm/cointerpmt.c 2013-07-25 23:57:06 UTC (rev 2759) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 from - CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CoInterpreterMT VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1112,6 +1112,7 @@ void printObjectsFromto(sqInt startAddress, sqInt endAddress); static void printOopShort(sqInt oop); void printOop(sqInt oop); +static void printPrimLogEntryAt(sqInt i); void printProcessStack(sqInt aProcess); void printProcsOnList(sqInt procList); void printReferencesTo(sqInt anOop); @@ -1312,10 +1313,10 @@ _iss usqInt memoryLimit; _iss usqInt endOfMemory; _iss StackPage * mostRecentlyUsedPage; +_iss unsigned char primTraceLogIndex; _iss sqInt numStackPages; _iss usqInt scavengeThreshold; _iss sqInt numThreads; -_iss unsigned char primTraceLogIndex; _iss CogVMThread ** threads; _iss sqLong nextProfileTick; _iss sqInt processHasThreadId; @@ -2067,7 +2068,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.311]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.312]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -13925,6 +13926,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = (0 + (((usqInt) (getVMOwner()) << 16))); GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = TraceCodeCompaction; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } /* 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 @@ -15477,13 +15483,13 @@ } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { for (i = GIV(primTraceLogIndex); i <= (PrimTraceLogSize - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } } for (i = 0; i <= (GIV(primTraceLogIndex) - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } @@ -18827,6 +18833,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = (0 + (((usqInt) (getVMOwner()) << 16))); GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeFull == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -20003,6 +20017,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = (0 + (((usqInt) (getVMOwner()) << 16))); GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeIncr == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -43752,6 +43774,32 @@ } } +static void +printPrimLogEntryAt(sqInt i) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt intOrSelector; + + intOrSelector = GIV(primTraceLog)[i]; + if ((intOrSelector & 1)) { + if (intOrSelector == TraceIncrementalGC) { + print("**IncrementalGC**"); + return; + } + if (intOrSelector == TraceFullGC) { + print("**FullGC**"); + return; + } + if (intOrSelector == TraceCodeCompaction) { + print("**CompactCode**"); + return; + } + print("???"); + } + else { + safePrintStringOf(intOrSelector); + } +} + void printProcessStack(sqInt aProcess) { DECL_MAYBE_SQ_GLOBAL_STRUCT Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/src/vm/cointerpmt.h 2013-07-25 23:57:06 UTC (rev 2759) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-25 23:57:06 UTC (rev 2759) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 from - CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1050,6 +1050,7 @@ void printObjectsFromto(sqInt startAddress, sqInt endAddress); static void printOopShort(sqInt oop); void printOop(sqInt oop); +static void printPrimLogEntryAt(sqInt i); void printProcessStack(sqInt aProcess); void printProcsOnList(sqInt procList); void printReferencesTo(sqInt anOop); @@ -1232,9 +1233,9 @@ _iss usqInt memoryLimit; _iss usqInt endOfMemory; _iss StackPage * mostRecentlyUsedPage; +_iss unsigned char primTraceLogIndex; _iss sqInt numStackPages; _iss usqInt scavengeThreshold; -_iss unsigned char primTraceLogIndex; _iss sqLong nextProfileTick; _iss sqInt needGCFlag; _iss sqInt jmpDepth; @@ -1971,7 +1972,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.311]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.312]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13507,6 +13508,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = TraceCodeCompaction; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } /* 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 @@ -14920,13 +14926,13 @@ } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { for (i = GIV(primTraceLogIndex); i <= (PrimTraceLogSize - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } } for (i = 0; i <= (GIV(primTraceLogIndex) - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } @@ -18151,6 +18157,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeFull == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -19283,6 +19297,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeIncr == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -42354,6 +42376,32 @@ } } +static void +printPrimLogEntryAt(sqInt i) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt intOrSelector; + + intOrSelector = GIV(primTraceLog)[i]; + if ((intOrSelector & 1)) { + if (intOrSelector == TraceIncrementalGC) { + print("**IncrementalGC**"); + return; + } + if (intOrSelector == TraceFullGC) { + print("**FullGC**"); + return; + } + if (intOrSelector == TraceCodeCompaction) { + print("**CompactCode**"); + return; + } + print("???"); + } + else { + safePrintStringOf(intOrSelector); + } +} + void printProcessStack(sqInt aProcess) { DECL_MAYBE_SQ_GLOBAL_STRUCT Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-25 23:57:06 UTC (rev 2759) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 from - CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CoInterpreterMT VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1115,6 +1115,7 @@ void printObjectsFromto(sqInt startAddress, sqInt endAddress); static void printOopShort(sqInt oop); void printOop(sqInt oop); +static void printPrimLogEntryAt(sqInt i); void printProcessStack(sqInt aProcess); void printProcsOnList(sqInt procList); void printReferencesTo(sqInt anOop); @@ -1315,10 +1316,10 @@ _iss usqInt memoryLimit; _iss usqInt endOfMemory; _iss StackPage * mostRecentlyUsedPage; +_iss unsigned char primTraceLogIndex; _iss sqInt numStackPages; _iss usqInt scavengeThreshold; _iss sqInt numThreads; -_iss unsigned char primTraceLogIndex; _iss CogVMThread ** threads; _iss sqLong nextProfileTick; _iss sqInt processHasThreadId; @@ -2070,7 +2071,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.311]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.312]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -13934,6 +13935,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = (0 + (((usqInt) (getVMOwner()) << 16))); GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = TraceCodeCompaction; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } /* 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 @@ -15486,13 +15492,13 @@ } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { for (i = GIV(primTraceLogIndex); i <= (PrimTraceLogSize - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } } for (i = 0; i <= (GIV(primTraceLogIndex) - 1); i += 1) { - safePrintStringOf(GIV(primTraceLog)[i]); + printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } @@ -18836,6 +18842,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = (0 + (((usqInt) (getVMOwner()) << 16))); GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeFull == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -20012,6 +20026,14 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = (0 + (((usqInt) (getVMOwner()) << 16))); GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } + if (recordPrimTrace()) { + traceType = (GCModeIncr == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -43761,6 +43783,32 @@ } } +static void +printPrimLogEntryAt(sqInt i) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt intOrSelector; + + intOrSelector = GIV(primTraceLog)[i]; + if ((intOrSelector & 1)) { + if (intOrSelector == TraceIncrementalGC) { + print("**IncrementalGC**"); + return; + } + if (intOrSelector == TraceFullGC) { + print("**FullGC**"); + return; + } + if (intOrSelector == TraceCodeCompaction) { + print("**CompactCode**"); + return; + } + print("???"); + } + else { + safePrintStringOf(intOrSelector); + } +} + void printProcessStack(sqInt aProcess) { DECL_MAYBE_SQ_GLOBAL_STRUCT Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/src/vm/interp.h 2013-07-25 23:57:06 UTC (rev 2759) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-07-25 18:13:19 UTC (rev 2758) +++ branches/Cog/src/vm/vmCallback.h 2013-07-25 23:57:06 UTC (rev 2759) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.312 uuid: c3721341-0803-4acd-aa1e-48ab09aca8e3 */ #define VM_CALLBACK_INC 1

1 0

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

26 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.312.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.312 Author: eem Time: 25 July 2013, 4:51:01.71 pm UUID: c3721341-0803-4acd-aa1e-48ab09aca8e3 Ancestors: VMMaker.oscog-eem.311 Add tracing of GCs and code compactions to primTraceLog. =============== Diff against VMMaker.oscog-eem.311 =============== 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]. + cogit recordPrimTrace ifTrue: + [self fastLogPrim: TraceCodeCompaction]. 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. 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: CoInterpreter>>dumpPrimTraceLog (in category 'debug support') ----- dumpPrimTraceLog "The prim trace log is a circular buffer of entries. If there is an entry at primTraceLogIndex \\ PrimTraceLogSize it has entries. If there is something at primTraceLogIndex it has wrapped." <api> <inline: false> (primTraceLog at: (self safe: primTraceLogIndex - 1 mod: PrimTraceLogSize)) = 0 ifTrue: [^nil]. (primTraceLog at: primTraceLogIndex) ~= 0 ifTrue: [primTraceLogIndex to: PrimTraceLogSize - 1 do: + [:i | self printPrimLogEntryAt: i; cr]]. - [:i | objectMemory safePrintStringOf: (primTraceLog at: i); cr]]. 0 to: primTraceLogIndex - 1 do: + [:i | self printPrimLogEntryAt: i; cr]! - [:i | objectMemory safePrintStringOf: (primTraceLog at: i); cr]! Item was changed: ----- Method: CoInterpreter>>preGCAction: (in category 'object memory support') ----- preGCAction: gcModeArg + <inline: true> "Need to write back the frame pointers unless all pages are free (as in snapshot). Need to set gcMode var (to avoid passing the flag through a lot of the updating code)" super preGCAction: gcModeArg. gcMode := gcModeArg. cogit recordEventTrace ifTrue: [| traceType | traceType := gcModeArg == GCModeFull ifTrue: [TraceFullGC] ifFalse: [TraceIncrementalGC]. + self recordTrace: traceType thing: traceType source: 0]. + + cogit recordPrimTrace ifTrue: + [| traceType | + traceType := gcModeArg == GCModeFull ifTrue: [TraceFullGC] ifFalse: [TraceIncrementalGC]. + self fastLogPrim: traceType]! - self recordTrace: traceType thing: traceType source: 0]! Item was added: + ----- Method: CoInterpreter>>printPrimLogEntryAt: (in category 'debug support') ----- + printPrimLogEntryAt: i + <inline: false> + | intOrSelector | + intOrSelector := primTraceLog at: i. + (objectMemory isIntegerObject: intOrSelector) + ifTrue: + [ intOrSelector = TraceIncrementalGC ifTrue: + [self print: '**IncrementalGC**'. ^nil]. + intOrSelector = TraceFullGC ifTrue: + [self print: '**FullGC**'. ^nil]. + intOrSelector = TraceCodeCompaction ifTrue: + [self print: '**CompactCode**'. ^nil]. + self print: '???'] + ifFalse: + [objectMemory safePrintStringOf: intOrSelector]!

1 0

[commit][2758] CogVM source as per VMMaker.oscog-eem.311
by commits＠squeakvm.org 25 Jul '13

25 Jul '13

Revision: 2758 Author: eliot Date: 2013-07-25 11:13:19 -0700 (Thu, 25 Jul 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.311 primitiveTerminateTo needs one more assertValidStackedInstructionPointers: Modified Paths: -------------- 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/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/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-25 18:13:19 UTC (rev 2758) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 from - CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __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.310"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.311"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -43344,6 +43344,7 @@ assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } + assertValidStackedInstructionPointers(__LINE__); /* May cause a GC!! */ Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-25 18:13:19 UTC (rev 2758) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-25 18:13:19 UTC (rev 2758) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 from - CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __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.310"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.311"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -43353,6 +43353,7 @@ assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } + assertValidStackedInstructionPointers(__LINE__); /* May cause a GC!! */ Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/nscogsrc/vm/interp.h 2013-07-25 18:13:19 UTC (rev 2758) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-25 18:13:19 UTC (rev 2758) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jul 25 10:10:03 PDT 2013 + Thu Jul 25 11:12:49 PDT 2013 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/src/vm/cointerp.c 2013-07-25 18:13:19 UTC (rev 2758) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 from - CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __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.310]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.311]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -38831,6 +38831,7 @@ assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } + assertValidStackedInstructionPointers(__LINE__); /* May cause a GC!! */ Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/src/vm/cointerp.h 2013-07-25 18:13:19 UTC (rev 2758) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/src/vm/cointerpmt.c 2013-07-25 18:13:19 UTC (rev 2758) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 from - CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -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.310]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.311]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -40200,6 +40200,7 @@ assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } + assertValidStackedInstructionPointers(__LINE__); /* May cause a GC!! */ Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/src/vm/cointerpmt.h 2013-07-25 18:13:19 UTC (rev 2758) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-25 18:13:19 UTC (rev 2758) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 from - CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __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.310]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.311]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -38840,6 +38840,7 @@ assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } + assertValidStackedInstructionPointers(__LINE__); /* May cause a GC!! */ Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-25 18:13:19 UTC (rev 2758) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 from - CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -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.310]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.311]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -40209,6 +40209,7 @@ assert(GIV(stackPage) == (mostRecentlyUsedPage())); return; } + assertValidStackedInstructionPointers(__LINE__); /* May cause a GC!! */ Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/src/vm/interp.h 2013-07-25 18:13:19 UTC (rev 2758) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-07-25 17:10:22 UTC (rev 2757) +++ branches/Cog/src/vm/vmCallback.h 2013-07-25 18:13:19 UTC (rev 2758) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 */ #define VM_CALLBACK_INC 1

1 0

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

25 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.311.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.311 Author: eem Time: 25 July 2013, 11:06:54.686 am UUID: 1532d343-6ca3-4722-acfd-f56c1f3cc306 Ancestors: VMMaker.oscog-eem.310 primitiveTerminateTo needs one more assertValidStackedInstructionPointers: =============== Diff against VMMaker.oscog-eem.310 =============== 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: [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 assertValidStackedInstructionPointers: #'__LINE__'. 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]. self pop: 1. self assertValidStackedInstructionPointers: #'__LINE__'. self assert: stackPage = stackPages mostRecentlyUsedPage!

1 0

[commit][2757] CogVM source as per VMMaker.oscog-eem.310
by commits＠squeakvm.org 25 Jul '13

25 Jul '13

Revision: 2757 Author: eliot Date: 2013-07-25 10:10:22 -0700 (Thu, 25 Jul 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.310 Fix some assert:s that should be assert:l:s Modified Paths: -------------- 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/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/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-25 17:10:22 UTC (rev 2757) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec from - CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __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.309"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.310"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13518,7 +13518,7 @@ theIP = ((usqInt)(longAt((aStackPage->headSP)))); theFP = (aStackPage->headFP); if (GIV(stackPage) == aStackPage) { - assert(GIV(framePointer) == theFP); + assertl(GIV(framePointer) == theFP, ln); } } while (1) { @@ -13532,8 +13532,8 @@ theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; assertl((theIP == (ceCannotResumePC())) - || (asserta((theIP >= (((usqInt)theMethod))) - && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); + || ((theIP >= (((usqInt)theMethod))) + && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln); prevFrameWasCogged = 1; } else { Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-25 17:10:22 UTC (rev 2757) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-25 17:10:22 UTC (rev 2757) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec from - CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __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.309"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.310"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13527,7 +13527,7 @@ theIP = ((usqInt)(longAt((aStackPage->headSP)))); theFP = (aStackPage->headFP); if (GIV(stackPage) == aStackPage) { - assert(GIV(framePointer) == theFP); + assertl(GIV(framePointer) == theFP, ln); } } while (1) { @@ -13541,8 +13541,8 @@ theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; assertl((theIP == (ceCannotResumePC())) - || (asserta((theIP >= (((usqInt)theMethod))) - && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); + || ((theIP >= (((usqInt)theMethod))) + && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln); prevFrameWasCogged = 1; } else { Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/nscogsrc/vm/interp.h 2013-07-25 17:10:22 UTC (rev 2757) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-25 17:10:22 UTC (rev 2757) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jul 24 12:45:36 PDT 2013 + Thu Jul 25 10:10:03 PDT 2013 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/src/vm/cointerp.c 2013-07-25 17:10:22 UTC (rev 2757) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec from - CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __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.309]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.310]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -9623,7 +9623,7 @@ theIP = ((usqInt)(longAt((aStackPage->headSP)))); theFP = (aStackPage->headFP); if (GIV(stackPage) == aStackPage) { - assert(GIV(framePointer) == theFP); + assertl(GIV(framePointer) == theFP, ln); } } while (1) { @@ -9637,8 +9637,8 @@ theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; assertl((theIP == (ceCannotResumePC())) - || (asserta((theIP >= (((usqInt)theMethod))) - && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); + || ((theIP >= (((usqInt)theMethod))) + && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln); prevFrameWasCogged = 1; } else { Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/src/vm/cointerp.h 2013-07-25 17:10:22 UTC (rev 2757) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/src/vm/cointerpmt.c 2013-07-25 17:10:22 UTC (rev 2757) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec from - CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -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.309]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.310]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -9724,7 +9724,7 @@ theIP = ((usqInt)(longAt((aStackPage->headSP)))); theFP = (aStackPage->headFP); if (GIV(stackPage) == aStackPage) { - assert(GIV(framePointer) == theFP); + assertl(GIV(framePointer) == theFP, ln); } } while (1) { @@ -9738,8 +9738,8 @@ theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; assertl((theIP == (ceCannotResumePC())) - || (asserta((theIP >= (((usqInt)theMethod))) - && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); + || ((theIP >= (((usqInt)theMethod))) + && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln); prevFrameWasCogged = 1; } else { Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/src/vm/cointerpmt.h 2013-07-25 17:10:22 UTC (rev 2757) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-25 17:10:22 UTC (rev 2757) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec from - CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __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.309]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.310]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -9632,7 +9632,7 @@ theIP = ((usqInt)(longAt((aStackPage->headSP)))); theFP = (aStackPage->headFP); if (GIV(stackPage) == aStackPage) { - assert(GIV(framePointer) == theFP); + assertl(GIV(framePointer) == theFP, ln); } } while (1) { @@ -9646,8 +9646,8 @@ theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; assertl((theIP == (ceCannotResumePC())) - || (asserta((theIP >= (((usqInt)theMethod))) - && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); + || ((theIP >= (((usqInt)theMethod))) + && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln); prevFrameWasCogged = 1; } else { Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-25 17:10:22 UTC (rev 2757) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec from - CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -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.309]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.310]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -9733,7 +9733,7 @@ theIP = ((usqInt)(longAt((aStackPage->headSP)))); theFP = (aStackPage->headFP); if (GIV(stackPage) == aStackPage) { - assert(GIV(framePointer) == theFP); + assertl(GIV(framePointer) == theFP, ln); } } while (1) { @@ -9747,8 +9747,8 @@ theMethod = ((CogMethod *) (methodField & MFMethodMask)); l1: /* end mframeHomeMethod: */; assertl((theIP == (ceCannotResumePC())) - || (asserta((theIP >= (((usqInt)theMethod))) - && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln); + || ((theIP >= (((usqInt)theMethod))) + && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln); prevFrameWasCogged = 1; } else { Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/src/vm/interp.h 2013-07-25 17:10:22 UTC (rev 2757) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-07-24 19:46:12 UTC (rev 2756) +++ branches/Cog/src/vm/vmCallback.h 2013-07-25 17:10:22 UTC (rev 2757) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec */ #define VM_CALLBACK_INC 1

1 0

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

25 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.310.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.310 Author: eem Time: 25 July 2013, 10:06:49.832 am UUID: d05bf462-ca3e-4094-9350-b57f667e30ec Ancestors: VMMaker.oscog-eem.309 Fix some assert:s that should be assert:l:s =============== Diff against VMMaker.oscog-eem.309 =============== 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: #theIP type: #usqInt> <var: #theMethod type: #'CogMethod *'> <inline: false> | prevFrameWasCogged theFP callerFP theMethod theIP 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 l: ln]]. - [self assert: framePointer = theFP]]. [(self isMachineCodeFrame: theFP) ifTrue: [theMethod := self mframeHomeMethod: theFP. self assert: (theIP = cogit ceCannotResumePC + or: [theIP >= theMethod asUnsignedInteger + and: [theIP < (theMethod asUnsignedInteger + theMethod blockSize)]]) + l: ln. - 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. 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. ^true!

1 0

← Newer
1
2
3
4
5
6
7
8
...
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