[Vm-dev] [commit][3251] CogVM source as per VMMaker.oscog-eem.1051
commits at squeakvm.org
commits at squeakvm.org
Wed Feb 11 03:01:25 UTC 2015
Revision: 3251
Author: eliot
Date: 2015-02-10 19:01:24 -0800 (Tue, 10 Feb 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1051
...and rescue compilation of the cogits given the change to
checkIntegrityOfObjectReferencesInCode: in VMMaker.oscog-eem.1048
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogit.c
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogit.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursrc/vm/cogit.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/nscogsrc/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -836,6 +836,7 @@
static sqInt genInnerPrimitiveNew(sqInt retNoffset) NoDbgRegParms;
static sqInt genInnerPrimitiveStringAtPut(sqInt retNoffset) NoDbgRegParms;
static sqInt getActiveContextAllocatesInMachineCode(void);
+static sqInt hasSpurMemoryManagerAPI(void);
static void maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) NoDbgRegParms;
static sqInt allYoungObjectsAgeInFullGC(void);
static sqInt cacheTagIsMarked(sqInt cacheTag) NoDbgRegParms;
@@ -9087,8 +9088,7 @@
if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) {
ok = 0;
}
- if ((hasSpurMemoryManagerAPI())
- || (gcModes & GCModeNewSpace)) {
+ if (gcModes & GCModeNewSpace) {
if (((isYoungObject((cogMethod->methodObject)))
|| (isYoung((cogMethod->selector))))
&& (!((cogMethod->cmRefersToYoung)))) {
@@ -15468,7 +15468,13 @@
return 0;
}
+static sqInt
+hasSpurMemoryManagerAPI(void)
+{
+ return 0;
+}
+
/* Object representations with lazy forwarding will want to check for
forwarding pointers on primitive failure and retry the primitive if found.
By default do nothing. */
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/nscogsrc/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/nsspursrc/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -895,6 +895,7 @@
static sqInt genStoreSourceRegslotIndexdestRegscratchReg(sqInt sourceReg, sqInt index, sqInt destReg, sqInt scratchReg) NoDbgRegParms;
static sqInt genStoreSourceRegslotIndexintoNewObjectInDestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms;
static sqInt getActiveContextAllocatesInMachineCode(void);
+static sqInt hasSpurMemoryManagerAPI(void);
static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms;
static sqInt inlineCacheTagsMayBeObjects(void);
static sqInt isSmallIntegerTagNonZero(void);
@@ -9105,18 +9106,16 @@
if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) {
ok = 0;
}
- if ((hasSpurMemoryManagerAPI())
- || (gcModes & GCModeNewSpace)) {
- if (((isYoungObject((cogMethod->methodObject)))
- || (isYoung((cogMethod->selector))))
- && (!((cogMethod->cmRefersToYoung)))) {
- print("CM ");
- printHex(((sqInt)cogMethod));
- print(" refers to young but not marked as such");
- cr();
- ok = 0;
- }
+ if (((isYoungObject((cogMethod->methodObject)))
+ || (isYoung((cogMethod->selector))))
+ && (!((cogMethod->cmRefersToYoung)))) {
+ print("CM ");
+ printHex(((sqInt)cogMethod));
+ print(" refers to young but not marked as such");
+ cr();
+ ok = 0;
}
+
}
else {
if (((cogMethod->cmType)) == CMClosedPIC) {
@@ -18179,7 +18178,13 @@
return 1;
}
+static sqInt
+hasSpurMemoryManagerAPI(void)
+{
+ return 1;
+}
+
/* Since all cache tags in Spur are class indices none of
them are young or have to be updated in a scavenge. */
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Tue Feb 10 18:45:50 PST 2015
+ Tue Feb 10 19:01:40 PST 2015
Modified: branches/Cog/sistasrc/vm/cogit.c
===================================================================
--- branches/Cog/sistasrc/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/sistasrc/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -827,6 +827,7 @@
static sqInt genInnerPrimitiveNew(sqInt retNoffset) NoDbgRegParms;
static sqInt genInnerPrimitiveStringAtPut(sqInt retNoffset) NoDbgRegParms;
static sqInt getActiveContextAllocatesInMachineCode(void);
+static sqInt hasSpurMemoryManagerAPI(void);
static void maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) NoDbgRegParms;
static sqInt allocateCounters(sqInt nCounters) NoDbgRegParms;
static sqInt allYoungObjectsAgeInFullGC(void);
@@ -9009,8 +9010,7 @@
if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) {
ok = 0;
}
- if ((hasSpurMemoryManagerAPI())
- || (gcModes & GCModeNewSpace)) {
+ if (gcModes & GCModeNewSpace) {
if (((isYoungObject((cogMethod->methodObject)))
|| (isYoung((cogMethod->selector))))
&& (!((cogMethod->cmRefersToYoung)))) {
@@ -14926,7 +14926,13 @@
return 0;
}
+static sqInt
+hasSpurMemoryManagerAPI(void)
+{
+ return 0;
+}
+
/* Object representations with lazy forwarding will want to check for
forwarding pointers on primitive failure and retry the primitive if found.
By default do nothing. */
Modified: branches/Cog/sistasrc/vm/cogit.h
===================================================================
--- branches/Cog/sistasrc/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/sistasrc/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
Modified: branches/Cog/spursistasrc/vm/cogit.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/spursistasrc/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -891,6 +891,7 @@
static sqInt genStoreSourceRegslotIndexdestRegscratchReg(sqInt sourceReg, sqInt index, sqInt destReg, sqInt scratchReg) NoDbgRegParms;
static sqInt genStoreSourceRegslotIndexintoNewObjectInDestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms;
static sqInt getActiveContextAllocatesInMachineCode(void);
+static sqInt hasSpurMemoryManagerAPI(void);
static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms;
static sqInt inlineCacheTagsMayBeObjects(void);
static sqInt isSmallIntegerTagNonZero(void);
@@ -9039,18 +9040,16 @@
if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) {
ok = 0;
}
- if ((hasSpurMemoryManagerAPI())
- || (gcModes & GCModeNewSpace)) {
- if (((isYoungObject((cogMethod->methodObject)))
- || (isYoung((cogMethod->selector))))
- && (!((cogMethod->cmRefersToYoung)))) {
- print("CM ");
- printHex(((sqInt)cogMethod));
- print(" refers to young but not marked as such");
- cr();
- ok = 0;
- }
+ if (((isYoungObject((cogMethod->methodObject)))
+ || (isYoung((cogMethod->selector))))
+ && (!((cogMethod->cmRefersToYoung)))) {
+ print("CM ");
+ printHex(((sqInt)cogMethod));
+ print(" refers to young but not marked as such");
+ cr();
+ ok = 0;
}
+
}
else {
if (((cogMethod->cmType)) == CMClosedPIC) {
@@ -17502,7 +17501,13 @@
return 1;
}
+static sqInt
+hasSpurMemoryManagerAPI(void)
+{
+ return 1;
+}
+
/* Since all cache tags in Spur are class indices none of
them are young or have to be updated in a scavenge. */
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/spursistasrc/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
Modified: branches/Cog/spursrc/vm/cogit.c
===================================================================
--- branches/Cog/spursrc/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/spursrc/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -880,6 +880,7 @@
static sqInt genStoreSourceRegslotIndexdestRegscratchReg(sqInt sourceReg, sqInt index, sqInt destReg, sqInt scratchReg) NoDbgRegParms;
static sqInt genStoreSourceRegslotIndexintoNewObjectInDestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms;
static sqInt getActiveContextAllocatesInMachineCode(void);
+static sqInt hasSpurMemoryManagerAPI(void);
static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms;
static sqInt inlineCacheTagsMayBeObjects(void);
static sqInt isSmallIntegerTagNonZero(void);
@@ -8696,18 +8697,16 @@
if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) {
ok = 0;
}
- if ((hasSpurMemoryManagerAPI())
- || (gcModes & GCModeNewSpace)) {
- if (((isYoungObject((cogMethod->methodObject)))
- || (isYoung((cogMethod->selector))))
- && (!((cogMethod->cmRefersToYoung)))) {
- print("CM ");
- printHex(((sqInt)cogMethod));
- print(" refers to young but not marked as such");
- cr();
- ok = 0;
- }
+ if (((isYoungObject((cogMethod->methodObject)))
+ || (isYoung((cogMethod->selector))))
+ && (!((cogMethod->cmRefersToYoung)))) {
+ print("CM ");
+ printHex(((sqInt)cogMethod));
+ print(" refers to young but not marked as such");
+ cr();
+ ok = 0;
}
+
}
else {
if (((cogMethod->cmType)) == CMClosedPIC) {
@@ -16952,7 +16951,13 @@
return 1;
}
+static sqInt
+hasSpurMemoryManagerAPI(void)
+{
+ return 1;
+}
+
/* Since all cache tags in Spur are class indices none of
them are young or have to be updated in a scavenge. */
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/spursrc/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
Modified: branches/Cog/src/vm/cogit.c
===================================================================
--- branches/Cog/src/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/src/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -823,6 +823,7 @@
static sqInt genInnerPrimitiveNew(sqInt retNoffset) NoDbgRegParms;
static sqInt genInnerPrimitiveStringAtPut(sqInt retNoffset) NoDbgRegParms;
static sqInt getActiveContextAllocatesInMachineCode(void);
+static sqInt hasSpurMemoryManagerAPI(void);
static void maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) NoDbgRegParms;
static sqInt allYoungObjectsAgeInFullGC(void);
static sqInt cacheTagIsMarked(sqInt cacheTag) NoDbgRegParms;
@@ -8666,8 +8667,7 @@
if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) {
ok = 0;
}
- if ((hasSpurMemoryManagerAPI())
- || (gcModes & GCModeNewSpace)) {
+ if (gcModes & GCModeNewSpace) {
if (((isYoungObject((cogMethod->methodObject)))
|| (isYoung((cogMethod->selector))))
&& (!((cogMethod->cmRefersToYoung)))) {
@@ -14672,7 +14672,13 @@
return 0;
}
+static sqInt
+hasSpurMemoryManagerAPI(void)
+{
+ return 0;
+}
+
/* Object representations with lazy forwarding will want to check for
forwarding pointers on primitive failure and retry the primitive if found.
By default do nothing. */
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250)
+++ branches/Cog/src/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f
+ CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91
*/
More information about the Vm-dev
mailing list