[Vm-dev] [commit][2757] CogVM source as per VMMaker.oscog-eem.310
commits at squeakvm.org
commits at squeakvm.org
Thu Jul 25 17:10:24 UTC 2013
Revision: 2757
Author: eliot
Date: 2013-07-25 10:10:22 -0700 (Thu, 25 Jul 2013)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.310
Fix some assert:s that should be assert:l:s
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-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-25 17:10:22 UTC (rev 2757)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
from
- CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __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.309";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.310";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -13518,7 +13518,7 @@
theIP = ((usqInt)(longAt((aStackPage->headSP))));
theFP = (aStackPage->headFP);
if (GIV(stackPage) == aStackPage) {
- assert(GIV(framePointer) == theFP);
+ assertl(GIV(framePointer) == theFP, ln);
}
}
while (1) {
@@ -13532,8 +13532,8 @@
theMethod = ((CogMethod *) (methodField & MFMethodMask));
l1: /* end mframeHomeMethod: */;
assertl((theIP == (ceCannotResumePC()))
- || (asserta((theIP >= (((usqInt)theMethod)))
- && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln);
+ || ((theIP >= (((usqInt)theMethod)))
+ && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln);
prevFrameWasCogged = 1;
}
else {
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-25 17:10:22 UTC (rev 2757)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-25 17:10:22 UTC (rev 2757)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
from
- CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __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.309";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.310";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -13527,7 +13527,7 @@
theIP = ((usqInt)(longAt((aStackPage->headSP))));
theFP = (aStackPage->headFP);
if (GIV(stackPage) == aStackPage) {
- assert(GIV(framePointer) == theFP);
+ assertl(GIV(framePointer) == theFP, ln);
}
}
while (1) {
@@ -13541,8 +13541,8 @@
theMethod = ((CogMethod *) (methodField & MFMethodMask));
l1: /* end mframeHomeMethod: */;
assertl((theIP == (ceCannotResumePC()))
- || (asserta((theIP >= (((usqInt)theMethod)))
- && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln);
+ || ((theIP >= (((usqInt)theMethod)))
+ && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln);
prevFrameWasCogged = 1;
}
else {
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/nscogsrc/vm/interp.h 2013-07-25 17:10:22 UTC (rev 2757)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-25 17:10:22 UTC (rev 2757)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Jul 24 12:45:36 PDT 2013
+ Thu Jul 25 10:10:03 PDT 2013
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/src/vm/cointerp.c 2013-07-25 17:10:22 UTC (rev 2757)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
from
- CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __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.309]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.310]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -9623,7 +9623,7 @@
theIP = ((usqInt)(longAt((aStackPage->headSP))));
theFP = (aStackPage->headFP);
if (GIV(stackPage) == aStackPage) {
- assert(GIV(framePointer) == theFP);
+ assertl(GIV(framePointer) == theFP, ln);
}
}
while (1) {
@@ -9637,8 +9637,8 @@
theMethod = ((CogMethod *) (methodField & MFMethodMask));
l1: /* end mframeHomeMethod: */;
assertl((theIP == (ceCannotResumePC()))
- || (asserta((theIP >= (((usqInt)theMethod)))
- && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln);
+ || ((theIP >= (((usqInt)theMethod)))
+ && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln);
prevFrameWasCogged = 1;
}
else {
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/src/vm/cointerp.h 2013-07-25 17:10:22 UTC (rev 2757)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/src/vm/cointerpmt.c 2013-07-25 17:10:22 UTC (rev 2757)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
from
- CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __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.309]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.310]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -9724,7 +9724,7 @@
theIP = ((usqInt)(longAt((aStackPage->headSP))));
theFP = (aStackPage->headFP);
if (GIV(stackPage) == aStackPage) {
- assert(GIV(framePointer) == theFP);
+ assertl(GIV(framePointer) == theFP, ln);
}
}
while (1) {
@@ -9738,8 +9738,8 @@
theMethod = ((CogMethod *) (methodField & MFMethodMask));
l1: /* end mframeHomeMethod: */;
assertl((theIP == (ceCannotResumePC()))
- || (asserta((theIP >= (((usqInt)theMethod)))
- && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln);
+ || ((theIP >= (((usqInt)theMethod)))
+ && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln);
prevFrameWasCogged = 1;
}
else {
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/src/vm/cointerpmt.h 2013-07-25 17:10:22 UTC (rev 2757)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-25 17:10:22 UTC (rev 2757)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
from
- CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __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.309]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.310]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -9632,7 +9632,7 @@
theIP = ((usqInt)(longAt((aStackPage->headSP))));
theFP = (aStackPage->headFP);
if (GIV(stackPage) == aStackPage) {
- assert(GIV(framePointer) == theFP);
+ assertl(GIV(framePointer) == theFP, ln);
}
}
while (1) {
@@ -9646,8 +9646,8 @@
theMethod = ((CogMethod *) (methodField & MFMethodMask));
l1: /* end mframeHomeMethod: */;
assertl((theIP == (ceCannotResumePC()))
- || (asserta((theIP >= (((usqInt)theMethod)))
- && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln);
+ || ((theIP >= (((usqInt)theMethod)))
+ && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln);
prevFrameWasCogged = 1;
}
else {
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-25 17:10:22 UTC (rev 2757)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
from
- CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec " __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.309]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.310]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -9733,7 +9733,7 @@
theIP = ((usqInt)(longAt((aStackPage->headSP))));
theFP = (aStackPage->headFP);
if (GIV(stackPage) == aStackPage) {
- assert(GIV(framePointer) == theFP);
+ assertl(GIV(framePointer) == theFP, ln);
}
}
while (1) {
@@ -9747,8 +9747,8 @@
theMethod = ((CogMethod *) (methodField & MFMethodMask));
l1: /* end mframeHomeMethod: */;
assertl((theIP == (ceCannotResumePC()))
- || (asserta((theIP >= (((usqInt)theMethod)))
- && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize)))))), ln);
+ || ((theIP >= (((usqInt)theMethod)))
+ && (theIP < ((((usqInt)theMethod)) + ((theMethod->blockSize))))), ln);
prevFrameWasCogged = 1;
}
else {
Modified: branches/Cog/src/vm/interp.h
===================================================================
--- branches/Cog/src/vm/interp.h 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/src/vm/interp.h 2013-07-25 17:10:22 UTC (rev 2757)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/src/vm/vmCallback.h
===================================================================
--- branches/Cog/src/vm/vmCallback.h 2013-07-24 19:46:12 UTC (rev 2756)
+++ branches/Cog/src/vm/vmCallback.h 2013-07-25 17:10:22 UTC (rev 2757)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.309 uuid: 2ee24067-8c61-4855-b4b3-4bb419b4fe7f
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.310 uuid: d05bf462-ca3e-4094-9350-b57f667e30ec
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list