[Vm-dev] [commit][2758] CogVM source as per VMMaker.oscog-eem.311
commits at squeakvm.org
commits at squeakvm.org
Thu Jul 25 18:13:20 UTC 2013
Revision: 2758
Author: eliot
Date: 2013-07-25 11:13:19 -0700 (Thu, 25 Jul 2013)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.311
primitiveTerminateTo needs one more assertValidStackedInstructionPointers:
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nscogsrc/vm/interp.h
branches/Cog/nscogsrc/vm/vmCallback.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/src/vm/interp.h
branches/Cog/src/vm/vmCallback.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-25 18:13:19 UTC (rev 2758)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
from
- CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1978,7 +1978,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.310";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.311";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -43344,6 +43344,7 @@
assert(GIV(stackPage) == (mostRecentlyUsedPage()));
return;
}
+ assertValidStackedInstructionPointers(__LINE__);
/* May cause a GC!! */
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-25 18:13:19 UTC (rev 2758)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-25 18:13:19 UTC (rev 2758)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
from
- CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1981,7 +1981,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.310";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.311";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -43353,6 +43353,7 @@
assert(GIV(stackPage) == (mostRecentlyUsedPage()));
return;
}
+ assertValidStackedInstructionPointers(__LINE__);
/* May cause a GC!! */
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/nscogsrc/vm/interp.h 2013-07-25 18:13:19 UTC (rev 2758)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-25 18:13:19 UTC (rev 2758)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Thu Jul 25 10:10:03 PDT 2013
+ Thu Jul 25 11:12:49 PDT 2013
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/src/vm/cointerp.c 2013-07-25 18:13:19 UTC (rev 2758)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
from
- CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1968,7 +1968,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.310]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.311]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -38831,6 +38831,7 @@
assert(GIV(stackPage) == (mostRecentlyUsedPage()));
return;
}
+ assertValidStackedInstructionPointers(__LINE__);
/* May cause a GC!! */
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/src/vm/cointerp.h 2013-07-25 18:13:19 UTC (rev 2758)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/src/vm/cointerpmt.c 2013-07-25 18:13:19 UTC (rev 2758)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
from
- CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2067,7 +2067,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.310]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.311]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -40200,6 +40200,7 @@
assert(GIV(stackPage) == (mostRecentlyUsedPage()));
return;
}
+ assertValidStackedInstructionPointers(__LINE__);
/* May cause a GC!! */
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/src/vm/cointerpmt.h 2013-07-25 18:13:19 UTC (rev 2758)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-25 18:13:19 UTC (rev 2758)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
from
- CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1971,7 +1971,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.310]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.311]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -38840,6 +38840,7 @@
assert(GIV(stackPage) == (mostRecentlyUsedPage()));
return;
}
+ assertValidStackedInstructionPointers(__LINE__);
/* May cause a GC!! */
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-25 18:13:19 UTC (rev 2758)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
from
- CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2070,7 +2070,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.310]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.311]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -40209,6 +40209,7 @@
assert(GIV(stackPage) == (mostRecentlyUsedPage()));
return;
}
+ assertValidStackedInstructionPointers(__LINE__);
/* May cause a GC!! */
Modified: branches/Cog/src/vm/interp.h
===================================================================
--- branches/Cog/src/vm/interp.h 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/src/vm/interp.h 2013-07-25 18:13:19 UTC (rev 2758)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/src/vm/vmCallback.h
===================================================================
--- branches/Cog/src/vm/vmCallback.h 2013-07-25 17:10:22 UTC (rev 2757)
+++ branches/Cog/src/vm/vmCallback.h 2013-07-25 18:13:19 UTC (rev 2758)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.311 uuid: 1532d343-6ca3-4722-acfd-f56c1f3cc306
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list