[Vm-dev] [commit][3039] CogVM source as per VMMaker.oscog-eem.812
commits at squeakvm.org
commits at squeakvm.org
Wed Jul 9 19:37:10 UTC 2014
Revision: 3039
Author: eliot
Date: 2014-07-09 12:37:09 -0700 (Wed, 09 Jul 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.812
Fix bogus assert fail due to signedness.
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nscogsrc/vm/cogmethod.h
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/sistasrc/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-07-09 19:14:36 UTC (rev 3038)
+++ branches/Cog/nscogsrc/vm/cogit.c 2014-07-09 19:37:09 UTC (rev 3039)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ CCodeGenerator VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ StackToRegisterMappingCogit VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -15951,7 +15951,7 @@
jumpIsInt = genoperand(JumpNonZero, ((sqInt)0));
/* begin MoveMw:r:R: */
genoperandoperandoperand(MoveMwrR, 0, sourceReg, destReg);
- assert(((compactClassFieldMask()) << (compactClassFieldLSB())) < (nilObject()));
+ assert(((compactClassFieldMask()) << (compactClassFieldLSB())) < (((usqInt)(nilObject()))));
/* begin AndCq:R: */
quickConstant = ((1 << (compactClassFieldWidth())) - 1) << (compactClassFieldLSB());
genoperandoperand(AndCqR, quickConstant, destReg);
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2014-07-09 19:14:36 UTC (rev 3038)
+++ branches/Cog/nscogsrc/vm/cogit.h 2014-07-09 19:37:09 UTC (rev 3039)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ CCodeGenerator VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
*/
Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h 2014-07-09 19:14:36 UTC (rev 3038)
+++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-07-09 19:37:09 UTC (rev 3039)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ CCodeGenerator VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
*/
typedef struct {
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Jul 9 12:10:26 PDT 2014
+ Wed Jul 9 12:37:05 PDT 2014
Modified: branches/Cog/sistasrc/vm/cogit.c
===================================================================
--- branches/Cog/sistasrc/vm/cogit.c 2014-07-09 19:14:36 UTC (rev 3038)
+++ branches/Cog/sistasrc/vm/cogit.c 2014-07-09 19:37:09 UTC (rev 3039)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ CCodeGenerator VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -15151,7 +15151,7 @@
jumpIsInt = genoperand(JumpNonZero, ((sqInt)0));
/* begin MoveMw:r:R: */
genoperandoperandoperand(MoveMwrR, 0, sourceReg, destReg);
- assert(((compactClassFieldMask()) << (compactClassFieldLSB())) < (nilObject()));
+ assert(((compactClassFieldMask()) << (compactClassFieldLSB())) < (((usqInt)(nilObject()))));
/* begin AndCq:R: */
quickConstant = ((1 << (compactClassFieldWidth())) - 1) << (compactClassFieldLSB());
genoperandoperand(AndCqR, quickConstant, destReg);
Modified: branches/Cog/sistasrc/vm/cogit.h
===================================================================
--- branches/Cog/sistasrc/vm/cogit.h 2014-07-09 19:14:36 UTC (rev 3038)
+++ branches/Cog/sistasrc/vm/cogit.h 2014-07-09 19:37:09 UTC (rev 3039)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ CCodeGenerator VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
*/
Modified: branches/Cog/sistasrc/vm/cogmethod.h
===================================================================
--- branches/Cog/sistasrc/vm/cogmethod.h 2014-07-09 19:14:36 UTC (rev 3038)
+++ branches/Cog/sistasrc/vm/cogmethod.h 2014-07-09 19:37:09 UTC (rev 3039)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ CCodeGenerator VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
*/
typedef struct {
Modified: branches/Cog/src/vm/cogit.c
===================================================================
--- branches/Cog/src/vm/cogit.c 2014-07-09 19:14:36 UTC (rev 3038)
+++ branches/Cog/src/vm/cogit.c 2014-07-09 19:37:09 UTC (rev 3039)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ CCodeGenerator VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ StackToRegisterMappingCogit VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -15194,7 +15194,7 @@
jumpIsInt = genoperand(JumpNonZero, ((sqInt)0));
/* begin MoveMw:r:R: */
genoperandoperandoperand(MoveMwrR, 0, sourceReg, destReg);
- assert(((compactClassFieldMask()) << (compactClassFieldLSB())) < (nilObject()));
+ assert(((compactClassFieldMask()) << (compactClassFieldLSB())) < (((usqInt)(nilObject()))));
/* begin AndCq:R: */
quickConstant = ((1 << (compactClassFieldWidth())) - 1) << (compactClassFieldLSB());
genoperandoperand(AndCqR, quickConstant, destReg);
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2014-07-09 19:14:36 UTC (rev 3038)
+++ branches/Cog/src/vm/cogit.h 2014-07-09 19:37:09 UTC (rev 3039)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ CCodeGenerator VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
*/
Modified: branches/Cog/src/vm/cogmethod.h
===================================================================
--- branches/Cog/src/vm/cogmethod.h 2014-07-09 19:14:36 UTC (rev 3038)
+++ branches/Cog/src/vm/cogmethod.h 2014-07-09 19:37:09 UTC (rev 3039)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.811 uuid: 96eb7a61-d68a-4114-8c1a-c0a7fad3232e
+ CCodeGenerator VMMaker.oscog-eem.812 uuid: 9454793f-8770-42b7-9802-4c2a92b29f92
*/
typedef struct {
More information about the Vm-dev
mailing list