[Vm-dev] [commit][2945] CogVM source as per VMMaker.oscog-eem.757

commits at squeakvm.org commits at squeakvm.org
Thu Jun 5 17:44:41 UTC 2014


Revision: 2945
Author:   eliot
Date:     2014-06-05 10:44:38 -0700 (Thu, 05 Jun 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.757

Fix a stupid slip in genSpecialSelectorEqualsEquals.  The constant evaluation
must remember to pop the simulation stack before it pushes the boolean result.

Modified Paths:
--------------
    branches/Cog/nscogsrc/vm/cogit.c
    branches/Cog/nscogsrc/vm/cogit.h
    branches/Cog/nscogsrc/vm/cogmethod.h
    branches/Cog/nsspursrc/vm/cogit.c
    branches/Cog/nsspursrc/vm/cogit.h
    branches/Cog/nsspursrc/vm/cogmethod.h
    branches/Cog/sistasrc/vm/cogit.c
    branches/Cog/sistasrc/vm/cogit.h
    branches/Cog/sistasrc/vm/cogmethod.h
    branches/Cog/spursistasrc/vm/cogit.c
    branches/Cog/spursistasrc/vm/cogit.h
    branches/Cog/spursistasrc/vm/cogmethod.h
    branches/Cog/spursrc/vm/cogit.c
    branches/Cog/spursrc/vm/cogit.h
    branches/Cog/spursrc/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:45:11 UTC (rev 2944)
+++ branches/Cog/nscogsrc/vm/cogit.c	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -16092,6 +16092,7 @@
     BytecodeDescriptor *primDescriptor;
     sqInt quickConstant;
     sqInt rcvrReg;
+    sqInt result;
     sqInt targetBytecodePC;
     sqInt unforwardArg;
     sqInt unforwardRcvr;
@@ -16103,9 +16104,11 @@
 	if (((((ssTop())->type)) == SSConstant)
 	 && ((((ssValue(1))->type)) == SSConstant)) {
 		assert(!((primDescriptor->isMapped)));
-		return ssPushConstant(((((ssTop())->constant)) == (((ssValue(1))->constant))
+		result = ((((ssTop())->constant)) == (((ssValue(1))->constant))
 			? trueObject()
-			: falseObject()));
+			: falseObject());
+		ssPop(2);
+		return ssPushConstant(result);
 	}
 	nextPC = bytecodePC + ((primDescriptor->numBytes));
 	nExts = 0;

Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/nscogsrc/vm/cogit.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 

Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/nscogsrc/vm/cogmethod.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 typedef struct {

Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/nsspursrc/vm/cogit.c	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -17752,6 +17752,7 @@
     BytecodeDescriptor *primDescriptor;
     sqInt quickConstant;
     sqInt rcvrReg;
+    sqInt result;
     sqInt targetBytecodePC;
     sqInt unforwardArg;
     sqInt unforwardRcvr;
@@ -17763,9 +17764,11 @@
 	if (((((ssTop())->type)) == SSConstant)
 	 && ((((ssValue(1))->type)) == SSConstant)) {
 		assert(!((primDescriptor->isMapped)));
-		return ssPushConstant(((((ssTop())->constant)) == (((ssValue(1))->constant))
+		result = ((((ssTop())->constant)) == (((ssValue(1))->constant))
 			? trueObject()
-			: falseObject()));
+			: falseObject());
+		ssPop(2);
+		return ssPushConstant(result);
 	}
 	nextPC = bytecodePC + ((primDescriptor->numBytes));
 	nExts = 0;

Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/nsspursrc/vm/cogit.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 

Modified: branches/Cog/nsspursrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogmethod.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/nsspursrc/vm/cogmethod.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 typedef struct {


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Wed Jun  4 17:44:20 PDT 2014
   + Thu Jun  5 10:44:17 PDT 2014

Modified: branches/Cog/sistasrc/vm/cogit.c
===================================================================
--- branches/Cog/sistasrc/vm/cogit.c	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/sistasrc/vm/cogit.c	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
    from
-	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

Modified: branches/Cog/sistasrc/vm/cogit.h
===================================================================
--- branches/Cog/sistasrc/vm/cogit.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/sistasrc/vm/cogit.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 

Modified: branches/Cog/sistasrc/vm/cogmethod.h
===================================================================
--- branches/Cog/sistasrc/vm/cogmethod.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/sistasrc/vm/cogmethod.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 typedef struct {

Modified: branches/Cog/spursistasrc/vm/cogit.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.c	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/spursistasrc/vm/cogit.c	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
    from
-	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/spursistasrc/vm/cogit.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 

Modified: branches/Cog/spursistasrc/vm/cogmethod.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogmethod.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/spursistasrc/vm/cogmethod.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 typedef struct {

Modified: branches/Cog/spursrc/vm/cogit.c
===================================================================
--- branches/Cog/spursrc/vm/cogit.c	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/spursrc/vm/cogit.c	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -16102,6 +16102,7 @@
     BytecodeDescriptor *primDescriptor;
     sqInt quickConstant;
     sqInt rcvrReg;
+    sqInt result;
     sqInt targetBytecodePC;
     sqInt unforwardArg;
     sqInt unforwardRcvr;
@@ -16113,9 +16114,11 @@
 	if (((((ssTop())->type)) == SSConstant)
 	 && ((((ssValue(1))->type)) == SSConstant)) {
 		assert(!((primDescriptor->isMapped)));
-		return ssPushConstant(((((ssTop())->constant)) == (((ssValue(1))->constant))
+		result = ((((ssTop())->constant)) == (((ssValue(1))->constant))
 			? trueObject()
-			: falseObject()));
+			: falseObject());
+		ssPop(2);
+		return ssPushConstant(result);
 	}
 	nextPC = bytecodePC + ((primDescriptor->numBytes));
 	nExts = 0;

Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/spursrc/vm/cogit.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 

Modified: branches/Cog/spursrc/vm/cogmethod.h
===================================================================
--- branches/Cog/spursrc/vm/cogmethod.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/spursrc/vm/cogmethod.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 typedef struct {

Modified: branches/Cog/src/vm/cogit.c
===================================================================
--- branches/Cog/src/vm/cogit.c	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/src/vm/cogit.c	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -14869,6 +14869,7 @@
     BytecodeDescriptor *primDescriptor;
     sqInt quickConstant;
     sqInt rcvrReg;
+    sqInt result;
     sqInt targetBytecodePC;
     sqInt unforwardArg;
     sqInt unforwardRcvr;
@@ -14880,9 +14881,11 @@
 	if (((((ssTop())->type)) == SSConstant)
 	 && ((((ssValue(1))->type)) == SSConstant)) {
 		assert(!((primDescriptor->isMapped)));
-		return ssPushConstant(((((ssTop())->constant)) == (((ssValue(1))->constant))
+		result = ((((ssTop())->constant)) == (((ssValue(1))->constant))
 			? trueObject()
-			: falseObject()));
+			: falseObject());
+		ssPop(2);
+		return ssPushConstant(result);
 	}
 	nextPC = bytecodePC + ((primDescriptor->numBytes));
 	nExts = 0;

Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/src/vm/cogit.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 

Modified: branches/Cog/src/vm/cogmethod.h
===================================================================
--- branches/Cog/src/vm/cogmethod.h	2014-06-05 00:45:11 UTC (rev 2944)
+++ branches/Cog/src/vm/cogmethod.h	2014-06-05 17:44:38 UTC (rev 2945)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.756 uuid: 34211eb3-ba7a-43fb-b007-12c94b1b4826
+	CCodeGenerator VMMaker.oscog-eem.757 uuid: c4908baa-712c-4cb6-a606-5bde992e9582
  */
 
 typedef struct {



More information about the Vm-dev mailing list