Revision: 3692
Author: eliot
Date: 2016-05-01 22:12:46 -0700 (Sun, 01 May 2016)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1855
Fix primitiveIsPinned.
Modified Paths:
--------------
branches/Cog/nsspur64src/vm/cogit.h
branches/Cog/nsspur64src/vm/cointerp.c
branches/Cog/nsspur64src/vm/cointerp.h
branches/Cog/nsspur64src/vm/gcc3x-cointerp.c
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/spur64src/vm/cogit.h
branches/Cog/spur64src/vm/cointerp.c
branches/Cog/spur64src/vm/cointerp.h
branches/Cog/spur64src/vm/gcc3x-cointerp.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/nsspur64src/vm/cogit.h
===================================================================
--- branches/Cog/nsspur64src/vm/cogit.h 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspur64src/vm/cogit.h 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGenerator VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
Modified: branches/Cog/nsspur64src/vm/cointerp.c
===================================================================
--- branches/Cog/nsspur64src/vm/cointerp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspur64src/vm/cointerp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2436,7 +2436,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-nice.1853";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1855";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -35464,7 +35464,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -35473,11 +35472,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
@@ -41193,7 +41189,7 @@
sqInt oopRcvr;
sqInt oopResult;
usqLong result;
- int resultIsNegative;
+ sqInt resultIsNegative;
char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -61366,7 +61362,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -67422,7 +67418,7 @@
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
usqInt numSlots;
usqInt numSlots1;
SpurSegmentInfo *seg;
@@ -67765,8 +67761,8 @@
{
usqLong firstSavedBridgeWord;
sqInt nWritten;
- usqInt pier1;
- usqInt pier2;
+ sqInt pier1;
+ sqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/nsspur64src/vm/cointerp.h
===================================================================
--- branches/Cog/nsspur64src/vm/cointerp.h 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspur64src/vm/cointerp.h 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2439,7 +2439,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-nice.1853";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1855";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -35473,7 +35473,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -35482,11 +35481,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
@@ -41202,7 +41198,7 @@
sqInt oopRcvr;
sqInt oopResult;
usqLong result;
- int resultIsNegative;
+ sqInt resultIsNegative;
char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -61375,7 +61371,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -67431,7 +67427,7 @@
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
usqInt numSlots;
usqInt numSlots1;
SpurSegmentInfo *seg;
@@ -67774,8 +67770,8 @@
{
usqLong firstSavedBridgeWord;
sqInt nWritten;
- usqInt pier1;
- usqInt pier2;
+ sqInt pier1;
+ sqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspursrc/vm/cogit.h 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGenerator VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2412,7 +2412,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-nice.1853";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1855";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -35501,7 +35501,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -35510,11 +35509,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
@@ -40377,7 +40373,7 @@
sqInt oopRcvr;
sqInt oopResult;
usqLong result;
- int resultIsNegative;
+ sqInt resultIsNegative;
char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -42188,7 +42184,7 @@
sqInt fmt;
usqInt instBytes;
sqInt instFormat;
- sqInt newFormat;
+ usqInt newFormat;
sqInt normalizedInstFormat;
usqInt numBytes;
usqInt numSlots;
@@ -60300,7 +60296,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -66096,7 +66092,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- sqInt clifton;
+ usqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -66277,7 +66273,7 @@
static void
postSnapshot(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt address;
+ usqInt address;
sqInt bytes;
usqInt freeChunk;
sqInt i;
@@ -66683,8 +66679,8 @@
{
usqLong firstSavedBridgeWord;
sqInt nWritten;
- sqInt pier1;
- sqInt pier2;
+ usqInt pier1;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2415,7 +2415,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-nice.1853";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1855";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -35510,7 +35510,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -35519,11 +35518,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
@@ -40386,7 +40382,7 @@
sqInt oopRcvr;
sqInt oopResult;
usqLong result;
- int resultIsNegative;
+ sqInt resultIsNegative;
char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -42197,7 +42193,7 @@
sqInt fmt;
usqInt instBytes;
sqInt instFormat;
- sqInt newFormat;
+ usqInt newFormat;
sqInt normalizedInstFormat;
usqInt numBytes;
usqInt numSlots;
@@ -60309,7 +60305,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -66105,7 +66101,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- sqInt clifton;
+ usqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -66286,7 +66282,7 @@
static void
postSnapshot(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt address;
+ usqInt address;
sqInt bytes;
usqInt freeChunk;
sqInt i;
@@ -66692,8 +66688,8 @@
{
usqLong firstSavedBridgeWord;
sqInt nWritten;
- sqInt pier1;
- sqInt pier2;
+ usqInt pier1;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2178,7 +2178,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-nice.1853";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1855";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -21795,7 +21795,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -21804,11 +21803,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
Modified: branches/Cog/nsspurstack64src/vm/interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/interp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspurstack64src/vm/interp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2175,7 +2175,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-nice.1853";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1855";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -21786,7 +21786,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -21795,11 +21794,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2155,7 +2155,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-nice.1853";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1855";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -21521,7 +21521,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -21530,11 +21529,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2152,7 +2152,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-nice.1853";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1855";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -21512,7 +21512,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -21521,11 +21520,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Sat Apr 30 10:56:28 PDT 2016
+ Sun May 1 22:11:41 PDT 2016
Modified: branches/Cog/spur64src/vm/cogit.h
===================================================================
--- branches/Cog/spur64src/vm/cogit.h 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spur64src/vm/cogit.h 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGenerator VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
Modified: branches/Cog/spur64src/vm/cointerp.c
===================================================================
--- branches/Cog/spur64src/vm/cointerp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spur64src/vm/cointerp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1588,8 +1588,8 @@
_iss usqInt newSpaceLimit;
_iss char * stackBasePlus1;
_iss sqInt weaklingStack;
-_iss sqInt trueObj;
_iss SpurSegmentInfo * segments;
+_iss sqInt trueObj;
_iss usqInt newSpaceStart;
_iss sqInt hiddenRootsObj;
_iss sqInt falseObj;
@@ -2399,7 +2399,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-nice.1853]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1855]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -12152,7 +12152,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -29481,7 +29481,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -29490,11 +29489,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
@@ -41089,7 +41085,7 @@
sqInt effectsFlags1;
sqInt errCode;
sqInt fieldOffset;
- usqInt fieldOffset1;
+ sqInt fieldOffset1;
sqInt fmt;
sqInt hash;
sqInt header;
@@ -55356,7 +55352,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -61148,7 +61144,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- sqInt clifton;
+ usqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -61329,7 +61325,7 @@
static void
postSnapshot(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt address;
+ usqInt address;
sqInt bytes;
usqInt freeChunk;
sqInt i;
@@ -61392,7 +61388,7 @@
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
usqInt numSlots;
usqInt numSlots1;
SpurSegmentInfo *seg;
@@ -61735,8 +61731,8 @@
{
usqLong firstSavedBridgeWord;
sqInt nWritten;
- sqInt pier1;
- sqInt pier2;
+ usqInt pier1;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/spur64src/vm/cointerp.h
===================================================================
--- branches/Cog/spur64src/vm/cointerp.h 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spur64src/vm/cointerp.h 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
Modified: branches/Cog/spur64src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spur64src/vm/gcc3x-cointerp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spur64src/vm/gcc3x-cointerp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1591,8 +1591,8 @@
_iss usqInt newSpaceLimit;
_iss char * stackBasePlus1;
_iss sqInt weaklingStack;
-_iss sqInt trueObj;
_iss SpurSegmentInfo * segments;
+_iss sqInt trueObj;
_iss usqInt newSpaceStart;
_iss sqInt hiddenRootsObj;
_iss sqInt falseObj;
@@ -2402,7 +2402,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-nice.1853]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1855]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -12161,7 +12161,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -29490,7 +29490,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -29499,11 +29498,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
@@ -41098,7 +41094,7 @@
sqInt effectsFlags1;
sqInt errCode;
sqInt fieldOffset;
- usqInt fieldOffset1;
+ sqInt fieldOffset1;
sqInt fmt;
sqInt hash;
sqInt header;
@@ -55365,7 +55361,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -61157,7 +61153,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- sqInt clifton;
+ usqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -61338,7 +61334,7 @@
static void
postSnapshot(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt address;
+ usqInt address;
sqInt bytes;
usqInt freeChunk;
sqInt i;
@@ -61401,7 +61397,7 @@
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
usqInt numSlots;
usqInt numSlots1;
SpurSegmentInfo *seg;
@@ -61744,8 +61740,8 @@
{
usqLong firstSavedBridgeWord;
sqInt nWritten;
- sqInt pier1;
- sqInt pier2;
+ usqInt pier1;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spursistasrc/vm/cogit.h 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGenerator VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2396,7 +2396,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-nice.1853]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1855]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -27851,7 +27851,7 @@
sqInt ccIndex1;
sqInt fmt;
sqInt ok;
- int smallIntValue;
+ sqInt smallIntValue;
sqInt sz;
usqLong value;
@@ -29795,7 +29795,7 @@
sqInt oopRcvr;
sqInt oopResult;
usqLong result;
- int shift;
+ sqInt shift;
char *sp;
/* begin stackIntegerValue: */
@@ -29810,7 +29810,7 @@
if (!GIV(primFailCode)) {
GIV(primFailCode) = 1;
}
- shift = ((sqInt) 0);
+ shift = 0;
goto l1;
}
l1: /* end stackIntegerValue: */;
@@ -35622,7 +35622,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -35631,11 +35630,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
@@ -40471,7 +40467,7 @@
sqInt oopRcvr;
sqInt oopResult;
usqLong result;
- sqInt resultIsNegative;
+ int resultIsNegative;
char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -46304,7 +46300,7 @@
sqInt effectsFlags1;
sqInt errCode;
sqInt fieldOffset;
- usqInt fieldOffset1;
+ sqInt fieldOffset1;
sqInt fmt;
sqInt hash;
sqInt header;
@@ -66791,8 +66787,8 @@
{
usqLong firstSavedBridgeWord;
sqInt nWritten;
- usqInt pier1;
- usqInt pier2;
+ sqInt pier1;
+ sqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2399,7 +2399,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-nice.1853]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1855]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -27860,7 +27860,7 @@
sqInt ccIndex1;
sqInt fmt;
sqInt ok;
- int smallIntValue;
+ sqInt smallIntValue;
sqInt sz;
usqLong value;
@@ -29804,7 +29804,7 @@
sqInt oopRcvr;
sqInt oopResult;
usqLong result;
- int shift;
+ sqInt shift;
char *sp;
/* begin stackIntegerValue: */
@@ -29819,7 +29819,7 @@
if (!GIV(primFailCode)) {
GIV(primFailCode) = 1;
}
- shift = ((sqInt) 0);
+ shift = 0;
goto l1;
}
l1: /* end stackIntegerValue: */;
@@ -35631,7 +35631,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -35640,11 +35639,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
@@ -40480,7 +40476,7 @@
sqInt oopRcvr;
sqInt oopResult;
usqLong result;
- sqInt resultIsNegative;
+ int resultIsNegative;
char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -46313,7 +46309,7 @@
sqInt effectsFlags1;
sqInt errCode;
sqInt fieldOffset;
- usqInt fieldOffset1;
+ sqInt fieldOffset1;
sqInt fmt;
sqInt hash;
sqInt header;
@@ -66800,8 +66796,8 @@
{
usqLong firstSavedBridgeWord;
sqInt nWritten;
- usqInt pier1;
- usqInt pier2;
+ sqInt pier1;
+ sqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spursrc/vm/cogit.h 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGenerator VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spursrc/vm/cointerp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2375,7 +2375,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-nice.1853]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1855]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -22844,7 +22844,7 @@
sqInt ccIndex1;
sqInt fmt;
sqInt ok;
- int smallIntValue;
+ sqInt smallIntValue;
sqInt sz;
usqLong value;
@@ -29835,7 +29835,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -29844,11 +29843,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
@@ -36495,7 +36491,7 @@
sqInt fmt;
usqInt instBytes;
sqInt instFormat;
- sqInt newFormat;
+ usqInt newFormat;
sqInt normalizedInstFormat;
usqInt numBytes;
usqInt numSlots;
@@ -40517,7 +40513,7 @@
sqInt effectsFlags1;
sqInt errCode;
sqInt fieldOffset;
- usqInt fieldOffset1;
+ sqInt fieldOffset1;
sqInt fmt;
sqInt hash;
sqInt header;
@@ -54607,7 +54603,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spursrc/vm/cointerp.h 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2378,7 +2378,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-nice.1853]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1855]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -22853,7 +22853,7 @@
sqInt ccIndex1;
sqInt fmt;
sqInt ok;
- int smallIntValue;
+ sqInt smallIntValue;
sqInt sz;
usqLong value;
@@ -29844,7 +29844,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -29853,11 +29852,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
@@ -36504,7 +36500,7 @@
sqInt fmt;
usqInt instBytes;
sqInt instFormat;
- sqInt newFormat;
+ usqInt newFormat;
sqInt normalizedInstFormat;
usqInt numBytes;
usqInt numSlots;
@@ -40526,7 +40522,7 @@
sqInt effectsFlags1;
sqInt errCode;
sqInt fieldOffset;
- usqInt fieldOffset1;
+ sqInt fieldOffset1;
sqInt fmt;
sqInt hash;
sqInt header;
@@ -54616,7 +54612,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2142,7 +2142,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-nice.1853]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1855]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -16685,7 +16685,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -16694,11 +16693,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
Modified: branches/Cog/spurstack64src/vm/interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/interp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spurstack64src/vm/interp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2139,7 +2139,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-nice.1853]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1855]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -16676,7 +16676,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt obj;
char *sp;
- sqInt trueOrFalse;
obj = longAt(GIV(stackPointer));
if ((obj & (tagMask()))
@@ -16685,11 +16684,8 @@
return;
}
/* begin pop:thenPushBool: */
- trueOrFalse = (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
+ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((((usqInt) (longAt(obj))) >> 30) & 1) != 0
? GIV(trueObj)
- : GIV(falseObj));
- longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse
- ? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
}
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2016-05-01 14:39:20 UTC (rev 3691)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2016-05-02 05:12:46 UTC (rev 3692)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
from
- StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e
+ StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ;
@@ Diff output truncated at 50000 characters. @@
