Vm-dev March 2013

vm-dev@lists.squeakfoundation.org

38 participants
135 discussions

Re: [Vm-dev] VM Maker: VMMaker-dtl.302.mcz
by David T. Lewis 09 Mar '13

09 Mar '13

On Sat, Mar 09, 2013 at 03:06:23PM +0000, commits(a)source.squeak.org wrote: > > David T. Lewis uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker-dtl.302.mcz > @Tim: This fixes the parameter declaration in HostWindowPlugin slang: unsigned *dispBits; @Eliot: This is a one line patch to WordArray that can go into the oscog branch also. I also made a test for it, change set attached. Dave

1 0

VM Maker: VMMaker-dtl.302.mcz
by commits＠source.squeak.org 09 Mar '13

09 Mar '13

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.302.mcz ==================== Summary ==================== Name: VMMaker-dtl.302 Author: dtl Time: 9 March 2013, 10:04:04.23 am UUID: 4429f2bf-efd9-4ad1-b426-6625fea1d942 Ancestors: VMMaker-dtl.301 VMMaker 4.10.13 A WordArray parameter in the parameter list of a primitive declaration should be declared as (unsigned *) not (usqInt *) in the generated C code. Fix WordArray class>>ccgDeclareCForVar: code generation and provide a unit test. Also remove redundant type declaration in HostWindowPlugin>>primitiveShowHostWindow:bits:width:height:depth:left:right:top:bottom: which was an ineffective attempt to work around the code generation bug. =============== Diff against VMMaker-dtl.301 =============== Item was changed: ----- Method: HostWindowPlugin>>primitiveShowHostWindow:bits:width:height:depth:left:right:top:bottom: (in category 'system primitives') ----- primitiveShowHostWindow: windowIndex bits: dispBits width: w height: h depth: d left: left right: right top: top bottom: bottom "Host window analogue of DisplayScreen> primShowRectLeft:right:top:bottom: (Interpreter>primitiveShowDisplayRect) which takes the window index, bitmap details and the rectangle bounds. Fail if the windowIndex is invalid or the platform routine returns false to indicate failure" |ok| - self var: #dispBits type: 'unsigned char * '. self primitive: 'primitiveShowHostWindowRect' parameters: #(SmallInteger WordArray SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger). "Tell the vm to copy pixel's from dispBits to the screen - this is just ioShowDisplay with the extra parameter of the windowIndex integer" ok := self cCode: 'ioShowDisplayOnWindow(dispBits, w, h, d, left, right, top, bottom, windowIndex)'. ok ifFalse:[interpreterProxy primitiveFail]! Item was added: + ----- Method: SlangTest>>testSmartSyntaxParameterDeclaration (in category 'testing smart syntax') ----- + testSmartSyntaxParameterDeclaration + "(SlangTest selector: #testSmartSyntaxParameterDeclaration) run" + + | s | + s := (SlangTestSupportSmartSyntaxInterpreterPlugin + asInlinedCString: #declareInt:wordPointer: ). + "parameter taken from the stack should be cast to (unsigned *)" + self should: ['*pointerToWords = ((unsigned **) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(0))));*' match: s]. + "local variable declaration should match the data type as in the cast" + self shouldnt: ['*usqInt **pointerToWords*' match: s]. "the buggy code generator renders it as 'usqInt *pointerToWords' " + self should: ['*unsigned **pointerToWords*' match: s]. "it should be rendered as 'unsigned *pointerToWords' " + ! Item was added: + SmartSyntaxInterpreterPlugin subclass: #SlangTestSupportSmartSyntaxInterpreterPlugin + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Tests'! Item was added: + ----- Method: SlangTestSupportSmartSyntaxInterpreterPlugin>>declareInt:wordPointer: (in category 'parameter declarations') ----- + declareInt: anInt wordPointer: pointerToWords + "The pointerToWords parameter should be (unsigned *) as a result of the WordArray + declaration in primitive:parameters: and the local declaration for pointerToWords should + match this data type. For buggy code generator this is not the case." + + self var: #pointerToWords type: 'unsigned char * '. "intentional red herring, no effect" + self primitive: 'primitiveShowHostWindowRect' parameters: #(SmallInteger WordArray). + + "Incorrect output, demonstrating code generator bug: + + EXPORT(sqInt) primitiveShowHostWindowRect(void) { + sqInt anInt; + usqInt *pointerToWords; + + anInt = interpreterProxy->stackIntegerValue(1); + interpreterProxy->success(interpreterProxy->isWords(interpreterProxy->stackValue(0))); + pointerToWords = ((unsigned *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(0)))); + if (interpreterProxy->failed()) { + return null; + } + if (interpreterProxy->failed()) { + return null; + } + interpreterProxy->pop(2); + return null; + } + "! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.10.13'! - ^'4.10.12'! Item was changed: ----- Method: WordArray class>>ccgDeclareCForVar: (in category '*VMMaker-plugin generation') ----- ccgDeclareCForVar: aSymbolOrString + "Address of an unsigned 32 bit value, regardless of Smalltalk wordSize" + ^'unsigned *', aSymbolOrString! - ^'usqInt *', aSymbolOrString!

1 0

I need an idea. I know you have some. Give.
by Casey Ransberger 09 Mar '13

09 Mar '13

Hello Squeakers! My job search is turning up dead ends, hurry up and wait, and unfathomably boring prospects. Screw all that! I want to do something cool. I'm thinking about doing a KickStarter, but almost all of my ideas are either a) stuff no one else wants which only I could possibly think would be cool, or b) overly ambitious. The words Andreas used to describe my last idea: "a bit grandiose." Gift for understatement at times. So I'm looking for something which could be completed by one or two geeks in six months to a year, which people actually want, to be implemented (at least in part) using Squeak, and to be released at the end under the MIT license. I've floored my expenses, so I can make my own labor (relatively, for a guy living in Seattle) very cheap. By floored, I mean the room I sleep in isn't even tall enough to stand up in -- I do not presently meet the definition of a free-range chicken -- and I've disconnected my cellular service. I want to be an efficient engine for getting things that matter to me and other people done, rather than go on being some tool used to ship lucrative enterprise crapware. So here's the $x question: what do you want me to do? I have a Raspberry Pi on order, so bonus points if you can work that in somehow. The person with the best (realistic) idea will be credited for it. Inspire me! And thanks for reading all the way down to the bottom of this message. Casey

6 7

[commit][2701] CogVM source as per VMMaker.oscog-eem.272.
by commits＠squeakvm.org 09 Mar '13

09 Mar '13

