[Vm-dev] [commit][3042] CogVM source as per VMMaker.oscog-eem.822

commits at squeakvm.org commits at squeakvm.org
Wed Jul 16 18:49:21 UTC 2014


Revision: 3042
Author:   eliot
Date:     2014-07-16 11:49:18 -0700 (Wed, 16 Jul 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.822

Initialize numIRCs before checking for quick prims.

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

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c	2014-07-15 19:11:00 UTC (rev 3041)
+++ branches/Cog/nscogsrc/vm/cogit.c	2014-07-16 18:49:18 UTC (rev 3042)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7
+	CCodeGenerator VMMaker.oscog-eem.822 uuid: ccc5a2c0-9c7d-4777-a4c6-ba28c0d02d80
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7
+	StackToRegisterMappingCogit VMMaker.oscog-eem.822 uuid: ccc5a2c0-9c7d-4777-a4c6-ba28c0d02d80
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.822 uuid: ccc5a2c0-9c7d-4777-a4c6-ba28c0d02d80 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -363,7 +363,7 @@
 /*** Function Prototypes ***/
 
 
-#if defined(PRODUCTION) && !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms)
+#if !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms)
 # define NoDbgRegParms __attribute__ ((regparm (0)))
 #endif
 
@@ -371,6 +371,16 @@
 # define NoDbgRegParms /*empty*/
 #endif
 
+
+
+#if defined(__GNUC__) && !defined(NeverInline)
+# define NeverInline __attribute__ ((noinline))
+#endif
+
+#if !defined(NeverInline)
+# define NeverInline /*empty*/
+#endif
+
 static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
 static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
 static sqInt computeJumpTargetOffsetPlus(AbstractInstruction * self_in_computeJumpTargetOffsetPlus, sqInt anPCOffset) NoDbgRegParms;
@@ -12968,7 +12978,7 @@
 static sqInt
 markLiteralsAndUnlinkIfUnmarkedSendpcmethod(sqInt annotation, char *mcpc, sqInt cogMethod)
 {
-    sqInt cacheAddress;
+    usqInt cacheAddress;
     sqInt cacheTag;
     sqInt cacheTag1;
     sqInt cacheTagMarked;
@@ -13079,7 +13089,7 @@
 static sqInt
 markLiteralspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod)
 {
-    sqInt cacheAddress;
+    usqInt cacheAddress;
     sqInt cacheTag;
     sqInt cacheTag1;
     sqInt class;
@@ -13185,7 +13195,7 @@
 static sqInt
 markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod)
 {
-    sqInt cacheAddress;
+    usqInt cacheAddress;
     sqInt cacheTag;
     sqInt cacheTag1;
     sqInt class;
@@ -14032,7 +14042,7 @@
 static sqInt
 remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr)
 {
-    sqInt cacheAddress;
+    usqInt cacheAddress;
     sqInt cacheTag;
     sqInt cacheTag1;
     sqInt entryPoint;
@@ -14799,7 +14809,7 @@
 static void
 voidImplicitReceiverCacheAt(sqInt mcpc)
 {
-    sqInt cacheAddress;
+    usqInt cacheAddress;
 
 	assert(NumOopsPerIRC == 2);
 	cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd));
@@ -22504,18 +22514,18 @@
 	needsFrame = 0;
 	inBlock = 0;
 	prevBCDescriptor = null;
+	
+#  if NewspeakVM
+	numIRCs = 0;
+
+#  endif /* NewspeakVM */
+
 	if ((primitiveIndex > 0)
 	 && (isQuickPrimitiveIndex(primitiveIndex))) {
 		return 0;
 	}
 	pc = (latestContinuation = initialPC);
 	numBlocks = (framelessStackDelta = (nExts = 0));
-	
-#  if NewspeakVM
-	numIRCs = 0;
-
-#  endif /* NewspeakVM */
-
 	while (pc <= endPC) {
 		byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset;
 		descriptor = generatorAt(byte0);

Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h	2014-07-15 19:11:00 UTC (rev 3041)
+++ branches/Cog/nscogsrc/vm/cogit.h	2014-07-16 18:49:18 UTC (rev 3042)
@@ -1,12 +1,12 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7
+	CCodeGenerator VMMaker.oscog-eem.822 uuid: ccc5a2c0-9c7d-4777-a4c6-ba28c0d02d80
  */
 
 
 /*** Function Prototypes ***/
 
 
-#if defined(PRODUCTION) && !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms)
+#if !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms)
 # define NoDbgRegParms __attribute__ ((regparm (0)))
 #endif
 
@@ -14,6 +14,16 @@
 # define NoDbgRegParms /*empty*/
 #endif
 
+
+
+#if defined(__GNUC__) && !defined(NeverInline)
+# define NeverInline __attribute__ ((noinline))
+#endif
+
+#if !defined(NeverInline)
+# define NeverInline /*empty*/
+#endif
+
 sqInt abortOffset(void);
 void addCogMethodsToHeapMap(void);
 sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);

Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h	2014-07-15 19:11:00 UTC (rev 3041)
+++ branches/Cog/nscogsrc/vm/cogmethod.h	2014-07-16 18:49:18 UTC (rev 3042)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7
+	CCodeGenerator VMMaker.oscog-eem.822 uuid: ccc5a2c0-9c7d-4777-a4c6-ba28c0d02d80
  */
 
 typedef struct {

Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c	2014-07-15 19:11:00 UTC (rev 3041)
+++ branches/Cog/nsspursrc/vm/cogit.c	2014-07-16 18:49:18 UTC (rev 3042)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7
+	CCodeGenerator VMMaker.oscog-eem.822 uuid: ccc5a2c0-9c7d-4777-a4c6-ba28c0d02d80
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7
+	StackToRegisterMappingCogit VMMaker.oscog-eem.822 uuid: ccc5a2c0-9c7d-4777-a4c6-ba28c0d02d80
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.822 uuid: ccc5a2c0-9c7d-4777-a4c6-ba28c0d02d80 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -358,7 +358,7 @@
 /*** Function Prototypes ***/
 
 
-#if defined(PRODUCTION) && !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms)
+#if !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms)
 # define NoDbgRegParms __attribute__ ((regparm (0)))
 #endif
 
@@ -366,6 +366,16 @@
 # define NoDbgRegParms /*empty*/
 #endif
 
+
+
+#if defined(__GNUC__) && !defined(NeverInline)
+# define NeverInline __attribute__ ((noinline))
+#endif
+
+#if !defined(NeverInline)
+# define NeverInline /*empty*/
+#endif
+
 static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
 static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
 static sqInt computeJumpTargetOffsetPlus(AbstractInstruction * self_in_computeJumpTargetOffsetPlus, sqInt anPCOffset) NoDbgRegParms;
@@ -12789,7 +12799,7 @@
 static sqInt
 markLiteralspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod)
 {
-    usqInt cacheAddress;
+    sqInt cacheAddress;
     sqInt cacheTag;
     sqInt cacheTag1;
     sqInt class;
@@ -13694,7 +13704,7 @@
 static sqInt
 remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr)
 {
-    usqInt cacheAddress;
+    sqInt cacheAddress;
     sqInt cacheTag;
     sqInt cacheTag1;
     sqInt entryPoint;
@@ -14445,7 +14455,7 @@
 static void
 voidImplicitReceiverCacheAt(sqInt mcpc)
 {
-    usqInt cacheAddress;
+    sqInt cacheAddress;
 
 	assert(NumOopsPerIRC == 2);
 	cacheAddress = implicitReceiveCacheAt(backEnd, mcpc);
@@ -23884,18 +23894,18 @@
 	needsFrame = 0;
 	inBlock = 0;
 	prevBCDescriptor = null;
+	
+#  if NewspeakVM
+	numIRCs = 0;
+
+#  endif /* NewspeakVM */
+
 	if ((primitiveIndex > 0)
 	 && (isQuickPrimitiveIndex(primitiveIndex))) {
 		return 0;
 	}
 	pc = (latestContinuation = initialPC);
 	numBlocks = (framelessStackDelta = (nExts = 0));
-	
-#  if NewspeakVM
-	numIRCs = 0;
-
-#  endif /* NewspeakVM */
-
 	while (pc <= endPC) {
 		byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset;
 		descriptor = generatorAt(byte0);

Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h	2014-07-15 19:11:00 UTC (rev 3041)
+++ branches/Cog/nsspursrc/vm/cogit.h	2014-07-16 18:49:18 UTC (rev 3042)
@@ -1,12 +1,12 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7
+	CCodeGenerator VMMaker.oscog-eem.822 uuid: ccc5a2c0-9c7d-4777-a4c6-ba28c0d02d80
  */
 
 
 /*** Function Prototypes ***/
 
 
-#if defined(PRODUCTION) && !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms)
+#if !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms)
 # define NoDbgRegParms __attribute__ ((regparm (0)))
 #endif
 
@@ -14,6 +14,16 @@
 # define NoDbgRegParms /*empty*/
 #endif
 
+
+
+#if defined(__GNUC__) && !defined(NeverInline)
+# define NeverInline __attribute__ ((noinline))
+#endif
+
+#if !defined(NeverInline)
+# define NeverInline /*empty*/
+#endif
+
 sqInt abortOffset(void);
 void addCogMethodsToHeapMap(void);
 sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);

Modified: branches/Cog/nsspursrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogmethod.h	2014-07-15 19:11:00 UTC (rev 3041)
+++ branches/Cog/nsspursrc/vm/cogmethod.h	2014-07-16 18:49:18 UTC (rev 3042)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7
+	CCodeGenerator VMMaker.oscog-eem.822 uuid: ccc5a2c0-9c7d-4777-a4c6-ba28c0d02d80
  */
 
 typedef struct {


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Tue Jul 15 12:06:18 PDT 2014
   + Wed Jul 16 11:48:40 PDT 2014



More information about the Vm-dev mailing list