[Vm-dev] [commit][2830] CogVM source as per VMMaker.oscog-eem.560
commits at squeakvm.org
commits at squeakvm.org
Thu Dec 12 00:37:38 UTC 2013
Revision: 2830
Author: eliot
Date: 2013-12-11 16:37:38 -0800 (Wed, 11 Dec 2013)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.560
Also have to swizzle along the chain of free objStack pages.
Print value of topX field when printing objStacks.
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 16:06:51 PST 2013
+ Wed Dec 11 16:36:32 PST 2013
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2013-12-12 00:07:34 UTC (rev 2829)
+++ branches/Cog/spursrc/vm/cointerp.c 2013-12-12 00:37:38 UTC (rev 2830)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
from
- CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __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.559]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.560]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -6363,7 +6363,6 @@
/* begin internalPush: */
longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2)));
}
- null;
goto l4;
}
if (opType == 3) {
@@ -6373,7 +6372,6 @@
assert(GIV(method) == (iframeMethod(localFP)));
object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2));
longAtPointerput((localSP -= BytesPerOop), object);
- null;
goto l4;
}
if (opType == 4) {
@@ -6401,7 +6399,6 @@
/* begin internalPush: */
longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2)));
- null;
goto l4;
}
top = longAtPointer(localSP);
@@ -50322,7 +50319,9 @@
/* begin tab */
/* begin printChar: */
putchar(' ');
- print("next: ");
+ print("topx: ");
+ printNum(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackTopx << 2)));
+ print(" next: ");
printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)));
if (isFirstPage) {
print(" free: ");
@@ -56838,7 +56837,7 @@
assert((formatOf(firstPage)) == (wordIndexableFormat()));
null;
longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field);
- firstPage = stackOrNil;
+ firstPage = field;
}
assert(isValidObjStackAt(objStackRootIndex));
return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2));
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2013-12-12 00:07:34 UTC (rev 2829)
+++ branches/Cog/spursrc/vm/cointerp.h 2013-12-12 00:37:38 UTC (rev 2830)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-12 00:07:34 UTC (rev 2829)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-12 00:37:38 UTC (rev 2830)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
from
- CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __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.559]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.560]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -6372,7 +6372,6 @@
/* begin internalPush: */
longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2)));
}
- null;
goto l4;
}
if (opType == 3) {
@@ -6382,7 +6381,6 @@
assert(GIV(method) == (iframeMethod(localFP)));
object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2));
longAtPointerput((localSP -= BytesPerOop), object);
- null;
goto l4;
}
if (opType == 4) {
@@ -6410,7 +6408,6 @@
/* begin internalPush: */
longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2)));
- null;
goto l4;
}
top = longAtPointer(localSP);
@@ -50331,7 +50328,9 @@
/* begin tab */
/* begin printChar: */
putchar(' ');
- print("next: ");
+ print("topx: ");
+ printNum(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackTopx << 2)));
+ print(" next: ");
printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)));
if (isFirstPage) {
print(" free: ");
@@ -56847,7 +56846,7 @@
assert((formatOf(firstPage)) == (wordIndexableFormat()));
null;
longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field);
- firstPage = stackOrNil;
+ firstPage = field;
}
assert(isValidObjStackAt(objStackRootIndex));
return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2));
Modified: branches/Cog/spursrc/vm/interp.h
===================================================================
--- branches/Cog/spursrc/vm/interp.h 2013-12-12 00:07:34 UTC (rev 2829)
+++ branches/Cog/spursrc/vm/interp.h 2013-12-12 00:37:38 UTC (rev 2830)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursrc/vm/vmCallback.h 2013-12-12 00:07:34 UTC (rev 2829)
+++ branches/Cog/spursrc/vm/vmCallback.h 2013-12-12 00:37:38 UTC (rev 2830)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-12 00:07:34 UTC (rev 2829)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-12 00:37:38 UTC (rev 2830)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
from
- StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __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.559]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.560]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -46374,7 +46374,9 @@
/* begin tab */
/* begin printChar: */
putchar(' ');
- print("next: ");
+ print("topx: ");
+ printNum(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackTopx << 2)));
+ print(" next: ");
printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)));
if (isFirstPage) {
print(" free: ");
@@ -52381,7 +52383,7 @@
assert((formatOf(firstPage)) == (wordIndexableFormat()));
null;
longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field);
- firstPage = stackOrNil;
+ firstPage = field;
}
assert(isValidObjStackAt(objStackRootIndex));
return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2));
Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2013-12-12 00:07:34 UTC (rev 2829)
+++ branches/Cog/spurstacksrc/vm/interp.c 2013-12-12 00:37:38 UTC (rev 2830)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
from
- StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __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.559]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.560]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -46365,7 +46365,9 @@
/* begin tab */
/* begin printChar: */
putchar(' ');
- print("next: ");
+ print("topx: ");
+ printNum(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackTopx << 2)));
+ print(" next: ");
printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)));
if (isFirstPage) {
print(" free: ");
@@ -52372,7 +52374,7 @@
assert((formatOf(firstPage)) == (wordIndexableFormat()));
null;
longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field);
- firstPage = stackOrNil;
+ firstPage = field;
}
assert(isValidObjStackAt(objStackRootIndex));
return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2));
Modified: branches/Cog/spurstacksrc/vm/interp.h
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.h 2013-12-12 00:07:34 UTC (rev 2829)
+++ branches/Cog/spurstacksrc/vm/interp.h 2013-12-12 00:37:38 UTC (rev 2830)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spurstacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spurstacksrc/vm/vmCallback.h 2013-12-12 00:07:34 UTC (rev 2829)
+++ branches/Cog/spurstacksrc/vm/vmCallback.h 2013-12-12 00:37:38 UTC (rev 2830)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list