Revision: 2701 Author: eliot Date: 2013-03-08 15:43:09 -0800 (Fri, 08 Mar 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.272. Fix unknownBytecode processing to leave pc at unknown bytecode. Fix case of process switch to an interior frame. Fix some assert function signatures in the stack vm. Use symbols for types instead of strings in stack page funcs. Integrate VMMaker-oscog-EstebanLorenzano.235. - it is possible to build stackvm again 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/scripts/uploadvms branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/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-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-03-08 23:43:09 UTC (rev 2701) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f from - CoInterpreter VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CoInterpreter VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1950,7 +1950,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.270"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.272"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11629,13 +11629,13 @@ /* respondToUnknownBytecode */ { sqInt ourContext; - sqInt unknownBytecodeSelector; VM_LABEL(0respondToUnknownBytecode); - unknownBytecodeSelector = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) + GIV(messageSelector) = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorUnknownBytecode << ShiftForWord)) : 0); - if (unknownBytecodeSelector == null) { + if ((GIV(messageSelector) == null) + || (GIV(messageSelector) == GIV(nilObj))) { error("Unknown bytecode"); } /* begin ensureFrameIsMarried:SP: */ @@ -11649,11 +11649,11 @@ } ourContext = marryFrameSP(localFP, localSP); l283: /* end ensureFrameIsMarried:SP: */; + localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); - GIV(messageSelector) = unknownBytecodeSelector; GIV(argumentCount) = 0; - goto commonSend; + goto normalSend; } break; case 480: /*224*/ @@ -51767,7 +51767,10 @@ sqInt aMethodObj; sqInt aProcess; sqInt index; + StackPage *lastUsedPage; + StackPage *lruOrFree; sqInt newContext; + StackPage *newPage; sqInt object; sqInt oldProc; sqInt sched; @@ -51852,12 +51855,46 @@ assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); + if (theFrame != ((thePage->headFP))) { + + /* explicit assignment of suspendedContext can cause switch to interior frame. */ + + /* begin newStackPage */ + lruOrFree = (mostRecentlyUsedPage()->nextPage); + if (isFree(lruOrFree)) { + newPage = lruOrFree; + goto l3; + } + divorceFramesIn(lruOrFree); + newPage = lruOrFree; + l3: /* end newStackPage */; + moveFramesInthroughtoPage(thePage, findFrameAboveinPage(theFrame, thePage), newPage); + /* begin markStackPageLeastMostRecentlyUsed: */ + VM_LABEL(0markStackPageLeastMostRecentlyUsed); + assert(newPage == ((GIV(mostRecentlyUsedPage)->nextPage))); + lastUsedPage = (newPage->nextPage); + while (((lastUsedPage->baseFP)) == 0) { + lastUsedPage = (lastUsedPage->nextPage); + } + if (((lastUsedPage->nextPage)) == newPage) { + null; + goto l2; + } + ((newPage->prevPage)->nextPage = (newPage->nextPage)); + ((newPage->nextPage)->prevPage = (newPage->prevPage)); + ((lastUsedPage->prevPage)->nextPage = newPage); + (newPage->prevPage = (lastUsedPage->prevPage)); + (newPage->nextPage = lastUsedPage); + (lastUsedPage->prevPage = newPage); + assert(pageListIsWellFormed()); + l2: /* end markStackPageLeastMostRecentlyUsed: */; + } + assert(((thePage->headFP)) == theFrame); } else { thePage = makeBaseFrameFor(newContext); theFrame = (thePage->baseFP); } - assert(((thePage->headFP)) == theFrame); /* begin setStackPageAndLimit: */ GIV(stackPage) = thePage; if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-03-08 23:43:09 UTC (rev 2701) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-03-08 23:43:09 UTC (rev 2701) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f from - CoInterpreter VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CoInterpreter VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1953,7 +1953,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.270"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.272"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11638,13 +11638,13 @@ /* respondToUnknownBytecode */ { sqInt ourContext; - sqInt unknownBytecodeSelector; VM_LABEL(0respondToUnknownBytecode); - unknownBytecodeSelector = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) + GIV(messageSelector) = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorUnknownBytecode << ShiftForWord)) : 0); - if (unknownBytecodeSelector == null) { + if ((GIV(messageSelector) == null) + || (GIV(messageSelector) == GIV(nilObj))) { error("Unknown bytecode"); } /* begin ensureFrameIsMarried:SP: */ @@ -11658,11 +11658,11 @@ } ourContext = marryFrameSP(localFP, localSP); l283: /* end ensureFrameIsMarried:SP: */; + localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); - GIV(messageSelector) = unknownBytecodeSelector; GIV(argumentCount) = 0; - goto commonSend; + goto normalSend; } BREAK; CASE(480) /*224*/ @@ -51776,7 +51776,10 @@ sqInt aMethodObj; sqInt aProcess; sqInt index; + StackPage *lastUsedPage; + StackPage *lruOrFree; sqInt newContext; + StackPage *newPage; sqInt object; sqInt oldProc; sqInt sched; @@ -51861,12 +51864,46 @@ assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); + if (theFrame != ((thePage->headFP))) { + + /* explicit assignment of suspendedContext can cause switch to interior frame. */ + + /* begin newStackPage */ + lruOrFree = (mostRecentlyUsedPage()->nextPage); + if (isFree(lruOrFree)) { + newPage = lruOrFree; + goto l3; + } + divorceFramesIn(lruOrFree); + newPage = lruOrFree; + l3: /* end newStackPage */; + moveFramesInthroughtoPage(thePage, findFrameAboveinPage(theFrame, thePage), newPage); + /* begin markStackPageLeastMostRecentlyUsed: */ + VM_LABEL(0markStackPageLeastMostRecentlyUsed); + assert(newPage == ((GIV(mostRecentlyUsedPage)->nextPage))); + lastUsedPage = (newPage->nextPage); + while (((lastUsedPage->baseFP)) == 0) { + lastUsedPage = (lastUsedPage->nextPage); + } + if (((lastUsedPage->nextPage)) == newPage) { + null; + goto l2; + } + ((newPage->prevPage)->nextPage = (newPage->nextPage)); + ((newPage->nextPage)->prevPage = (newPage->prevPage)); + ((lastUsedPage->prevPage)->nextPage = newPage); + (newPage->prevPage = (lastUsedPage->prevPage)); + (newPage->nextPage = lastUsedPage); + (lastUsedPage->prevPage = newPage); + assert(pageListIsWellFormed()); + l2: /* end markStackPageLeastMostRecentlyUsed: */; + } + assert(((thePage->headFP)) == theFrame); } else { thePage = makeBaseFrameFor(newContext); theFrame = (thePage->baseFP); } - assert(((thePage->headFP)) == theFrame); /* begin setStackPageAndLimit: */ GIV(stackPage) = thePage; if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/nscogsrc/vm/interp.h 2013-03-08 23:43:09 UTC (rev 2701) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-03-08 23:43:09 UTC (rev 2701) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Mar 1 17:20:58 PST 2013 + Fri Mar 8 15:40:04 PST 2013 Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/scripts/uploadvms 2013-03-08 23:43:09 UTC (rev 2701) @@ -110,4 +110,5 @@ ssh -x eliotmiranda(a)bugsy.dreamhost.com mkdir mirandabanda.org/files/Cog/VM/VM.r$REV echo scp -p ChangeHistory README.$REV $ARCHIVES "$@" eliotmiranda@bugsy.dreamhost.com:mirandabanda.org/files/Cog/VM/VM.r$REV scp -p ChangeHistory README.$REV $ARCHIVES "$@" eliotmiranda@bugsy.dreamhost.com:mirandabanda.org/files/Cog/VM/VM.r$REV -ssh eliotmiranda(a)bugsy.dreamhost.com chmod a-w mirandabanda.org/files/Cog/VM/VM.r$REV "mirandabanda.org/files/Cog/VM/VM.r$REV/*" +echo ssh eliotmiranda(a)bugsy.dreamhost.com chmod a-w mirandabanda.org/files/Cog/VM/VM.r$REV mirandabanda.org/files/Cog/VM/VM.r$REV/* \\\; ls -al mirandabanda.org/files/Cog/VM/VM.r$REV +ssh eliotmiranda(a)bugsy.dreamhost.com chmod a-w mirandabanda.org/files/Cog/VM/VM.r$REV \"mirandabanda.org/files/Cog/VM/VM.r$REV/*\" \; ls -al mirandabanda.org/files/Cog/VM/VM.r$REV Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/src/vm/cointerp.c 2013-03-08 23:43:09 UTC (rev 2701) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f from - CoInterpreter VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CoInterpreter VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1940,7 +1940,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.270]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.272]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4616,13 +4616,13 @@ /* respondToUnknownBytecode */ { sqInt ourContext; - sqInt unknownBytecodeSelector; VM_LABEL(0respondToUnknownBytecode); - unknownBytecodeSelector = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) + GIV(messageSelector) = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorUnknownBytecode << ShiftForWord)) : 0); - if (unknownBytecodeSelector == null) { + if ((GIV(messageSelector) == null) + || (GIV(messageSelector) == GIV(nilObj))) { error("Unknown bytecode"); } /* begin ensureFrameIsMarried:SP: */ @@ -4636,11 +4636,11 @@ } ourContext = marryFrameSP(localFP, localSP); l142: /* end ensureFrameIsMarried:SP: */; + localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); - GIV(messageSelector) = unknownBytecodeSelector; GIV(argumentCount) = 0; - goto commonSend; + goto normalSend; } break; case 128: @@ -47198,7 +47198,10 @@ sqInt aMethodObj; sqInt aProcess; sqInt index; + StackPage *lastUsedPage; + StackPage *lruOrFree; sqInt newContext; + StackPage *newPage; sqInt object; sqInt oldProc; sqInt sched; @@ -47283,12 +47286,46 @@ assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); + if (theFrame != ((thePage->headFP))) { + + /* explicit assignment of suspendedContext can cause switch to interior frame. */ + + /* begin newStackPage */ + lruOrFree = (mostRecentlyUsedPage()->nextPage); + if (isFree(lruOrFree)) { + newPage = lruOrFree; + goto l3; + } + divorceFramesIn(lruOrFree); + newPage = lruOrFree; + l3: /* end newStackPage */; + moveFramesInthroughtoPage(thePage, findFrameAboveinPage(theFrame, thePage), newPage); + /* begin markStackPageLeastMostRecentlyUsed: */ + VM_LABEL(0markStackPageLeastMostRecentlyUsed); + assert(newPage == ((GIV(mostRecentlyUsedPage)->nextPage))); + lastUsedPage = (newPage->nextPage); + while (((lastUsedPage->baseFP)) == 0) { + lastUsedPage = (lastUsedPage->nextPage); + } + if (((lastUsedPage->nextPage)) == newPage) { + null; + goto l2; + } + ((newPage->prevPage)->nextPage = (newPage->nextPage)); + ((newPage->nextPage)->prevPage = (newPage->prevPage)); + ((lastUsedPage->prevPage)->nextPage = newPage); + (newPage->prevPage = (lastUsedPage->prevPage)); + (newPage->nextPage = lastUsedPage); + (lastUsedPage->prevPage = newPage); + assert(pageListIsWellFormed()); + l2: /* end markStackPageLeastMostRecentlyUsed: */; + } + assert(((thePage->headFP)) == theFrame); } else { thePage = makeBaseFrameFor(newContext); theFrame = (thePage->baseFP); } - assert(((thePage->headFP)) == theFrame); /* begin setStackPageAndLimit: */ GIV(stackPage) = thePage; if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/src/vm/cointerp.h 2013-03-08 23:43:09 UTC (rev 2701) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/src/vm/cointerpmt.c 2013-03-08 23:43:09 UTC (rev 2701) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f from - CoInterpreterMT VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CoInterpreterMT VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1278,8 +1278,8 @@ _iss usqInt method; _iss sqInt argumentCount; _iss usqInt newMethod; +_iss sqInt messageSelector; _iss usqInt youngStart; -_iss sqInt messageSelector; _iss StackPage * pages; _iss char * stackBasePlus1; _iss sqInt traceLogIndex; @@ -2039,7 +2039,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.270]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.272]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -4717,13 +4717,13 @@ /* respondToUnknownBytecode */ { sqInt ourContext; - sqInt unknownBytecodeSelector; VM_LABEL(0respondToUnknownBytecode); - unknownBytecodeSelector = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) + GIV(messageSelector) = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorUnknownBytecode << ShiftForWord)) : 0); - if (unknownBytecodeSelector == null) { + if ((GIV(messageSelector) == null) + || (GIV(messageSelector) == GIV(nilObj))) { error("Unknown bytecode"); } /* begin ensureFrameIsMarried:SP: */ @@ -4737,11 +4737,11 @@ } ourContext = marryFrameSP(localFP, localSP); l142: /* end ensureFrameIsMarried:SP: */; + localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); - GIV(messageSelector) = unknownBytecodeSelector; GIV(argumentCount) = 0; - goto commonSend; + goto normalSend; } break; case 128: @@ -17001,7 +17001,10 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aMethodObj; sqInt index; + StackPage *lastUsedPage; + StackPage *lruOrFree; sqInt newContext; + StackPage *newPage; char *theFrame; StackPage *thePage; sqInt value; @@ -17025,12 +17028,46 @@ assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); + if (theFrame != ((thePage->headFP))) { + + /* explicit assignment of suspendedContext can cause switch to interior frame. */ + + /* begin newStackPage */ + lruOrFree = (mostRecentlyUsedPage()->nextPage); + if (isFree(lruOrFree)) { + newPage = lruOrFree; + goto l1; + } + divorceFramesIn(lruOrFree); + newPage = lruOrFree; + l1: /* end newStackPage */; + moveFramesInthroughtoPage(thePage, findFrameAboveinPage(theFrame, thePage), newPage); + /* begin markStackPageLeastMostRecentlyUsed: */ + VM_LABEL(0markStackPageLeastMostRecentlyUsed); + assert(newPage == ((GIV(mostRecentlyUsedPage)->nextPage))); + lastUsedPage = (newPage->nextPage); + while (((lastUsedPage->baseFP)) == 0) { + lastUsedPage = (lastUsedPage->nextPage); + } + if (((lastUsedPage->nextPage)) == newPage) { + null; + goto l2; + } + ((newPage->prevPage)->nextPage = (newPage->nextPage)); + ((newPage->nextPage)->prevPage = (newPage->prevPage)); + ((lastUsedPage->prevPage)->nextPage = newPage); + (newPage->prevPage = (lastUsedPage->prevPage)); + (newPage->nextPage = lastUsedPage); + (lastUsedPage->prevPage = newPage); + assert(pageListIsWellFormed()); + l2: /* end markStackPageLeastMostRecentlyUsed: */; + } + assert(((thePage->headFP)) == theFrame); } else { thePage = makeBaseFrameFor(newContext); theFrame = (thePage->baseFP); } - assert(((thePage->headFP)) == theFrame); /* begin setStackPageAndLimit: */ GIV(stackPage) = thePage; if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/src/vm/cointerpmt.h 2013-03-08 23:43:09 UTC (rev 2701) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-03-08 23:43:09 UTC (rev 2701) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f from - CoInterpreter VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CoInterpreter VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1943,7 +1943,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.270]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.272]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4625,13 +4625,13 @@ /* respondToUnknownBytecode */ { sqInt ourContext; - sqInt unknownBytecodeSelector; VM_LABEL(0respondToUnknownBytecode); - unknownBytecodeSelector = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) + GIV(messageSelector) = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorUnknownBytecode << ShiftForWord)) : 0); - if (unknownBytecodeSelector == null) { + if ((GIV(messageSelector) == null) + || (GIV(messageSelector) == GIV(nilObj))) { error("Unknown bytecode"); } /* begin ensureFrameIsMarried:SP: */ @@ -4645,11 +4645,11 @@ } ourContext = marryFrameSP(localFP, localSP); l142: /* end ensureFrameIsMarried:SP: */; + localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); - GIV(messageSelector) = unknownBytecodeSelector; GIV(argumentCount) = 0; - goto commonSend; + goto normalSend; } BREAK; CASE(128) @@ -47207,7 +47207,10 @@ sqInt aMethodObj; sqInt aProcess; sqInt index; + StackPage *lastUsedPage; + StackPage *lruOrFree; sqInt newContext; + StackPage *newPage; sqInt object; sqInt oldProc; sqInt sched; @@ -47292,12 +47295,46 @@ assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); + if (theFrame != ((thePage->headFP))) { + + /* explicit assignment of suspendedContext can cause switch to interior frame. */ + + /* begin newStackPage */ + lruOrFree = (mostRecentlyUsedPage()->nextPage); + if (isFree(lruOrFree)) { + newPage = lruOrFree; + goto l3; + } + divorceFramesIn(lruOrFree); + newPage = lruOrFree; + l3: /* end newStackPage */; + moveFramesInthroughtoPage(thePage, findFrameAboveinPage(theFrame, thePage), newPage); + /* begin markStackPageLeastMostRecentlyUsed: */ + VM_LABEL(0markStackPageLeastMostRecentlyUsed); + assert(newPage == ((GIV(mostRecentlyUsedPage)->nextPage))); + lastUsedPage = (newPage->nextPage); + while (((lastUsedPage->baseFP)) == 0) { + lastUsedPage = (lastUsedPage->nextPage); + } + if (((lastUsedPage->nextPage)) == newPage) { + null; + goto l2; + } + ((newPage->prevPage)->nextPage = (newPage->nextPage)); + ((newPage->nextPage)->prevPage = (newPage->prevPage)); + ((lastUsedPage->prevPage)->nextPage = newPage); + (newPage->prevPage = (lastUsedPage->prevPage)); + (newPage->nextPage = lastUsedPage); + (lastUsedPage->prevPage = newPage); + assert(pageListIsWellFormed()); + l2: /* end markStackPageLeastMostRecentlyUsed: */; + } + assert(((thePage->headFP)) == theFrame); } else { thePage = makeBaseFrameFor(newContext); theFrame = (thePage->baseFP); } - assert(((thePage->headFP)) == theFrame); /* begin setStackPageAndLimit: */ GIV(stackPage) = thePage; if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-03-08 23:43:09 UTC (rev 2701) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f from - CoInterpreterMT VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CoInterpreterMT VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1281,8 +1281,8 @@ _iss usqInt method; _iss sqInt argumentCount; _iss usqInt newMethod; +_iss sqInt messageSelector; _iss usqInt youngStart; -_iss sqInt messageSelector; _iss StackPage * pages; _iss char * stackBasePlus1; _iss sqInt traceLogIndex; @@ -2042,7 +2042,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.270]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.272]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -4726,13 +4726,13 @@ /* respondToUnknownBytecode */ { sqInt ourContext; - sqInt unknownBytecodeSelector; VM_LABEL(0respondToUnknownBytecode); - unknownBytecodeSelector = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) + GIV(messageSelector) = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorUnknownBytecode << ShiftForWord)) : 0); - if (unknownBytecodeSelector == null) { + if ((GIV(messageSelector) == null) + || (GIV(messageSelector) == GIV(nilObj))) { error("Unknown bytecode"); } /* begin ensureFrameIsMarried:SP: */ @@ -4746,11 +4746,11 @@ } ourContext = marryFrameSP(localFP, localSP); l142: /* end ensureFrameIsMarried:SP: */; + localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); - GIV(messageSelector) = unknownBytecodeSelector; GIV(argumentCount) = 0; - goto commonSend; + goto normalSend; } BREAK; CASE(128) @@ -17010,7 +17010,10 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aMethodObj; sqInt index; + StackPage *lastUsedPage; + StackPage *lruOrFree; sqInt newContext; + StackPage *newPage; char *theFrame; StackPage *thePage; sqInt value; @@ -17034,12 +17037,46 @@ assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); + if (theFrame != ((thePage->headFP))) { + + /* explicit assignment of suspendedContext can cause switch to interior frame. */ + + /* begin newStackPage */ + lruOrFree = (mostRecentlyUsedPage()->nextPage); + if (isFree(lruOrFree)) { + newPage = lruOrFree; + goto l1; + } + divorceFramesIn(lruOrFree); + newPage = lruOrFree; + l1: /* end newStackPage */; + moveFramesInthroughtoPage(thePage, findFrameAboveinPage(theFrame, thePage), newPage); + /* begin markStackPageLeastMostRecentlyUsed: */ + VM_LABEL(0markStackPageLeastMostRecentlyUsed); + assert(newPage == ((GIV(mostRecentlyUsedPage)->nextPage))); + lastUsedPage = (newPage->nextPage); + while (((lastUsedPage->baseFP)) == 0) { + lastUsedPage = (lastUsedPage->nextPage); + } + if (((lastUsedPage->nextPage)) == newPage) { + null; + goto l2; + } + ((newPage->prevPage)->nextPage = (newPage->nextPage)); + ((newPage->nextPage)->prevPage = (newPage->prevPage)); + ((lastUsedPage->prevPage)->nextPage = newPage); + (newPage->prevPage = (lastUsedPage->prevPage)); + (newPage->nextPage = lastUsedPage); + (lastUsedPage->prevPage = newPage); + assert(pageListIsWellFormed()); + l2: /* end markStackPageLeastMostRecentlyUsed: */; + } + assert(((thePage->headFP)) == theFrame); } else { thePage = makeBaseFrameFor(newContext); theFrame = (thePage->baseFP); } - assert(((thePage->headFP)) == theFrame); /* begin setStackPageAndLimit: */ GIV(stackPage) = thePage; if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/src/vm/interp.h 2013-03-08 23:43:09 UTC (rev 2701) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/src/vm/vmCallback.h 2013-03-08 23:43:09 UTC (rev 2701) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.270 uuid: 014f0153-bb02-49b7-b544-d8f3ac2deef6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/stacksrc/vm/gcc3x-interp.c 2013-03-07 22:33:19 UTC (rev 2700) +++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2013-03-08 23:43:09 UTC (rev 2701) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure * VMMaker.oscog-lw.263 uuid: bf23be20-f2a7-1040-a675-76e097a7f431 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f from - StackInterpreter * VMMaker.oscog-lw.263 uuid: bf23be20-f2a7-1040-a675-76e097a7f431 + StackInterpreter VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f */ -static char __buildInfo[] = "StackInterpreter * VMMaker.oscog-lw.263 uuid: bf23be20-f2a7-1040-a675-76e097a7f431 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.272 uuid: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -219,7 +219,7 @@ #define MillisecondClockMask 0x1FFFFFFF #define MULTIPLEBYTECODESETS 0 #define MyListIndex 3 -#define NewspeakVM 0 +#define NewspeakVM 1 #define NextLinkIndex 0 #define NilObject 0 #define PrimErrBadArgument 3 @@ -255,6 +255,7 @@ #define SelectorMustBeBoolean 25 #define SelectorRunWithIn 49 #define SelectorStart 2 +#define SelectorUnknownBytecode 57 #define SenderIndex 0 #define ShiftForWord 2 #define Size4Bit 0 @@ -302,12 +303,13 @@ void * arrayValueOf(sqInt arrayOop); static sqInt asciiOfCharacter(sqInt characterObj); void assertValidExecutionPointers(usqInt lip, char *lifp, char *lisp); +static void assertValidExecutionPointersimbar(usqInt lip, char *lfp, char *lsp, sqInt inInterpreter); sqInt becomewith(sqInt array1, sqInt array2); static sqInt becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt copyHashFlag); void beRootIfOld(sqInt oop); static void beRootWhileForwarding(sqInt oop); sqInt booleanValueOf(sqInt obj); -static sqInt byteLengthOf(sqInt oop); +sqInt byteLengthOf(sqInt obj); sqInt byteSizeOf(sqInt oop); sqInt byteSwapped(sqInt w); EXPORT(sqInt) callbackEnter(sqInt *callbackID); @@ -457,6 +459,7 @@ static sqInt getShortFromFileswap(sqImageFile aFile, sqInt swapFlag); sqInt * getStackPointer(void); sqInt getThisSessionID(void); +static sqInt goodContextSize(sqInt oop); static void handleStackOverflow(void); static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch); sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); @@ -492,7 +495,7 @@ static sqInt isContextNonInt(sqInt oop); static sqInt isContext(sqInt oop); sqInt isFloatObject(sqInt oop); -static sqInt isFree(StackPage *thePage); +static sqInt isFree(StackPage * self_in_isFree); sqInt isIndexable(sqInt oop); sqInt isInMemory(sqInt address); sqInt isIntegerObject(sqInt objectPointer); @@ -510,6 +513,7 @@ static sqInt isPrimitiveFunctionPointerAnIndex(void); sqInt isQuickPrimitiveIndex(sqInt anInteger); static sqInt isSingleContext(sqInt aContext); +static sqInt isStillMarriedContext(sqInt aContext); static sqInt isWeakNonInt(sqInt oop); sqInt isWeak(sqInt oop); static sqInt isWidowedContext(sqInt aOnceMarriedContext); @@ -866,6 +870,7 @@ void printStackPagesInUse(void); static void printStackPage(StackPage *page); static void printStringOf(sqInt oop); +void printWronglySizedContexts(sqInt printContexts); void print(char *s); void pushBool(sqInt trueOrFalse); static sqInt pushedReceiverOrClosureOfFrame(char *theFP); @@ -960,6 +965,7 @@ static sqInt sweepPhase(void); static sqInt sweepPhaseForFullGC(void); static sqInt synchronousSignal(sqInt aSemaphore); +sqInt temporaryCountOfMethodHeader(sqInt header); void tenuringIncrementalGC(void); sqInt topRemappableOop(void); static void transferTo(sqInt newProc); @@ -968,7 +974,7 @@ static void updatePointersInRootObjectsFromto(sqInt memStart, sqInt memEnd); static void updateStateOfSpouseContextForFrameWithSP(char *theFP, char *theSP); static sqInt validInstructionPointerinFrame(usqInt anInstrPointer, char *fp); -sqInt validInstructionPointerinMethodframePointer(usqInt theInstrPointer, usqInt aMethod, sqInt fp); +sqInt validInstructionPointerinMethodframePointer(usqInt theInstrPointer, usqInt aMethod, char *fp); static sqInt validStackPageBaseFrames(void); static void verifyCleanHeaders(void); sqInt vmEndianness(void); @@ -986,8 +992,8 @@ #else # define _iss static #endif +_iss sqInt objectMemory; _iss char * stackPointer; -_iss sqInt objectMemory; _iss sqInt primFailCode; _iss sqInt specialObjectsOop; _iss StackPage * stackPage; @@ -1005,8 +1011,8 @@ _iss sqInt falseObj; _iss StackPage * pages; _iss usqInt reserveStart; +_iss char * stackMemory; _iss char * stackLimit; -_iss char * stackMemory; _iss sqInt rootTableCount; _iss sqInt lkupClass; _iss sqInt bytesPerPage; @@ -1014,12 +1020,12 @@ _iss usqInt memoryLimit; _iss StackPage * mostRecentlyUsedPage; _iss usqInt scavengeThreshold; +_iss sqInt coInterpreter; _iss sqInt jmpDepth; _iss usqInt fwdTableNext; _iss sqInt numStackPages; _iss sqInt needGCFlag; _iss sqLong nextProfileTick; -_iss sqInt coInterpreter; _iss usqInt compStart; _iss sqInt numPages; _iss sqInt growHeadroom; @@ -1046,6 +1052,7 @@ _iss usqLong statGCEndUsecs; _iss sqInt statSweepCount; _iss usqInt compEnd; +_iss sqInt heapMap; _iss sqInt metaclassSizeBits; _iss sqInt pendingFinalizationSignals; _iss sqInt shrinkThreshold; @@ -1718,7 +1725,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter * VMMaker.oscog-lw.263]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.272]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -1729,6 +1736,7 @@ #define compactClassFieldWidth() 5 #define dispatchFunctionPointer(aFunctionPointer) (aFunctionPointer)() #define flush() fflush(stdout) +#define freeStart() freeStart #define instFormatFieldLSB() 8 #define instFormatFieldWidth() 4 #define memory() memory @@ -5076,12 +5084,39 @@ BREAK; CASE(126) CASE(127) - CASE(139) /* unknownBytecode */ { VM_LABEL(0unknownBytecode); - error("Unknown bytecode"); + /* goto respondToUnknownBytecode */ } + + respondToUnknownBytecode: + /* respondToUnknownBytecode */ + { + sqInt ourContext; + + VM_LABEL(0respondToUnknownBytecode); + GIV(messageSelector) = (SelectorUnknownBytecode < (lengthOf(GIV(specialObjectsOop))) + ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorUnknownBytecode << ShiftForWord)) + : 0); + if ((GIV(messageSelector) == null) + || (GIV(messageSelector) == GIV(nilObj))) { + error("Unknown bytecode"); + } + /* begin ensureFrameIsMarried:SP: */ + if ((byteAt((localFP + FoxFrameFlags) + 2)) != 0) { + assert(isContext(frameContext(localFP))); + ourContext = longAt(localFP + FoxThisContext); + goto l143; + } + ourContext = marryFrameSP(localFP, localSP); + l143: /* end ensureFrameIsMarried:SP: */; + localIP -= 1; + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), ourContext); + GIV(argumentCount) = 0; + goto normalSend; + } BREAK; CASE(128) /* extendedPushBytecode */ @@ -5340,7 +5375,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l143; + goto l144; } /* second probe */ @@ -5351,7 +5386,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l143; + goto l144; } probe = (((usqInt) hash) >> 2) & MethodCacheMask; if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) @@ -5359,10 +5394,10 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l143; + goto l144; } ok = 0; - l143: /* end lookupInMethodCacheSel:class: */; + l144: /* end lookupInMethodCacheSel:class: */; if (!ok) { /* entry was not found in the cache; look it up the hard way */ @@ -5390,31 +5425,31 @@ if (localPrimIndex >= 264) { longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + ((localPrimIndex - 264) << ShiftForWord))); 1; - goto l145; + goto l146; } if (localPrimIndex == 256) { 1; - goto l145; + goto l146; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); 1; - goto l145; + goto l146; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); 1; - goto l145; + goto l146; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); 1; - goto l145; + goto l146; } longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); 1; - l145: /* end internalQuickPrimitiveResponse */; - goto l144; + l146: /* end internalQuickPrimitiveResponse */; + goto l145; } /* begin externalizeIPandSP */ GIV(instructionPointer) = oopForPointer(localIP); @@ -5452,7 +5487,7 @@ if (succeeded) { browserPluginReturnIfNeeded(); null; - goto l144; + goto l145; } } /* begin internalActivateNewMethod */ @@ -5549,11 +5584,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << ShiftForWord)); if (GIV(primFailCode) <= (((sqInt) (lastPointerOf(table)) >> 2))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << ShiftForWord)); - goto l146; + goto l147; } } errorCode = ((GIV(primFailCode) << 1) | 1); - l146: /* end getErrorObjectFromPrimFailCode */; + l147: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -5573,7 +5608,7 @@ localSP = pointerForOop(GIV(stackPointer)); localFP = pointerForOop(GIV(framePointer)); } - l144: /* end internalExecuteNewMethod */; + l145: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ # if MULTIPLEBYTECODESETS @@ -5867,6 +5902,8 @@ localIP = pointerForOop(GIV(instructionPointer)); localSP = pointerForOop(GIV(stackPointer)); localFP = pointerForOop(GIV(framePointer)); + markStackPageMostRecentlyUsed(GIV(stackPage)); + assertValidExecutionPointersimbar(((usqInt)localIP), localFP, localSP, 1); l5: /* end instVar:ofContext:put: */; } else { @@ -6038,6 +6075,13 @@ longAtPointerput((localSP -= BytesPerOop), array); } BREAK; + CASE(139) + /* unknownBytecode */ + { + VM_LABEL(1unknownBytecode); + goto respondToUnknownBytecode; + } + BREAK; CASE(140) /* pushRemoteTempLongBytecode */ { @@ -7030,7 +7074,7 @@ # endif /* MULTIPLEBYTECODESETS */ null; - goto l147; + goto l148; } if (bytecode == 172) { @@ -7048,7 +7092,7 @@ # endif /* MULTIPLEBYTECODESETS */ null; - goto l147; + goto l148; } if (bytecode > 167) { @@ -7067,7 +7111,7 @@ # endif /* MULTIPLEBYTECODESETS */ null; - goto l147; + goto l148; } } @@ -7082,7 +7126,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l147: /* end case */; + l148: /* end case */; BREAK; CASE(179) /* bytecodePrimGreaterThan */ @@ -7244,7 +7288,7 @@ # endif /* MULTIPLEBYTECODESETS */ null; - goto l148; + goto l149; } if (bytecode == 172) { @@ -7263,7 +7307,7 @@ # endif /* MULTIPLEBYTECODESETS */ null; - goto l148; + goto l149; } # if MULTIPLEBYTECODESETS @@ -7277,7 +7321,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l148: /* end case */; + l149: /* end case */; BREAK; CASE(180) /* bytecodePrimLessOrEqual */ @@ -9643,7 +9687,7 @@ l1: /* end adjustFieldsAndClassOf:by: */; } /* begin objectAfter: */ - if (!(asserta((((usqInt) oop)) < (((usqInt) GIV(freeStart)))))) { + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { error("no objects after the end of memory"); } if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { @@ -9822,26 +9866,30 @@ void assertValidExecutionPointers(usqInt lip, char *lifp, char *lisp) +{ + assertValidExecutionPointersimbar(lip, lifp, lisp, !0); +} + +static void +assertValidExecutionPointersimbar(usqInt lip, char *lfp, char *lsp, sqInt inInterpreter) { DECL_MAYBE_SQ_GLOBAL_STRUCT - /* begin assertValidExecutionPointe:r:s:imbar: */ - VM_LABEL(0assertValidExecutionPointersimbar); - assert(!0); - assert(GIV(stackPage) == (stackPageFor(lifp))); + assert(inInterpreter); + assert(GIV(stackPage) == (stackPageFor(lfp))); assert(GIV(stackPage) == (mostRecentlyUsedPage())); /* begin assertValidStackLimits */ assert((GIV(stackLimit) == ((GIV(stackPage)->realStackLimit))) || (GIV(stackLimit) == (((char *) (((usqInt) -1)))))); assert((((GIV(stackPage)->stackLimit)) == ((GIV(stackPage)->realStackLimit))) || (((GIV(stackPage)->stackLimit)) == (((char *) (((usqInt) -1)))))); - assert(lifp < ((GIV(stackPage)->baseAddress))); - assert(lisp < lifp); - assert(lifp > lisp); - assert(lisp >= (((GIV(stackPage)->realStackLimit)) - (stackLimitOffset()))); - assert((lifp - lisp) < LargeContextSize); - assert(validInstructionPointerinFrame(lip, lifp)); - assert((frameIsBlockActivation(lifp)) - || ((pushedReceiverOrClosureOfFrame(lifp)) == (frameReceiver(lifp)))); - assert(GIV(method) == (frameMethod(lifp))); + assert(lfp < ((GIV(stackPage)->baseAddress))); + assert(lsp < lfp); + assert(lfp > lsp); + assert(lsp >= (((GIV(stackPage)->realStackLimit)) - (stackLimitOffset()))); + assert((lfp - lsp) < LargeContextSize); + assert(validInstructionPointerinFrame(lip, lfp)); + assert((frameIsBlockActivation(lfp)) + || ((pushedReceiverOrClosureOfFrame(lfp)) == (frameReceiver(lfp)))); + assert(GIV(method) == (frameMethod(lfp))); # if MULTIPLEBYTECODESETS assert((methodUsesAlternateBytecodeSet(GIV(method))) == (bytecodeSetSelector == 256)); @@ -9887,6 +9935,9 @@ sqInt header; sqInt numLiterals; sqInt objHeader; + sqInt objHeader1; + sqInt objHeader11; + sqInt objHeader2; sqInt objHeaderBytes; sqInt objHeaderType; sqInt objSize; @@ -10003,13 +10054,27 @@ fwdBlock = (fwdHeader & AllButMarkBitAndTypeMask) << 1; assert((fwdHeader & MarkBit) != 0); assert(fwdBlockValid(fwdBlock)); - longAtput(oop1, longAt(fwdBlock + BytesPerWord)); + objHeader = longAt(fwdBlock + BytesPerWord); + /* begin restoreHeaderOf:to: */ + longAtput(oop1, objHeader); + if (((((usqInt) objHeader) >> 12) & 31) == ClassMethodContextCompactIndex) { + if (!(asserta(!(isStillMarriedContext(oop1))))) { + error("attempt to become married context"); + } + } /* begin restoreHeaderOf: */ fwdHeader1 = longAt(oop2); fwdBlock1 = (fwdHeader1 & AllButMarkBitAndTypeMask) << 1; assert((fwdHeader1 & MarkBit) != 0); assert(fwdBlockValid(fwdBlock1)); - longAtput(oop2, longAt(fwdBlock1 + BytesPerWord)); + objHeader1 = longAt(fwdBlock1 + BytesPerWord); + /* begin restoreHeaderOf:to: */ + longAtput(oop2, objHeader1); + if (((((usqInt) objHeader1) >> 12) & 31) == ClassMethodContextCompactIndex) { + if (!(asserta(!(isStillMarriedContext(oop2))))) { + error("attempt to become married context"); + } + } hdr1 = longAt(oop1); hdr2 = longAt(oop2); longAtput(oop1, (hdr1 & AllButHashBits) | (hdr2 & HashBits)); @@ -10038,7 +10103,14 @@ fwdBlock11 = (fwdHeader2 & AllButMarkBitAndTypeMask) << 1; assert((fwdHeader2 & MarkBit) != 0); assert(fwdBlockValid(fwdBlock11)); - longAtput(oop11, longAt(fwdBlock11 + BytesPerWord)); + objHeader2 = longAt(fwdBlock11 + BytesPerWord); + /* begin restoreHeaderOf:to: */ + longAtput(oop11, objHeader2); + if (((((usqInt) objHeader2) >> 12) & 31) == ClassMethodContextCompactIndex) { + if (!(asserta(!(isStillMarriedContext(oop11))))) { + error("attempt to become married context"); + } + } if (copyHashFlag) { /* Change the hash of the new oop (oop2) to be that of the old (oop1) @@ -10049,18 +10121,24 @@ longAtput(oop21, (hdr21 & AllButHashBits) | (hdr11 & HashBits)); } /* begin freeObject: */ - VM_LABEL(0freeObject); - objHeader = longAt(oop11); - if ((objHeader & RootBit) != 0) { + objHeader11 = longAt(oop11); + /* begin freeObject:header: */ + VM_LABEL(0freeObjectheader); + if (((((usqInt) objHeader11) >> 12) & 31) == ClassMethodContextCompactIndex) { + if (!(asserta(!(isStillMarriedContext(oop11))))) { + error("attempt to free married context"); + } + } + if ((objHeader11 & RootBit) != 0) { removeYoungRoot(oop11); } - objHeaderType = objHeader & TypeMask; + objHeaderType = objHeader11 & TypeMask; objHeaderBytes = headerTypeBytes[objHeaderType]; if ((objHeaderType & 1) == 1) { /* HeaderTypeClass or HeaderTypeShort */ - objSize = objHeader & SizeMask; + objSize = objHeader11 & SizeMask; } else { if (objHeaderType == HeaderTypeFree) { @@ -10071,7 +10149,7 @@ } assert(((objSize + objHeaderBytes) & AllButTypeMask) == (objSize + objHeaderBytes)); longAtput(oop11 - objHeaderBytes, (objSize + objHeaderBytes) | HeaderTypeFree); - l1: /* end freeObject: */; + l1: /* end freeObject:header: */; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.272.mcz
by commits＠source.squeak.org 09 Mar '13

