[Vm-dev] [commit][3164] CogVm source as per VMMaker.oscog-eem.973
commits at squeakvm.org
commits at squeakvm.org
Sun Dec 7 01:38:16 UTC 2014
Revision: 3164
Author: eliot
Date: 2014-12-06 17:38:11 -0800 (Sat, 06 Dec 2014)
Log Message:
-----------
CogVm source as per VMMaker.oscog-eem.973
Fix regression caused by breakmnu changes due to mis-initialization of
breakSelectorLength.
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/sistasrc/vm/cointerp.c
branches/Cog/sistasrc/vm/cointerp.h
branches/Cog/sistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spurstack64src/vm/gcc3x-interp.c
branches/Cog/spurstack64src/vm/interp.c
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1503,8 +1503,8 @@
jmp_buf reenterInterpreter; /* private export */;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
+sqInt breakSelectorLength;
sqInt checkForLeaks;
-sqInt breakSelectorLength = -1;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2098,7 +2098,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.971";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.973";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -19450,6 +19450,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
@@ -273,7 +273,7 @@
/*** Global Variables ***/
char * breakSelector;
-sqInt breakSelectorLength ;
+sqInt breakSelectorLength;
sqInt checkAllocFiller;
sqInt checkForLeaks;
sqInt deferDisplayUpdates;
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1506,8 +1506,8 @@
jmp_buf reenterInterpreter; /* private export */;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
+sqInt breakSelectorLength;
sqInt checkForLeaks;
-sqInt breakSelectorLength = -1;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2101,7 +2101,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.971";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.973";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -19459,6 +19459,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1726,7 +1726,7 @@
sqInt checkForLeaks;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2348,7 +2348,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.971";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.973";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -23858,6 +23858,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
@@ -321,7 +321,7 @@
/*** Global Variables ***/
char * breakSelector;
-sqInt breakSelectorLength ;
+sqInt breakSelectorLength;
sqInt checkAllocFiller;
sqInt checkForLeaks;
sqInt deferDisplayUpdates;
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1729,7 +1729,7 @@
sqInt checkForLeaks;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2351,7 +2351,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.971";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.973";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -23867,6 +23867,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1512,7 +1512,7 @@
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
void * showSurfaceFn;
sqInt deferDisplayUpdates;
struct VirtualMachine* interpreterProxy;
@@ -2097,7 +2097,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.971";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.973";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -60353,6 +60353,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1509,7 +1509,7 @@
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
void * showSurfaceFn;
sqInt deferDisplayUpdates;
struct VirtualMachine* interpreterProxy;
@@ -2094,7 +2094,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.971";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.973";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -60344,6 +60344,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Sat Dec 6 12:28:33 PST 2014
+ Sat Dec 6 17:37:50 PST 2014
Modified: branches/Cog/sistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/sistasrc/vm/cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1500,8 +1500,8 @@
jmp_buf reenterInterpreter; /* private export */;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
+sqInt breakSelectorLength;
sqInt checkForLeaks;
-sqInt breakSelectorLength = -1;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2095,7 +2095,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.973]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -7956,7 +7956,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -8016,7 +8016,7 @@
null;
goto l108;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -10941,7 +10941,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -11001,7 +11001,7 @@
null;
goto l242;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -19459,6 +19459,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
@@ -24591,7 +24592,7 @@
primitiveBitShift(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -24638,7 +24639,7 @@
}
return;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
Modified: branches/Cog/sistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.h 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/sistasrc/vm/cointerp.h 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
@@ -271,7 +271,7 @@
/*** Global Variables ***/
char * breakSelector;
-sqInt breakSelectorLength ;
+sqInt breakSelectorLength;
sqInt checkAllocFiller;
sqInt checkForLeaks;
sqInt deferDisplayUpdates;
Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1503,8 +1503,8 @@
jmp_buf reenterInterpreter; /* private export */;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
+sqInt breakSelectorLength;
sqInt checkForLeaks;
-sqInt breakSelectorLength = -1;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2098,7 +2098,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.973]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -7965,7 +7965,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -8025,7 +8025,7 @@
null;
goto l108;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -10950,7 +10950,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -11010,7 +11010,7 @@
null;
goto l242;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -19468,6 +19468,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
@@ -24600,7 +24601,7 @@
primitiveBitShift(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -24647,7 +24648,7 @@
}
return;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1722,7 +1722,7 @@
sqInt checkForLeaks;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2344,7 +2344,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.973]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -24053,6 +24053,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
@@ -319,7 +319,7 @@
/*** Global Variables ***/
char * breakSelector;
-sqInt breakSelectorLength ;
+sqInt breakSelectorLength;
sqInt checkAllocFiller;
sqInt checkForLeaks;
sqInt deferDisplayUpdates;
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1725,7 +1725,7 @@
sqInt checkForLeaks;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2347,7 +2347,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.973]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -24062,6 +24062,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/spursrc/vm/cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1713,7 +1713,7 @@
sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2335,7 +2335,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.973]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -19050,6 +19050,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/spursrc/vm/cointerp.h 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
@@ -317,7 +317,7 @@
/*** Global Variables ***/
char * breakSelector;
-sqInt breakSelectorLength ;
+sqInt breakSelectorLength;
sqInt checkAllocFiller;
sqInt checkForLeaks;
sqInt deferDisplayUpdates;
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1716,7 +1716,7 @@
sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2338,7 +2338,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.973]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -19059,6 +19059,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1531,7 +1531,7 @@
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
void * showSurfaceFn;
sqInt deferDisplayUpdates;
struct VirtualMachine* interpreterProxy;
@@ -2116,7 +2116,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.973]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -58357,6 +58357,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/spurstack64src/vm/interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/interp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/spurstack64src/vm/interp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1528,7 +1528,7 @@
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
void * showSurfaceFn;
sqInt deferDisplayUpdates;
struct VirtualMachine* interpreterProxy;
@@ -2113,7 +2113,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.973]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -58348,6 +58348,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1502,7 +1502,7 @@
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
void * showSurfaceFn;
sqInt deferDisplayUpdates;
struct VirtualMachine* interpreterProxy;
@@ -2087,7 +2087,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.973]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -55689,6 +55689,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/spurstacksrc/vm/interp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1499,7 +1499,7 @@
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
void * showSurfaceFn;
sqInt deferDisplayUpdates;
struct VirtualMachine* interpreterProxy;
@@ -2084,7 +2084,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.973]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -55680,6 +55680,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/src/vm/cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1491,8 +1491,8 @@
sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
+sqInt breakSelectorLength;
sqInt checkForLeaks;
-sqInt breakSelectorLength = -1;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2086,7 +2086,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.973]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -7794,7 +7794,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -7854,7 +7854,7 @@
null;
goto l108;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -14970,6 +14970,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
@@ -20001,7 +20002,7 @@
primitiveBitShift(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -20048,7 +20049,7 @@
}
return;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/src/vm/cointerp.h 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
@@ -269,7 +269,7 @@
/*** Global Variables ***/
char * breakSelector;
-sqInt breakSelectorLength ;
+sqInt breakSelectorLength;
sqInt checkAllocFiller;
sqInt checkForLeaks;
sqInt deferDisplayUpdates;
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/src/vm/cointerpmt.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreterMT VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreterMT VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1587,8 +1587,8 @@
sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
+sqInt breakSelectorLength;
sqInt checkForLeaks;
-sqInt breakSelectorLength = -1;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2183,7 +2183,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.973]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -4827,6 +4827,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l153;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4841,7 +4842,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- /* return self */
+ null;
l153: /* end baseFrameReturn */;
goto l152;
}
@@ -15263,6 +15264,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/src/vm/cointerpmt.h 2014-12-07 01:38:11 UTC (rev 3164)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
@@ -273,7 +273,7 @@
/*** Global Variables ***/
char * breakSelector;
-sqInt breakSelectorLength ;
+sqInt breakSelectorLength;
sqInt checkAllocFiller;
sqInt checkForLeaks;
sqInt deferDisplayUpdates;
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1494,8 +1494,8 @@
sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
+sqInt breakSelectorLength;
sqInt checkForLeaks;
-sqInt breakSelectorLength = -1;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2089,7 +2089,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.973]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -7803,7 +7803,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -7863,7 +7863,7 @@
null;
goto l108;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -14979,6 +14979,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
@@ -20010,7 +20011,7 @@
primitiveBitShift(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -20057,7 +20058,7 @@
}
return;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- CoInterpreterMT VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CoInterpreterMT VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1590,8 +1590,8 @@
sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */;
sqInt checkAllocFiller;
sqInt inIOProcessEvents;
+sqInt breakSelectorLength;
sqInt checkForLeaks;
-sqInt breakSelectorLength = -1;
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
@@ -2186,7 +2186,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.973]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -4836,6 +4836,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l153;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4850,7 +4851,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- /* return self */
+ null;
l153: /* end baseFrameReturn */;
goto l152;
}
@@ -15272,6 +15273,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-12-06 20:31:43 UTC (rev 3163)
+++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-12-07 01:38:11 UTC (rev 3164)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
from
- StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
+ StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1284,7 +1284,7 @@
sqInt desiredEdenBytes;
sqInt desiredNumStackPages;
sqInt extraVMMemory;
-sqInt breakSelectorLength = -1;
+sqInt breakSelectorLength;
void * showSurfaceFn;
sqInt deferDisplayUpdates;
struct VirtualMachine* interpreterProxy;
@@ -1872,7 +1872,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.971]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.973]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -37614,6 +37614,7 @@
}
}
GIV(method) = (GIV(newMethod) = GIV(nilObj));
+ breakSelectorLength = MinSmallInteger;
GIV(methodDictLinearSearchLimit) = 8;
/* begin flushMethodCache */
for (i = 1; i <= MethodCacheSize; i += 1) {
Modified: branches/Cog/stacksrc/vm/interp.c
===================================================================
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list