[Vm-dev] [commit][3430] CogVM source as per VMMaker.oscog-eem.1447
commits at squeakvm.org
commits at squeakvm.org
Tue Sep 1 19:13:24 UTC 2015
Revision: 3430
Author: eliot
Date: 2015-09-01 12:13:23 -0700 (Tue, 01 Sep 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1447
Whoops! Several of the flags were inverted when computing the flag word
written to the image header. Also, queueMourner: must check for an empty
or full queue.
Modified Paths:
--------------
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
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/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/cogit.h
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/cogit.h
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGenerator VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2414,7 +2414,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1446";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1447";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -63331,6 +63331,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -65136,7 +65137,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- usqInt clifton;
+ sqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -65377,7 +65378,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -78773,8 +78774,8 @@
: 0))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f);
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2417,7 +2417,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1446";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1447";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -63340,6 +63340,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -65145,7 +65146,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- usqInt clifton;
+ sqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -65386,7 +65387,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -78782,8 +78783,8 @@
: 0))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f);
Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2179,7 +2179,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1446";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1447";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -52286,6 +52286,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -71414,8 +71415,8 @@
: 2))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile(GIV(theUnknownShort), f);
Modified: branches/Cog/nsspurstack64src/vm/interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/interp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/nsspurstack64src/vm/interp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2176,7 +2176,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1446";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1447";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -52277,6 +52277,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -71405,8 +71406,8 @@
: 2))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile(GIV(theUnknownShort), f);
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2150,7 +2150,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1446";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1447";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -48069,6 +48069,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -67215,8 +67216,8 @@
: 2))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile(GIV(theUnknownShort), f);
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __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.1446";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1447";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -48060,6 +48060,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -67206,8 +67207,8 @@
: 2))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile(GIV(theUnknownShort), f);
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Mon Aug 31 14:04:28 PDT 2015
+ Tue Sep 1 12:12:00 PDT 2015
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spursistasrc/vm/cogit.h 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGenerator VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2389,7 +2389,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1447]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -61883,6 +61883,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -63695,7 +63696,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- sqInt clifton;
+ usqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -63936,7 +63937,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -64040,7 +64041,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt bridge;
+ usqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
@@ -64256,7 +64257,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -76444,8 +76445,8 @@
: 0))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f);
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2392,7 +2392,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1447]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -61892,6 +61892,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -63704,7 +63705,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- sqInt clifton;
+ usqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -63945,7 +63946,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -64049,7 +64050,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt bridge;
+ usqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
@@ -64265,7 +64266,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -76453,8 +76454,8 @@
: 0))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f);
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spursrc/vm/cogit.h 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGenerator VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spursrc/vm/cointerp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2376,7 +2376,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1447]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -12288,7 +12288,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt accessorDepth;
+ signed char accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -56798,6 +56798,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -58600,7 +58601,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- usqInt clifton;
+ sqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -58841,7 +58842,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -71314,8 +71315,8 @@
: 0))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f);
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spursrc/vm/cointerp.h 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2379,7 +2379,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1447]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -12297,7 +12297,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt accessorDepth;
+ signed char accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -56807,6 +56807,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -58609,7 +58610,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- usqInt clifton;
+ sqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -58850,7 +58851,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -71323,8 +71324,8 @@
: 0))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f);
Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2143,7 +2143,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1447]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -46888,6 +46888,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -65099,8 +65100,8 @@
: 2))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile(GIV(theUnknownShort), f);
Modified: branches/Cog/spurstack64src/vm/interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/interp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spurstack64src/vm/interp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2140,7 +2140,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1447]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -46879,6 +46879,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -65090,8 +65091,8 @@
: 2))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile(GIV(theUnknownShort), f);
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2114,7 +2114,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1447]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -42984,6 +42984,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -61205,8 +61206,8 @@
: 2))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile(GIV(theUnknownShort), f);
Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/spurstacksrc/vm/interp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __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.1446]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1447]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -42975,6 +42975,7 @@
&& (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat()))
|| ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat()))));
assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)))));
+ ensureRoomOnObjStackAt(MournQueueRootIndex);
pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue));
if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) {
/* begin setFormatOf:to: */
@@ -61196,8 +61197,8 @@
: 2))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile(GIV(theUnknownShort), f);
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/src/vm/cogit.h 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGenerator VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/src/vm/cointerp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2109,7 +2109,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1447]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -33965,7 +33965,7 @@
sqInt newEndOfMemory;
usqInt p;
usqInt start;
- usqInt totalReserve;
+ sqInt totalReserve;
fwdBlockBytes = GIV(totalObjectCount) & ((WordMask - BytesPerWord) + 1);
totalReserve = fwdBlockBytes + (interpreterAllocationReserveBytes());
@@ -50713,8 +50713,8 @@
: 0))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f);
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/src/vm/cointerp.h 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/src/vm/cointerpmt.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- CoInterpreterMT VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CoInterpreterMT VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2208,7 +2208,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1447]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -36448,7 +36448,7 @@
sqInt newEndOfMemory;
usqInt p;
usqInt start;
- sqInt totalReserve;
+ usqInt totalReserve;
fwdBlockBytes = GIV(totalObjectCount) & ((WordMask - BytesPerWord) + 1);
totalReserve = fwdBlockBytes + (interpreterAllocationReserveBytes());
@@ -52810,16 +52810,16 @@
putLongtoFile(((((((GIV(fullScreenFlag) + ((VMBIGENDIAN
? 0
: 2))) + ((GIV(processHasThreadId)
- ? 0
- : 4))) + ((GIV(flagInterpretedMethods)
+ ? 4
+ : 0))) + ((GIV(flagInterpretedMethods)
? 8
: 0))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(noThreadingOfGUIThread)
? 32
: 0))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 0x7F) - 0x7F)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 0x7F) - 0x7F)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f);
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/src/vm/cointerpmt.h 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2112,7 +2112,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1447]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -33974,7 +33974,7 @@
sqInt newEndOfMemory;
usqInt p;
usqInt start;
- usqInt totalReserve;
+ sqInt totalReserve;
fwdBlockBytes = GIV(totalObjectCount) & ((WordMask - BytesPerWord) + 1);
totalReserve = fwdBlockBytes + (interpreterAllocationReserveBytes());
@@ -50722,8 +50722,8 @@
: 0))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 91) - 91)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f);
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerpmt.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- CoInterpreterMT VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CoInterpreterMT VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2211,7 +2211,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1447]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -36457,7 +36457,7 @@
sqInt newEndOfMemory;
usqInt p;
usqInt start;
- sqInt totalReserve;
+ usqInt totalReserve;
fwdBlockBytes = GIV(totalObjectCount) & ((WordMask - BytesPerWord) + 1);
totalReserve = fwdBlockBytes + (interpreterAllocationReserveBytes());
@@ -52819,16 +52819,16 @@
putLongtoFile(((((((GIV(fullScreenFlag) + ((VMBIGENDIAN
? 0
: 2))) + ((GIV(processHasThreadId)
- ? 0
- : 4))) + ((GIV(flagInterpretedMethods)
+ ? 4
+ : 0))) + ((GIV(flagInterpretedMethods)
? 8
: 0))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(noThreadingOfGUIThread)
? 32
: 0))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 0x7F) - 0x7F)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 0x7F) - 0x7F)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f);
Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/stacksrc/vm/gcc3x-interp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1877,7 +1877,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1446]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1447]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -42318,8 +42318,8 @@
: 2))) + ((GIV(preemptionYields)
? 0
: 16))) + ((GIV(newFinalization)
- ? 0
- : 64))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
+ ? 64
+ : 0))) + (((GIV(imageHeaderFlags) | 83) - 83)), f);
putWord32toFile(extraVMMemory, f);
putShorttoFile(desiredNumStackPages, f);
putShorttoFile(GIV(theUnknownShort), f);
Modified: branches/Cog/stacksrc/vm/interp.c
===================================================================
--- branches/Cog/stacksrc/vm/interp.c 2015-08-31 21:10:05 UTC (rev 3429)
+++ branches/Cog/stacksrc/vm/interp.c 2015-09-01 19:13:23 UTC (rev 3430)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
from
- StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1
+ StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1447 uuid: 21232acb-44b6-4dc4-a345-108a56a916a8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1874,7 +1874,7 @@
/* 575 */ (void (*)(void))0,
0 };
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list