[commit] r2471 - Newspeak Cog VM source as per VMMaker.oscog-eem.111.mcz. Fix remapNSIfObjectRef: - Vm-dev

25 Jul 2011

Author: eliot
Date: 2011-07-25 13:49:46 -0700 (Mon, 25 Jul 2011)
New Revision: 2471
Modified:
   branches/Cog/nscogsrc/vm/cogit.c
   branches/Cog/nscogsrc/vm/cogit.h
   branches/Cog/nscogsrc/vm/cogmethod.h
   branches/Cog/nscogsrc/vm/cointerp.c
   branches/Cog/nscogsrc/vm/cointerp.h
   branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
   branches/Cog/nscogsrc/vm/interp.h
   branches/Cog/nscogsrc/vm/vmCallback.h
   branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Log:
Newspeak Cog VM source as per VMMaker.oscog-eem.111.mcz. Fix remapNSIfObjectRef:
pc:hasYoung: so if implicit receiver cache tag or value are young method must
remain in youngReferrers.  [gcc3x-]cointerp.c regenerated without defining
given constants (i.e. IMMUTABILITY & NewspeakVM).
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================

--- branches/Cog/nscogsrc/vm/cogit.c	2011-07-25 20:42:55 UTC (rev 2470)
+++ branches/Cog/nscogsrc/vm/cogit.c	2011-07-25 20:49:46 UTC (rev 2471)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.107 uuid: e97a2dd5-e1e7-4281-bb49-cb97be511631
+	CCodeGenerator VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.107 uuid: e97a2dd5-e1e7-4281-bb49-cb97be511631
+	StackToRegisterMappingCogit VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.107 uuid: e97a2dd5-e1e7-4281-bb49-cb97be511631 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
@@ -290,7 +290,6 @@
 #define MoveXwrRR 46
 #define MulRdRd 99
 #define NegateR 68
-#define NewspeakVM 1
 #define Nop 8
 #define NumObjRefsInRuntime 2
 #define NumSendTrampolines 4
@@ -15251,12 +15250,20 @@
    			if (mappedOop != oop) {
    				unalignedLongAtput(backEnd, pc, mappedOop);
    			}
+				if ((hasYoungPtr != 0)
+				 && (isYoung(mappedOop))) {
+					(((sqInt *) hasYoungPtr))[0] = 1;
+				}
    			pc = ((((sqInt)mcpc)) + (jumpShortByteSize(backEnd))) + BytesPerOop;
    			if (((oop = unalignedLongAt(backEnd, pc))) != 0) {
    				mappedOop = remap(oop);
    				if (mappedOop != oop) {
    					unalignedLongAtput(backEnd, pc, mappedOop);
    				}
+					if ((hasYoungPtr != 0)
+					 && (isYoung(mappedOop))) {
+						(((sqInt *) hasYoungPtr))[0] = 1;
+					}
    			}
    		}
    	}
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h	2011-07-25 20:42:55 UTC (rev 2470)
+++ branches/Cog/nscogsrc/vm/cogit.h	2011-07-25 20:49:46 UTC (rev 2471)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.107 uuid: e97a2dd5-e1e7-4281-bb49-cb97be511631
+	CCodeGenerator VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
  */
Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h	2011-07-25 20:42:55 UTC (rev 2470)
+++ branches/Cog/nscogsrc/vm/cogmethod.h	2011-07-25 20:49:46 UTC (rev 2471)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.107 uuid: e97a2dd5-e1e7-4281-bb49-cb97be511631
+	CCodeGenerator VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
  */
typedef struct {
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c	2011-07-25 20:42:55 UTC (rev 2470)
+++ branches/Cog/nscogsrc/vm/cointerp.c	2011-07-25 20:49:46 UTC (rev 2471)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
    from
-	CoInterpreter VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb
+	CoInterpreter VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -205,7 +205,6 @@
 #define HeaderTypeShort 3
 #define HeaderTypeSizeAndClass 0
 #define IFrameSlots 7
-#define IMMUTABILITY 0
 #define ImmutabilityBit 0x20000000
 #define InstanceSpecificationIndex 2
 #define InstructionPointerIndex 1
@@ -244,7 +243,6 @@
 #define MinBackwardJumpCountForCompile 10
 #define MixinIndex 3
 #define MyListIndex 3
-#define NewspeakVM 1
 #define NextLinkIndex 0
 #define NilObject 0
 #define PrimCallCollectsProfileSamples 8
@@ -1883,7 +1881,7 @@
    /* 575 */ (void (*)(void))0,
  0 };
 static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.106";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.111";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
 volatile int sendTrace;
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h	2011-07-25 20:42:55 UTC (rev 2470)
+++ branches/Cog/nscogsrc/vm/cointerp.h	2011-07-25 20:49:46 UTC (rev 2471)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
  */
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c	2011-07-25 20:42:55 UTC (rev 2470)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c	2011-07-25 20:49:46 UTC (rev 2471)
@@ -2,11 +2,11 @@
/* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
    from
-	CoInterpreter VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb
+	CoInterpreter VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -208,7 +208,6 @@
 #define HeaderTypeShort 3
 #define HeaderTypeSizeAndClass 0
 #define IFrameSlots 7
-#define IMMUTABILITY 0
 #define ImmutabilityBit 0x20000000
 #define InstanceSpecificationIndex 2
 #define InstructionPointerIndex 1
@@ -247,7 +246,6 @@
 #define MinBackwardJumpCountForCompile 10
 #define MixinIndex 3
 #define MyListIndex 3
-#define NewspeakVM 1
 #define NextLinkIndex 0
 #define NilObject 0
 #define PrimCallCollectsProfileSamples 8
@@ -1886,7 +1884,7 @@
    /* 575 */ (void (*)(void))0,
  0 };
 static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.106";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.111";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
 volatile int sendTrace;
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h	2011-07-25 20:42:55 UTC (rev 2470)
+++ branches/Cog/nscogsrc/vm/interp.h	2011-07-25 20:49:46 UTC (rev 2471)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
  */
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h	2011-07-25 20:42:55 UTC (rev 2470)
+++ branches/Cog/nscogsrc/vm/vmCallback.h	2011-07-25 20:49:46 UTC (rev 2471)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e
  */
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Wed Jul 20 14:36:22 PDT 2011
   + Mon Jul 25 13:48:23 PDT 2011

    