09 Mar '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.272.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.272 Author: eem Time: 8 March 2013, 3:33:01.637 pm UUID: 8f4167f2-5bf0-4d90-9b7f-5355c741c68f Ancestors: VMMaker.oscog-eem.271 Fix unknownBytecode processing to leave pc at unknown bytecode. Fix case of process switch to an interior frame. Fix some assert function signatures in the stack vm. Use symbols for types instead of strings in stack page funcs. =============== Diff against VMMaker.oscog-eem.271 =============== Item was added: + ----- Method: CoInterpreterStackPages>>markStackPageLeastMostRecentlyUsed: (in category 'page access') ----- + markStackPageLeastMostRecentlyUsed: page "<InterpreterStackPage>" + "This method is used to move a page to the end of the used pages. + This is to keep asserts checking pageListIsWellFormed happy." + + "MRUP-->used page<->used page<->used page<->used page<--LRUP + ^ <-next-prev-> ^ + | | + v <-prev-next-> v + free page<->free page<->free page<->free page" + + <var: #page type: #'StackPage *'> + <returnTypeC: #void> + | lastUsedPage | + <var: #lastUsedPage type: #'StackPage *'> + self assert: page = mostRecentlyUsedPage nextPage. + lastUsedPage := page nextPage. + [lastUsedPage isFree] whileTrue: + [lastUsedPage := lastUsedPage nextPage]. + lastUsedPage nextPage = page ifTrue: + [^nil]. + page prevPage nextPage: page nextPage. + page nextPage prevPage: page prevPage. + lastUsedPage prevPage nextPage: page. + page prevPage: lastUsedPage prevPage. + page nextPage: lastUsedPage. + lastUsedPage prevPage: page. + self assert: self pageListIsWellFormed! Item was changed: ----- Method: CoInterpreterStackPages>>markStackPageMostRecentlyUsed: (in category 'page access') ----- markStackPageMostRecentlyUsed: page "<InterpreterStackPage>" "MRUP-->used page<->used page<->used page<->used page<--LRUP ^ <-next-prev-> ^ | | v <-prev-next-> v free page<->free page<->free page<->free page" + <var: #page type: #'StackPage *'> - <var: #page type: 'StackPage *'> <asmLabel: false> <returnTypeC: #void> page == mostRecentlyUsedPage ifTrue: [^nil]. "Common case; making new page most recently used." page prevPage == mostRecentlyUsedPage ifTrue: [mostRecentlyUsedPage := page. self assert: self pageListIsWellFormed. ^nil]. page prevPage nextPage: page nextPage. page nextPage prevPage: page prevPage. mostRecentlyUsedPage nextPage prevPage: page. page prevPage: mostRecentlyUsedPage. page nextPage: mostRecentlyUsedPage nextPage. mostRecentlyUsedPage nextPage: page. mostRecentlyUsedPage := page. self assert: self pageListIsWellFormed! Item was changed: ----- Method: CoInterpreterStackPages>>markStackPageNextMostRecentlyUsed: (in category 'page access') ----- markStackPageNextMostRecentlyUsed: page "<InterpreterStackPage>" "This method is used to move a page to a position in the list such that it cannot be deallocated when a new page is allocated, without changing the most recently used page. There must be at least 3 pages in the system. So making the page the MRU's prevPage is sufficient to ensure it won't be deallocated." "MRUP-->used page<->used page<->used page<->used page<--LRUP ^ <-next-prev-> ^ | | v <-prev-next-> v free page<->free page<->free page<->free page" + <var: #page type: #'StackPage *'> - <var: #page type: 'StackPage *'> <returnTypeC: #void> self assert: page ~~ mostRecentlyUsedPage. page nextPage == mostRecentlyUsedPage ifTrue: [^nil]. page prevPage nextPage: page nextPage. page nextPage prevPage: page prevPage. mostRecentlyUsedPage prevPage nextPage: page. page prevPage: mostRecentlyUsedPage prevPage. page nextPage: mostRecentlyUsedPage. mostRecentlyUsedPage prevPage: page. self assert: self pageListIsWellFormed! Item was changed: ----- Method: CoInterpreterStackPages>>pageListIsWellFormed (in category 'assertions') ----- pageListIsWellFormed "Answer if the stack page list is well-formed. MRUP-->used page<->used page<->used page<->used page<--LRUP ^ <-next-prev-> ^ | | v <-prev-next-> v free page<->free page<->free page<->free page" | ok page count limit | <inline: false> + <var: #page type: #'StackPage *'> - <var: #page type: 'StackPage *'> ok := true. page := mostRecentlyUsedPage nextPage. count := 1. limit := coInterpreter numStkPages * 2. [page isFree and: [page ~= mostRecentlyUsedPage and: [count <= limit]]] whileTrue: [(self asserta: page nextPage prevPage == page) ifFalse: [ok := false]. page := page nextPage. count := count + 1]. [page ~= mostRecentlyUsedPage and: [count <= limit]] whileTrue: [(self asserta: page nextPage prevPage == page) ifFalse: [ok := false]. (self asserta: page isFree not) ifTrue: [(self asserta: (self stackPageFor: page baseFP) == page) ifFalse: [ok := false]. (self asserta: (self stackPageFor: page headSP) == page) ifFalse: [ok := false]] ifFalse: [ok := false]. page := page nextPage. count := count + 1]. (self asserta: count = coInterpreter numStkPages) ifFalse: [ok := false]. ^ok! Item was changed: ----- Method: CoInterpreterStackPages>>stackPageAt: (in category 'page access') ----- stackPageAt: index "Answer the page for a page index. N.B. This is a zero-relative index." + <returnTypeC: #'StackPage *'> - <returnTypeC: 'StackPage *'> ^self stackPageAt: index pages: pages! Item was added: + ----- Method: InterpreterStackPages>>markStackPageLeastMostRecentlyUsed: (in category 'page access') ----- + markStackPageLeastMostRecentlyUsed: page "<InterpreterStackPage>" + "This method is used to move a page to the end of the used pages. + This is to keep asserts checking pageListIsWellFormed happy." + + "MRUP-->used page<->used page<->used page<->used page<--LRUP + ^ <-next-prev-> ^ + | | + v <-prev-next-> v + free page<->free page<->free page<->free page" + + <var: #page type: #'StackPage *'> + <returnTypeC: #void> + | lastUsedPage | + <var: #lastUsedPage type: #'StackPage *'> + self assert: page = mostRecentlyUsedPage nextPage. + lastUsedPage := page nextPage. + [lastUsedPage isFree] whileTrue: + [lastUsedPage := lastUsedPage nextPage]. + lastUsedPage nextPage = page ifTrue: + [^nil]. + page prevPage nextPage: page nextPage. + page nextPage prevPage: page prevPage. + lastUsedPage prevPage nextPage: page. + page prevPage: lastUsedPage prevPage. + page nextPage: lastUsedPage. + lastUsedPage prevPage: page. + self assert: self pageListIsWellFormed! Item was changed: ----- Method: InterpreterStackPages>>markStackPageMostRecentlyUsed: (in category 'page access') ----- markStackPageMostRecentlyUsed: page "<InterpreterStackPage>" "MRUP-->used page<->used page<->used page<->used page<--LRUP ^ <-next-prev-> ^ | | v <-prev-next-> v free page<->free page<->free page<->free page" + <var: #page type: #'StackPage *'> - <var: #page type: 'StackPage *'> <asmLabel: false> page == mostRecentlyUsedPage ifTrue: [^nil]. "Common case; making new page most recently used." page prevPage == mostRecentlyUsedPage ifTrue: [mostRecentlyUsedPage := page. self assert: self pageListIsWellFormed. ^nil]. page prevPage nextPage: page nextPage. page nextPage prevPage: page prevPage. mostRecentlyUsedPage nextPage prevPage: page. page prevPage: mostRecentlyUsedPage. page nextPage: mostRecentlyUsedPage nextPage. mostRecentlyUsedPage nextPage: page. mostRecentlyUsedPage := page. self assert: self pageListIsWellFormed! Item was changed: ----- Method: InterpreterStackPages>>markStackPageNextMostRecentlyUsed: (in category 'page access') ----- markStackPageNextMostRecentlyUsed: page "<InterpreterStackPage>" "This method is used to move a page to a position in the list such that it cannot be deallocated when a new page is allocated, without changing the most recently used page. There must be at least 3 pages in the system. So making the page the MRU's prevPage is sufficient to ensure it won't be deallocated." "MRUP-->used page<->used page<->used page<->used page<--LRUP ^ <-next-prev-> ^ | | v <-prev-next-> v free page<->free page<->free page<->free page" + <var: #page type: #'StackPage *'> - <var: #page type: 'StackPage *'> self assert: page ~~ mostRecentlyUsedPage. page nextPage == mostRecentlyUsedPage ifTrue: [^nil]. page prevPage nextPage: page nextPage. page nextPage prevPage: page prevPage. mostRecentlyUsedPage prevPage nextPage: page. page prevPage: mostRecentlyUsedPage prevPage. page nextPage: mostRecentlyUsedPage. mostRecentlyUsedPage prevPage: page. self assert: self pageListIsWellFormed! Item was changed: ----- Method: InterpreterStackPages>>pageIndexFor: (in category 'page access') ----- pageIndexFor: pointer "<Integer>" "Answer the page index for a pointer into stack memory, i.e. the index for the page the address is in. N.B. This is a zero-relative index." + <var: #pointer type: #'void *'> - <var: #pointer type: 'void *'> ^self pageIndexFor: pointer stackMemory: stackMemory bytesPerPage: bytesPerPage! Item was changed: ----- Method: InterpreterStackPages>>pageListIsWellFormed (in category 'assertions') ----- pageListIsWellFormed "Answer if the stack page list is well-formed. MRUP-->used page<->used page<->used page<->used page<--LRUP ^ <-next-prev-> ^ | | v <-prev-next-> v free page<->free page<->free page<->free page" | ok page count limit | <inline: false> + <var: #page type: #'StackPage *'> - <var: #page type: 'StackPage *'> ok := true. page := mostRecentlyUsedPage nextPage. count := 1. limit := numPages * 2. [page isFree and: [page ~= mostRecentlyUsedPage and: [count <= limit]]] whileTrue: [(self asserta: page nextPage prevPage == page) ifFalse: [ok := false]. page := page nextPage. count := count + 1]. [page ~= mostRecentlyUsedPage and: [count <= limit]] whileTrue: [(self asserta: page nextPage prevPage == page) ifFalse: [ok := false]. (self asserta: page isFree not) ifTrue: [(self asserta: (self stackPageFor: page baseFP) == page) ifFalse: [ok := false]. (self asserta: (self stackPageFor: page headSP) == page) ifFalse: [ok := false]] ifFalse: [ok := false]. page := page nextPage. count := count + 1]. (self asserta: count = numPages) ifFalse: [ok := false]. ^ok! Item was changed: ----- Method: InterpreterStackPages>>stackPageAt: (in category 'page access') ----- stackPageAt: index "Answer the page for a page index. N.B. This is a zero-relative index." + <returnTypeC: #'StackPage *'> - <returnTypeC: 'StackPage *'> ^self stackPageAt: index pages: pages! Item was changed: ----- Method: StackInterpreter>>assertValidExecutionPointe:r:s:imbar: (in category 'debug support') ----- assertValidExecutionPointe: lip r: lfp s: lsp imbar: inInterpreter + <var: #lip type: #usqInt> - <var: #lip type: #'char *'> <var: #lfp type: #'char *'> <var: #lsp type: #'char *'> self assert: inInterpreter. self assert: stackPage = (stackPages stackPageFor: lfp). self assert: stackPage = stackPages mostRecentlyUsedPage. self assertValidStackLimits. self assert: lfp < stackPage baseAddress. self assert: lsp < lfp. self assert: lfp > lsp. self assert: lsp >= (stackPage realStackLimit - self stackLimitOffset). self assert: (lfp - lsp) < LargeContextSize. self assert: (self validInstructionPointer: lip inFrame: lfp). self assert: ((self frameIsBlockActivation: lfp) or: [(self pushedReceiverOrClosureOfFrame: lfp) = (self frameReceiver: lfp)]). self assert: method = (self frameMethod: lfp). self cppIf: MULTIPLEBYTECODESETS ifTrue: [self assert: (self methodUsesAlternateBytecodeSet: method) = (bytecodeSetSelector = 256)].! Item was changed: ----- Method: StackInterpreter>>externalSetStackPageAndPointersForSuspendedContextOfProcess: (in category 'frame access') ----- externalSetStackPageAndPointersForSuspendedContextOfProcess: aProcess "Set stackPage, framePointer and stackPointer for the suspendedContext of aProcess, marrying the context if necessary, and niling the suspendedContext slot. This is used on process switch to ensure a context has a stack frame and so can continue execution." + | newContext theFrame thePage newPage | - | newContext theFrame thePage | <var: #theFrame type: #'char *'> <var: #thePage type: #'StackPage *'> + <var: #newPage type: #'StackPage *'> newContext := objectMemory fetchPointer: SuspendedContextIndex ofObject: aProcess. self assert: (objectMemory isContext: newContext). (self isMarriedOrWidowedContext: newContext) ifTrue: [self assert: (self checkIsStillMarriedContext: newContext currentFP: framePointer)]. + objectMemory + storePointerUnchecked: SuspendedContextIndex + ofObject: aProcess + withValue: objectMemory nilObject. - objectMemory storePointerUnchecked: SuspendedContextIndex ofObject: aProcess withValue: objectMemory nilObject. (self isStillMarriedContext: newContext) ifTrue: [theFrame := self frameOfMarriedContext: newContext. + thePage := stackPages stackPageFor: theFrame. + theFrame ~= thePage headFP ifTrue: + ["explicit assignment of suspendedContext can cause switch to interior frame." + newPage := self newStackPage. + self moveFramesIn: thePage + through: (self findFrameAbove: theFrame inPage: thePage) + toPage: newPage. + stackPages markStackPageLeastMostRecentlyUsed: newPage]. + self assert: thePage headFP = theFrame] - thePage := stackPages stackPageFor: theFrame] ifFalse: [thePage := self makeBaseFrameFor: newContext. theFrame := thePage baseFP]. - self assert: thePage headFP = theFrame. self setStackPageAndLimit: thePage. stackPointer := thePage headSP. framePointer := thePage headFP. (self isMachineCodeFrame: framePointer) ifFalse: [self setMethod: (self iframeMethod: framePointer)]. self assertValidExecutionPointe: self stackTop asUnsignedInteger r: framePointer s: stackPointer! Item was changed: ----- Method: StackInterpreter>>respondToUnknownBytecode (in category 'miscellaneous bytecodes') ----- respondToUnknownBytecode "If an error selector is available then send it to the activeContext, otherwise abort." <sharedCodeNamed: #respondToUnknownBytecode inCase: #unknownBytecode> + | ourContext | + messageSelector := objectMemory maybeSplObj: SelectorUnknownBytecode. + (messageSelector isNil + or: [messageSelector = objectMemory nilObject]) ifTrue: - | unknownBytecodeSelector ourContext | - unknownBytecodeSelector := objectMemory maybeSplObj: SelectorUnknownBytecode. - unknownBytecodeSelector isNil ifTrue: [self error: 'Unknown bytecode']. ourContext := self ensureFrameIsMarried: localFP SP: localSP. + "undo fetch of bytecode so that context's pc is pointing to the unknown bytecode." + localIP := localIP - 1. - "N.B. Do Not: - self fetchNextBytecode." self internalPush: ourContext. - messageSelector := unknownBytecodeSelector. argumentCount := 0. + self normalSend! - self commonSend! Item was changed: ----- Method: StackInterpreter>>validInstructionPointer:inMethod:framePointer: (in category 'debug support') ----- validInstructionPointer: theInstrPointer inMethod: aMethod framePointer: fp <var: #theInstrPointer type: #usqInt> <var: #aMethod type: #usqInt> + <var: #fp type: #'char *'> ^self cppIf: MULTIPLEBYTECODESETS ifTrue: [| methodHeader | methodHeader := self noAssertHeaderOf: aMethod. "-1 for pre-increment in fetchNextBytecode" theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BaseHeaderSize - 1) and: [theInstrPointer < (aMethod + (objectMemory byteLengthOf: aMethod) + BaseHeaderSize - 1) and: ["If the method starts with a CallPrimitive opcode the instruction pointer should be past it." ((self headerIndicatesAlternateBytecodeSet: methodHeader) and: [(self alternateHeaderHasPrimitiveFlag: methodHeader) and: [theInstrPointer < (aMethod + BaseHeaderSize - 1 + (objectMemory lastPointerOf: aMethod) + (self sizeOfCallPrimitiveBytecode: methodHeader) - 1)]]) not]]] ifFalse: "-1 for pre-increment in fetchNextBytecode" [theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BaseHeaderSize - 1) and: [theInstrPointer < (aMethod + (objectMemory byteLengthOf: aMethod) + BaseHeaderSize - 1)]]!

