[Vm-dev] [commit][2943] CogVM source as per VMMaker.oscog-eem.756
commits at squeakvm.org
commits at squeakvm.org
Thu Jun 5 00:33:45 UTC 2014
Revision: 2943
Author: eliot
Date: 2014-06-04 17:33:44 -0700 (Wed, 04 Jun 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.756
Oops. Need a null genEnsureOopInRegNotForwarded:scratchReg: for Squeak V3.
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nscogsrc/vm/cogmethod.h
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogmethod.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2014-06-05 00:16:47 UTC (rev 2942)
+++ branches/Cog/nscogsrc/vm/cogit.c 2014-06-05 00:33:44 UTC (rev 2943)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -603,6 +603,7 @@
static void (*genEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void) NoDbgRegParms;
static void (*genEnilopmartForcalled(sqInt regArg, char *trampolineName))(void) NoDbgRegParms;
static sqInt genEnsureObjInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
+static sqInt genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
static void (*genEnterPICEnilopmartNumArgs(sqInt numArgs))(void) NoDbgRegParms;
static sqInt genExtendedSendBytecode(void);
static sqInt genExtendedSuperBytecode(void);
@@ -11379,6 +11380,16 @@
}
+/* Make sure that the oop in reg is not forwarded. By default there is
+ nothing to do. Subclasses for memory managers that forward will override. */
+
+static sqInt
+genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch)
+{
+ return 0;
+}
+
+
/* Generate special versions of the ceEnterCogCodePopReceiverAndClassRegs
enilopmart that also pop register args from the stack to undo the pushing
of register args in the abort/miss trampolines. */
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2014-06-05 00:16:47 UTC (rev 2942)
+++ branches/Cog/nscogsrc/vm/cogit.h 2014-06-05 00:33:44 UTC (rev 2943)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
*/
Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-05 00:16:47 UTC (rev 2942)
+++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-05 00:33:44 UTC (rev 2943)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
*/
typedef struct {
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Jun 4 17:09:43 PDT 2014
+ Wed Jun 4 17:33:34 PDT 2014
Modified: branches/Cog/src/vm/cogit.c
===================================================================
--- branches/Cog/src/vm/cogit.c 2014-06-05 00:16:47 UTC (rev 2942)
+++ branches/Cog/src/vm/cogit.c 2014-06-05 00:33:44 UTC (rev 2943)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -595,6 +595,7 @@
static void (*genEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void) NoDbgRegParms;
static void (*genEnilopmartForcalled(sqInt regArg, char *trampolineName))(void) NoDbgRegParms;
static sqInt genEnsureObjInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
+static sqInt genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
static void (*genEnterPICEnilopmartNumArgs(sqInt numArgs))(void) NoDbgRegParms;
static sqInt genExtendedSendBytecode(void);
static sqInt genExtendedSuperBytecode(void);
@@ -10843,6 +10844,16 @@
}
+/* Make sure that the oop in reg is not forwarded. By default there is
+ nothing to do. Subclasses for memory managers that forward will override. */
+
+static sqInt
+genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch)
+{
+ return 0;
+}
+
+
/* Generate special versions of the ceEnterCogCodePopReceiverAndClassRegs
enilopmart that also pop register args from the stack to undo the pushing
of register args in the abort/miss trampolines. */
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2014-06-05 00:16:47 UTC (rev 2942)
+++ branches/Cog/src/vm/cogit.h 2014-06-05 00:33:44 UTC (rev 2943)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
*/
Modified: branches/Cog/src/vm/cogmethod.h
===================================================================
--- branches/Cog/src/vm/cogmethod.h 2014-06-05 00:16:47 UTC (rev 2942)
+++ branches/Cog/src/vm/cogmethod.h 2014-06-05 00:33:44 UTC (rev 2943)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
*/
typedef struct {
More information about the Vm-dev
mailing list