Vm-dev January 2015

vm-dev@lists.squeakfoundation.org

22 participants
111 discussions

[commit][3207] Step 2 in moving Mac OS build resources to a common directory.
by commits＠squeakvm.org 06 Jan '15

06 Jan '15

Revision: 3207 Author: eliot Date: 2015-01-06 11:19:08 -0800 (Tue, 06 Jan 2015) Log Message: ----------- Step 2 in moving Mac OS build resources to a common directory. Added Paths: ----------- branches/Cog/platforms/Mac OS/Resources/Newspeak Virtual Machine.icns branches/Cog/platforms/Mac OS/Resources/NewspeakDocuments.icns Copied: branches/Cog/platforms/Mac OS/Resources/Newspeak Virtual Machine.icns (from rev 3205, branches/Cog/build.macos32x86/newspeak.cog.v3/resources/ProjectBuilder/Newspeak Virtual Machine.icns) =================================================================== (Binary files differ) Copied: branches/Cog/platforms/Mac OS/Resources/NewspeakDocuments.icns (from rev 3205, branches/Cog/build.macos32x86/newspeak.cog.v3/resources/ProjectBuilder/NewspeakDocuments.icns) =================================================================== (Binary files differ)

1 0

[commit][3206] Step 1 in moving Mac OS build resources to a common directory.
by commits＠squeakvm.org 06 Jan '15

06 Jan '15

Revision: 3206 Author: eliot Date: 2015-01-06 11:18:07 -0800 (Tue, 06 Jan 2015) Log Message: ----------- Step 1 in moving Mac OS build resources to a common directory. Added Paths: ----------- branches/Cog/platforms/Mac OS/Resources/

1 0

New Cog VMs available
by Eliot Miranda 02 Jan '15

02 Jan '15

...at http://www.mirandabanda.org/files/Cog/VM/VM.r3205/. Happy New Year! CogVM source as per VMMaker.oscog-eem.1008/r3205 Send cannotReturn for sideways return attemps when there's an unwind-protect. Old code would erroneously answer unwind-protect even if home could'nt be found. e.g. This should raise cannot return: | b | b := [ ^ 42 ]. [ [b value] ensure: [1] ] fork. Processor yield just as this does: | b | b := [ ^ 42 ]. [ b value ] fork. Processor yield Speed up non-local return processing by using the fact that 98% of the time returns are within the same page. The search for the home context following finding an unwind is unnecessary iff the home is married and on the same page. Refactor commonReturn to eiminate CoInterpreter's version, moving the divergence into maybeReturnToMachineCodeFrame. Ensure search for home through the block's closure uses followField:ofObject:. (related) Revisit the Sista bug fix for followed contexts during scavenging in VMMaker.oscog-eem.913 of 24 October 2014. Split isWidowedContext: into a more careful version, isWidowedContextDuringGC: for use only during scavenging. Win32: Nuke obsolete RCS vrsion info Spur: Fix argument count slips in three primitives. Check for sufficient memory in two-way become. All: Fix checking of boolean arg in primitiveArrayBecomeOneWayCopyHash. Make primitiveSlotAt[Put] cope with non-pointer objects. Change the pixel-touch-pixel prim to allow LPI arguments for the color values Update the ScratchPlugin bilinear scaling prim to include the correct alpha channel value for non-transparent output pixels. No longer build or upload the Newspeak V3 VMs, now superseded by Spur. Use the gcc/clang built-ins for CAS and atomic increment if available. -- best, Eliot

3 2

[commit][3205] CogVM source as per VMMaker.oscog-eem.1008
by commits＠squeakvm.org 01 Jan '15

01 Jan '15

