[Vm-dev] [commit][3029] CogVM source as per VMMaker.oscog-eem.797
commits at squeakvm.org
commits at squeakvm.org
Thu Jul 3 02:52:10 UTC 2014
Revision: 3029
Author: eliot
Date: 2014-07-02 19:52:10 -0700 (Wed, 02 Jul 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.797
Nuke a halt from testing the simulator...
Modified Paths:
--------------
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspursrc/vm/interp.h
branches/Cog/nsspursrc/vm/vmCallback.h
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/interp.h
branches/Cog/spursistasrc/vm/vmCallback.h
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
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
from
- CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2283,7 +2283,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.795";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.797";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -18946,7 +18946,6 @@
&& ((((GIV(newMethod) & 3) == 0)
&& (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24))
&& (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) {
- halt();
/* begin initPrimCall */
GIV(primFailCode) = 0;
dispatchFunctionPointer(primitiveFunctionPointer);
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-03 02:52:10 UTC (rev 3029)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
from
- CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2286,7 +2286,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.795";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.797";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -18955,7 +18955,6 @@
&& ((((GIV(newMethod) & 3) == 0)
&& (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24))
&& (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) {
- halt();
/* begin initPrimCall */
GIV(primFailCode) = 0;
dispatchFunctionPointer(primitiveFunctionPointer);
Modified: branches/Cog/nsspursrc/vm/interp.h
===================================================================
--- branches/Cog/nsspursrc/vm/interp.h 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/nsspursrc/vm/interp.h 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nsspursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nsspursrc/vm/vmCallback.h 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Jul 2 19:14:44 PDT 2014
+ Wed Jul 2 19:52:06 PDT 2014
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
from
- CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2278,7 +2278,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.795]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.797]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -14349,7 +14349,6 @@
&& ((((GIV(newMethod) & 3) == 0)
&& (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24))
&& (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) {
- halt();
/* begin initPrimCall */
GIV(primFailCode) = 0;
dispatchFunctionPointer(primitiveFunctionPointer);
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-07-03 02:52:10 UTC (rev 3029)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
from
- CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2281,7 +2281,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.795]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.797]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -14358,7 +14358,6 @@
&& ((((GIV(newMethod) & 3) == 0)
&& (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24))
&& (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) {
- halt();
/* begin initPrimCall */
GIV(primFailCode) = 0;
dispatchFunctionPointer(primitiveFunctionPointer);
Modified: branches/Cog/spursistasrc/vm/interp.h
===================================================================
--- branches/Cog/spursistasrc/vm/interp.h 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/spursistasrc/vm/interp.h 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursistasrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursistasrc/vm/vmCallback.h 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/spursrc/vm/cointerp.c 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
from
- CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2273,7 +2273,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.795]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.797]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -14345,7 +14345,6 @@
&& ((((GIV(newMethod) & 3) == 0)
&& (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24))
&& (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) {
- halt();
/* begin initPrimCall */
GIV(primFailCode) = 0;
dispatchFunctionPointer(primitiveFunctionPointer);
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/spursrc/vm/cointerp.h 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-07-03 02:52:10 UTC (rev 3029)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
from
- CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2276,7 +2276,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.795]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.797]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -14354,7 +14354,6 @@
&& ((((GIV(newMethod) & 3) == 0)
&& (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24))
&& (checkForAndFollowForwardedPrimitiveStateFor(primitiveIndexOfMethodheader(GIV(newMethod), headerOf(GIV(newMethod))))))) {
- halt();
/* begin initPrimCall */
GIV(primFailCode) = 0;
dispatchFunctionPointer(primitiveFunctionPointer);
Modified: branches/Cog/spursrc/vm/interp.h
===================================================================
--- branches/Cog/spursrc/vm/interp.h 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/spursrc/vm/interp.h 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursrc/vm/vmCallback.h 2014-07-03 02:16:19 UTC (rev 3028)
+++ branches/Cog/spursrc/vm/vmCallback.h 2014-07-03 02:52:10 UTC (rev 3029)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.797 uuid: 28e6fe82-fa68-4b73-a714-e2481f350031
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list