1 0

VM Maker: VMMaker.oscog-eem.271.mcz
by commits＠source.squeak.org 08 Mar '13

08 Mar '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.271.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.271 Author: eem Time: 8 March 2013, 1:04:37.342 pm UUID: 8943dd74-9b0c-4423-b878-187204349978 Ancestors: VMMaker.oscog-eem.270 Integrate VMMaker-oscog-EstebanLorenzano.235. - it is possible to build stackvm again =============== Diff against VMMaker.oscog-eem.270 =============== Item was changed: ----- Method: InterpreterStackPages>>isFree: (in category 'page access') ----- isFree: thePage + "This is an anachronism. Previously Slang couldn't generate the method correctly + from e.g. InterpreterStackPage>>isFree since Slang didn't do substitution on self. + Now it does, but there are still callers of isFree: so we keep this for simulation." + <doNotGenerate> + ^thePage baseFP = 0! - "This is a sad workaround. Ideally this is an accessor on InterpreterStackPages. - But it isn't easy to extend Slang to deal with this. There's no easy place to put - the type information and Slang doesn't ever do substitution on self. It merely - elides self." - <inline: true> - <var: #thePage type: 'StackPage *'> - ^thePage baseFP = 0 - ! Item was changed: ----- Method: StackInterpreter class>>isNonArgumentImplicitReceiverVariableName: (in category 'translation') ----- isNonArgumentImplicitReceiverVariableName: aString + ^#('self' 'stackPages' 'interpreter' 'objectMemory' 'coInterpreter' 'heapMap') includes: aString! - ^#('self' 'stackPages' 'interpreter' 'objectMemory' 'coInterpreter') includes: aString!

