Revision: 3572 Author: eliot Date: 2016-01-24 20:18:14 -0800 (Sun, 24 Jan 2016) Log Message: ----------- CogVm source as per VMMaker.oscog-eem.1669
Fix regression in StackInterpreters from VMMaker.oscog-eem.1665. It's primitiveFail, not primitiveFailed...
Modified Paths: -------------- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-01-25 03:02:30 UTC (rev 3571) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-01-25 04:18:14 UTC (rev 3572) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae from - StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2177,7 +2177,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1668"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1669"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -8658,7 +8658,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l69; } if ((fmt1 == (indexablePointersFormat())) @@ -8727,7 +8730,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l65; } /* begin lengthOf:format: */ @@ -8916,7 +8922,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l79; } if ((fmt1 == (indexablePointersFormat())) @@ -8985,7 +8994,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l75; } /* begin lengthOf:format: */ @@ -11485,7 +11497,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l140; } if ((fmt1 == (indexablePointersFormat())) @@ -11554,7 +11569,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l136; } /* begin lengthOf:format: */ @@ -11743,7 +11761,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l150; } if ((fmt1 == (indexablePointersFormat())) @@ -11812,7 +11833,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l146; } /* begin lengthOf:format: */
Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2016-01-25 03:02:30 UTC (rev 3571) +++ branches/Cog/nsspurstack64src/vm/interp.c 2016-01-25 04:18:14 UTC (rev 3572) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae from - StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2174,7 +2174,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1668"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1669"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -8649,7 +8649,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l69; } if ((fmt1 == (indexablePointersFormat())) @@ -8718,7 +8721,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l65; } /* begin lengthOf:format: */ @@ -8907,7 +8913,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l79; } if ((fmt1 == (indexablePointersFormat())) @@ -8976,7 +8985,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l75; } /* begin lengthOf:format: */ @@ -11476,7 +11488,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l140; } if ((fmt1 == (indexablePointersFormat())) @@ -11545,7 +11560,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l136; } /* begin lengthOf:format: */ @@ -11734,7 +11752,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l150; } if ((fmt1 == (indexablePointersFormat())) @@ -11803,7 +11824,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l146; } /* begin lengthOf:format: */
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-01-25 03:02:30 UTC (rev 3571) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-01-25 04:18:14 UTC (rev 3572) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae from - StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2147,7 +2147,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1668"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1669"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -8294,7 +8294,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l92; } if ((fmt1 == (indexablePointersFormat())) @@ -8363,7 +8366,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l87; } /* begin lengthOf:format: */ @@ -8600,7 +8606,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l103; } if ((fmt1 == (indexablePointersFormat())) @@ -8669,7 +8678,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l99; } /* begin lengthOf:format: */ @@ -10843,7 +10855,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l187; } if ((fmt1 == (indexablePointersFormat())) @@ -10912,7 +10927,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l182; } /* begin lengthOf:format: */ @@ -11149,7 +11167,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l198; } if ((fmt1 == (indexablePointersFormat())) @@ -11218,7 +11239,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l194; } /* begin lengthOf:format: */ @@ -37775,7 +37799,7 @@ static sqInt imageSegmentVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - int wholeWord; + sqInt wholeWord;
/* first data word, 'does' */ @@ -54727,7 +54751,7 @@ sqInt slotBytes4; sqInt stopAddr; sqInt swapFloatWords; - int temp; + sqInt temp; sqInt temp1; sqInt wordAddr;
@@ -65416,7 +65440,7 @@ sqInt displayObj; sqInt primFailCodeValue; sqInt ptr; - int reversed; + sqInt reversed; sqInt w; sqInt wordEndIndex; sqInt wordStartIndex;
Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2016-01-25 03:02:30 UTC (rev 3571) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2016-01-25 04:18:14 UTC (rev 3572) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae from - StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2144,7 +2144,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1668"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1669"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -8285,7 +8285,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l92; } if ((fmt1 == (indexablePointersFormat())) @@ -8354,7 +8357,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l87; } /* begin lengthOf:format: */ @@ -8591,7 +8597,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l103; } if ((fmt1 == (indexablePointersFormat())) @@ -8660,7 +8669,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l99; } /* begin lengthOf:format: */ @@ -10834,7 +10846,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l187; } if ((fmt1 == (indexablePointersFormat())) @@ -10903,7 +10918,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l182; } /* begin lengthOf:format: */ @@ -11140,7 +11158,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l198; } if ((fmt1 == (indexablePointersFormat())) @@ -11209,7 +11230,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l194; } /* begin lengthOf:format: */ @@ -37766,7 +37790,7 @@ static sqInt imageSegmentVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - int wholeWord; + sqInt wholeWord;
/* first data word, 'does' */ @@ -54718,7 +54742,7 @@ sqInt slotBytes4; sqInt stopAddr; sqInt swapFloatWords; - int temp; + sqInt temp; sqInt temp1; sqInt wordAddr;
@@ -65407,7 +65431,7 @@ sqInt displayObj; sqInt primFailCodeValue; sqInt ptr; - int reversed; + sqInt reversed; sqInt w; sqInt wordEndIndex; sqInt wordStartIndex;
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Jan 24 18:56:46 PST 2016 + Sun Jan 24 20:17:37 PST 2016
Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2016-01-25 03:02:30 UTC (rev 3571) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2016-01-25 04:18:14 UTC (rev 3572) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae from - StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2141,7 +2141,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1668]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1669]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -9783,7 +9783,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l69; } if ((fmt1 == (indexablePointersFormat())) @@ -9852,7 +9855,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l65; } /* begin lengthOf:format: */ @@ -10048,7 +10054,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l79; } if ((fmt1 == (indexablePointersFormat())) @@ -10117,7 +10126,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l75; } /* begin lengthOf:format: */
Modified: branches/Cog/spurstack64src/vm/interp.c =================================================================== --- branches/Cog/spurstack64src/vm/interp.c 2016-01-25 03:02:30 UTC (rev 3571) +++ branches/Cog/spurstack64src/vm/interp.c 2016-01-25 04:18:14 UTC (rev 3572) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae from - StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2138,7 +2138,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1668]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1669]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -9774,7 +9774,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l69; } if ((fmt1 == (indexablePointersFormat())) @@ -9843,7 +9846,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l65; } /* begin lengthOf:format: */ @@ -10039,7 +10045,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l79; } if ((fmt1 == (indexablePointersFormat())) @@ -10108,7 +10117,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l75; } /* begin lengthOf:format: */
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2016-01-25 03:02:30 UTC (rev 3571) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2016-01-25 04:18:14 UTC (rev 3572) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae from - StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2111,7 +2111,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1668]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1669]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -9419,7 +9419,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l92; } if ((fmt1 == (indexablePointersFormat())) @@ -9488,7 +9491,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l87; } /* begin lengthOf:format: */ @@ -9732,7 +9738,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l103; } if ((fmt1 == (indexablePointersFormat())) @@ -9801,7 +9810,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l99; } /* begin lengthOf:format: */
Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2016-01-25 03:02:30 UTC (rev 3571) +++ branches/Cog/spurstacksrc/vm/interp.c 2016-01-25 04:18:14 UTC (rev 3572) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae from - StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2108,7 +2108,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1668]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1669]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -9410,7 +9410,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l92; } if ((fmt1 == (indexablePointersFormat())) @@ -9479,7 +9482,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l87; } /* begin lengthOf:format: */ @@ -9723,7 +9729,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); if (((fmt1 >= (firstShortFormat())) && (fmt1 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l103; } if ((fmt1 == (indexablePointersFormat())) @@ -9792,7 +9801,10 @@ /* For now the AtCache code doesn't support 16-bit indexability. */ fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); if (((fmt2 >= (firstShortFormat())) && (fmt2 <= ((firstByteFormat()) - 1)))) { - primitiveFailed(); + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } goto l99; } /* begin lengthOf:format: */
Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/stacksrc/vm/gcc3x-interp.c 2016-01-25 03:02:30 UTC (rev 3571) +++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2016-01-25 04:18:14 UTC (rev 3572) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae from - StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -1876,7 +1876,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1668]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1669]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
Modified: branches/Cog/stacksrc/vm/interp.c =================================================================== --- branches/Cog/stacksrc/vm/interp.c 2016-01-25 03:02:30 UTC (rev 3571) +++ branches/Cog/stacksrc/vm/interp.c 2016-01-25 04:18:14 UTC (rev 3572) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae from - StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -1873,7 +1873,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1668]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1669]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
vm-dev@lists.squeakfoundation.org