Revision: 3205 Author: eliot Date: 2015-01-01 14:08:51 -0800 (Thu, 01 Jan 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1008 Third time luckyC in fixing the findUnwindThroughContext: regression? And remove a gcc compiler warning for printHexnp: Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) +++ branches/Cog/nscogsrc/vm/cointerp.c 2015-01-01 22:08:51 UTC (rev 3205) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a from - CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CoInterpreter VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2101,7 +2101,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1006"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1008"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18908,7 +18908,7 @@ putchar(' '); if (p > 1024) { /* begin printHexnp: */ - printf("0x%lx", p); + printf("0x%lx", ((unsigned long) p)); } else { printNum(p); @@ -46183,6 +46183,7 @@ if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } + return 0; } if (!(onSamePage || (ctxtOrNilOrZero == GIV(nilObj)))) { @@ -47313,13 +47314,13 @@ print(" ("); /* begin printHexnp: */ - printf("0x%lx", class); + printf("0x%lx", ((unsigned long) class)); print(")"); } fmt = (((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15; print(" format "); /* begin printHexnp: */ - printf("0x%lx", fmt); + printf("0x%lx", ((unsigned long) fmt)); if (fmt > 4) { print(" nbytes "); printNum(numBytesOf(oop)); @@ -47371,7 +47372,7 @@ } print(" hash "); /* begin printHexnp: */ - printf("0x%lx", (((usqInt) (longAt(oop))) >> HashBitsOffset) & HashMaskUnshifted); + printf("0x%lx", ((unsigned long) ((((usqInt) (longAt(oop))) >> HashBitsOffset) & HashMaskUnshifted))); /* begin cr */ printf("\n"); if (((fmt >= 8) && (fmt <= (12 - 1)))) { @@ -49726,7 +49727,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(page)); + printf("0x%lx", ((unsigned long) (oopForPointer(page)))); /* begin cr */ printf("\n"); printFramesInPage(page); @@ -49958,7 +49959,7 @@ offset = (literalCountOfMethodHeader(methodHeaderOf(oop))) - 1; methodClassAssociation = longAt((oop + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -49975,7 +49976,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop2 >> 1)); + printf("0x%lx", ((unsigned long) ((oop2 >> 1)))); /* begin printChar: */ putchar(')'); @@ -49984,7 +49985,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop2); + printf("0x%lx", ((unsigned long) oop2)); goto l8; } @@ -50111,7 +50112,7 @@ printOopShort(longAt((oop2 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l5: ; } l8: /* end printOopShortInner: */; @@ -50278,7 +50279,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -50287,7 +50288,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); goto l4; } @@ -50414,7 +50415,7 @@ printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l1: ; } l4: /* end printOopShortInner: */; @@ -50855,10 +50856,10 @@ if (oop == (longAt(theSP))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" @ "); /* begin printHexnp: */ - printf("0x%lx", theSP); + printf("0x%lx", ((unsigned long) theSP)); /* begin cr */ printf("\n"); } @@ -50870,7 +50871,7 @@ if (oop == (longAt(theFP + FoxThisContext))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" CTXT"); /* begin cr */ printf("\n"); @@ -50879,7 +50880,7 @@ if (oop == (longAt(theFP + FoxMethod))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" MTHD"); /* begin cr */ printf("\n"); @@ -50896,10 +50897,10 @@ if (oop == (longAt(theSP))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" @ "); /* begin printHexnp: */ - printf("0x%lx", theSP); + printf("0x%lx", ((unsigned long) theSP)); /* begin cr */ printf("\n"); } @@ -51785,7 +51786,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(page)); + printf("0x%lx", ((unsigned long) (oopForPointer(page)))); /* begin cr */ printf("\n"); shortPrintFramesInPage(page); @@ -51812,7 +51813,7 @@ sqInt ccIndex; /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); if ((oop & 1)) { if ((oop & 1)) { printf("=%ld\n", (long)integerValueOf(oop)); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2015-01-01 21:42:13 UTC (rev 3204) +++ branches/Cog/nscogsrc/vm/cointerp.h 2015-01-01 22:08:51 UTC (rev 3205) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-01-01 22:08:51 UTC (rev 3205) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a from - CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CoInterpreter VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2104,7 +2104,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1006"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1008"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18917,7 +18917,7 @@ putchar(' '); if (p > 1024) { /* begin printHexnp: */ - printf("0x%lx", p); + printf("0x%lx", ((unsigned long) p)); } else { printNum(p); @@ -46192,6 +46192,7 @@ if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } + return 0; } if (!(onSamePage || (ctxtOrNilOrZero == GIV(nilObj)))) { @@ -47322,13 +47323,13 @@ print(" ("); /* begin printHexnp: */ - printf("0x%lx", class); + printf("0x%lx", ((unsigned long) class)); print(")"); } fmt = (((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15; print(" format "); /* begin printHexnp: */ - printf("0x%lx", fmt); + printf("0x%lx", ((unsigned long) fmt)); if (fmt > 4) { print(" nbytes "); printNum(numBytesOf(oop)); @@ -47380,7 +47381,7 @@ } print(" hash "); /* begin printHexnp: */ - printf("0x%lx", (((usqInt) (longAt(oop))) >> HashBitsOffset) & HashMaskUnshifted); + printf("0x%lx", ((unsigned long) ((((usqInt) (longAt(oop))) >> HashBitsOffset) & HashMaskUnshifted))); /* begin cr */ printf("\n"); if (((fmt >= 8) && (fmt <= (12 - 1)))) { @@ -49735,7 +49736,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(page)); + printf("0x%lx", ((unsigned long) (oopForPointer(page)))); /* begin cr */ printf("\n"); printFramesInPage(page); @@ -49967,7 +49968,7 @@ offset = (literalCountOfMethodHeader(methodHeaderOf(oop))) - 1; methodClassAssociation = longAt((oop + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -49984,7 +49985,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop2 >> 1)); + printf("0x%lx", ((unsigned long) ((oop2 >> 1)))); /* begin printChar: */ putchar(')'); @@ -49993,7 +49994,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop2); + printf("0x%lx", ((unsigned long) oop2)); goto l8; } @@ -50120,7 +50121,7 @@ printOopShort(longAt((oop2 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l5: ; } l8: /* end printOopShortInner: */; @@ -50287,7 +50288,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -50296,7 +50297,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); goto l4; } @@ -50423,7 +50424,7 @@ printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l1: ; } l4: /* end printOopShortInner: */; @@ -50864,10 +50865,10 @@ if (oop == (longAt(theSP))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" @ "); /* begin printHexnp: */ - printf("0x%lx", theSP); + printf("0x%lx", ((unsigned long) theSP)); /* begin cr */ printf("\n"); } @@ -50879,7 +50880,7 @@ if (oop == (longAt(theFP + FoxThisContext))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" CTXT"); /* begin cr */ printf("\n"); @@ -50888,7 +50889,7 @@ if (oop == (longAt(theFP + FoxMethod))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" MTHD"); /* begin cr */ printf("\n"); @@ -50905,10 +50906,10 @@ if (oop == (longAt(theSP))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" @ "); /* begin printHexnp: */ - printf("0x%lx", theSP); + printf("0x%lx", ((unsigned long) theSP)); /* begin cr */ printf("\n"); } @@ -51794,7 +51795,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(page)); + printf("0x%lx", ((unsigned long) (oopForPointer(page)))); /* begin cr */ printf("\n"); shortPrintFramesInPage(page); @@ -51821,7 +51822,7 @@ sqInt ccIndex; /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); if ((oop & 1)) { if ((oop & 1)) { printf("=%ld\n", (long)integerValueOf(oop)); Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-01-01 22:08:51 UTC (rev 3205) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a from - CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CoInterpreter VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2353,7 +2353,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1006"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1008"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -23265,7 +23265,7 @@ putchar(' '); if (p > 1024) { /* begin printHexnp: */ - printf("0x%lx", p); + printf("0x%lx", ((unsigned long) p)); } else { printNum(p); @@ -59168,27 +59168,27 @@ print("freeChunk "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(freeChunk)); + printf("0x%lx", ((unsigned long) (oopForPointer(freeChunk)))); print(" bytes "); printNum(numBytes); print(" next "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))))); if ((numBytes >= (32 * 8)) && (!isNextChunk)) { print(" ^ "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))))); print(" < "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))))); print(" > "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (4 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (4 << (shiftForWord()))))))); } /* begin cr */ printf("\n"); @@ -59219,10 +59219,10 @@ printf("\n"); print("mask: "); /* begin printHexnp: */ - printf("0x%lx", GIV(freeListsMask)); + printf("0x%lx", ((unsigned long) GIV(freeListsMask))); print(" expected: "); /* begin printHexnp: */ - printf("0x%lx", expectedMask); + printf("0x%lx", ((unsigned long) expectedMask)); /* begin cr */ printf("\n"); } @@ -65586,6 +65586,7 @@ if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } + return 0; } if (!(onSamePage || (ctxtOrNilOrZero == GIV(nilObj)))) { @@ -66949,17 +66950,17 @@ printNameOfClasscount(class, 5); print(" ("); /* begin printHexnp: */ - printf("0x%lx", (longAt(oop)) & 0x3FFFFF); + printf("0x%lx", ((unsigned long) ((longAt(oop)) & 0x3FFFFF))); print("=>"); /* begin printHexnp: */ - printf("0x%lx", class); + printf("0x%lx", ((unsigned long) class)); print(")"); } fmt = (((usqInt) (longAt(oop))) >> 24) & 0x1F; print(" format "); /* begin printHexnp: */ - printf("0x%lx", fmt); + printf("0x%lx", ((unsigned long) fmt)); if (fmt > 5) { print(" nbytes "); printNum(numBytesOf(oop)); @@ -67026,7 +67027,7 @@ putchar(aByte4); print(" hash "); /* begin printHexnp: */ - printf("0x%lx", (long32At(oop + 4)) & 0x3FFFFF); + printf("0x%lx", ((unsigned long) ((long32At(oop + 4)) & 0x3FFFFF))); /* begin cr */ printf("\n"); if (((fmt >= 16) && (fmt <= (24 - 1)))) { @@ -69568,7 +69569,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(page)); + printf("0x%lx", ((unsigned long) (oopForPointer(page)))); /* begin cr */ printf("\n"); printFramesInPage(page); @@ -69857,7 +69858,7 @@ offset = (literalCountOf(objOop1)) - 1; methodClassAssociation = longAt((objOop1 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", objOop1); + printf("0x%lx", ((unsigned long) objOop1)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -69876,7 +69877,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -69887,7 +69888,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -69896,7 +69897,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); goto l27; } @@ -69921,7 +69922,7 @@ referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); } n = referent; - printf("0x%lx", n); + printf("0x%lx", ((unsigned long) n)); goto l27; } @@ -70083,7 +70084,7 @@ printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l22: ; } l27: /* end printOopShortInner: */; @@ -70113,7 +70114,7 @@ offset = (literalCountOf(objOop1)) - 1; methodClassAssociation = longAt((objOop1 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", objOop1); + printf("0x%lx", ((unsigned long) objOop1)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -70132,7 +70133,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop1 >> 1)); + printf("0x%lx", ((unsigned long) ((oop1 >> 1)))); /* begin printChar: */ putchar(')'); @@ -70143,7 +70144,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop1 >> 1)); + printf("0x%lx", ((unsigned long) ((oop1 >> 1)))); /* begin printChar: */ putchar(')'); @@ -70152,7 +70153,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop1); + printf("0x%lx", ((unsigned long) oop1)); goto l35; } @@ -70177,7 +70178,7 @@ referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); } n1 = referent1; - printf("0x%lx", n1); + printf("0x%lx", ((unsigned long) n1)); goto l35; } @@ -70339,7 +70340,7 @@ printOopShort(longAt((oop1 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop1 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop1 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l34: ; } l35: /* end printOopShortInner: */; @@ -70374,7 +70375,7 @@ offset = (literalCountOf(objOop11)) - 1; methodClassAssociation = longAt((objOop11 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", objOop11); + printf("0x%lx", ((unsigned long) objOop11)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -70393,7 +70394,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop2 >> 1)); + printf("0x%lx", ((unsigned long) ((oop2 >> 1)))); /* begin printChar: */ putchar(')'); @@ -70404,7 +70405,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop2 >> 1)); + printf("0x%lx", ((unsigned long) ((oop2 >> 1)))); /* begin printChar: */ putchar(')'); @@ -70413,7 +70414,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop2); + printf("0x%lx", ((unsigned long) oop2)); goto l42; } @@ -70438,7 +70439,7 @@ referent2 = longAt((referent2 + BaseHeaderSize) + (0 << (shiftForWord()))); } n2 = referent2; - printf("0x%lx", n2); + printf("0x%lx", ((unsigned long) n2)); goto l42; } @@ -70600,7 +70601,7 @@ printOopShort(longAt((oop2 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l41: ; } l42: /* end printOopShortInner: */; @@ -70764,7 +70765,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -70775,7 +70776,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -70784,7 +70785,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); goto l7; } @@ -70809,7 +70810,7 @@ referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); } n = referent; - printf("0x%lx", n); + printf("0x%lx", ((unsigned long) n)); goto l7; } @@ -70971,7 +70972,7 @@ printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l1: ; } l7: /* end printOopShortInner: */; @@ -71424,10 +71425,10 @@ if (oop == (longAt(theSP))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" @ "); /* begin printHexnp: */ - printf("0x%lx", theSP); + printf("0x%lx", ((unsigned long) theSP)); /* begin cr */ printf("\n"); } @@ -71439,7 +71440,7 @@ if (oop == (longAt(theFP + FoxThisContext))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" CTXT"); /* begin cr */ printf("\n"); @@ -71448,7 +71449,7 @@ if (oop == (longAt(theFP + FoxMethod))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" MTHD"); /* begin cr */ printf("\n"); @@ -71465,10 +71466,10 @@ if (oop == (longAt(theSP))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" @ "); /* begin printHexnp: */ - printf("0x%lx", theSP); + printf("0x%lx", ((unsigned long) theSP)); /* begin cr */ printf("\n"); } @@ -72484,7 +72485,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(page)); + printf("0x%lx", ((unsigned long) (oopForPointer(page)))); /* begin cr */ printf("\n"); shortPrintFramesInPage(page); @@ -72509,7 +72510,7 @@ shortPrintOop(sqInt oop) { /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); if ((oop & 3) != 0) { if ((oop & 1)) { printf("=%ld\n", (long)integerValueOf(oop)); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-01-01 21:42:13 UTC (rev 3204) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-01-01 22:08:51 UTC (rev 3205) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-01-01 22:08:51 UTC (rev 3205) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a from - CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CoInterpreter VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2356,7 +2356,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1006"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1008"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -23274,7 +23274,7 @@ putchar(' '); if (p > 1024) { /* begin printHexnp: */ - printf("0x%lx", p); + printf("0x%lx", ((unsigned long) p)); } else { printNum(p); @@ -59177,27 +59177,27 @@ print("freeChunk "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(freeChunk)); + printf("0x%lx", ((unsigned long) (oopForPointer(freeChunk)))); print(" bytes "); printNum(numBytes); print(" next "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))))); if ((numBytes >= (32 * 8)) && (!isNextChunk)) { print(" ^ "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))))); print(" < "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))))); print(" > "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (4 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (4 << (shiftForWord()))))))); } /* begin cr */ printf("\n"); @@ -59228,10 +59228,10 @@ printf("\n"); print("mask: "); /* begin printHexnp: */ - printf("0x%lx", GIV(freeListsMask)); + printf("0x%lx", ((unsigned long) GIV(freeListsMask))); print(" expected: "); /* begin printHexnp: */ - printf("0x%lx", expectedMask); + printf("0x%lx", ((unsigned long) expectedMask)); /* begin cr */ printf("\n"); } @@ -65595,6 +65595,7 @@ if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } + return 0; } if (!(onSamePage || (ctxtOrNilOrZero == GIV(nilObj)))) { @@ -66958,17 +66959,17 @@ printNameOfClasscount(class, 5); print(" ("); /* begin printHexnp: */ - printf("0x%lx", (longAt(oop)) & 0x3FFFFF); + printf("0x%lx", ((unsigned long) ((longAt(oop)) & 0x3FFFFF))); print("=>"); /* begin printHexnp: */ - printf("0x%lx", class); + printf("0x%lx", ((unsigned long) class)); print(")"); } fmt = (((usqInt) (longAt(oop))) >> 24) & 0x1F; print(" format "); /* begin printHexnp: */ - printf("0x%lx", fmt); + printf("0x%lx", ((unsigned long) fmt)); if (fmt > 5) { print(" nbytes "); printNum(numBytesOf(oop)); @@ -67035,7 +67036,7 @@ putchar(aByte4); print(" hash "); /* begin printHexnp: */ - printf("0x%lx", (long32At(oop + 4)) & 0x3FFFFF); + printf("0x%lx", ((unsigned long) ((long32At(oop + 4)) & 0x3FFFFF))); /* begin cr */ printf("\n"); if (((fmt >= 16) && (fmt <= (24 - 1)))) { @@ -69577,7 +69578,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(page)); + printf("0x%lx", ((unsigned long) (oopForPointer(page)))); /* begin cr */ printf("\n"); printFramesInPage(page); @@ -69866,7 +69867,7 @@ offset = (literalCountOf(objOop1)) - 1; methodClassAssociation = longAt((objOop1 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", objOop1); + printf("0x%lx", ((unsigned long) objOop1)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -69885,7 +69886,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -69896,7 +69897,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -69905,7 +69906,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); goto l27; } @@ -69930,7 +69931,7 @@ referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); } n = referent; - printf("0x%lx", n); + printf("0x%lx", ((unsigned long) n)); goto l27; } @@ -70092,7 +70093,7 @@ printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l22: ; } l27: /* end printOopShortInner: */; @@ -70122,7 +70123,7 @@ offset = (literalCountOf(objOop1)) - 1; methodClassAssociation = longAt((objOop1 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", objOop1); + printf("0x%lx", ((unsigned long) objOop1)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -70141,7 +70142,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop1 >> 1)); + printf("0x%lx", ((unsigned long) ((oop1 >> 1)))); /* begin printChar: */ putchar(')'); @@ -70152,7 +70153,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop1 >> 1)); + printf("0x%lx", ((unsigned long) ((oop1 >> 1)))); /* begin printChar: */ putchar(')'); @@ -70161,7 +70162,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop1); + printf("0x%lx", ((unsigned long) oop1)); goto l35; } @@ -70186,7 +70187,7 @@ referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); } n1 = referent1; - printf("0x%lx", n1); + printf("0x%lx", ((unsigned long) n1)); goto l35; } @@ -70348,7 +70349,7 @@ printOopShort(longAt((oop1 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop1 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop1 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l34: ; } l35: /* end printOopShortInner: */; @@ -70383,7 +70384,7 @@ offset = (literalCountOf(objOop11)) - 1; methodClassAssociation = longAt((objOop11 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", objOop11); + printf("0x%lx", ((unsigned long) objOop11)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -70402,7 +70403,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop2 >> 1)); + printf("0x%lx", ((unsigned long) ((oop2 >> 1)))); /* begin printChar: */ putchar(')'); @@ -70413,7 +70414,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop2 >> 1)); + printf("0x%lx", ((unsigned long) ((oop2 >> 1)))); /* begin printChar: */ putchar(')'); @@ -70422,7 +70423,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop2); + printf("0x%lx", ((unsigned long) oop2)); goto l42; } @@ -70447,7 +70448,7 @@ referent2 = longAt((referent2 + BaseHeaderSize) + (0 << (shiftForWord()))); } n2 = referent2; - printf("0x%lx", n2); + printf("0x%lx", ((unsigned long) n2)); goto l42; } @@ -70609,7 +70610,7 @@ printOopShort(longAt((oop2 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l41: ; } l42: /* end printOopShortInner: */; @@ -70773,7 +70774,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -70784,7 +70785,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -70793,7 +70794,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); goto l7; } @@ -70818,7 +70819,7 @@ referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); } n = referent; - printf("0x%lx", n); + printf("0x%lx", ((unsigned long) n)); goto l7; } @@ -70980,7 +70981,7 @@ printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l1: ; } l7: /* end printOopShortInner: */; @@ -71433,10 +71434,10 @@ if (oop == (longAt(theSP))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" @ "); /* begin printHexnp: */ - printf("0x%lx", theSP); + printf("0x%lx", ((unsigned long) theSP)); /* begin cr */ printf("\n"); } @@ -71448,7 +71449,7 @@ if (oop == (longAt(theFP + FoxThisContext))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" CTXT"); /* begin cr */ printf("\n"); @@ -71457,7 +71458,7 @@ if (oop == (longAt(theFP + FoxMethod))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" MTHD"); /* begin cr */ printf("\n"); @@ -71474,10 +71475,10 @@ if (oop == (longAt(theSP))) { print("FP: "); /* begin printHexnp: */ - printf("0x%lx", theFP); + printf("0x%lx", ((unsigned long) theFP)); print(" @ "); /* begin printHexnp: */ - printf("0x%lx", theSP); + printf("0x%lx", ((unsigned long) theSP)); /* begin cr */ printf("\n"); } @@ -72493,7 +72494,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(page)); + printf("0x%lx", ((unsigned long) (oopForPointer(page)))); /* begin cr */ printf("\n"); shortPrintFramesInPage(page); @@ -72518,7 +72519,7 @@ shortPrintOop(sqInt oop) { /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); if ((oop & 3) != 0) { if ((oop & 1)) { printf("=%ld\n", (long)integerValueOf(oop)); Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-01-01 21:42:13 UTC (rev 3204) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-01-01 22:08:51 UTC (rev 3205) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a from - StackInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e + StackInterpreter VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1008 uuid: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2101,7 +2101,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1006"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1008"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -4921,6 +4921,8 @@ unwindContextOrNilOrZero = home; goto l245; } + unwindContextOrNilOrZero = 0; + goto l245; } if (!(onSamePage || (ctxtOrNilOrZero == GIV(nilObj)))) { @@ -45277,27 +45279,27 @@ print("freeChunk "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(freeChunk)); + printf("0x%lx", ((unsigned long) (oopForPointer(freeChunk)))); print(" bytes "); printNum(numBytes); print(" next "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))))); if ((numBytes >= (32 * 8)) && (!isNextChunk)) { print(" ^ "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))))); print(" < "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))))); print(" > "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (4 << (shiftForWord()))))); + printf("0x%lx", ((unsigned long) (oopForPointer(longAt((freeChunk + BaseHeaderSize) + (4 << (shiftForWord()))))))); } /* begin cr */ printf("\n"); @@ -45328,10 +45330,10 @@ printf("\n"); print("mask: "); /* begin printHexnp: */ - printf("0x%lx", GIV(freeListsMask)); + printf("0x%lx", ((unsigned long) GIV(freeListsMask))); print(" expected: "); /* begin printHexnp: */ - printf("0x%lx", expectedMask); + printf("0x%lx", ((unsigned long) expectedMask)); /* begin cr */ printf("\n"); } @@ -53838,17 +53840,17 @@ printNameOfClasscount(class, 5); print(" ("); /* begin printHexnp: */ - printf("0x%lx", (longAt(oop)) & 0x3FFFFF); + printf("0x%lx", ((unsigned long) ((longAt(oop)) & 0x3FFFFF))); print("=>"); /* begin printHexnp: */ - printf("0x%lx", class); + printf("0x%lx", ((unsigned long) class)); print(")"); } fmt = (((usqInt) (longAt(oop))) >> 24) & 0x1F; print(" format "); /* begin printHexnp: */ - printf("0x%lx", fmt); + printf("0x%lx", ((unsigned long) fmt)); if (fmt > 5) { print(" nbytes "); printNum(numBytesOf(oop)); @@ -53915,7 +53917,7 @@ putchar(aByte4); print(" hash "); /* begin printHexnp: */ - printf("0x%lx", (long32At(oop + 4)) & 0x3FFFFF); + printf("0x%lx", ((unsigned long) ((long32At(oop + 4)) & 0x3FFFFF))); /* begin cr */ printf("\n"); if (((fmt >= 16) && (fmt <= (24 - 1)))) { @@ -58022,7 +58024,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%lx", oopForPointer(page)); + printf("0x%lx", ((unsigned long) (oopForPointer(page)))); /* begin cr */ printf("\n"); printFramesInPage(page); @@ -58341,7 +58343,7 @@ offset = (literalCountOf(objOop1)) - 1; methodClassAssociation = longAt((objOop1 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", objOop1); + printf("0x%lx", ((unsigned long) objOop1)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -58360,7 +58362,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -58371,7 +58373,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -58380,7 +58382,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); goto l27; } @@ -58405,7 +58407,7 @@ referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); } n = referent; - printf("0x%lx", n); + printf("0x%lx", ((unsigned long) n)); goto l27; } @@ -58567,7 +58569,7 @@ printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l22: ; } l27: /* end printOopShortInner: */; @@ -58597,7 +58599,7 @@ offset = (literalCountOf(objOop1)) - 1; methodClassAssociation = longAt((objOop1 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", objOop1); + printf("0x%lx", ((unsigned long) objOop1)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -58616,7 +58618,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop1 >> 1)); + printf("0x%lx", ((unsigned long) ((oop1 >> 1)))); /* begin printChar: */ putchar(')'); @@ -58627,7 +58629,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop1 >> 1)); + printf("0x%lx", ((unsigned long) ((oop1 >> 1)))); /* begin printChar: */ putchar(')'); @@ -58636,7 +58638,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop1); + printf("0x%lx", ((unsigned long) oop1)); goto l35; } @@ -58661,7 +58663,7 @@ referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); } n1 = referent1; - printf("0x%lx", n1); + printf("0x%lx", ((unsigned long) n1)); goto l35; } @@ -58823,7 +58825,7 @@ printOopShort(longAt((oop1 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop1 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop1 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l34: ; } l35: /* end printOopShortInner: */; @@ -58858,7 +58860,7 @@ offset = (literalCountOf(objOop11)) - 1; methodClassAssociation = longAt((objOop11 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%lx", objOop11); + printf("0x%lx", ((unsigned long) objOop11)); /* begin space */ /* begin printChar: */ putchar(' '); @@ -58877,7 +58879,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop2 >> 1)); + printf("0x%lx", ((unsigned long) ((oop2 >> 1)))); /* begin printChar: */ putchar(')'); @@ -58888,7 +58890,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop2 >> 1)); + printf("0x%lx", ((unsigned long) ((oop2 >> 1)))); /* begin printChar: */ putchar(')'); @@ -58897,7 +58899,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop2); + printf("0x%lx", ((unsigned long) oop2)); goto l42; } @@ -58922,7 +58924,7 @@ referent2 = longAt((referent2 + BaseHeaderSize) + (0 << (shiftForWord()))); } n2 = referent2; - printf("0x%lx", n2); + printf("0x%lx", ((unsigned long) n2)); goto l42; } @@ -59084,7 +59086,7 @@ printOopShort(longAt((oop2 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l41: ; } l42: /* end printOopShortInner: */; @@ -59167,7 +59169,7 @@ putchar(' '); if (p > 1024) { /* begin printHexnp: */ - printf("0x%lx", p); + printf("0x%lx", ((unsigned long) p)); } else { printNum(p); @@ -59318,7 +59320,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -59329,7 +59331,7 @@ /* begin printChar: */ putchar('('); /* begin printHexnp: */ - printf("0x%lx", (oop >> 1)); + printf("0x%lx", ((unsigned long) ((oop >> 1)))); /* begin printChar: */ putchar(')'); @@ -59338,7 +59340,7 @@ print("unknown immediate "); /* begin printHexnp: */ - printf("0x%lx", oop); + printf("0x%lx", ((unsigned long) oop)); goto l7; } @@ -59363,7 +59365,7 @@ referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); } n = referent; - printf("0x%lx", n); + printf("0x%lx", ((unsigned long) n)); goto l7; } @@ -59525,7 +59527,7 @@ printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); /* begin printHexnp: */ - printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + printf("0x%lx", ((unsigned long) (longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l1: ; } l7: /* end printOopShortInner: */; @@ -59978,10 +59980,10 @@ if (oop == (longAt(theSP))) { print("FP: "); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1008.mcz
by commits＠source.squeak.org 01 Jan '15

01 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1008.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1008 Author: eem Time: 1 January 2015, 2:03:01.789 pm UUID: e5b26122-f27e-498b-bc8a-70f5f0fc3e1a Ancestors: VMMaker.oscog-eem.1007 Third time lucky? And remove a gcc compiler warning for printHexnp: =============== Diff against VMMaker.oscog-eem.1007 =============== Item was changed: ----- Method: StackInterpreter>>findUnwindThroughContext: (in category 'return bytecodes') ----- findUnwindThroughContext: homeContext "Search for either an unwind-protect (activation of method with primitive 198) or homeContext along the sender chain, which ever is found first. Return values: 0 home context was found on sender chain with no intervening unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found" | onSamePage ctxtOrNilOrZero theMethod | "Almost always (98%) the home is on the same page, in which case we know it will be found." onSamePage := (self isStillMarriedContext: homeContext) and: [(stackPages pageIndexFor: framePointer) = (stackPages pageIndexFor: (self frameOfMarriedContext: homeContext))]. "Since nothing changes we don't need to internalize." ctxtOrNilOrZero := self findMethodWithPrimitive: 198 FromFP: framePointer UpToContext: homeContext. self deny: (onSamePage and: [ctxtOrNilOrZero = objectMemory nilObject]). ctxtOrNilOrZero = 0 ifTrue: [theMethod := objectMemory fetchPointer: MethodIndex ofObject: homeContext. (self primitiveIndexOf: theMethod) = 198 ifTrue: + [^homeContext]. + ^0]. - [^homeContext]]. "If an unwind was found, can the home context be found also? No need to look if on the same page. No need to look if cannot return (ctxtOrNilOrZero = objectMemory nilObject)" (onSamePage or: [ctxtOrNilOrZero = objectMemory nilObject]) ifFalse: [(self findMethodWithPrimitive: 0 FromContext: ctxtOrNilOrZero UpToContext: homeContext) = objectMemory nilObject ifTrue: [^objectMemory nilObject]]. ^ctxtOrNilOrZero! Item was changed: ----- Method: StackInterpreter>>printHexnp: (in category 'debug printing') ----- printHexnp: n "Print n in hex, in the form '0x1234', unpadded" + self print: '0x%lx' f: (self cCoerceSimple: n to: #'unsigned long')! - self print: '0x%lx' f: n!

1 0

Potential problems with 64bit spur large SmallInteger comparison
by Nicolas Cellier 01 Jan '15

01 Jan '15

One of the problem I foresee is this one: 1.0e17 >= 100000000000000001 indeed, the (generated) primitive currently convert the SmallInteger to double, and this one is true: 1.0e17 >= 100000000000000001 asFloat In 32 bit Spur/COG with 30 bit max magnitude, it was OK because every conversion SmallInteger -> Double was exact - like all integer in the range [-2^53,2^53] - see Float class>>maxExactInteger In 64 bits Spur, this might not be the case anymore since some SmallInteger exceed this range... So the (generated) primitive must be protected with some range test.

5 11

[commit][3204] CogVM source as per VMMaker.oscog-eem.1007
by commits＠squeakvm.org 01 Jan '15

01 Jan '15

Revision: 3204 Author: eliot Date: 2015-01-01 13:42:13 -0800 (Thu, 01 Jan 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1007 Fix stupid regression in findUnwindThroughContext:. Minor streamline to commonReturn in CoInterpreter. Add range check for 64-bit SmallInteger to Float conversion since in 64-bits this can overflow the exact float range. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/uploadvms branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/nscogsrc/vm/cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2101,7 +2101,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1004"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1006"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4353,9 +4353,7 @@ /* If this is a method simply return to the sender/caller. */ - if (!(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { + if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; goto l294; } @@ -46088,7 +46086,9 @@ unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found */ -/* Almost always (98%) the home is on the same page. */ +/* Almost always (98%) the home is on the same page, in which case we know it + will be found. + */ static sqInt findUnwindThroughContext(sqInt homeContext) @@ -46176,15 +46176,16 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } - return 0; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { return GIV(nilObj); } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/nscogsrc/vm/cointerp.h 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2104,7 +2104,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1004"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1006"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4362,9 +4362,7 @@ /* If this is a method simply return to the sender/caller. */ - if (!(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { + if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; goto l294; } @@ -46097,7 +46095,9 @@ unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found */ -/* Almost always (98%) the home is on the same page. */ +/* Almost always (98%) the home is on the same page, in which case we know it + will be found. + */ static sqInt findUnwindThroughContext(sqInt homeContext) @@ -46185,15 +46185,16 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } - return 0; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { return GIV(nilObj); } Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2353,7 +2353,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1004"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1006"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5100,9 +5100,7 @@ /* If this is a method simply return to the sender/caller. */ - if (!(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { + if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; goto l248; } @@ -65491,7 +65489,9 @@ unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found */ -/* Almost always (98%) the home is on the same page. */ +/* Almost always (98%) the home is on the same page, in which case we know it + will be found. + */ static sqInt findUnwindThroughContext(sqInt homeContext) @@ -65579,15 +65579,16 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } - return 0; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { return GIV(nilObj); } Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2356,7 +2356,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1004"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1006"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5109,9 +5109,7 @@ /* If this is a method simply return to the sender/caller. */ - if (!(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { + if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; goto l248; } @@ -65500,7 +65498,9 @@ unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found */ -/* Almost always (98%) the home is on the same page. */ +/* Almost always (98%) the home is on the same page, in which case we know it + will be found. + */ static sqInt findUnwindThroughContext(sqInt homeContext) @@ -65588,15 +65588,16 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } - return 0; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { return GIV(nilObj); } Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - StackInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + StackInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2101,7 +2101,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1004"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1006"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -4913,17 +4913,17 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, home); l248: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; goto l245; } - unwindContextOrNilOrZero = 0; - goto l245; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, home)) == GIV(nilObj)) { unwindContextOrNilOrZero = GIV(nilObj); goto l245; Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - StackInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + StackInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2098,7 +2098,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1004"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1006"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -4904,17 +4904,17 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, home); l248: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; goto l245; } - unwindContextOrNilOrZero = 0; - goto l245; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, home)) == GIV(nilObj)) { unwindContextOrNilOrZero = GIV(nilObj); goto l245; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Dec 31 14:34:37 PST 2014 + Thu Jan 1 13:41:39 PST 2015 Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/scripts/uploadvms 2015-01-01 21:42:13 UTC (rev 3204) @@ -148,12 +148,12 @@ fi if [ -n "$CheckDMG" -a -n "$MNSSPUR" -a ! -f "Newspeak Spur Virtual Machine-$TAG.dmg" ]; then NMID=../build.macos32x86/newspeak.cog.spur/installer - if [ -f "Newspeak Virtual Spur Machine-$TAG.dmg" ]; then + if [ -f "Newspeak Spur Virtual Machine-$TAG.dmg" ]; then true - elif [ -f "$NMID/Newspeak Virtual Spur Machine-$TAG.dmg" ]; then - ln "$NMID/Newspeak Virtual Spur Machine-$TAG.dmg" . + elif [ -f "$NMID/Newspeak Spur Virtual Machine-$TAG.dmg" ]; then + ln "$NMID/Newspeak Spur Virtual Machine-$TAG.dmg" . else - echo Newspeak Virtual Spur Machine-$TAG.dmg is missing 1>&2 + echo Newspeak Spur Virtual Machine-$TAG.dmg is missing 1>&2 exit 1 fi fi Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/sistasrc/vm/cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2098,7 +2098,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1004]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1006]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4353,9 +4353,7 @@ /* If this is a method simply return to the sender/caller. */ - if (!(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { + if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; goto l293; } @@ -7951,7 +7949,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -8011,7 +8009,7 @@ null; goto l108; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10936,7 +10934,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -10996,7 +10994,7 @@ null; goto l242; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -24480,7 +24478,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -24527,7 +24525,7 @@ } return; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -46061,7 +46059,9 @@ unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found */ -/* Almost always (98%) the home is on the same page. */ +/* Almost always (98%) the home is on the same page, in which case we know it + will be found. + */ static sqInt findUnwindThroughContext(sqInt homeContext) @@ -46149,15 +46149,16 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } - return 0; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { return GIV(nilObj); } Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/sistasrc/vm/cointerp.h 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2101,7 +2101,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1004]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1006]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4362,9 +4362,7 @@ /* If this is a method simply return to the sender/caller. */ - if (!(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { + if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; goto l293; } @@ -7960,7 +7958,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -8020,7 +8018,7 @@ null; goto l108; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10945,7 +10943,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -11005,7 +11003,7 @@ null; goto l242; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -24489,7 +24487,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -24536,7 +24534,7 @@ } return; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -46070,7 +46068,9 @@ unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found */ -/* Almost always (98%) the home is on the same page. */ +/* Almost always (98%) the home is on the same page, in which case we know it + will be found. + */ static sqInt findUnwindThroughContext(sqInt homeContext) @@ -46158,15 +46158,16 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } - return 0; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { return GIV(nilObj); } Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/spursistasrc/vm/cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2349,7 +2349,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1004]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1006]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5099,9 +5099,7 @@ /* If this is a method simply return to the sender/caller. */ - if (!(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { + if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; goto l250; } @@ -9168,7 +9166,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -9228,7 +9226,7 @@ null; goto l77; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11965,7 +11963,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -12025,7 +12023,7 @@ null; goto l183; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -29590,7 +29588,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -29637,7 +29635,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -65603,7 +65601,9 @@ unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found */ -/* Almost always (98%) the home is on the same page. */ +/* Almost always (98%) the home is on the same page, in which case we know it + will be found. + */ static sqInt findUnwindThroughContext(sqInt homeContext) @@ -65691,15 +65691,16 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } - return 0; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { return GIV(nilObj); } Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/spursistasrc/vm/cointerp.h 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2352,7 +2352,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1004]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1006]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5108,9 +5108,7 @@ /* If this is a method simply return to the sender/caller. */ - if (!(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { + if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; goto l250; } @@ -9177,7 +9175,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -9237,7 +9235,7 @@ null; goto l77; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11974,7 +11972,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -12034,7 +12032,7 @@ null; goto l183; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -29599,7 +29597,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -29646,7 +29644,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -65612,7 +65610,9 @@ unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found */ -/* Almost always (98%) the home is on the same page. */ +/* Almost always (98%) the home is on the same page, in which case we know it + will be found. + */ static sqInt findUnwindThroughContext(sqInt homeContext) @@ -65700,15 +65700,16 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } - return 0; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { return GIV(nilObj); } Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/spursrc/vm/cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2340,7 +2340,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1004]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1006]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4989,9 +4989,7 @@ /* If this is a method simply return to the sender/caller. */ - if (!(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { + if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; goto l123; } @@ -60492,7 +60490,9 @@ unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found */ -/* Almost always (98%) the home is on the same page. */ +/* Almost always (98%) the home is on the same page, in which case we know it + will be found. + */ static sqInt findUnwindThroughContext(sqInt homeContext) @@ -60580,15 +60580,16 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } - return 0; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { return GIV(nilObj); } Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/spursrc/vm/cointerp.h 2015-01-01 21:42:13 UTC (rev 3204) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e from - CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1006 uuid: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2343,7 +2343,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1004]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1006]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4998,9 +4998,7 @@ /* If this is a method simply return to the sender/caller. */ - if (!(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { + if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; goto l123; } @@ -60501,7 +60499,9 @@ unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found */ -/* Almost always (98%) the home is on the same page. */ +/* Almost always (98%) the home is on the same page, in which case we know it + will be found. + */ static sqInt findUnwindThroughContext(sqInt homeContext) @@ -60589,15 +60589,16 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { return homeContext; } - return 0; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { return GIV(nilObj); } Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-01-01 00:32:58 UTC (rev 3203) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-01-01 21:42:13 UTC (rev 3204) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1007 uuid: 5ab9382c-cd68-43ef-a5e4-0c107083d0c6 from - StackInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + StackInterpreter VMMaker.oscog-eem.1007 uuid: 5ab9382c-cd68-43ef-a5e4-0c107083d0c6 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1007 uuid: 5ab9382c-cd68-43ef-a5e4-0c107083d0c6 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -127,7 +127,7 @@ /*** Constants ***/ #define ActiveProcessIndex 1 #define AlternateHeaderHasPrimFlag 0x80000 -#define AltLongStoreBytecode 234 +#define AltLongStoreBytecode 129 #define AtCacheFixedFields 4 #define AtCacheFmt 3 #define AtCacheMask 0x1C @@ -2121,7 +2121,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1004]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1007]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -4835,17 +4835,17 @@ } ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, home); l102: /* end findMethodWithPrimitive:FromFP:UpToContext: */; - if (onSamePage - || (ctxtOrNilOrZero == 0)) { + assert(!((onSamePage + && (ctxtOrNilOrZero == (nilObject()))))); + if (ctxtOrNilOrZero == 0) { theMethod = longAt((home + BaseHeaderSize) + (((long)MethodIndex) << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; goto l99; } - unwindContextOrNilOrZero = 0; - goto l99; } - if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if (!(onSamePage + || (ctxtOrNilOrZero == GIV(nilObj)))) { if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, home)) == GIV(nilObj)) { unwindContextOrNilOrZero = GIV(nilObj); goto l99; @@ -6810,6 +6810,8 @@ double result2; sqInt rot; sqInt rot1; + sqInt shift; + sqInt shift1; char *sp; sqInt tagBits; sqInt tagBits1; @@ -6855,7 +6857,9 @@ rcvr1 = (((double *) ((&bits))))[0]; goto l17; } - if (tagBits == 1) { + if ((tagBits == 1) + && (((shift = (64 - 3) - 52), + (((sqInt) (((long)rcvr) << shift)) >> shift) == rcvr))) { rcvr1 = ((double) ((rcvr >> 3)) ); goto l17; } @@ -6892,7 +6896,9 @@ arg1 = (((double *) ((&bits1))))[0]; goto l18; } - if (tagBits1 == 1) { + if ((tagBits1 == 1) + && (((shift1 = (64 - 3) - 52), + (((sqInt) (((long)arg) << shift1)) >> shift1) == arg))) { arg1 = ((double) ((arg >> 3)) ); goto l18; } @@ -6948,6 +6954,8 @@ double result2; sqInt rot; sqInt rot1; + sqInt shift; + sqInt shift1; char *sp; sqInt tagBits; sqInt tagBits1; @@ -6993,7 +7001,9 @@ rcvr1 = (((double *) ((&bits))))[0]; goto l20; } - if (tagBits == 1) { + if ((tagBits == 1) + && (((shift = (64 - 3) - 52), + (((sqInt) (((long)rcvr) << shift)) >> shift) == rcvr))) { rcvr1 = ((double) ((rcvr >> 3)) ); goto l20; } @@ -7030,7 +7040,9 @@ arg1 = (((double *) ((&bits1))))[0]; goto l21; } - if (tagBits1 == 1) { + if ((tagBits1 == 1) + && (((shift1 = (64 - 3) - 52), + (((sqInt) (((long)arg) << shift1)) >> shift1) == arg))) { arg1 = ((double) ((arg >> 3)) ); goto l21; } @@ -7086,6 +7098,8 @@ double result1; sqInt rot; sqInt rot1; + sqInt shift; + sqInt shift1; sqInt tagBits; sqInt tagBits1; @@ -7128,7 +7142,9 @@ rcvr1 = (((double *) ((&bits))))[0]; goto l23; } - if (tagBits == 1) { + if ((tagBits == 1) + && (((shift = (64 - 3) - 52), + (((sqInt) (((long)rcvr) << shift)) >> shift) == rcvr))) { rcvr1 = ((double) ((rcvr >> 3)) ); goto l23; } @@ -7165,7 +7181,9 @@ arg1 = (((double *) ((&bits1))))[0]; goto l24; } - if (tagBits1 == 1) { + if ((tagBits1 == 1) + && (((shift1 = (64 - 3) - 52), + (((sqInt) (((long)arg) << shift1)) >> shift1) == arg))) { arg1 = ((double) ((arg >> 3)) ); goto l24; } @@ -7269,6 +7287,8 @@ double result1; sqInt rot; sqInt rot1; + sqInt shift; + sqInt shift1; sqInt tagBits; sqInt tagBits1; @@ -7311,7 +7331,9 @@ rcvr1 = (((double *) ((&bits))))[0]; goto l26; } - if (tagBits == 1) { + if ((tagBits == 1) + && (((shift = (64 - 3) - 52), + (((sqInt) (((long)rcvr) << shift)) >> shift) == rcvr))) { rcvr1 = ((double) ((rcvr >> 3)) ); goto l26; } @@ -7348,7 +7370,9 @@ arg1 = (((double *) ((&bits1))))[0]; goto l27; } - if (tagBits1 == 1) { + if ((tagBits1 == 1) + && (((shift1 = (64 - 3) - 52), + (((sqInt) (((long)arg) << shift1)) >> shift1) == arg))) { arg1 = ((double) ((arg >> 3)) ); goto l27; } @@ -7441,6 +7465,8 @@ double result1; sqInt rot; sqInt rot1; + sqInt shift; + sqInt shift1; sqInt tagBits; sqInt tagBits1; @@ -7483,7 +7509,9 @@ rcvr1 = (((double *) ((&bits))))[0]; goto l29; } - if (tagBits == 1) { + if ((tagBits == 1) + && (((shift = (64 - 3) - 52), + (((sqInt) (((long)rcvr) << shift)) >> shift) == rcvr))) { rcvr1 = ((double) ((rcvr >> 3)) ); goto l29; } @@ -7520,7 +7548,9 @@ arg1 = (((double *) ((&bits1))))[0]; goto l30; } - if (tagBits1 == 1) { @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1007.mcz
by commits＠source.squeak.org 01 Jan '15

01 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1007.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1007 Author: eem Time: 1 January 2015, 1:38:43.854 pm UUID: 5ab9382c-cd68-43ef-a5e4-0c107083d0c6 Ancestors: VMMaker.oscog-eem.1006 ...and use a signed shift for the 64-bit Spur loadFloatOrIntFrom: check. =============== Diff against VMMaker.oscog-eem.1006 =============== Item was changed: ----- Method: Spur64BitMemoryManager>>loadFloatOrIntFrom: (in category 'interpreter access') ----- loadFloatOrIntFrom: floatOrIntOop "If floatOrInt is an integer, then convert it to a C double float and return it. If it is a Float, then load its value and return it. Otherwise fail -- ie return with primErrorCode non-zero." <inline: true> <returnTypeC: #double> | result tagBits shift | <var: #result type: #double> (tagBits := floatOrIntOop bitAnd: self tagMask) ~= 0 ifTrue: [tagBits = self smallFloatTag ifTrue: [^self smallFloatValueOf: floatOrIntOop]. (tagBits = self smallIntegerTag and: [shift := 64 - self numTagBits - self smallFloatMantissaBits. (self cCode: [floatOrIntOop << shift] + inSmalltalk: [floatOrIntOop << shift bitAnd: 1 << 64 - 1]) >>> shift = floatOrIntOop]) ifTrue: - inSmalltalk: [floatOrIntOop << shift bitAnd: 1 << 64 - 1]) >> shift = floatOrIntOop]) ifTrue: [^(self integerValueOf: floatOrIntOop) asFloat]] ifFalse: [(self classIndexOf: floatOrIntOop) = ClassFloatCompactIndex ifTrue: [self cCode: '' inSmalltalk: [result := Float new: 2]. self fetchFloatAt: floatOrIntOop + self baseHeaderSize into: result. ^result]]. coInterpreter primitiveFail. ^0.0!

1 0

VM Maker: VMMaker.oscog-eem.1006.mcz
by commits＠source.squeak.org 01 Jan '15

01 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1006.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1006 Author: eem Time: 1 January 2015, 1:27:32.18 pm UUID: 9d3cd4bd-d2d0-476b-bf87-1b040eaaf57e Ancestors: VMMaker.oscog-eem.1005 Ugh, /really/ fix stupid regression in findUnwindThroughContext:. =============== Diff against VMMaker.oscog-eem.1005 =============== Item was changed: ----- Method: StackInterpreter>>findUnwindThroughContext: (in category 'return bytecodes') ----- findUnwindThroughContext: homeContext "Search for either an unwind-protect (activation of method with primitive 198) or homeContext along the sender chain, which ever is found first. Return values: 0 home context was found on sender chain with no intervening unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found" | onSamePage ctxtOrNilOrZero theMethod | + "Almost always (98%) the home is on the same page, in which case we know it will be found." - "Almost always (98%) the home is on the same page." onSamePage := (self isStillMarriedContext: homeContext) and: [(stackPages pageIndexFor: framePointer) = (stackPages pageIndexFor: (self frameOfMarriedContext: homeContext))]. + "Since nothing changes we don't need to internalize." ctxtOrNilOrZero := self findMethodWithPrimitive: 198 FromFP: framePointer UpToContext: homeContext. + self deny: (onSamePage and: [ctxtOrNilOrZero = objectMemory nilObject]). + + ctxtOrNilOrZero = 0 ifTrue: - (onSamePage or: [ctxtOrNilOrZero = 0]) ifTrue: [theMethod := objectMemory fetchPointer: MethodIndex ofObject: homeContext. (self primitiveIndexOf: theMethod) = 198 ifTrue: + [^homeContext]]. + + "If an unwind was found, can the home context be found also? No need to look if on the same page. + No need to look if cannot return (ctxtOrNilOrZero = objectMemory nilObject)" + (onSamePage + or: [ctxtOrNilOrZero = objectMemory nilObject]) ifFalse: - [^homeContext]. - self assert: ctxtOrNilOrZero ~= objectMemory nilObject. - ^ctxtOrNilOrZero]. - "If an unwnd was found, can the home context be found also?" - ctxtOrNilOrZero ~= objectMemory nilObject ifTrue: [(self findMethodWithPrimitive: 0 FromContext: ctxtOrNilOrZero UpToContext: homeContext) = objectMemory nilObject ifTrue: [^objectMemory nilObject]]. ^ctxtOrNilOrZero!

1 0

VM Maker: VMMaker.oscog-eem.1005.mcz
by commits＠source.squeak.org 01 Jan '15

01 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1005.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1005 Author: eem Time: 1 January 2015, 1:17:34.558 pm UUID: 60586ca3-d2d0-4b96-b7e0-7956eb990e3c Ancestors: VMMaker.oscog-eem.1004 Fix stupid regression in findUnwindThroughContext:. Minor streamline to commonReturn in CoInterpreter. Add range check for 64-bit SmallInteger to Float conversion since in 64-bits this can overflow the exact float range. =============== Diff against VMMaker.oscog-eem.1004 =============== Item was changed: ----- Method: Spur64BitMemoryManager>>loadFloatOrIntFrom: (in category 'interpreter access') ----- loadFloatOrIntFrom: floatOrIntOop "If floatOrInt is an integer, then convert it to a C double float and return it. If it is a Float, then load its value and return it. Otherwise fail -- ie return with primErrorCode non-zero." <inline: true> <returnTypeC: #double> + | result tagBits shift | - | result tagBits | <var: #result type: #double> (tagBits := floatOrIntOop bitAnd: self tagMask) ~= 0 ifTrue: [tagBits = self smallFloatTag ifTrue: [^self smallFloatValueOf: floatOrIntOop]. + (tagBits = self smallIntegerTag + and: [shift := 64 - self numTagBits - self smallFloatMantissaBits. + (self cCode: [floatOrIntOop << shift] + inSmalltalk: [floatOrIntOop << shift bitAnd: 1 << 64 - 1]) >> shift = floatOrIntOop]) ifTrue: - tagBits = self smallIntegerTag ifTrue: [^(self integerValueOf: floatOrIntOop) asFloat]] ifFalse: [(self classIndexOf: floatOrIntOop) = ClassFloatCompactIndex ifTrue: [self cCode: '' inSmalltalk: [result := Float new: 2]. self fetchFloatAt: floatOrIntOop + self baseHeaderSize into: result. ^result]]. coInterpreter primitiveFail. ^0.0! Item was changed: ----- Method: StackInterpreter>>commonReturn (in category 'return bytecodes') ----- commonReturn "Do an ^-return (return from method), checking for unwinds if this is a block activation. Note: Assumed to be inlined into the dispatch loop." <sharedCodeInCase: #returnReceiver> | closure home unwindContextOrNilOrZero frameToReturnTo contextToReturnTo theFP callerFP newPage | <var: #frameToReturnTo type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #newPage type: #'StackPage *'> <var: #thePage type: #'StackPage *'> "If this is a method simply return to the sender/caller." + (self iframeIsBlockActivation: localFP) ifFalse: - (self frameIsBlockActivation: localFP) ifFalse: [^self commonCallerReturn]. "Since this is a block activation the closure is on the stack above any args and the frame." closure := self pushedReceiverOrClosureOfFrame: localFP. home := nil. "Walk the closure's lexical chain to find the context or frame to return from (home)." [closure ~= objectMemory nilObject] whileTrue: [home := objectMemory followField: ClosureOuterContextIndex ofObject: closure. closure := objectMemory followField: ClosureIndex ofObject: home]. "home is to be returned from provided there is no unwind-protect activation between this frame and home's sender. Search for an unwind. findUnwindThroughContext: will answer either the context for an unwind-protect activation or nilObj if the sender cannot be found or 0 if no unwind is found but the sender is. We must update the current page's headFrame pointers to enable the search to identify widowed contexts correctly." self writeBackHeadFramePointers. self externalizeIPandSP. unwindContextOrNilOrZero := self findUnwindThroughContext: home. unwindContextOrNilOrZero = objectMemory nilObject ifTrue: ["error: can't find home on chain; cannot return" ^self internalCannotReturn: localReturnValue]. unwindContextOrNilOrZero ~= 0 ifTrue: [^self internalAboutToReturn: localReturnValue through: unwindContextOrNilOrZero]. "Now we know home is on the sender chain. We could be returning to either a context or a frame. Find out which." contextToReturnTo := nil. (self isMarriedOrWidowedContext: home) ifTrue: [self assert: (self checkIsStillMarriedContext: home currentFP: localFP). theFP := self frameOfMarriedContext: home. (self isBaseFrame: theFP) ifTrue: [contextToReturnTo := self frameCallerContext: theFP] ifFalse: [frameToReturnTo := self frameCallerFP: theFP]] ifFalse: [contextToReturnTo := objectMemory fetchPointer: SenderIndex ofObject: home. ((objectMemory isContext: contextToReturnTo) and: [self isMarriedOrWidowedContext: contextToReturnTo]) ifTrue: [self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP). frameToReturnTo := self frameOfMarriedContext: contextToReturnTo. contextToReturnTo := nil]]. "If returning to a context we must make a frame for it unless it is dead." contextToReturnTo ~= nil ifTrue: [frameToReturnTo := self establishFrameForContextToReturnTo: contextToReturnTo. frameToReturnTo == 0 ifTrue: ["error: home's sender is dead; cannot return" ^self internalCannotReturn: localReturnValue]]. "Now we have a frame to return to. If it is on a different page we must free intervening pages and nil out intervening contexts. We must free intervening stack pages because if we leave the pages to be divorced then their contexts will be divorced with intact senders and instruction pointers. This + code is similar to primitiveTerminateTo. We must move any frames on intervening pages above the - code is similar to primitiveTerminateTo. We must move any frames on itervening pages above the frame linked to because these may be in use, e.g. via co-routining (see baseFrameReturn)." self assert: stackPages pageListIsWellFormed. newPage := stackPages stackPageFor: frameToReturnTo. newPage ~~ stackPage ifTrue: [| currentCtx thePage nextCntx | currentCtx := self frameCallerContext: stackPage baseFP. stackPages freeStackPage: stackPage. [self assert: (objectMemory isContext: currentCtx). (self isMarriedOrWidowedContext: currentCtx) and: [(stackPages stackPageFor: (theFP := self frameOfMarriedContext: currentCtx)) = newPage]] whileFalse: [(self isMarriedOrWidowedContext: currentCtx) ifTrue: [thePage := stackPages stackPageFor: theFP. theFP ~= thePage headFP ifTrue: ["Since we've just deallocated a page we know that newStackPage won't deallocate an existing one." self moveFramesIn: thePage through: (self findFrameAbove: theFP inPage: thePage) toPage: self newStackPage]. currentCtx := self frameCallerContext: thePage baseFP. stackPages freeStackPage: thePage] ifFalse: [nextCntx := objectMemory fetchPointer: SenderIndex ofObject: currentCtx. self markContextAsDead: currentCtx. currentCtx := nextCntx]]. self setStackPageAndLimit: newPage. localSP := stackPage headSP. localFP := stackPage headFP]. "Two cases. Returning to the top frame on a new page or an interior frame on the current page. The top frame has its instruction pointer on top of stack. An interior frame has its instruction pointer in the caller frame. We need to peel back any frames on the page until we get to the correct frame." localFP = frameToReturnTo ifTrue: "pop the saved IP, push the return value and continue." [localIP := self pointerForOop: self internalStackTop] ifFalse: [[callerFP := localFP. localFP := self frameCallerFP: localFP. localFP ~~ frameToReturnTo] whileTrue. localIP := self frameCallerSavedIP: callerFP. localSP := (self frameCallerSP: callerFP) - objectMemory wordSize]. self maybeReturnToMachineCodeFrame. self setMethod: (self frameMethod: localFP). self fetchNextBytecode. self internalStackTopPut: localReturnValue! Item was changed: ----- Method: StackInterpreter>>findUnwindThroughContext: (in category 'return bytecodes') ----- findUnwindThroughContext: homeContext "Search for either an unwind-protect (activation of method with primitive 198) or homeContext along the sender chain, which ever is found first. Return values: 0 home context was found on sender chain with no intervening unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found" | onSamePage ctxtOrNilOrZero theMethod | "Almost always (98%) the home is on the same page." onSamePage := (self isStillMarriedContext: homeContext) and: [(stackPages pageIndexFor: framePointer) = (stackPages pageIndexFor: (self frameOfMarriedContext: homeContext))]. "Since nothing changes we don't need to internalize." ctxtOrNilOrZero := self findMethodWithPrimitive: 198 FromFP: framePointer UpToContext: homeContext. (onSamePage or: [ctxtOrNilOrZero = 0]) ifTrue: [theMethod := objectMemory fetchPointer: MethodIndex ofObject: homeContext. (self primitiveIndexOf: theMethod) = 198 ifTrue: [^homeContext]. + self assert: ctxtOrNilOrZero ~= objectMemory nilObject. + ^ctxtOrNilOrZero]. + "If an unwnd was found, can the home context be found also?" + ctxtOrNilOrZero ~= objectMemory nilObject ifTrue: - ^0]. - "Found an unwind. Can the home context be found also?" - ctxtOrNilOrZero = objectMemory nilObject ifFalse: [(self findMethodWithPrimitive: 0 FromContext: ctxtOrNilOrZero UpToContext: homeContext) = objectMemory nilObject ifTrue: [^objectMemory nilObject]]. ^ctxtOrNilOrZero! Item was added: + ----- Method: StackInterpreter>>iframeIsBlockActivation: (in category 'frame access') ----- + iframeIsBlockActivation: theFP "<Integer>" + ^self frameIsBlockActivation: theFP!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2015