1 0

Re: [squeak-dev] new Cog VMs available
by Eliot Miranda 08 Mar '13

08 Mar '13

Hi Chris, can you package up a reproducible case and point me to the image? By reproducible I mean save the image with a doit that invokes the code that creates the bug, e.g. Smalltalk saveAs: 'crash'. Gofer it url: 'http://www.squeaksource.com/MetacelloRepository'; package: 'ConfigurationOfFFI'; load. (Smalltalk at: #ConfigurationOfFFI) project stableVersion load. On Wed, Mar 6, 2013 at 4:06 PM, Chris Muller <asqueaker(a)gmail.com> wrote: > Thanks Eliot. Unfortunately, for me my app still crashes instantly with: > > ----------- > [ ... big stack trace ... ] > stack page bytes 4096 available headroom 3300 minimum unused headroom 2596 > > (last object overwritten) > ----------- > > 2640 is stable for me (as long as I don't use a write-barrier). > > > > On Tue, Mar 5, 2013 at 4:45 PM, Eliot Miranda <eliot.miranda(a)gmail.com> > wrote: > > at http://www.mirandabanda.org/files/Cog/VM/VM.r2697/ > > > > CogVM binaries as per VMMaker.oscog-eem.270/r2697 > > > > Fix the become issue where methods that are identical are failing > > the code test because their penultimate literals are different objects. > > Add a flag "cmUsesPenultimateLit" to jitted methods, stealing bits > > from stackCheckOffset (which was way larger than needed). > > Shrink stackCheckOffset to 12 bits (still an order of magnitude larger > > than needed) and add an error check on assigning it. > > Also add a check for max method size (2^16-1 bytes) and refuse to > > jit a method that generates too much code. > > When comparing code, use the cmUsesPenultimateLit flag to decide > > if comparison includes penultimate lit or not. > > > > This is mildly insane, but the VM really doesn't know about the > penultimate > > literal and it shouldn't depend on knowing it can be ignored. Note that > the > > CoInterpreter knows about the last literal; it uses this in supersends. > > With this hack, Pharo's condenseSources works. > > > > Fix bug in primitiveClone/cloneContext: that causes the copy to be a word > > short. > > Use isPointerNonInt: and isContextNonInt: in a few places. > > > > Implement unknownBytecode. Send unknownBytecode to the activeContext on > > unknown bytecode if the selector is in the specialObjectsArray. > > > > Fix page size bug in platforms/Cross/vm/sqHeapMap.c. > > > > -- > > best, > > Eliot > > > > > > > > -- best, Eliot

1 0

VM Maker: VMMaker-oscog-EstebanLorenzano.235.mcz
by commits＠source.squeak.org 08 Mar '13

08 Mar '13

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-EstebanLorenzano.235.mcz ==================== Summary ==================== Name: VMMaker-oscog-EstebanLorenzano.235 Author: EstebanLorenzano Time: 8 March 2013, 5:36:38.541 pm UUID: 0387ce7c-0822-46ef-ba1e-9bade5722098 Ancestors: VMMaker-oscog-EstebanLorenzano.234 - it is possible to build stackvm again =============== Diff against VMMaker-oscog-EstebanLorenzano.234 =============== Item was changed: ----- Method: InterpreterStackPages>>isFree: (in category 'page access') ----- isFree: thePage "This is a sad workaround. Ideally this is an accessor on InterpreterStackPages. But it isn't easy to extend Slang to deal with this. There's no easy place to put the type information and Slang doesn't ever do substitution on self. It merely elides self." + <doNotGenerate> <inline: true> <var: #thePage type: 'StackPage *'> ^thePage baseFP = 0 ! Item was changed: ----- Method: StackInterpreter class>>isNonArgumentImplicitReceiverVariableName: (in category 'translation') ----- isNonArgumentImplicitReceiverVariableName: aString + ^#('self' 'stackPages' 'interpreter' 'objectMemory' 'coInterpreter' 'heapMap') includes: aString! - ^#('self' 'stackPages' 'interpreter' 'objectMemory' 'coInterpreter') includes: aString!

1 0

VM Maker: CMakeVMMaker-EstebanLorenzano.194.mcz
by commits＠source.squeak.org 08 Mar '13

08 Mar '13

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.194.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.194 Author: EstebanLorenzano Time: 8 March 2013, 5:28:17.302 pm UUID: ac6cf747-7b71-4ee8-8030-58368e8c4382 Ancestors: CMakeVMMaker-EstebanLorenzano.193 - build script now check existence of vmVersionInfo.h =============== Diff against CMakeVMMaker-EstebanLorenzano.193 =============== Item was changed: ----- Method: CogFamilyUnixConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ '#!!bash + if [ !! -e vmVersionInfo.h ]; then + ../codegen-scripts/extract-commit-info.sh + fi cmake . make '! Item was changed: ----- Method: CogFamilyWindowsConfig>>buildScript (in category 'as yet unclassified') ----- buildScript "answer the build script for building everything" ^ '#!!bash + if [ !! -e vmVersionInfo.h ]; then + ../codegen-scripts/extract-commit-info.sh + fi cmake -G "MSYS Makefiles" . make '! Item was changed: ----- Method: MacOSConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ '#!!bash + if [ !! -e vmVersionInfo.h ]; then + ../codegen-scripts/extract-commit-info.sh + fi cmake . make make install '! Item was added: + ----- Method: StackIPhoneConfig>>buildScript (in category 'build script') ----- + buildScript + "answer the build script for building everything" + + + ^ + '#!!bash + + if [ !! -e vmVersionInfo.h ]; then + ../codegen-scripts/extract-commit-info.sh + fi + cmake -G Xcode . + xcodebuild -sdk {sdk} -configuration Release -target {name} + + ' nameFormat: {#name->self executableName. #sdk->self sdkTarget} asDictionary! Item was added: + ----- Method: StackIPhoneConfig>>sdkTarget (in category 'accessing') ----- + sdkTarget + ^'iphone', self sdkVersion! Item was added: + ----- Method: StackSimulatorConfig>>sdkTarget (in category 'accessing') ----- + sdkTarget + ^'iphonesimulator', self sdkVersion!

1 0

Cross file updates
by tim Rowledge 08 Mar '13

08 Mar '13

I've just committed some changes to the Cross platform files that should have no effect for anything but the Acorn code. I had to fudge a definition of fileno() so that the push/popOutputFile stuff would compile. Added a decl for ioSetCursorARGB() Fudged FilePlugin.h for ACORN to keep a long for my (ab)use of the lastOp field. Fixed a mismatched decl for ioShowDisplayOnWindow() in HostWindowPlugin.h SVN thinks there are a few other lines changed even though I can't find any difference even with a binary editor. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Useful random insult:- Went to the dentist to have his cranial cavity filled.

3 12

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev March 2013