Revision: 2914 Author: eliot Date: 2014-05-04 09:34:55 -0700 (Sun, 04 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.702
Oops! Correct the collapsed generateWhile:loop:on:indent: which was missing the not operation. IIABDFI :-(
And regenerate the plugins affected by the recent conditional indenting fix.
Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/plugins/AioPlugin/AioPlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/SqueakSSL/SqueakSSL.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c 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/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 from - StackToRegisterMappingCogit VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + StackToRegisterMappingCogit VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -6448,7 +6448,7 @@ AbstractInstruction *dependentChain;
dependentChain = (self_in_concretizeLabel->dependent); - while ((dependentChain == null)) { + while (!(dependentChain == null)) { updateLabel(dependentChain, self_in_concretizeLabel); dependentChain = (dependentChain->dependent); } @@ -7949,7 +7949,7 @@ case Label: /* begin concretizeLabel */ dependentChain = (self_in_dispatchConcretize->dependent); - while ((dependentChain == null)) { + while (!(dependentChain == null)) { updateLabel(dependentChain, self_in_dispatchConcretize); dependentChain = (dependentChain->dependent); } @@ -19710,7 +19710,7 @@ CogMethod *openPIC;
openPIC = openPICList; - while ((openPIC == null)) { + while (!(openPIC == null)) { printCogMethod(openPIC); openPIC = ((CogMethod *) ((openPIC->nextOpenPIC))); }
Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */
Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */
typedef struct {
Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 from - CoInterpreter VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2045,7 +2045,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.701"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.702"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -4534,7 +4534,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + while (!((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage))) { if (((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { /* begin stackPageFor: */ @@ -5684,7 +5684,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } - null; goto l4; } if (opType == 3) { @@ -5694,7 +5693,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -5708,7 +5706,6 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2);
- null; goto l4; } top = longAtPointer(localSP); @@ -20650,7 +20647,7 @@ ? (longAt(explicitReceiver - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); mixinOrMixinApplication = aClass; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((longAt((mixinOrMixinApplication + BaseHeaderSize) + (MixinIndex << ShiftForWord))) == targetMixin)))) { mixinOrMixinApplication = longAt((mixinOrMixinApplication + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); @@ -21561,7 +21558,7 @@ sqInt mixinOrMixinApplication;
mixinOrMixinApplication = aBehavior; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((((mixin = longAt((mixinOrMixinApplication + BaseHeaderSize) + (MixinIndex << ShiftForWord)))) == targetMixin) || (((((ccIndex = (((usqInt) (longAt(mixin))) >> 12) & 0x1F)) == 0 @@ -23770,7 +23767,7 @@ ? (longAt(implicitReceiver - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord)))); mixinOrMixinApplication = aClass; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((longAt((mixinOrMixinApplication + BaseHeaderSize) + (MixinIndex << ShiftForWord))) == targetMixin)))) { mixinOrMixinApplication = longAt((mixinOrMixinApplication + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); @@ -25630,7 +25627,7 @@ : (((ccIndex = (((usqInt) (longAt(oop))) >> 12) & 0x1F)) == 0 ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); - while ((oopClass == GIV(nilObj))) { + while (!(oopClass == GIV(nilObj))) { if (oopClass == aClass) { return 1; } @@ -25653,7 +25650,7 @@ : (((ccIndex = (((usqInt) (longAt(oop))) >> 12) & 0x1F)) == 0 ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); - while ((oopClass == GIV(nilObj))) { + while (!(oopClass == GIV(nilObj))) { if (classNameOfIs(oopClass, className)) { return 1; } @@ -26168,7 +26165,7 @@ ; return 0; } - while ((fieldPtr > lastPtr)) { + while (!(fieldPtr > lastPtr)) {
/* Examine each pointer field */
@@ -26247,7 +26244,7 @@ /* Go through all oops, remapping them... */
lastPtr = segOop + (lastPointerOf(segOop)); - while ((fieldPtr > lastPtr)) { + while (!(fieldPtr > lastPtr)) {
/* Examine each pointer field */
@@ -26565,7 +26562,7 @@ error("heap is empty"); oop = null; l3: /* end firstAccessibleObject */; - while ((oop == null)) { + while (!(oop == null)) { if ((((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) <= 4) || (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12)) { if (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12) { @@ -43177,7 +43174,7 @@ error("heap is empty"); thisObj = null; l2: /* end firstAccessibleObject */; - while ((thisObj == null)) { + while (!(thisObj == null)) { thisClass = ((thisObj & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)) : (((ccIndex = (((usqInt) (longAt(thisObj))) >> 12) & 0x1F)) == 0 @@ -44534,7 +44531,7 @@
/* Need to walk the stack freeing stack pages and nilling contexts. */
- while (((currentCtx == aContextOrNil) + while (!((currentCtx == aContextOrNil) || (currentCtx == GIV(nilObj)))) { assert(isContext(currentCtx)); if (((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { @@ -46515,7 +46512,7 @@ sqInt context;
context = shortReversePrintFrameAndCallers(theFP); - while ((context == GIV(nilObj))) { + while (!(context == GIV(nilObj))) { if (((longAt((context + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); @@ -46546,7 +46543,7 @@ return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (SuspendedContextIndex << ShiftForWord))); } context = aContextOrProcessOrFrame; - while ((context == GIV(nilObj))) { + while (!(context == GIV(nilObj))) { if (((longAt((context + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); @@ -46573,7 +46570,7 @@ sqInt value;
ctxt = aContext; - while ((ctxt == GIV(nilObj))) { + while (!(ctxt == GIV(nilObj))) { if (((longAt((ctxt + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { /* begin frameOfMarriedContext: */ value = longAt((ctxt + BaseHeaderSize) + (SenderIndex << ShiftForWord)); @@ -46704,7 +46701,7 @@ sqInt ctxt;
ctxt = aContext; - while (((ctxt == GIV(nilObj)) + while (!((ctxt == GIV(nilObj)) || (((longAt((ctxt + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)))) { shortPrintContext(ctxt); ctxt = longAt((ctxt + BaseHeaderSize) + (SenderIndex << ShiftForWord)); @@ -47466,7 +47463,7 @@ error("heap is empty"); oop = null; l2: /* end firstAccessibleObject */; - while ((oop == null)) { + while (!(oop == null)) { if (((((ccIndex = (((usqInt) (longAt(oop))) >> 12) & 0x1F)) == 0 ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == aClassOop) { @@ -48152,7 +48149,7 @@ error("heap is empty"); oop = null; l2: /* end firstAccessibleObject */; - while ((oop == null)) { + while (!(oop == null)) { if (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12) { i = ((literalCountOfHeader(headerOf(oop))) + LiteralStart) - 1; while (i >= 0) { @@ -48659,7 +48656,7 @@ sqInt proc;
proc = (firstProc = longAt((procList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))); - while ((proc == GIV(nilObj))) { + while (!(proc == GIV(nilObj))) { printProcessStack(proc); proc = longAt((proc + BaseHeaderSize) + (NextLinkIndex << ShiftForWord)); if (proc == firstProc) { @@ -48718,7 +48715,7 @@ error("heap is empty"); oop = null; l3: /* end firstAccessibleObject */; - while ((oop == null)) { + while (!(oop == null)) { if ((((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) <= 4) || (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12)) { if (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12) { @@ -49072,7 +49069,7 @@ error("heap is empty"); oop = null; l2: /* end firstAccessibleObject */; - while ((oop == null)) { + while (!(oop == null)) { if ((((((usqInt) (longAt(oop))) >> 12) & 0x1F) == ClassMethodContextCompactIndex) && (badContextSize(oop))) { printHex(oop); @@ -53356,7 +53353,7 @@ /* Go through all oops, remapping them... */
lastPtr = segOop + (lastPointerOf(segOop)); - while ((fieldPtr > lastPtr)) { + while (!(fieldPtr > lastPtr)) {
/* Examine each pointer field */
@@ -55190,7 +55187,7 @@ : GIV(highestRunnableProcessPriority)); while (((p -= 1)) >= 0) { processList = longAt((schedLists + BaseHeaderSize) + (p << ShiftForWord)); - while (((longAt((processList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj))) { + while (!((longAt((processList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj))) {
/* Only answer processes with a runnable suspendedContext. Discard those that aren't; the VM would crash otherwise. */
Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-04 16:34:55 UTC (rev 2914) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 from - CoInterpreter VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2048,7 +2048,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.701"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.702"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -4543,7 +4543,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + while (!((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage))) { if (((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { /* begin stackPageFor: */ @@ -5693,7 +5693,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } - null; goto l4; } if (opType == 3) { @@ -5703,7 +5702,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -5717,7 +5715,6 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2);
- null; goto l4; } top = longAtPointer(localSP); @@ -20659,7 +20656,7 @@ ? (longAt(explicitReceiver - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); mixinOrMixinApplication = aClass; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((longAt((mixinOrMixinApplication + BaseHeaderSize) + (MixinIndex << ShiftForWord))) == targetMixin)))) { mixinOrMixinApplication = longAt((mixinOrMixinApplication + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); @@ -21570,7 +21567,7 @@ sqInt mixinOrMixinApplication;
mixinOrMixinApplication = aBehavior; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((((mixin = longAt((mixinOrMixinApplication + BaseHeaderSize) + (MixinIndex << ShiftForWord)))) == targetMixin) || (((((ccIndex = (((usqInt) (longAt(mixin))) >> 12) & 0x1F)) == 0 @@ -23779,7 +23776,7 @@ ? (longAt(implicitReceiver - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord)))); mixinOrMixinApplication = aClass; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((longAt((mixinOrMixinApplication + BaseHeaderSize) + (MixinIndex << ShiftForWord))) == targetMixin)))) { mixinOrMixinApplication = longAt((mixinOrMixinApplication + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); @@ -25639,7 +25636,7 @@ : (((ccIndex = (((usqInt) (longAt(oop))) >> 12) & 0x1F)) == 0 ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); - while ((oopClass == GIV(nilObj))) { + while (!(oopClass == GIV(nilObj))) { if (oopClass == aClass) { return 1; } @@ -25662,7 +25659,7 @@ : (((ccIndex = (((usqInt) (longAt(oop))) >> 12) & 0x1F)) == 0 ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); - while ((oopClass == GIV(nilObj))) { + while (!(oopClass == GIV(nilObj))) { if (classNameOfIs(oopClass, className)) { return 1; } @@ -26177,7 +26174,7 @@ ; return 0; } - while ((fieldPtr > lastPtr)) { + while (!(fieldPtr > lastPtr)) {
/* Examine each pointer field */
@@ -26256,7 +26253,7 @@ /* Go through all oops, remapping them... */
lastPtr = segOop + (lastPointerOf(segOop)); - while ((fieldPtr > lastPtr)) { + while (!(fieldPtr > lastPtr)) {
/* Examine each pointer field */
@@ -26574,7 +26571,7 @@ error("heap is empty"); oop = null; l3: /* end firstAccessibleObject */; - while ((oop == null)) { + while (!(oop == null)) { if ((((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) <= 4) || (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12)) { if (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12) { @@ -43186,7 +43183,7 @@ error("heap is empty"); thisObj = null; l2: /* end firstAccessibleObject */; - while ((thisObj == null)) { + while (!(thisObj == null)) { thisClass = ((thisObj & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)) : (((ccIndex = (((usqInt) (longAt(thisObj))) >> 12) & 0x1F)) == 0 @@ -44543,7 +44540,7 @@
/* Need to walk the stack freeing stack pages and nilling contexts. */
- while (((currentCtx == aContextOrNil) + while (!((currentCtx == aContextOrNil) || (currentCtx == GIV(nilObj)))) { assert(isContext(currentCtx)); if (((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { @@ -46524,7 +46521,7 @@ sqInt context;
context = shortReversePrintFrameAndCallers(theFP); - while ((context == GIV(nilObj))) { + while (!(context == GIV(nilObj))) { if (((longAt((context + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); @@ -46555,7 +46552,7 @@ return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (SuspendedContextIndex << ShiftForWord))); } context = aContextOrProcessOrFrame; - while ((context == GIV(nilObj))) { + while (!(context == GIV(nilObj))) { if (((longAt((context + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); @@ -46582,7 +46579,7 @@ sqInt value;
ctxt = aContext; - while ((ctxt == GIV(nilObj))) { + while (!(ctxt == GIV(nilObj))) { if (((longAt((ctxt + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { /* begin frameOfMarriedContext: */ value = longAt((ctxt + BaseHeaderSize) + (SenderIndex << ShiftForWord)); @@ -46713,7 +46710,7 @@ sqInt ctxt;
ctxt = aContext; - while (((ctxt == GIV(nilObj)) + while (!((ctxt == GIV(nilObj)) || (((longAt((ctxt + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)))) { shortPrintContext(ctxt); ctxt = longAt((ctxt + BaseHeaderSize) + (SenderIndex << ShiftForWord)); @@ -47475,7 +47472,7 @@ error("heap is empty"); oop = null; l2: /* end firstAccessibleObject */; - while ((oop == null)) { + while (!(oop == null)) { if (((((ccIndex = (((usqInt) (longAt(oop))) >> 12) & 0x1F)) == 0 ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == aClassOop) { @@ -48161,7 +48158,7 @@ error("heap is empty"); oop = null; l2: /* end firstAccessibleObject */; - while ((oop == null)) { + while (!(oop == null)) { if (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12) { i = ((literalCountOfHeader(headerOf(oop))) + LiteralStart) - 1; while (i >= 0) { @@ -48668,7 +48665,7 @@ sqInt proc;
proc = (firstProc = longAt((procList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))); - while ((proc == GIV(nilObj))) { + while (!(proc == GIV(nilObj))) { printProcessStack(proc); proc = longAt((proc + BaseHeaderSize) + (NextLinkIndex << ShiftForWord)); if (proc == firstProc) { @@ -48727,7 +48724,7 @@ error("heap is empty"); oop = null; l3: /* end firstAccessibleObject */; - while ((oop == null)) { + while (!(oop == null)) { if ((((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) <= 4) || (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12)) { if (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12) { @@ -49081,7 +49078,7 @@ error("heap is empty"); oop = null; l2: /* end firstAccessibleObject */; - while ((oop == null)) { + while (!(oop == null)) { if ((((((usqInt) (longAt(oop))) >> 12) & 0x1F) == ClassMethodContextCompactIndex) && (badContextSize(oop))) { printHex(oop); @@ -53365,7 +53362,7 @@ /* Go through all oops, remapping them... */
lastPtr = segOop + (lastPointerOf(segOop)); - while ((fieldPtr > lastPtr)) { + while (!(fieldPtr > lastPtr)) {
/* Examine each pointer field */
@@ -55199,7 +55196,7 @@ : GIV(highestRunnableProcessPriority)); while (((p -= 1)) >= 0) { processList = longAt((schedLists + BaseHeaderSize) + (p << ShiftForWord)); - while (((longAt((processList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj))) { + while (!((longAt((processList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj))) {
/* Only answer processes with a runnable suspendedContext. Discard those that aren't; the VM would crash otherwise. */
Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nscogsrc/vm/interp.h 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */
#define VM_CALLBACK_INC 1
Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 from - StackToRegisterMappingCogit VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + StackToRegisterMappingCogit VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -6383,7 +6383,7 @@ AbstractInstruction *dependentChain;
dependentChain = (self_in_concretizeLabel->dependent); - while ((dependentChain == null)) { + while (!(dependentChain == null)) { updateLabel(dependentChain, self_in_concretizeLabel); dependentChain = (dependentChain->dependent); } @@ -7879,7 +7879,7 @@ case Label: /* begin concretizeLabel */ dependentChain = (self_in_dispatchConcretize->dependent); - while ((dependentChain == null)) { + while (!(dependentChain == null)) { updateLabel(dependentChain, self_in_dispatchConcretize); dependentChain = (dependentChain->dependent); } @@ -20349,7 +20349,7 @@ CogMethod *openPIC;
openPIC = openPICList; - while ((openPIC == null)) { + while (!(openPIC == null)) { printCogMethod(openPIC); openPIC = ((CogMethod *) ((openPIC->nextOpenPIC))); }
Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */
Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */
typedef struct {
Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 from - CoInterpreter VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2218,7 +2218,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.701"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.702"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -5201,7 +5201,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (((((longAt((currentCtx + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) + while (!((((longAt((currentCtx + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage))) { if (((longAt((currentCtx + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { /* begin stackPageFor: */ @@ -22404,7 +22404,7 @@ assert(!(isRemembered(here))); assert(isMarked(lastBridge())); next = objectAfterlimit(here, GIV(endOfMemory)); - while ((((((usqInt) (longAt(next + 4))) >> 23) & 1) != 0)) { + while (!(((((usqInt) (longAt(next + 4))) >> 23) & 1) != 0)) {
/* coalescing; rare case */
@@ -26396,7 +26396,7 @@ aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l1: /* end fetchClassOf: */; mixinOrMixinApplication = aClass; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); @@ -27393,7 +27393,7 @@ sqInt mixinOrMixinApplication;
mixinOrMixinApplication = aBehavior; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((((mixin = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2)))) == targetMixin) || ((fetchClassOfNonImm(mixin)) == targetMixin))))) { @@ -31524,7 +31524,7 @@ aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l2: /* end fetchClassOf: */; mixinOrMixinApplication = aClass; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); @@ -33623,7 +33623,7 @@ } oopClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l1: /* end fetchClassOf: */; - while ((oopClass == GIV(nilObj))) { + while (!(oopClass == GIV(nilObj))) { if (oopClass == aClass) { return 1; } @@ -33665,7 +33665,7 @@ } oopClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l1: /* end fetchClassOf: */; - while ((oopClass == GIV(nilObj))) { + while (!(oopClass == GIV(nilObj))) { if (classNameOfIs(oopClass, className)) { return 1; } @@ -37400,7 +37400,7 @@
/* skip any initial immobile objects */
- while (((((((usqInt) hereObjHeader) >> 30) & 1) == 0) + while (!((((((usqInt) hereObjHeader) >> 30) & 1) == 0) && ((hereObjHeader & 0x3FFFFF) > 8))) { /* begin addressAfter: */ /* begin numSlotsOfAny: */ @@ -54658,7 +54658,7 @@
/* Need to walk the stack freeing stack pages and nilling contexts. */
- while (((currentCtx == aContextOrNil) + while (!((currentCtx == aContextOrNil) || (currentCtx == GIV(nilObj)))) { assert(isContext(currentCtx)); if (((longAt((currentCtx + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { @@ -56983,7 +56983,7 @@ sqInt context;
context = shortReversePrintFrameAndCallers(theFP); - while ((context == GIV(nilObj))) { + while (!(context == GIV(nilObj))) { if (((longAt((context + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); @@ -57014,7 +57014,7 @@ return printCallStackOf(longAt((aContextOrProcessOrFrame + (BaseHeaderSize)) + (SuspendedContextIndex << 2))); } context = aContextOrProcessOrFrame; - while ((context == GIV(nilObj))) { + while (!(context == GIV(nilObj))) { if (((longAt((context + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); @@ -57041,7 +57041,7 @@ sqInt value;
ctxt = aContext; - while ((ctxt == GIV(nilObj))) { + while (!(ctxt == GIV(nilObj))) { if (((longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { /* begin frameOfMarriedContext: */ value = longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2)); @@ -57172,7 +57172,7 @@ sqInt ctxt;
ctxt = aContext; - while (((ctxt == GIV(nilObj)) + while (!((ctxt == GIV(nilObj)) || (((longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)))) { shortPrintContext(ctxt); ctxt = longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2)); @@ -59649,7 +59649,7 @@ sqInt proc;
proc = (firstProc = followFieldofObject(FirstLinkIndex, procList)); - while ((proc == GIV(nilObj))) { + while (!(proc == GIV(nilObj))) { printProcessStack(proc); /* begin followField:ofObject: */ objOop = longAt((proc + (BaseHeaderSize)) + (NextLinkIndex << 2)); @@ -67182,7 +67182,7 @@ : GIV(highestRunnableProcessPriority)); while (((p -= 1)) >= 0) { processList = longAt((schedLists + (BaseHeaderSize)) + (p << 2)); - while (((longAt((processList + (BaseHeaderSize)) + (FirstLinkIndex << 2))) == GIV(nilObj))) { + while (!((longAt((processList + (BaseHeaderSize)) + (FirstLinkIndex << 2))) == GIV(nilObj))) {
/* Only answer processes with a runnable suspendedContext. Discard those that aren't; the VM would crash otherwise. */
Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-05-04 16:34:55 UTC (rev 2914) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 from - CoInterpreter VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2221,7 +2221,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.701"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.702"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -5210,7 +5210,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (((((longAt((currentCtx + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) + while (!((((longAt((currentCtx + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage))) { if (((longAt((currentCtx + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { /* begin stackPageFor: */ @@ -22413,7 +22413,7 @@ assert(!(isRemembered(here))); assert(isMarked(lastBridge())); next = objectAfterlimit(here, GIV(endOfMemory)); - while ((((((usqInt) (longAt(next + 4))) >> 23) & 1) != 0)) { + while (!(((((usqInt) (longAt(next + 4))) >> 23) & 1) != 0)) {
/* coalescing; rare case */
@@ -26405,7 +26405,7 @@ aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l1: /* end fetchClassOf: */; mixinOrMixinApplication = aClass; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); @@ -27402,7 +27402,7 @@ sqInt mixinOrMixinApplication;
mixinOrMixinApplication = aBehavior; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((((mixin = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2)))) == targetMixin) || ((fetchClassOfNonImm(mixin)) == targetMixin))))) { @@ -31533,7 +31533,7 @@ aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l2: /* end fetchClassOf: */; mixinOrMixinApplication = aClass; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); @@ -33632,7 +33632,7 @@ } oopClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l1: /* end fetchClassOf: */; - while ((oopClass == GIV(nilObj))) { + while (!(oopClass == GIV(nilObj))) { if (oopClass == aClass) { return 1; } @@ -33674,7 +33674,7 @@ } oopClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l1: /* end fetchClassOf: */; - while ((oopClass == GIV(nilObj))) { + while (!(oopClass == GIV(nilObj))) { if (classNameOfIs(oopClass, className)) { return 1; } @@ -37409,7 +37409,7 @@
/* skip any initial immobile objects */
- while (((((((usqInt) hereObjHeader) >> 30) & 1) == 0) + while (!((((((usqInt) hereObjHeader) >> 30) & 1) == 0) && ((hereObjHeader & 0x3FFFFF) > 8))) { /* begin addressAfter: */ /* begin numSlotsOfAny: */ @@ -54667,7 +54667,7 @@
/* Need to walk the stack freeing stack pages and nilling contexts. */
- while (((currentCtx == aContextOrNil) + while (!((currentCtx == aContextOrNil) || (currentCtx == GIV(nilObj)))) { assert(isContext(currentCtx)); if (((longAt((currentCtx + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { @@ -56992,7 +56992,7 @@ sqInt context;
context = shortReversePrintFrameAndCallers(theFP); - while ((context == GIV(nilObj))) { + while (!(context == GIV(nilObj))) { if (((longAt((context + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); @@ -57023,7 +57023,7 @@ return printCallStackOf(longAt((aContextOrProcessOrFrame + (BaseHeaderSize)) + (SuspendedContextIndex << 2))); } context = aContextOrProcessOrFrame; - while ((context == GIV(nilObj))) { + while (!(context == GIV(nilObj))) { if (((longAt((context + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); @@ -57050,7 +57050,7 @@ sqInt value;
ctxt = aContext; - while ((ctxt == GIV(nilObj))) { + while (!(ctxt == GIV(nilObj))) { if (((longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { /* begin frameOfMarriedContext: */ value = longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2)); @@ -57181,7 +57181,7 @@ sqInt ctxt;
ctxt = aContext; - while (((ctxt == GIV(nilObj)) + while (!((ctxt == GIV(nilObj)) || (((longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)))) { shortPrintContext(ctxt); ctxt = longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2)); @@ -59658,7 +59658,7 @@ sqInt proc;
proc = (firstProc = followFieldofObject(FirstLinkIndex, procList)); - while ((proc == GIV(nilObj))) { + while (!(proc == GIV(nilObj))) { printProcessStack(proc); /* begin followField:ofObject: */ objOop = longAt((proc + (BaseHeaderSize)) + (NextLinkIndex << 2)); @@ -67191,7 +67191,7 @@ : GIV(highestRunnableProcessPriority)); while (((p -= 1)) >= 0) { processList = longAt((schedLists + (BaseHeaderSize)) + (p << 2)); - while (((longAt((processList + (BaseHeaderSize)) + (FirstLinkIndex << 2))) == GIV(nilObj))) { + while (!((longAt((processList + (BaseHeaderSize)) + (FirstLinkIndex << 2))) == GIV(nilObj))) {
/* Only answer processes with a runnable suspendedContext. Discard those that aren't; the VM would crash otherwise. */
Modified: branches/Cog/nsspursrc/vm/interp.h =================================================================== --- branches/Cog/nsspursrc/vm/interp.h 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nsspursrc/vm/interp.h 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nsspursrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspursrc/vm/vmCallback.h 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-05-04 16:34:55 UTC (rev 2914) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */
#define VM_CALLBACK_INC 1
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-05-04 15:29:20 UTC (rev 2913) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-05-04 16:34:55 UTC (rev 2914) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 from - StackInterpreter VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 + StackInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.701 uuid: 92f5171c-4e3e-4113-bb82-05f92e8b7c82 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2008,7 +2008,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.701"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.702"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -19388,7 +19388,7 @@ assert(!(isRemembered(here))); assert(isMarked(lastBridge())); next = objectAfterlimit(here, GIV(endOfMemory)); - while ((((((usqInt) (longAt(next + 4))) >> 23) & 1) != 0)) { + while (!(((((usqInt) (longAt(next + 4))) >> 23) & 1) != 0)) {
/* coalescing; rare case */
@@ -22640,7 +22640,7 @@ aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l1: /* end fetchClassOf: */; mixinOrMixinApplication = aClass; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); @@ -23463,7 +23463,7 @@ sqInt mixinOrMixinApplication;
mixinOrMixinApplication = aBehavior; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((((mixin = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2)))) == targetMixin) || ((fetchClassOfNonImm(mixin)) == targetMixin))))) { @@ -27048,7 +27048,7 @@ aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l2: /* end fetchClassOf: */; mixinOrMixinApplication = aClass; - while (((mixinOrMixinApplication == GIV(nilObj)) + while (!((mixinOrMixinApplication == GIV(nilObj)) || ((mixinOrMixinApplication == targetMixin) || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); @@ -29025,7 +29025,7 @@ } oopClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l1: /* end fetchClassOf: */; - while ((oopClass == GIV(nilObj))) { + while (!(oopClass == GIV(nilObj))) { if (oopClass == aClass) { return 1; } @@ -29067,7 +29067,7 @@ } oopClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); l1: /* end fetchClassOf: */; - while ((oopClass == GIV(nilObj))) { + while (!(oopClass == GIV(nilObj))) { if (classNameOfIs(oopClass, className)) { return 1; } @@ -32049,7 +32049,7 @@
/* skip any initial immobile objects */
- while (((((((usqInt) hereObjHeader) >> 30) & 1) == 0) + while (!((((((usqInt) hereObjHeader) >> 30) & 1) == 0) && ((hereObjHeader & 0x3FFFFF) > 8))) { /* begin addressAfter: */ /* begin numSlotsOfAny: */ @@ -49084,7 +49084,7 @@
/* Need to walk the stack freeing stack pages and nilling contexts. */
- while (((currentCtx == aContextOrNil) + while (!((currentCtx == aContextOrNil) || (currentCtx == GIV(nilObj)))) { assert(isContext(currentCtx)); if (((longAt((currentCtx + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { @@ -50987,7 +50987,7 @@ sqInt context;
context = shortReversePrintFrameAndCallers(theFP); - while ((context == GIV(nilObj))) { + while (!(context == GIV(nilObj))) { if (((longAt((context + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); @@ -51018,7 +51018,7 @@ return printCallStackOf(longAt((aContextOrProcessOrFrame + (BaseHeaderSize)) + (SuspendedContextIndex << 2))); } context = aContextOrProcessOrFrame; - while ((context == GIV(nilObj))) { + while (!(context == GIV(nilObj))) { if (((longAt((context + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); @@ -51042,7 +51042,7 @@ sqInt value;
ctxt = aContext; - while ((ctxt == GIV(nilObj))) { + while (!(ctxt == GIV(nilObj))) { if (((longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)) { /* begin frameOfMarriedContext: */ value = longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2)); @@ -51100,7 +51100,7 @@ sqInt ctxt;
ctxt = aContext; - while (((ctxt == GIV(nilObj)) + while (!((ctxt == GIV(nilObj)) || (((longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2))) & 1)))) { shortPrintContext(ctxt); ctxt = longAt((ctxt + (BaseHeaderSize)) + (SenderIndex << 2)); @@ -53184,7 +53184,7 @@ sqInt proc;
proc = (firstProc = followFieldofObject(FirstLinkIndex, procList)); - while ((proc == GIV(nilObj))) { + while (!(proc == GIV(nilObj))) { printProcessStack(proc); /* begin followField:ofObject: */ objOop = longAt((proc + (BaseHeaderSize)) + (NextLinkIndex << 2)); @@ -59828,7 +59828,7 @@ : GIV(highestRunnableProcessPriority)); while (((p -= 1)) >= 0) { processList = longAt((schedLists + (BaseHeaderSize)) + (p << 2));
@@ Diff output truncated at 50000 characters. @@
vm-dev@lists.squeakfoundation.org