[Vm-dev] [commit][2751] CogVM source as per VMMaker.oscog-eem.304.
commits at squeakvm.org
commits at squeakvm.org
Wed Jul 17 20:57:48 UTC 2013
Revision: 2751
Author: eliot
Date: 2013-07-17 13:57:47 -0700 (Wed, 17 Jul 2013)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.304.
Make deferStackLimitSmashAround:[with:] answer true so it can be
invoked in an assert and hence be optimized out in a non-assert VM,
hence optimizing away assertValidExecutionPointe:r:s:imbar:line:.
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-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-17 20:57:47 UTC (rev 2751)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
from
- CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -480,7 +480,7 @@
static sqInt defaultCogCodeSize(void);
static sqInt defaultEdenBytes(void);
static sqInt defaultNumStackPages(void);
-static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
+static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b);
sqInt displayObject(void);
static sqInt divorceAllFrames(void);
@@ -1976,7 +1976,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.303";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.304";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -13405,7 +13405,7 @@
assertl(GIV(stackPage) == (stackPageFor(lifp)), ln);
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
- deferStackLimitSmashAroundwith(assertValidStackLimits, ln);
+ assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln));
assertl(lifp < ((GIV(stackPage)->baseAddress)), ln);
assertl(lisp < lifp, ln);
assertl(lifp > lisp, ln);
@@ -18393,7 +18393,7 @@
assert checks)
*/
-static void
+static sqInt
deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
GIV(deferSmash) = 1;
@@ -18406,6 +18406,7 @@
sqLowLevelMFence();
forceInterruptCheck();
}
+ return 1;
}
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-17 20:57:47 UTC (rev 2751)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-17 20:57:47 UTC (rev 2751)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
from
- CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -483,7 +483,7 @@
static sqInt defaultCogCodeSize(void);
static sqInt defaultEdenBytes(void);
static sqInt defaultNumStackPages(void);
-static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
+static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b);
sqInt displayObject(void);
static sqInt divorceAllFrames(void);
@@ -1979,7 +1979,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.303";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.304";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -13414,7 +13414,7 @@
assertl(GIV(stackPage) == (stackPageFor(lifp)), ln);
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
- deferStackLimitSmashAroundwith(assertValidStackLimits, ln);
+ assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln));
assertl(lifp < ((GIV(stackPage)->baseAddress)), ln);
assertl(lisp < lifp, ln);
assertl(lifp > lisp, ln);
@@ -18402,7 +18402,7 @@
assert checks)
*/
-static void
+static sqInt
deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
GIV(deferSmash) = 1;
@@ -18415,6 +18415,7 @@
sqLowLevelMFence();
forceInterruptCheck();
}
+ return 1;
}
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/nscogsrc/vm/interp.h 2013-07-17 20:57:47 UTC (rev 2751)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-17 20:57:47 UTC (rev 2751)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Tue Jul 16 15:53:52 PDT 2013
+ Wed Jul 17 13:57:16 PDT 2013
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/src/vm/cointerp.c 2013-07-17 20:57:47 UTC (rev 2751)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
from
- CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -475,7 +475,7 @@
static sqInt defaultCogCodeSize(void);
static sqInt defaultEdenBytes(void);
static sqInt defaultNumStackPages(void);
-static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
+static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b);
sqInt displayObject(void);
static sqInt divorceAllFrames(void);
@@ -1966,7 +1966,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.303]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.304]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -9511,7 +9511,7 @@
assertl(GIV(stackPage) == (stackPageFor(lifp)), ln);
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
- deferStackLimitSmashAroundwith(assertValidStackLimits, ln);
+ assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln));
assertl(lifp < ((GIV(stackPage)->baseAddress)), ln);
assertl(lisp < lifp, ln);
assertl(lifp > lisp, ln);
@@ -14307,7 +14307,7 @@
assert checks)
*/
-static void
+static sqInt
deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
GIV(deferSmash) = 1;
@@ -14320,6 +14320,7 @@
sqLowLevelMFence();
forceInterruptCheck();
}
+ return 1;
}
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/src/vm/cointerp.h 2013-07-17 20:57:47 UTC (rev 2751)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/src/vm/cointerpmt.c 2013-07-17 20:57:47 UTC (rev 2751)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
from
- CoInterpreterMT VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -522,7 +522,7 @@
static sqInt defaultCogCodeSize(void);
static sqInt defaultEdenBytes(void);
static sqInt defaultNumStackPages(void);
-static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
+static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
sqInt disownVM(sqInt flags);
static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b);
sqInt displayObject(void);
@@ -2065,7 +2065,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.303]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.304]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -9612,7 +9612,7 @@
assertl(GIV(stackPage) == (stackPageFor(lifp)), ln);
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
- deferStackLimitSmashAroundwith(assertValidStackLimits, ln);
+ assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln));
assertl(lifp < ((GIV(stackPage)->baseAddress)), ln);
assertl(lisp < lifp, ln);
assertl(lifp > lisp, ln);
@@ -14749,7 +14749,7 @@
N.B. SYNCHRONIZE WITH forceInterruptCheckFromHeartbeat
*/
-static void
+static sqInt
deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
GIV(deferSmash) = 1;
@@ -14763,6 +14763,7 @@
forceInterruptCheck();
checkVMOwnershipFromHeartbeat();
}
+ return 1;
}
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/src/vm/cointerpmt.h 2013-07-17 20:57:47 UTC (rev 2751)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-17 20:57:47 UTC (rev 2751)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
from
- CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -478,7 +478,7 @@
static sqInt defaultCogCodeSize(void);
static sqInt defaultEdenBytes(void);
static sqInt defaultNumStackPages(void);
-static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
+static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b);
sqInt displayObject(void);
static sqInt divorceAllFrames(void);
@@ -1969,7 +1969,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.303]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.304]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -9520,7 +9520,7 @@
assertl(GIV(stackPage) == (stackPageFor(lifp)), ln);
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
- deferStackLimitSmashAroundwith(assertValidStackLimits, ln);
+ assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln));
assertl(lifp < ((GIV(stackPage)->baseAddress)), ln);
assertl(lisp < lifp, ln);
assertl(lifp > lisp, ln);
@@ -14316,7 +14316,7 @@
assert checks)
*/
-static void
+static sqInt
deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
GIV(deferSmash) = 1;
@@ -14329,6 +14329,7 @@
sqLowLevelMFence();
forceInterruptCheck();
}
+ return 1;
}
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-17 20:57:47 UTC (rev 2751)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
from
- CoInterpreterMT VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -525,7 +525,7 @@
static sqInt defaultCogCodeSize(void);
static sqInt defaultEdenBytes(void);
static sqInt defaultNumStackPages(void);
-static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
+static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg);
sqInt disownVM(sqInt flags);
static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b);
sqInt displayObject(void);
@@ -2068,7 +2068,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.303]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.304]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -9621,7 +9621,7 @@
assertl(GIV(stackPage) == (stackPageFor(lifp)), ln);
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
- deferStackLimitSmashAroundwith(assertValidStackLimits, ln);
+ assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln));
assertl(lifp < ((GIV(stackPage)->baseAddress)), ln);
assertl(lisp < lifp, ln);
assertl(lifp > lisp, ln);
@@ -14758,7 +14758,7 @@
N.B. SYNCHRONIZE WITH forceInterruptCheckFromHeartbeat
*/
-static void
+static sqInt
deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
GIV(deferSmash) = 1;
@@ -14772,6 +14772,7 @@
forceInterruptCheck();
checkVMOwnershipFromHeartbeat();
}
+ return 1;
}
Modified: branches/Cog/src/vm/interp.h
===================================================================
--- branches/Cog/src/vm/interp.h 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/src/vm/interp.h 2013-07-17 20:57:47 UTC (rev 2751)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/src/vm/vmCallback.h
===================================================================
--- branches/Cog/src/vm/vmCallback.h 2013-07-16 22:54:52 UTC (rev 2750)
+++ branches/Cog/src/vm/vmCallback.h 2013-07-17 20:57:47 UTC (rev 2751)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list