[Vm-dev] [commit][2920] CogVM source as per VMMaker.oscog-eem.715
commits at squeakvm.org
commits at squeakvm.org
Sat May 10 15:56:23 UTC 2014
Revision: 2920
Author: eliot
Date: 2014-05-10 08:56:23 -0700 (Sat, 10 May 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.715
Get rid of the stupid validate macro hack.
Fix the regression introduced by VMMaker.oscog-eem.709. When "adding" a method
marked <doNotImplement> make sure that any inherited version of the method is
removed. The old code also removed methods that weren't inherited.
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/sistasrc/vm/cointerp.c
branches/Cog/sistasrc/vm/cointerp.h
branches/Cog/sistasrc/vm/gcc3x-cointerp.c
branches/Cog/sistasrc/vm/interp.h
branches/Cog/sistasrc/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
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
branches/Cog/stacksrc/vm/interp.h
branches/Cog/stacksrc/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 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
from
- CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1157,7 +1157,7 @@
static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void));
static sqInt roomToPushNArgs(sqInt n);
static void runLeakCheckerForFullGC(sqInt fullGCFlag);
-static sqInt safeObjectAfter(sqInt oop);
+static usqInt safeObjectAfter(sqInt oop);
static sqInt safePrintStringOf(sqInt oop);
usqInt scavengeThresholdAddress(void);
EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext);
@@ -2045,7 +2045,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.712";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.715";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -24003,17 +24003,15 @@
sqInt header1;
sqInt header2;
sqInt header3;
- sqInt header4;
usqInt lastWord;
sqInt newFreeChunk;
sqInt newOop;
- sqInt next;
+ usqInt next;
sqInt oop;
sqInt realHeader;
sqInt sz;
sqInt sz1;
sqInt sz2;
- sqInt sz3;
sqInt target;
usqInt w;
@@ -24024,21 +24022,7 @@
/* begin objectAfterWhileForwarding: */
header2 = longAt(oop);
if ((header2 & MarkBit) == 0) {
- /* begin objectAfter: */
- if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) {
- error("no objects after the end of memory");
- }
- if (((longAt(oop)) & TypeMask) == HeaderTypeFree) {
- sz2 = (longAt(oop)) & AllButTypeMask;
- }
- else {
- /* begin sizeBitsOf: */
- header3 = longAt(oop);
- sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
- ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask
- : header3 & SizeMask);
- }
- next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]);
+ next = ((sqInt) (objectAfter(oop)));
goto l1;
}
fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1;
@@ -24053,7 +24037,7 @@
else {
sz1 = realHeader & SizeMask;
}
- next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]);
+ next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask])));
l1: /* end objectAfterWhileForwarding: */;
if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) {
@@ -24107,18 +24091,18 @@
}
/* begin safeObjectAfter: */
if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) {
- sz3 = (longAt(newFreeChunk)) & AllButTypeMask;
+ sz2 = (longAt(newFreeChunk)) & AllButTypeMask;
}
else {
/* begin sizeBitsOf: */
- header4 = longAt(newFreeChunk);
- sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass
+ header3 = longAt(newFreeChunk);
+ sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask
- : header4 & SizeMask);
+ : header3 & SizeMask);
}
- next = ((newFreeChunk + sz3) >= GIV(freeStart)
+ next = ((newFreeChunk + sz2) >= GIV(freeStart)
? GIV(freeStart)
- : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask]));
+ : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask]));
assert((next == GIV(freeStart))
|| (next == (oopFromChunk(GIV(compEnd)))));
if (next == GIV(freeStart)) {
@@ -50589,7 +50573,8 @@
assert(checkInterpreterIntegrity());
assert(checkStackIntegrity());
assert(checkCodeIntegrity(fullGCFlag));
- validate();
+ /* begin validate */
+ null;
}
}
@@ -50598,7 +50583,7 @@
given object or free chunk in memory. Return freeStart when
enumeration is complete. This is for assertion checking only. */
-static sqInt
+static usqInt
safeObjectAfter(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt header;
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-10 15:56:23 UTC (rev 2920)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
from
- CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1160,7 +1160,7 @@
static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void));
static sqInt roomToPushNArgs(sqInt n);
static void runLeakCheckerForFullGC(sqInt fullGCFlag);
-static sqInt safeObjectAfter(sqInt oop);
+static usqInt safeObjectAfter(sqInt oop);
static sqInt safePrintStringOf(sqInt oop);
usqInt scavengeThresholdAddress(void);
EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext);
@@ -2048,7 +2048,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.712";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.715";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -24012,17 +24012,15 @@
sqInt header1;
sqInt header2;
sqInt header3;
- sqInt header4;
usqInt lastWord;
sqInt newFreeChunk;
sqInt newOop;
- sqInt next;
+ usqInt next;
sqInt oop;
sqInt realHeader;
sqInt sz;
sqInt sz1;
sqInt sz2;
- sqInt sz3;
sqInt target;
usqInt w;
@@ -24033,21 +24031,7 @@
/* begin objectAfterWhileForwarding: */
header2 = longAt(oop);
if ((header2 & MarkBit) == 0) {
- /* begin objectAfter: */
- if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) {
- error("no objects after the end of memory");
- }
- if (((longAt(oop)) & TypeMask) == HeaderTypeFree) {
- sz2 = (longAt(oop)) & AllButTypeMask;
- }
- else {
- /* begin sizeBitsOf: */
- header3 = longAt(oop);
- sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
- ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask
- : header3 & SizeMask);
- }
- next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]);
+ next = ((sqInt) (objectAfter(oop)));
goto l1;
}
fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1;
@@ -24062,7 +24046,7 @@
else {
sz1 = realHeader & SizeMask;
}
- next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]);
+ next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask])));
l1: /* end objectAfterWhileForwarding: */;
if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) {
@@ -24116,18 +24100,18 @@
}
/* begin safeObjectAfter: */
if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) {
- sz3 = (longAt(newFreeChunk)) & AllButTypeMask;
+ sz2 = (longAt(newFreeChunk)) & AllButTypeMask;
}
else {
/* begin sizeBitsOf: */
- header4 = longAt(newFreeChunk);
- sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass
+ header3 = longAt(newFreeChunk);
+ sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask
- : header4 & SizeMask);
+ : header3 & SizeMask);
}
- next = ((newFreeChunk + sz3) >= GIV(freeStart)
+ next = ((newFreeChunk + sz2) >= GIV(freeStart)
? GIV(freeStart)
- : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask]));
+ : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask]));
assert((next == GIV(freeStart))
|| (next == (oopFromChunk(GIV(compEnd)))));
if (next == GIV(freeStart)) {
@@ -50598,7 +50582,8 @@
assert(checkInterpreterIntegrity());
assert(checkStackIntegrity());
assert(checkCodeIntegrity(fullGCFlag));
- validate();
+ /* begin validate */
+ null;
}
}
@@ -50607,7 +50592,7 @@
given object or free chunk in memory. Return freeStart when
enumeration is complete. This is for assertion checking only. */
-static sqInt
+static usqInt
safeObjectAfter(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt header;
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/nscogsrc/vm/interp.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Sat May 10 08:05:46 PDT 2014
+ Sat May 10 08:54:19 PDT 2014
Modified: branches/Cog/sistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.c 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/sistasrc/vm/cointerp.c 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
from
- CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2039,7 +2039,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.712]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.715]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -46052,7 +46052,8 @@
assert(checkInterpreterIntegrity());
assert(checkStackIntegrity());
assert(checkCodeIntegrity(fullGCFlag));
- validate();
+ /* begin validate */
+ null;
}
}
Modified: branches/Cog/sistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/sistasrc/vm/cointerp.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-05-10 15:56:23 UTC (rev 2920)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
from
- CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2042,7 +2042,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.712]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.715]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -46061,7 +46061,8 @@
assert(checkInterpreterIntegrity());
assert(checkStackIntegrity());
assert(checkCodeIntegrity(fullGCFlag));
- validate();
+ /* begin validate */
+ null;
}
}
Modified: branches/Cog/sistasrc/vm/interp.h
===================================================================
--- branches/Cog/sistasrc/vm/interp.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/sistasrc/vm/interp.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/sistasrc/vm/vmCallback.h
===================================================================
--- branches/Cog/sistasrc/vm/vmCallback.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/sistasrc/vm/vmCallback.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/src/vm/cointerp.c 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
from
- CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2035,7 +2035,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.712]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.715]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -45881,7 +45881,8 @@
assert(checkInterpreterIntegrity());
assert(checkStackIntegrity());
assert(checkCodeIntegrity(fullGCFlag));
- validate();
+ /* begin validate */
+ null;
}
}
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/src/vm/cointerp.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/src/vm/cointerpmt.c 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
from
- CoInterpreterMT VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CoInterpreterMT VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2132,7 +2132,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.712]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.715]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -26420,7 +26420,7 @@
GIV(instructionPointer) = ceReturnToInterpreterPC();
}
GIV(newMethod) = (vmThread->newMethodOrNull);
- GIV(argumentCount) = argumentCount(vmThread);
+ GIV(argumentCount) = (vmThread->argumentCount);
memcpy(reenterInterpreter, (vmThread->reenterInterpreter), sizeof(jmp_buf));
(vmThread->newMethodOrNull = null);
@@ -27023,7 +27023,7 @@
assert((ownerIndexOfProcess(activeProc)) == ((preemptedThread->index)));
}
(preemptedThread->newMethodOrNull = GIV(newMethod));
- argumentCount(preemptedThread, GIV(argumentCount));
+ (preemptedThread->argumentCount = GIV(argumentCount));
(preemptedThread->inMachineCode = (((usqInt)GIV(instructionPointer))) <= (startOfMemory()));
memcpy((preemptedThread->reenterInterpreter), reenterInterpreter, sizeof(jmp_buf));
}
@@ -47304,7 +47304,8 @@
assert(checkInterpreterIntegrity());
assert(checkStackIntegrity());
assert(checkCodeIntegrity(fullGCFlag));
- validate();
+ /* begin validate */
+ null;
}
}
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/src/vm/cointerpmt.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2014-05-10 15:56:23 UTC (rev 2920)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
from
- CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2038,7 +2038,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.712]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.715]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -45890,7 +45890,8 @@
assert(checkInterpreterIntegrity());
assert(checkStackIntegrity());
assert(checkCodeIntegrity(fullGCFlag));
- validate();
+ /* begin validate */
+ null;
}
}
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-05-10 15:56:23 UTC (rev 2920)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
from
- CoInterpreterMT VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CoInterpreterMT VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2135,7 +2135,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.712]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.715]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -26429,7 +26429,7 @@
GIV(instructionPointer) = ceReturnToInterpreterPC();
}
GIV(newMethod) = (vmThread->newMethodOrNull);
- GIV(argumentCount) = argumentCount(vmThread);
+ GIV(argumentCount) = (vmThread->argumentCount);
memcpy(reenterInterpreter, (vmThread->reenterInterpreter), sizeof(jmp_buf));
(vmThread->newMethodOrNull = null);
@@ -27032,7 +27032,7 @@
assert((ownerIndexOfProcess(activeProc)) == ((preemptedThread->index)));
}
(preemptedThread->newMethodOrNull = GIV(newMethod));
- argumentCount(preemptedThread, GIV(argumentCount));
+ (preemptedThread->argumentCount = GIV(argumentCount));
(preemptedThread->inMachineCode = (((usqInt)GIV(instructionPointer))) <= (startOfMemory()));
memcpy((preemptedThread->reenterInterpreter), reenterInterpreter, sizeof(jmp_buf));
}
@@ -47313,7 +47313,8 @@
assert(checkInterpreterIntegrity());
assert(checkStackIntegrity());
assert(checkCodeIntegrity(fullGCFlag));
- validate();
+ /* begin validate */
+ null;
}
}
Modified: branches/Cog/src/vm/interp.h
===================================================================
--- branches/Cog/src/vm/interp.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/src/vm/interp.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/src/vm/vmCallback.h
===================================================================
--- branches/Cog/src/vm/vmCallback.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/src/vm/vmCallback.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-05-10 15:56:23 UTC (rev 2920)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
from
- StackInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ StackInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1824,7 +1824,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.712]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.715]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -39557,7 +39557,8 @@
assert(checkInterpreterIntegrity());
assert(checkStackIntegrity());
assert(checkCodeIntegrity(fullGCFlag));
- validate();
+ /* begin validate */
+ null;
}
}
Modified: branches/Cog/stacksrc/vm/interp.c
===================================================================
--- branches/Cog/stacksrc/vm/interp.c 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/stacksrc/vm/interp.c 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
from
- StackInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ StackInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1821,7 +1821,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.712]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.715]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -39548,7 +39548,8 @@
assert(checkInterpreterIntegrity());
assert(checkStackIntegrity());
assert(checkCodeIntegrity(fullGCFlag));
- validate();
+ /* begin validate */
+ null;
}
}
Modified: branches/Cog/stacksrc/vm/interp.h
===================================================================
--- branches/Cog/stacksrc/vm/interp.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/stacksrc/vm/interp.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/stacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/stacksrc/vm/vmCallback.h 2014-05-10 15:08:04 UTC (rev 2919)
+++ branches/Cog/stacksrc/vm/vmCallback.h 2014-05-10 15:56:23 UTC (rev 2920)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list