Vm-dev May 2014

vm-dev@lists.squeakfoundation.org

32 participants
151 discussions

Start a nNew thread

SequenceableCollection VM crash (was Re: [Pharo-users] XMLOrderedList Concantenation)
by Ben Coman 05 May '14

05 May '14

4 4

[commit][2915] CogVM source as per VMMaker.oscog-eem.704.
by commits＠squeakvm.org 05 May '14

05 May '14

Revision: 2915 Author: eliot Date: 2014-05-04 17:52:47 -0700 (Sun, 04 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.704. Fix compilation warnings re compaction memcpy calls. Fix stack backtrace printing when frameCallerContext is forwarded. Modified Paths: -------------- 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/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/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 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e from - CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __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.702"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.704"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -37452,7 +37452,7 @@ && ((freeBytes > ((there - here) + 8)) || (freeBytes == (there - here))))) break; moved = 1; - memcpy(destination, here, there - here); + memcpy(((void *)destination), ((void *)here), there - here); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(destination + (hereObj - here)))); @@ -37579,7 +37579,7 @@ chunkBytes = (addressAfter(freeChunk)) - dest; if ((chunkBytes == pigBytes) || (chunkBytes > (pigBytes + 8))) { - memcpy(dest, here, pigBytes); + memcpy(((void *)dest), ((void *)here), pigBytes); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(dest + (hereObj - here)))); @@ -57035,6 +57035,7 @@ sqInt ctxt; sqInt index; sqInt index1; + sqInt referent; char *theFP; StackPage *thePage; StackPage *thePage1; @@ -57078,6 +57079,16 @@ assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); ctxt = callerContextOrNil; + if (((longAt(ctxt)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(ctxt)); + referent = longAt((ctxt + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + ctxt = referent; + } } else { print("widowed caller frame "); @@ -63696,9 +63707,11 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; sqInt callerContextOrNil; char *callerFP; sqInt index; + sqInt referent; char *theFP; StackPage *thePage; @@ -63725,7 +63738,18 @@ assert(addressCouldBeObj(callerContextOrNil)); assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); - return callerContextOrNil; + caller = callerContextOrNil; + if (((longAt(caller)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(caller)); + referent = longAt((caller + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + caller = referent; + } + return caller; } Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-05-05 00:52:47 UTC (rev 2915) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e from - CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __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.702"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.704"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -37461,7 +37461,7 @@ && ((freeBytes > ((there - here) + 8)) || (freeBytes == (there - here))))) break; moved = 1; - memcpy(destination, here, there - here); + memcpy(((void *)destination), ((void *)here), there - here); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(destination + (hereObj - here)))); @@ -37588,7 +37588,7 @@ chunkBytes = (addressAfter(freeChunk)) - dest; if ((chunkBytes == pigBytes) || (chunkBytes > (pigBytes + 8))) { - memcpy(dest, here, pigBytes); + memcpy(((void *)dest), ((void *)here), pigBytes); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(dest + (hereObj - here)))); @@ -57044,6 +57044,7 @@ sqInt ctxt; sqInt index; sqInt index1; + sqInt referent; char *theFP; StackPage *thePage; StackPage *thePage1; @@ -57087,6 +57088,16 @@ assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); ctxt = callerContextOrNil; + if (((longAt(ctxt)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(ctxt)); + referent = longAt((ctxt + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + ctxt = referent; + } } else { print("widowed caller frame "); @@ -63705,9 +63716,11 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; sqInt callerContextOrNil; char *callerFP; sqInt index; + sqInt referent; char *theFP; StackPage *thePage; @@ -63734,7 +63747,18 @@ assert(addressCouldBeObj(callerContextOrNil)); assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); - return callerContextOrNil; + caller = callerContextOrNil; + if (((longAt(caller)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(caller)); + referent = longAt((caller + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + caller = referent; + } + return caller; } Modified: branches/Cog/nsspursrc/vm/interp.h =================================================================== --- branches/Cog/nsspursrc/vm/interp.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/nsspursrc/vm/interp.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspursrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspursrc/vm/vmCallback.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-05-05 00:52:47 UTC (rev 2915) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e from - StackInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + StackInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2008,7 +2008,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.702"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.704"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -32101,7 +32101,7 @@ && ((freeBytes > ((there - here) + 8)) || (freeBytes == (there - here))))) break; moved = 1; - memcpy(destination, here, there - here); + memcpy(((void *)destination), ((void *)here), there - here); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(destination + (hereObj - here)))); @@ -32228,7 +32228,7 @@ chunkBytes = (addressAfter(freeChunk)) - dest; if ((chunkBytes == pigBytes) || (chunkBytes > (pigBytes + 8))) { - memcpy(dest, here, pigBytes); + memcpy(((void *)dest), ((void *)here), pigBytes); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(dest + (hereObj - here)))); @@ -51037,6 +51037,7 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ctxt; sqInt index; + sqInt referent; char *theFP; StackPage *thePage; sqInt value; @@ -51065,6 +51066,16 @@ shortPrintFrameAndCallers(theFP); theFP = (thePage->baseFP); ctxt = longAt(theFP + FoxCallerContext); + if (((longAt(ctxt)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(ctxt)); + referent = longAt((ctxt + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + ctxt = referent; + } } else { print("widowed caller frame "); @@ -56758,7 +56769,9 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; char *callerFP; + sqInt referent; char *theFP; if (aFramePointer == 0) { @@ -56772,7 +56785,18 @@ if (!(callerFP != 0)) break; theFP = callerFP; } - return longAt(theFP + FoxCallerContext); + caller = longAt(theFP + FoxCallerContext); + if (((longAt(caller)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(caller)); + referent = longAt((caller + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + caller = referent; + } + return caller; } Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e from - StackInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + StackInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2005,7 +2005,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.702"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.704"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -32092,7 +32092,7 @@ && ((freeBytes > ((there - here) + 8)) || (freeBytes == (there - here))))) break; moved = 1; - memcpy(destination, here, there - here); + memcpy(((void *)destination), ((void *)here), there - here); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(destination + (hereObj - here)))); @@ -32219,7 +32219,7 @@ chunkBytes = (addressAfter(freeChunk)) - dest; if ((chunkBytes == pigBytes) || (chunkBytes > (pigBytes + 8))) { - memcpy(dest, here, pigBytes); + memcpy(((void *)dest), ((void *)here), pigBytes); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(dest + (hereObj - here)))); @@ -51028,6 +51028,7 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ctxt; sqInt index; + sqInt referent; char *theFP; StackPage *thePage; sqInt value; @@ -51056,6 +51057,16 @@ shortPrintFrameAndCallers(theFP); theFP = (thePage->baseFP); ctxt = longAt(theFP + FoxCallerContext); + if (((longAt(ctxt)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(ctxt)); + referent = longAt((ctxt + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + ctxt = referent; + } } else { print("widowed caller frame "); @@ -56749,7 +56760,9 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; char *callerFP; + sqInt referent; char *theFP; if (aFramePointer == 0) { @@ -56763,7 +56776,18 @@ if (!(callerFP != 0)) break; theFP = callerFP; } - return longAt(theFP + FoxCallerContext); + caller = longAt(theFP + FoxCallerContext); + if (((longAt(caller)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(caller)); + referent = longAt((caller + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + caller = referent; + } + return caller; } Modified: branches/Cog/nsspurstacksrc/vm/interp.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun May 4 09:33:41 PDT 2014 + Sun May 4 17:50:58 PDT 2014 Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e from - CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1314,7 +1314,7 @@ static void setSignalLowSpaceFlagAndSaveProcess(void); static void setTraceFlagOnContextsFramesPageIfNeeded(sqInt aContext); sqInt shiftForWord(void); -static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize); +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize); static sqInt shortPrintContext(sqInt aContext); static sqInt shortPrintFrameAndCallers(char *theFP); EXPORT(void) shortPrintFramesInPage(StackPage *thePage); @@ -2213,7 +2213,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.702]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.704]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -32292,7 +32292,7 @@ && ((freeBytes > ((there - here) + 8)) || (freeBytes == (there - here))))) break; moved = 1; - memcpy(destination, here, there - here); + memcpy(((void *)destination), ((void *)here), there - here); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(destination + (hereObj - here)))); @@ -32419,7 +32419,7 @@ chunkBytes = (addressAfter(freeChunk)) - dest; if ((chunkBytes == pigBytes) || (chunkBytes > (pigBytes + 8))) { - memcpy(dest, here, pigBytes); + memcpy(((void *)dest), ((void *)here), pigBytes); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(dest + (hereObj - here)))); @@ -51821,6 +51821,7 @@ sqInt ctxt; sqInt index; sqInt index1; + sqInt referent; char *theFP; StackPage *thePage; StackPage *thePage1; @@ -51864,6 +51865,16 @@ assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); ctxt = callerContextOrNil; + if (((longAt(ctxt)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(ctxt)); + referent = longAt((ctxt + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + ctxt = referent; + } } else { print("widowed caller frame "); @@ -58238,7 +58249,7 @@ zero if no change was possible. */ -static usqInt +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -58474,9 +58485,11 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; sqInt callerContextOrNil; char *callerFP; sqInt index; + sqInt referent; char *theFP; StackPage *thePage; @@ -58503,7 +58516,18 @@ assert(addressCouldBeObj(callerContextOrNil)); assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); - return callerContextOrNil; + caller = callerContextOrNil; + if (((longAt(caller)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(caller)); + referent = longAt((caller + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + caller = referent; + } + return caller; } Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-05-05 00:52:47 UTC (rev 2915) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e from - CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1317,7 +1317,7 @@ static void setSignalLowSpaceFlagAndSaveProcess(void); static void setTraceFlagOnContextsFramesPageIfNeeded(sqInt aContext); sqInt shiftForWord(void); -static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize); +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize); static sqInt shortPrintContext(sqInt aContext); static sqInt shortPrintFrameAndCallers(char *theFP); EXPORT(void) shortPrintFramesInPage(StackPage *thePage); @@ -2216,7 +2216,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.702]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.704]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -32301,7 +32301,7 @@ && ((freeBytes > ((there - here) + 8)) || (freeBytes == (there - here))))) break; moved = 1; - memcpy(destination, here, there - here); + memcpy(((void *)destination), ((void *)here), there - here); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(destination + (hereObj - here)))); @@ -32428,7 +32428,7 @@ chunkBytes = (addressAfter(freeChunk)) - dest; if ((chunkBytes == pigBytes) || (chunkBytes > (pigBytes + 8))) { - memcpy(dest, here, pigBytes); + memcpy(((void *)dest), ((void *)here), pigBytes); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(dest + (hereObj - here)))); @@ -51830,6 +51830,7 @@ sqInt ctxt; sqInt index; sqInt index1; + sqInt referent; char *theFP; StackPage *thePage; StackPage *thePage1; @@ -51873,6 +51874,16 @@ assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); ctxt = callerContextOrNil; + if (((longAt(ctxt)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(ctxt)); + referent = longAt((ctxt + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + ctxt = referent; + } } else { print("widowed caller frame "); @@ -58247,7 +58258,7 @@ zero if no change was possible. */ -static usqInt +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -58483,9 +58494,11 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; sqInt callerContextOrNil; char *callerFP; sqInt index; + sqInt referent; char *theFP; StackPage *thePage; @@ -58512,7 +58525,18 @@ assert(addressCouldBeObj(callerContextOrNil)); assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); - return callerContextOrNil; + caller = callerContextOrNil; + if (((longAt(caller)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(caller)); + referent = longAt((caller + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + caller = referent; + } + return caller; } Modified: branches/Cog/spursistasrc/vm/interp.h =================================================================== --- branches/Cog/spursistasrc/vm/interp.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spursistasrc/vm/interp.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursistasrc/vm/vmCallback.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spursrc/vm/cointerp.c 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e from - CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2208,7 +2208,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.702]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.704]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -32153,7 +32153,7 @@ && ((freeBytes > ((there - here) + 8)) || (freeBytes == (there - here))))) break; moved = 1; - memcpy(destination, here, there - here); + memcpy(((void *)destination), ((void *)here), there - here); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(destination + (hereObj - here)))); @@ -32280,7 +32280,7 @@ chunkBytes = (addressAfter(freeChunk)) - dest; if ((chunkBytes == pigBytes) || (chunkBytes > (pigBytes + 8))) { - memcpy(dest, here, pigBytes); + memcpy(((void *)dest), ((void *)here), pigBytes); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(dest + (hereObj - here)))); @@ -51618,6 +51618,7 @@ sqInt ctxt; sqInt index; sqInt index1; + sqInt referent; char *theFP; StackPage *thePage; StackPage *thePage1; @@ -51661,6 +51662,16 @@ assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); ctxt = callerContextOrNil; + if (((longAt(ctxt)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(ctxt)); + referent = longAt((ctxt + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + ctxt = referent; + } } else { print("widowed caller frame "); @@ -58235,9 +58246,11 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; sqInt callerContextOrNil; char *callerFP; sqInt index; + sqInt referent; char *theFP; StackPage *thePage; @@ -58264,7 +58277,18 @@ assert(addressCouldBeObj(callerContextOrNil)); assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); - return callerContextOrNil; + caller = callerContextOrNil; + if (((longAt(caller)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(caller)); + referent = longAt((caller + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + caller = referent; + } + return caller; } Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spursrc/vm/cointerp.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-05-05 00:52:47 UTC (rev 2915) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e from - CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2211,7 +2211,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.702]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.704]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -32162,7 +32162,7 @@ && ((freeBytes > ((there - here) + 8)) || (freeBytes == (there - here))))) break; moved = 1; - memcpy(destination, here, there - here); + memcpy(((void *)destination), ((void *)here), there - here); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(destination + (hereObj - here)))); @@ -32289,7 +32289,7 @@ chunkBytes = (addressAfter(freeChunk)) - dest; if ((chunkBytes == pigBytes) || (chunkBytes > (pigBytes + 8))) { - memcpy(dest, here, pigBytes); + memcpy(((void *)dest), ((void *)here), pigBytes); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(dest + (hereObj - here)))); @@ -51627,6 +51627,7 @@ sqInt ctxt; sqInt index; sqInt index1; + sqInt referent; char *theFP; StackPage *thePage; StackPage *thePage1; @@ -51670,6 +51671,16 @@ assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); ctxt = callerContextOrNil; + if (((longAt(ctxt)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(ctxt)); + referent = longAt((ctxt + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + ctxt = referent; + } } else { print("widowed caller frame "); @@ -58244,9 +58255,11 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; sqInt callerContextOrNil; char *callerFP; sqInt index; + sqInt referent; char *theFP; StackPage *thePage; @@ -58273,7 +58286,18 @@ assert(addressCouldBeObj(callerContextOrNil)); assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); - return callerContextOrNil; + caller = callerContextOrNil; + if (((longAt(caller)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(caller)); + referent = longAt((caller + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + caller = referent; + } + return caller; } Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spursrc/vm/interp.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spursrc/vm/vmCallback.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-05-05 00:52:47 UTC (rev 2915) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e from - StackInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + StackInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2001,7 +2001,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.702]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.704]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -27165,7 +27165,7 @@ && ((freeBytes > ((there - here) + 8)) || (freeBytes == (there - here))))) break; moved = 1; - memcpy(destination, here, there - here); + memcpy(((void *)destination), ((void *)here), there - here); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(destination + (hereObj - here)))); @@ -27292,7 +27292,7 @@ chunkBytes = (addressAfter(freeChunk)) - dest; if ((chunkBytes == pigBytes) || (chunkBytes > (pigBytes + 8))) { - memcpy(dest, here, pigBytes); + memcpy(((void *)dest), ((void *)here), pigBytes); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(dest + (hereObj - here)))); @@ -45933,6 +45933,7 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ctxt; sqInt index; + sqInt referent; char *theFP; StackPage *thePage; sqInt value; @@ -45961,6 +45962,16 @@ shortPrintFrameAndCallers(theFP); theFP = (thePage->baseFP); ctxt = longAt(theFP + FoxCallerContext); + if (((longAt(ctxt)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(ctxt)); + referent = longAt((ctxt + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + ctxt = referent; + } } else { print("widowed caller frame "); @@ -51607,7 +51618,9 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; char *callerFP; + sqInt referent; char *theFP; if (aFramePointer == 0) { @@ -51621,7 +51634,18 @@ if (!(callerFP != 0)) break; theFP = callerFP; } - return longAt(theFP + FoxCallerContext); + caller = longAt(theFP + FoxCallerContext); + if (((longAt(caller)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(caller)); + referent = longAt((caller + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + caller = referent; + } + return caller; } Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spurstacksrc/vm/interp.c 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e from - StackInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + StackInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1998,7 +1998,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.702]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.704]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -27156,7 +27156,7 @@ && ((freeBytes > ((there - here) + 8)) || (freeBytes == (there - here))))) break; moved = 1; - memcpy(destination, here, there - here); + memcpy(((void *)destination), ((void *)here), there - here); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(destination + (hereObj - here)))); @@ -27283,7 +27283,7 @@ chunkBytes = (addressAfter(freeChunk)) - dest; if ((chunkBytes == pigBytes) || (chunkBytes > (pigBytes + 8))) { - memcpy(dest, here, pigBytes); + memcpy(((void *)dest), ((void *)here), pigBytes); /* begin forwardUnchecked:to: */ assert((isInOldSpace(hereObj)) && (isInOldSpace(dest + (hereObj - here)))); @@ -45924,6 +45924,7 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ctxt; sqInt index; + sqInt referent; char *theFP; StackPage *thePage; sqInt value; @@ -45952,6 +45953,16 @@ shortPrintFrameAndCallers(theFP); theFP = (thePage->baseFP); ctxt = longAt(theFP + FoxCallerContext); + if (((longAt(ctxt)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(ctxt)); + referent = longAt((ctxt + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + ctxt = referent; + } } else { print("widowed caller frame "); @@ -51598,7 +51609,9 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; char *callerFP; + sqInt referent; char *theFP; if (aFramePointer == 0) { @@ -51612,7 +51625,18 @@ if (!(callerFP != 0)) break; theFP = callerFP; } - return longAt(theFP + FoxCallerContext); + caller = longAt(theFP + FoxCallerContext); + if (((longAt(caller)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(caller)); + referent = longAt((caller + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + caller = referent; + } + return caller; } Modified: branches/Cog/spurstacksrc/vm/interp.h =================================================================== --- branches/Cog/spurstacksrc/vm/interp.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spurstacksrc/vm/interp.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/spurstacksrc/vm/vmCallback.h 2014-05-04 16:34:55 UTC (rev 2914) +++ branches/Cog/spurstacksrc/vm/vmCallback.h 2014-05-05 00:52:47 UTC (rev 2915) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.704.mcz
by commits＠source.squeak.org 05 May '14

05 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.704.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.704 Author: eem Time: 4 May 2014, 5:45:34.57 pm UUID: 5a1a2624-b349-4d95-aeb3-097087219b4e Ancestors: VMMaker.oscog-eem.703 Slang: fix return types of float accessors (void). Spur: cast args to mem:cp:y: in compaction to aovid warning. =============== Diff against VMMaker.oscog-eem.703 =============== Item was changed: ----- Method: CCodeGenerator>>computeKernelReturnTypes (in category 'public') ----- computeKernelReturnTypes ^Dictionary newFromPairs: #(oopAt: #sqInt oopAt:put: #sqInt oopAtPointer: #sqInt oopAtPointer:put: #sqInt byteAt: #sqInt byteAt:put: #sqInt byteAtPointer: #sqInt byteAtPointer:put: #sqInt shortAt: #sqInt shortAt:put: #sqInt shortAtPointer: #sqInt shortAtPointer:put: #sqInt intAt: #sqInt intAt:put: #sqInt intAtPointer: #sqInt intAtPointer:put: #sqInt longAt: #sqInt longAt:put: #sqInt longAtPointer: #sqInt longAtPointer:put: #sqInt long32At: #sqInt long32At:put: #sqInt longLongAt: #sqLong longLongAt:put: #sqLong longLongAtPointer: #sqLong longLongAtPointer:put: #sqLong long64At: #sqLong long64At:put: #sqLong + fetchFloatAt:into: #void storeFloatAt:from: #void + fetchFloatAtPointer:into: #void storeFloatAtPointer:from: #void + fetchSingleFloatAt:into: #void storeSingleFloatAt:from: #void + fetchSingleFloatAtPointer:into: #void storeSingleFloatAtPointer:from: #void - fetchFloatAt:into: #float storeFloatAt:from: #float - fetchFloatAtPointer:into: #float storeFloatAtPointer:from: #float - fetchSingleFloatAt:into: #float storeSingleFloatAt:from: #float - fetchSingleFloatAtPointer:into: #float storeSingleFloatAtPointer:from: #float pointerForOop: #'char *' oopForPointer: #sqInt)! Item was changed: ----- Method: SpurMemoryManager>>moveARunOfObjectsStartingAt:upTo: (in category 'compaction') ----- moveARunOfObjectsStartingAt: startAddress upTo: limit "Move the sequence of movable objects starting at startAddress. Answer the start of the next sequence of movable objects after a possible run of unmovable objects, or the limit, if there are no more movable objects, or 0 if no more compaction can be done. Compaction is done when the search through the freeList has reached the address from which objects are being moved from. There are two broad cases to be dealt with here. One is a run of smallish objects that can easily be moved into free chunks. The other is a large object that is unlikely to fit in the typical free chunk. This second pig needs careful handling; it needs to be moved to the lowest place it will fit and not cause the scan to skip lots of smaller free chunks looking in vain for somewhere to put it." <var: #startAddress type: #usqInt> <var: #limit type: #usqInt> <inline: false> | here hereObj hereObjHeader prevPrevFreeChunk prevFreeChunk thisFreeChunk maxFreeChunk | <var: #here type: #usqInt> <var: #there type: #usqInt> <var: #nextFree type: #usqInt> <var: #endOfFree type: #usqInt> <var: #destination type: #usqInt> <var: #maxFreeChunk type: #usqInt> here := startAddress. hereObj := self objectStartingAt: startAddress. hereObjHeader := self atLeastClassIndexHalfHeader: hereObj. prevPrevFreeChunk := prevFreeChunk := 0. thisFreeChunk := maxFreeChunk := firstFreeChunk. [thisFreeChunk ~= 0] whileTrue: [| freeBytes endOfFree nextFree destination there moved | "skip any initial immobile objects" [(self isMobileObjectHeader: hereObjHeader)] whileFalse: [here := self addressAfter: hereObj. here >= limit ifTrue: [^maxFreeChunk >= startAddress ifTrue: [0] ifFalse: [limit]]. hereObj := self objectStartingAt: here. hereObjHeader := self atLeastClassIndexHalfHeader: hereObj]. "grab a free chunk, and the following one, because we want to overwrite this one." self assert: ((self isFreeObject: firstFreeChunk) and: [self isFreeObject: thisFreeChunk]). freeBytes := self bytesInObject: thisFreeChunk. nextFree := self nextInSortedFreeListLink: thisFreeChunk given: prevFreeChunk. destination := self startOfObject: thisFreeChunk. endOfFree := destination + freeBytes. moved := false. maxFreeChunk := maxFreeChunk max: nextFree. self assert: (nextFree = 0 or: [self isFreeObject: nextFree]). "move as many objects as will fit in freeBytes..." [there := self addressAfter: hereObj. "N.B. *must* add allocationUnit, not subtract, to avoid unsigned arithmetic issues when freeBytes = 0" (self isMobileObjectHeader: hereObjHeader) and: [freeBytes > (there - here + self allocationUnit) or: [freeBytes = (there - here)]]] whileTrue: [moved := true. + self mem: destination asVoidPointer cp: here asVoidPointer y: there - here. - self mem: destination cp: here y: there - here. self forwardUnchecked: hereObj to: destination + (hereObj - here). destination := destination + (there - here). freeBytes := freeBytes - (there - here). hereObj := self objectStartingAt: there. here := there. hereObjHeader := self atLeastClassIndexHalfHeader: hereObj]. moved ifTrue: "we did overwrite it; we need to repair the free list" [| nextNextFree | nextFree ~= 0 ifTrue: [nextNextFree := self nextInSortedFreeListLink: nextFree given: thisFreeChunk. self assert: (self isFreeObject: nextFree)]. (destination > thisFreeChunk "if false couldn't move anything" and: [destination < endOfFree]) "if false, filled entire free chunk" ifTrue: [thisFreeChunk := self initFreeChunkWithBytes: endOfFree - destination at: destination. self inSortedFreeListLink: prevFreeChunk to: thisFreeChunk given: prevPrevFreeChunk. self inSortedFreeListLink: thisFreeChunk to: nextFree given: prevFreeChunk. nextFree ~= 0 ifTrue: [self inSortedFreeListLink: nextFree to: nextNextFree given: thisFreeChunk]. prevPrevFreeChunk := prevFreeChunk. prevFreeChunk := thisFreeChunk. thisFreeChunk := nextFree] ifFalse: [self inSortedFreeListLink: prevFreeChunk to: nextFree given: prevPrevFreeChunk. nextFree ~= 0 ifTrue: [self inSortedFreeListLink: nextFree to: nextNextFree given: prevFreeChunk]. thisFreeChunk := nextFree]] ifFalse: "out of space (or immobile object); move on up the free list..." [prevPrevFreeChunk := prevFreeChunk. prevFreeChunk := thisFreeChunk. thisFreeChunk := nextFree]. (self isMobileObjectHeader: hereObjHeader) ifFalse: [^maxFreeChunk >= startAddress ifTrue: [0] ifFalse: [there]]. "Was the loop stopped by a pig? If so, try and find space for it" there - here >= (self averageObjectSizeInBytes * 8) ifTrue: "256b in 32 bit, 512b in 64 bit" [| usedChunk | usedChunk := self tryToMovePig: hereObj at: here end: there. "if it couldn't be moved we need to advance, so always set here to there whether the pig was moved or not." hereObj := self objectStartingAt: there. here := there. hereObjHeader := self atLeastClassIndexHalfHeader: hereObj. "In general it's a bad idea to reset the enumeration; it leads to N^2 behaviour when encountering pigs. But if the move affected the enumeration this is simpler than resetting the list pointers." (usedChunk = prevPrevFreeChunk or: [usedChunk = prevFreeChunk or: [usedChunk = thisFreeChunk]]) ifTrue: ["reset the scan for free space back to the start of the list" prevPrevFreeChunk := prevFreeChunk := 0. thisFreeChunk := firstFreeChunk]]. ((here > startAddress and: [there >= limit]) or: [maxFreeChunk >= startAddress]) ifTrue: [^maxFreeChunk >= startAddress ifTrue: [0] ifFalse: [there]]]. ^here! Item was changed: ----- Method: SpurMemoryManager>>tryToMovePig:at:end: (in category 'compaction') ----- tryToMovePig: pigObj at: pigStart end: pigEnd "Try to move a pig (a largish object) to a free chunk in low memory. Answer the freeChunk that was used to house the moved pig, or 0 if no free chunk could be found." | freeChunk prevFree prevPrevFree pigBytes nextNext | prevPrevFree := prevFree := 0. freeChunk := firstFreeChunk. pigBytes := pigEnd - pigStart. [freeChunk ~= 0 and: [freeChunk < pigObj]] whileTrue: [| next dest chunkBytes newChunk | next := self nextInSortedFreeListLink: freeChunk given: prevFree. dest := self startOfObject: freeChunk. chunkBytes := (self addressAfter: freeChunk) - dest. "N.B. *must* add allocationUnit, not subtract, to avoid unsigned arithmetic issues when chunkBytes = 0" (chunkBytes = pigBytes or: [chunkBytes > (pigBytes + self allocationUnit)]) ifTrue: + [self mem: dest asVoidPointer cp: pigStart asVoidPointer y: pigBytes. - [self mem: dest cp: pigStart y: pigBytes. self forwardUnchecked: pigObj to: dest + (pigObj - pigStart). next ~= 0 ifTrue: [nextNext := self nextInSortedFreeListLink: next given: freeChunk]. "now either shorten the chunk, or remove it, adjusting the links to keep the list sorted." pigBytes < chunkBytes "if false, filled entire free chunk" ifTrue: [newChunk := self initFreeChunkWithBytes: chunkBytes - pigBytes at: dest + pigBytes. self inSortedFreeListLink: prevFree to: newChunk given: prevPrevFree. self inSortedFreeListLink: newChunk to: next given: prevFree. next ~= 0 ifTrue: [self inSortedFreeListLink: next to: nextNext given: newChunk]] ifFalse: [self inSortedFreeListLink: prevFree to: next given: prevPrevFree. next ~= 0 ifTrue: [self inSortedFreeListLink: next to: nextNext given: prevFree]]. "self checkTraversableSortedFreeList". ^freeChunk]. prevPrevFree := prevFree. prevFree := freeChunk. freeChunk := next]. ^0!

1 0

Suspect single float types
by Nicolas Cellier 05 May '14

05 May '14

I read in CCodeGenerator>>computeKernelReturnTypes fetchFloatAt:into: #float storeFloatAt:from: #float fetchFloatAtPointer:into: #float storeFloatAtPointer:from: #float fetchSingleFloatAt:into: #float storeSingleFloatAt:from: #float fetchSingleFloatAtPointer:into: #float storeSingleFloatAtPointer:from: #float Ain't these #double?

2 2

VM Maker: VMMaker.oscog-eem.703.mcz
by commits＠source.squeak.org 05 May '14

05 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.703.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.703 Author: eem Time: 4 May 2014, 5:22:13.476 pm UUID: 72bcfdab-bf50-4e10-a4d7-81c9cd88eccd Ancestors: VMMaker.oscog-eem.702 Fix stack printing when frameCallerContext ref is forwarded. Simulator: Fix breakpointing in ioLoadFunction:From:AccessorDepthInto: Allow breakpointing on plugin load. Fix str:n:cmp: =============== Diff against VMMaker.oscog-eem.702 =============== Item was changed: ----- Method: CogVMSimulator>>ioLoadFunction:From:AccessorDepthInto: (in category 'plugin support') ----- ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr "Load and return the requested function from a module. Assign the accessor depth through accessorDepthPtr. N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" | firstTime plugin fnSymbol | firstTime := false. fnSymbol := functionString asSymbol. transcript cr; show: '(', byteCount printString, ') Looking for ', functionString, ' in ', (pluginString isEmpty ifTrue:['vm'] ifFalse:[pluginString]). + (self str: functionString n: breakSelector cmp: functionString size) = 0 ifTrue: + [self halt: functionString]. - functionString = breakSelector ifTrue: [self halt: breakSelector]. plugin := pluginList detect: [:any| any key = pluginString asString] ifNone: [firstTime := true. self loadNewPlugin: pluginString]. plugin ifNil: [firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0]. plugin := plugin value. mappedPluginEntries doWithIndex: [:pluginAndName :index| ((pluginAndName at: 1) == plugin and:[(pluginAndName at: 2) == fnSymbol]) ifTrue: [firstTime ifTrue: [transcript show: ' ... okay'; cr]. accessorDepthPtr at: 0 put: (pluginAndName at: 4). ^index]]. firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0! Item was changed: ----- Method: CogVMSimulator>>loadNewPlugin: (in category 'plugin support') ----- loadNewPlugin: pluginString + (self str: pluginString n: breakSelector cmp: pluginString size) = 0 ifTrue: + [self halt: pluginString]. ^(self tryLoadNewPlugin: pluginString pluginEntries: mappedPluginEntries) ifNotNil: [:entry| pluginList := pluginList copyWith: entry. entry]! Item was changed: ----- Method: SpurSegmentManager>>prepareForSnapshot (in category 'snapshot') ----- prepareForSnapshot "shorten all segments by any trailing free space." <inline: false> <var: #seg type: #'SpurSegmentInfo *'> 0 to: numSegments - 1 do: [:i| (segments at: i) savedSegSize: (segments at: i) segSize; lastFreeObject: nil]. "Ideally finding the lastFreeObject of each segment would be done in some linear pass through the heap. But for now KISS." manager freeTreeNodesDo: [:freeChunk| | node next seg | node := freeChunk. [node ~= 0] whileTrue: [next := manager objectAfter: node limit: manager endOfMemory. (manager isSegmentBridge: next) ifTrue: [seg := self segmentContainingObj: node. seg lastFreeObject: node. node := 0] ifFalse: + [node := manager + fetchPointer: manager freeChunkNextIndex - [node := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node]]. freeChunk]. 0 to: numSegments - 1 do: [:i| (segments at: i) lastFreeObject ifNotNil: [:freeChunk| manager detachFreeObject: freeChunk. (segments at: i) segSize: (manager startOfObject: freeChunk) + manager bridgeSize - (segments at: i) segStart. self bridgeFrom: (self addressOf: (segments at: i)) to: (i < (numSegments - 1) ifTrue: [self addressOf: (segments at: i + 1)])]]. "perhaps this should read manager setEndOfMemory: 0; assimilateNewSegment: (segments at: numSegments - 1)" manager setEndOfMemory: (segments at: numSegments - 1) segLimit - manager bridgeSize! Item was changed: ----- Method: StackInterpreter>>printCallStackOf:currentFP: (in category 'debug printing') ----- printCallStackOf: aContext currentFP: currFP | ctxt theFP thePage | <inline: false> <var: #currFP type: #'char *'> <var: #theFP type: #'char *'> <var: #thePage type: #'StackPage *'> ctxt := aContext. [ctxt = objectMemory nilObject] whileFalse: [(self isMarriedOrWidowedContext: ctxt) ifFalse: [self shortPrintContext: ctxt. ctxt := objectMemory fetchPointer: SenderIndex ofObject: ctxt] ifTrue: [theFP := self frameOfMarriedContext: ctxt. (self checkIsStillMarriedContext: ctxt currentFP: currFP) ifTrue: [thePage := stackPages stackPageFor: theFP. (stackPages isFree: thePage) ifTrue: [self printHexPtr: theFP; print: ' is on a free page?!!'; cr. ^nil]. self shortPrintFrameAndCallers: theFP. theFP := thePage baseFP. + ctxt := self frameCallerContext: theFP. + (objectMemory isForwarded: ctxt) ifTrue: + [ctxt := objectMemory followForwarded: ctxt]] - ctxt := self frameCallerContext: theFP] ifFalse: [self print: 'widowed caller frame '; printHexPtr: theFP; cr. ^nil]]]! Item was changed: ----- Method: StackInterpreter>>shortReversePrintFrameAndCallers: (in category 'debug printing') ----- shortReversePrintFrameAndCallers: aFramePointer + | theFP callerFP caller | - | theFP callerFP | <inline: false> <var: #aFramePointer type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> aFramePointer = 0 ifTrue: [^objectMemory nilObject]. theFP := aFramePointer. [self shortPrintFrame: theFP. callerFP := self frameCallerFP: theFP. callerFP ~= 0] whileTrue: [theFP := callerFP]. + caller := self frameCallerContext: theFP. + (objectMemory isForwarded: caller) ifTrue: + [caller := objectMemory followForwarded: caller]. + ^caller! - ^self frameCallerContext: theFP! Item was changed: ----- Method: StackInterpreterSimulator>>ioLoadFunction:From:AccessorDepthInto: (in category 'plugin support') ----- ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr "Load and return the requested function from a module. Assign the accessor depth through accessorDepthPtr. N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" | firstTime plugin fnSymbol | firstTime := false. fnSymbol := functionString asSymbol. transcript cr; show: '(', byteCount printString, ') Looking for ', functionString, ' in ', (pluginString isEmpty ifTrue:['vm'] ifFalse:[pluginString]). + breakSelector ifNotNil: + [(self str: functionString n: breakSelector cmp: functionString size) = 0 ifTrue: + [self halt: functionString]]. - functionString = breakSelector ifTrue: [self halt: breakSelector]. plugin := pluginList detect: [:any| any key = pluginString asString] ifNone: [firstTime := true. self loadNewPlugin: pluginString]. plugin ifNil: [firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0]. plugin := plugin value. + "mappedPluginEntries select: [:tuple| tuple first = plugin] an OrderedCollection({an UnixOSProcessPlugin . #getModuleName . [closure] in [] in StackInterpreterSimulatorLSB(StackInterpreter)>>tryLoadNewPlugin:pluginEntries: . nil} {an UnixOSProcessPlugin . #setInterpreter . [closure] in [] in StackInterpreterSimulatorLSB(StackInterpreter)>>tryLoadNewPlugin:pluginEntries: . nil})" mappedPluginEntries doWithIndex: [:pluginAndName :index| ((pluginAndName at: 1) == plugin and:[(pluginAndName at: 2) == fnSymbol]) ifTrue: [firstTime ifTrue: [transcript show: ' ... okay'; cr]. accessorDepthPtr at: 0 put: (pluginAndName at: 4). ^index]]. firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0! Item was changed: ----- Method: StackInterpreterSimulator>>loadNewPlugin: (in category 'plugin support') ----- loadNewPlugin: pluginString + breakSelector ifNotNil: + [(self str: pluginString n: breakSelector cmp: pluginString size) = 0 ifTrue: + [self halt: pluginString]]. ^(self tryLoadNewPlugin: pluginString pluginEntries: mappedPluginEntries) ifNotNil: [:entry| pluginList := pluginList copyWith: entry. entry]! Item was changed: ----- Method: VMClass>>str:n:cmp: (in category 'C library simulation') ----- str: aString n: bString cmp: n <doNotGenerate> "implementation of strncmp(3)" bString isString ifTrue: + [1 to: n do: + [:i| + (aString at: i) asCharacter ~= (bString at: i) ifTrue: + [^i]]. + ^0]. - [^(aString first: (n min: aString size)) ~= (bString first: (n min: bString size))]. 1 to: n do: [:i| | v | v := (aString at: i) asInteger - (self byteAt: bString + i - 1). v ~= 0 ifTrue: [^v]]. ^0!

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 05 May '14

05 May '14

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 Author: eem Time: 4 May 2014, 3:36:37.292 pm UUID: 65e92aef-c30a-4a73-8966-e3d7da6ec7b6 Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.47 Fix simulation of primitiveGetSession and primitiveGetThreadID

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.47.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 04 May '14

04 May '14

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.47 Author: eem Time: 4 May 2014, 2:53:22.443 pm UUID: 0c975974-afa7-4e15-ab47-7ca18911cb9e Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.46 Fix simulatiom of the [Unix|Win32]OSProcessPlugin by making sure they override OSProcessPlugin class's shouldBeTranslated

1 0

Re: [Pharo-dev] Immutability in the VM - is it hard?
by Eliot Miranda 04 May '14

04 May '14

Hi Alexandre, On Sun, May 4, 2014 at 1:09 PM, Alexandre Bergel <alexandre.bergel(a)me.com>wrote: > Why is immutability related to the memory management? > It isn't. > Are you referring to the change in the header, therefore the garbage > collector has to be aware of the extra bit? > The object representation needs to make room for the bit in the header, but the GC ignores it completely. However, the memory manager (of which the GC is a component) implements the core of e.g. the become primitive and that primitive can reasonably be expected to fail an attempt to become an immutable object. > Cheers, > Alexandre > > Le 04-05-2014 à 12:05, Clément Bera <bera.clement(a)gmail.com> a écrit : > > Hello, > > Immutability needs to be implemented in the VM. It is quite some work on > the current memory manager. Few people have enough skills to do this kind > of changes nicely and efficiently, and none of them had enough time to do > it. However, things are now moving quicker and quicker and some work and > immutability has started. > > Right now part of the VM work is focusing the new memory manager Spur that > will be released for Pharo 4. This new memory manager will feature > immutability (1 bit in the object header is now reserved for this purpose). > However, although immutability is required by some projects and people, it > is quite far away on the To Do list right now (firstly, the new memory > manager needs to work efficiently, be stable, be in production, ...). > Therefore, you may have to wait for Pharo 5 (2 years from now) to have > immutability in production. > > Best, > Clement > > > 2014-05-04 8:40 GMT-07:00 Aaron Rosenzweig <aaron(a)chatnbike.com>: > >> Hello, >> >> Why is the concept of “immutability” special to VisualWorks? Is it >> something hard to add to other Smalltalk dialects such as Pharo or are >> there other reasons for not having it? >> >> When I read the docs for the GOODS database client it says the following: >> >> “The GOODS client uses this immutability support for change detection.” >> >> It goes on to say that this is only for VisualWorks. For Pharo it says >> that it is generally slow to commit changes because the client to the OODB >> has to spent extra time detecting change detection. I guess for VisualWorks >> it is basically “free” to detect a change in an object. >> >> Thank you,*Aaron Rosenzweig* / Chat 'n Bike <http://www.chatnbike.com> >> *e:* aaron(a)chatnbike.com *t:* (301) 956-2319 [image: Chat 'n Bike] [image: >> Chat 'n Bike] >> >> > -- best, Eliot

1 0

[commit][2914] CogVM source as per VMMaker.oscog-eem.702
by commits＠squeakvm.org 04 May '14

04 May '14

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. @@

1 0

VM Maker: VMMaker.oscog-eem.702.mcz
by commits＠source.squeak.org 04 May '14

04 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.702.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.702 Author: eem Time: 4 May 2014, 9:16:03.626 am UUID: 2f753471-9a18-4f13-aaef-58ffb0702465 Ancestors: VMMaker.oscog-eem.701 Oops! Correct the collapsed generateWhile:loop:on:indent: which was missing the not operation. IIABDFI :-( =============== Diff against VMMaker.oscog-eem.701 =============== Item was changed: ----- Method: CCodeGenerator>>generateWhile:loop:on:indent: (in category 'C translation') ----- generateWhile: boolean loop: msgNode on: aStream indent: level "Generate while(cond) {stmtList} or while(!!(cond)) {stmtList}." aStream nextPutAll: 'while ('. + boolean ifFalse: [aStream nextPutAll: '!!(']. - boolean ifFalse: [aStream nextPut: $(]. self emitCTestBlock: msgNode receiver on: aStream indent: level. boolean ifFalse: [aStream nextPut: $)]. aStream nextPutAll: ') {'; cr. msgNode args first isNilStmtListNode ifFalse: [msgNode args first emitCCodeOn: aStream level: level + 1 generator: self]. aStream tab: level. aStream nextPut: $}!

1 0

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