[Vm-dev] [commit][2829] CogVM source as per VMMaker.oscog-eem.559
commits at squeakvm.org
commits at squeakvm.org
Thu Dec 12 00:07:35 UTC 2013
Revision: 2829
Author: eliot
Date: 2013-12-11 16:07:34 -0800 (Wed, 11 Dec 2013)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.559
Fix snafu in Spur markAndTraceObjStack:andContents: that spun marking first
free page in an objStack.
Modified Paths:
--------------
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/interp.h
branches/Cog/spursrc/vm/vmCallback.h
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/spurstacksrc/vm/interp.h
branches/Cog/spurstacksrc/vm/vmCallback.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Dec 11 15:15:14 PST 2013
+ Wed Dec 11 16:06:51 PST 2013
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2013-12-11 23:17:12 UTC (rev 2828)
+++ branches/Cog/spursrc/vm/cointerp.c 2013-12-12 00:07:34 UTC (rev 2829)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
from
- CoInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2162,7 +2162,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
usqInt heapBase;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.558]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.559]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -6363,6 +6363,7 @@
/* begin internalPush: */
longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2)));
}
+ null;
goto l4;
}
if (opType == 3) {
@@ -6372,6 +6373,7 @@
assert(GIV(method) == (iframeMethod(localFP)));
object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2));
longAtPointerput((localSP -= BytesPerOop), object);
+ null;
goto l4;
}
if (opType == 4) {
@@ -6399,6 +6401,7 @@
/* begin internalPush: */
longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2)));
+ null;
goto l4;
}
top = longAtPointer(localSP);
@@ -28942,7 +28945,7 @@
}
field = stackOrNil;
while (1) {
- field = longAt((stackOrNil + (BaseHeaderSize)) + (ObjStackFreex << 2));
+ field = longAt((field + (BaseHeaderSize)) + (ObjStackFreex << 2));
if (!(field != 0)) break;
setIsMarkedOfto(field, 1);
}
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2013-12-11 23:17:12 UTC (rev 2828)
+++ branches/Cog/spursrc/vm/cointerp.h 2013-12-12 00:07:34 UTC (rev 2829)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-11 23:17:12 UTC (rev 2828)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-12 00:07:34 UTC (rev 2829)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
from
- CoInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2165,7 +2165,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
usqInt heapBase;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.558]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.559]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -6372,6 +6372,7 @@
/* begin internalPush: */
longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2)));
}
+ null;
goto l4;
}
if (opType == 3) {
@@ -6381,6 +6382,7 @@
assert(GIV(method) == (iframeMethod(localFP)));
object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2));
longAtPointerput((localSP -= BytesPerOop), object);
+ null;
goto l4;
}
if (opType == 4) {
@@ -6408,6 +6410,7 @@
/* begin internalPush: */
longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2)));
+ null;
goto l4;
}
top = longAtPointer(localSP);
@@ -28951,7 +28954,7 @@
}
field = stackOrNil;
while (1) {
- field = longAt((stackOrNil + (BaseHeaderSize)) + (ObjStackFreex << 2));
+ field = longAt((field + (BaseHeaderSize)) + (ObjStackFreex << 2));
if (!(field != 0)) break;
setIsMarkedOfto(field, 1);
}
Modified: branches/Cog/spursrc/vm/interp.h
===================================================================
--- branches/Cog/spursrc/vm/interp.h 2013-12-11 23:17:12 UTC (rev 2828)
+++ branches/Cog/spursrc/vm/interp.h 2013-12-12 00:07:34 UTC (rev 2829)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursrc/vm/vmCallback.h 2013-12-11 23:17:12 UTC (rev 2828)
+++ branches/Cog/spursrc/vm/vmCallback.h 2013-12-12 00:07:34 UTC (rev 2829)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-11 23:17:12 UTC (rev 2828)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-12 00:07:34 UTC (rev 2829)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
from
- StackInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1955,7 +1955,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.558]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.559]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -26098,7 +26098,7 @@
}
field = stackOrNil;
while (1) {
- field = longAt((stackOrNil + (BaseHeaderSize)) + (ObjStackFreex << 2));
+ field = longAt((field + (BaseHeaderSize)) + (ObjStackFreex << 2));
if (!(field != 0)) break;
setIsMarkedOfto(field, 1);
}
Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2013-12-11 23:17:12 UTC (rev 2828)
+++ branches/Cog/spurstacksrc/vm/interp.c 2013-12-12 00:07:34 UTC (rev 2829)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
from
- StackInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1952,7 +1952,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.558]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.559]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -26089,7 +26089,7 @@
}
field = stackOrNil;
while (1) {
- field = longAt((stackOrNil + (BaseHeaderSize)) + (ObjStackFreex << 2));
+ field = longAt((field + (BaseHeaderSize)) + (ObjStackFreex << 2));
if (!(field != 0)) break;
setIsMarkedOfto(field, 1);
}
Modified: branches/Cog/spurstacksrc/vm/interp.h
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.h 2013-12-11 23:17:12 UTC (rev 2828)
+++ branches/Cog/spurstacksrc/vm/interp.h 2013-12-12 00:07:34 UTC (rev 2829)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spurstacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spurstacksrc/vm/vmCallback.h 2013-12-11 23:17:12 UTC (rev 2828)
+++ branches/Cog/spurstacksrc/vm/vmCallback.h 2013-12-12 00:07:34 UTC (rev 2829)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list