[Vm-dev] [commit][2778] CogVM source as per VMMaker.oscog-eem.335.

[commits at squeakvm.org]

Revision: 2778
Author:   eliot
Date:     2013-08-23 11:55:42 -0700 (Fri, 23 Aug 2013)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.335.

Fix snafu in unpairedMethodList maintennance during code
compaction.  Must only examine CMMethods.

Modified Paths:
--------------
    branches/Cog/nscogsrc/vm/cogit.c
    branches/Cog/nscogsrc/vm/cogit.h
    branches/Cog/nscogsrc/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	2013-08-22 21:35:57 UTC (rev 2777)
+++ branches/Cog/nscogsrc/vm/cogit.c	2013-08-23 18:55:42 UTC (rev 2778)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.334 uuid: 7fbb9957-2619-46fe-acff-d1afd6e470fe
+	CCodeGenerator VMMaker.oscog-eem.335 uuid: 02e5ae48-52a4-4324-9b6d-887f45be6a12
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.334 uuid: 7fbb9957-2619-46fe-acff-d1afd6e470fe
+	StackToRegisterMappingCogit VMMaker.oscog-eem.335 uuid: 02e5ae48-52a4-4324-9b6d-887f45be6a12
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.334 uuid: 7fbb9957-2619-46fe-acff-d1afd6e470fe " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.335 uuid: 02e5ae48-52a4-4324-9b6d-887f45be6a12 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -3716,7 +3716,8 @@
 		if (((source->cmUsageCount)) > 0) {
 			(source->cmUsageCount = ((sqInt) ((source->cmUsageCount)) >> 1));
 		}
-		if ((((sqInt)(rawHeaderOf((source->methodObject))))) != (((sqInt)source))) {
+		if ((((source->cmType)) == CMMethod)
+		 && ((((sqInt)(rawHeaderOf((source->methodObject))))) != (((sqInt)source)))) {
 			(source->nextMethod = unpairedMethodList);
 			unpairedMethodList = source;
 		}

Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h	2013-08-22 21:35:57 UTC (rev 2777)
+++ branches/Cog/nscogsrc/vm/cogit.h	2013-08-23 18:55:42 UTC (rev 2778)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.334 uuid: 7fbb9957-2619-46fe-acff-d1afd6e470fe
+	CCodeGenerator VMMaker.oscog-eem.335 uuid: 02e5ae48-52a4-4324-9b6d-887f45be6a12
  */
 
 

Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h	2013-08-22 21:35:57 UTC (rev 2777)
+++ branches/Cog/nscogsrc/vm/cogmethod.h	2013-08-23 18:55:42 UTC (rev 2778)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.334 uuid: 7fbb9957-2619-46fe-acff-d1afd6e470fe
+	CCodeGenerator VMMaker.oscog-eem.335 uuid: 02e5ae48-52a4-4324-9b6d-887f45be6a12
  */
 
 typedef struct {


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Thu Aug 22 14:35:32 PDT 2013
   + Fri Aug 23 11:55:04 PDT 2013