CogVM source as per VMMaker.oscog-nice.1933

Fix incorrect type inferencing for asUnsignedLongLong which causes a bug in the v3 format VM in fetchLong64:ofObject:. This breaks large integer arithmetic. In this case, type inferencing is used for correct unsigned casting before left shifting. TODO: verify that all selectors translated via initializeCTranslationDictionary have correct type inferencing in returnTypeForSend:in:ifNil: Sista: The jumpIfNotInstanceOfOrPop bytecode was interesting but hard to tackle in many places, leading to hard to write assertion in the JIT. It has been changed so that it now always consumes the top of the stack, jumping if the top of the stack is not an instance of one of the class specified in the literal. This way that bytecode can also be used easily to optimize PICs. Fixed machine code generation of UByteNumBytes
OpenSmalltalk · Sep 5, 2016 · 456992c · 456992c
1 parent f39cb11
commit 456992c
Show file tree

Hide file tree

Showing 51 changed files with 452 additions and 450 deletions.
diff --git a/nsspur64src/vm/cogit.h b/nsspur64src/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	CCodeGenerator VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
  */
 
 

diff --git a/nsspur64src/vm/cogitX64.c b/nsspur64src/vm/cogitX64.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	CCodeGenerator VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	StackToRegisterMappingCogit VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/nsspur64src/vm/cointerp.c b/nsspur64src/vm/cointerp.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
    from
-	CoInterpreter VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	CoInterpreter VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2459,7 +2459,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */]
 	};
 sqInt checkedPluginName;
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1930";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-nice.1933";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -21449,7 +21449,7 @@ printFrameWithSP(char *theFP, char *theSP)
     usqInt index;
     sqInt methodField;
     usqInt numArgs;
-    usqInt numTemps;
+    sqInt numTemps;
     char *rcvrAddress;
     sqInt rcvrOrClosure;
     sqInt theMethod;
@@ -32448,7 +32448,7 @@ primitiveImmediateAsInteger(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt oop;
     char *sp;
-    usqInt value;
+    sqInt value;
 
 	value = 0;
 	oop = longAt(GIV(stackPointer));
@@ -40458,7 +40458,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass)
     sqInt fmt;
     usqInt instBytes;
     sqInt instFormat;
-    usqInt newFormat;
+    sqInt newFormat;
     sqInt normalizedInstFormat;
     usqInt numBytes;
     usqInt numSlots;
@@ -40627,7 +40627,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass)
 	/* begin set:classIndexTo:formatTo: */
 	assert(((classIndex >= 0) && (classIndex <= (classIndexMask()))));
 	assert(((newFormat >= 0) && (newFormat <= (formatMask()))));
-	longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift()))));
+	longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift()))))));
 	return 0;
 }
 
@@ -42449,7 +42449,7 @@ scavengeFutureSurvivorSpaceStartingAt(sqInt initialAddress)
     usqInt numSlots1;
     usqInt numSlots2;
     sqInt obj;
-    usqInt ptr;
+    sqInt ptr;
     usqInt slotBytes;
 
 	ptr = initialAddress;
@@ -47629,7 +47629,7 @@ eliminateAndFreeForwardersForPigCompact(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt address;
     sqInt address1;
-    usqInt bytes;
+    sqInt bytes;
     sqInt endOfFreeRun;
     sqInt f;
     sqInt firstOfFreeRun;
@@ -53812,7 +53812,7 @@ maybeSplObj(sqInt index)
 static sqInt NoDbgRegParms
 moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    usqInt chunkBytes;
+    sqInt chunkBytes;
     sqInt classIndex;
     sqInt classIndex1;
     sqInt dest;
@@ -60244,8 +60244,8 @@ writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSeg
 {
     usqLong firstSavedBridgeWord;
     sqInt nWritten;
-    sqInt pier1;
-    sqInt pier2;
+    usqInt pier1;
+    usqInt pier2;
     usqLong secondSavedBridgeWord;
 
 	pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -70967,7 +70967,7 @@ removeFirstLinkOfList(sqInt aList)
 static sqInt
 retryPrimitiveOnFailure(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    signed char accessorDepth;
+    sqInt accessorDepth;
     sqInt canRetry;
     sqInt firstBytecode;
     sqInt followDone;

diff --git a/nsspur64src/vm/cointerp.h b/nsspur64src/vm/cointerp.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
  */
 
 

diff --git a/nsspur64src/vm/gcc3x-cointerp.c b/nsspur64src/vm/gcc3x-cointerp.c
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
    from
-	CoInterpreter VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	CoInterpreter VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2462,7 +2462,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */]
 	};
 sqInt checkedPluginName;
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1930";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-nice.1933";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -21458,7 +21458,7 @@ printFrameWithSP(char *theFP, char *theSP)
     usqInt index;
     sqInt methodField;
     usqInt numArgs;
-    usqInt numTemps;
+    sqInt numTemps;
     char *rcvrAddress;
     sqInt rcvrOrClosure;
     sqInt theMethod;
@@ -32457,7 +32457,7 @@ primitiveImmediateAsInteger(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt oop;
     char *sp;
-    usqInt value;
+    sqInt value;
 
 	value = 0;
 	oop = longAt(GIV(stackPointer));
@@ -40467,7 +40467,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass)
     sqInt fmt;
     usqInt instBytes;
     sqInt instFormat;
-    usqInt newFormat;
+    sqInt newFormat;
     sqInt normalizedInstFormat;
     usqInt numBytes;
     usqInt numSlots;
@@ -40636,7 +40636,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass)
 	/* begin set:classIndexTo:formatTo: */
 	assert(((classIndex >= 0) && (classIndex <= (classIndexMask()))));
 	assert(((newFormat >= 0) && (newFormat <= (formatMask()))));
-	longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift()))));
+	longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift()))))));
 	return 0;
 }
 
@@ -42458,7 +42458,7 @@ scavengeFutureSurvivorSpaceStartingAt(sqInt initialAddress)
     usqInt numSlots1;
     usqInt numSlots2;
     sqInt obj;
-    usqInt ptr;
+    sqInt ptr;
     usqInt slotBytes;
 
 	ptr = initialAddress;
@@ -47638,7 +47638,7 @@ eliminateAndFreeForwardersForPigCompact(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt address;
     sqInt address1;
-    usqInt bytes;
+    sqInt bytes;
     sqInt endOfFreeRun;
     sqInt f;
     sqInt firstOfFreeRun;
@@ -53821,7 +53821,7 @@ maybeSplObj(sqInt index)
 static sqInt NoDbgRegParms
 moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    usqInt chunkBytes;
+    sqInt chunkBytes;
     sqInt classIndex;
     sqInt classIndex1;
     sqInt dest;
@@ -60253,8 +60253,8 @@ writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSeg
 {
     usqLong firstSavedBridgeWord;
     sqInt nWritten;
-    sqInt pier1;
-    sqInt pier2;
+    usqInt pier1;
+    usqInt pier2;
     usqLong secondSavedBridgeWord;
 
 	pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -70976,7 +70976,7 @@ removeFirstLinkOfList(sqInt aList)
 static sqInt
 retryPrimitiveOnFailure(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    signed char accessorDepth;
+    sqInt accessorDepth;
     sqInt canRetry;
     sqInt firstBytecode;
     sqInt followDone;

diff --git a/nsspursrc/vm/cogit.h b/nsspursrc/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	CCodeGenerator VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
  */
 
 

diff --git a/nsspursrc/vm/cogitARMv5.c b/nsspursrc/vm/cogitARMv5.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	CCodeGenerator VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	StackToRegisterMappingCogit VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -711,7 +711,7 @@ static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt re
 static AbstractInstruction * NoDbgRegParms gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg);
 static AbstractInstruction * NoDbgRegParms gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg);
 static AbstractInstruction * NoDbgRegParms gMoveRR(sqInt reg1, sqInt reg2);
-static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod);
+static sqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod);
 static sqInt NoDbgRegParms mapForperformUntilarg(CogMethod *cogMethod, sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg);
 static sqInt NoDbgRegParms mapObjectReferencesInClosedPIC(CogMethod *cPIC);
 static void mapObjectReferencesInGeneratedRuntime(void);
@@ -12129,7 +12129,7 @@ gMoveRR(sqInt reg1, sqInt reg2)
 /*	Answer the address of the null byte at the end of the method map. */
 
 	/* Cogit>>#mapEndFor: */
-static usqInt NoDbgRegParms
+static sqInt NoDbgRegParms
 mapEndFor(CogMethod *cogMethod)
 {
     usqInt end;

diff --git a/nsspursrc/vm/cogitIA32.c b/nsspursrc/vm/cogitIA32.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	CCodeGenerator VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034
+	StackToRegisterMappingCogit VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1930 uuid: e01f4bfc-2f0a-40e1-9491-d744cde15034 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1933 uuid: 18f1dc32-84e8-43aa-baba-937ea911b845 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -656,7 +656,7 @@ static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt re
 static AbstractInstruction * NoDbgRegParms gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg);
 static AbstractInstruction * NoDbgRegParms gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg);
 static AbstractInstruction * NoDbgRegParms gMoveRR(sqInt reg1, sqInt reg2);
-static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod);
+static sqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod);
 static sqInt NoDbgRegParms mapForperformUntilarg(CogMethod *cogMethod, sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg);
 static sqInt NoDbgRegParms mapObjectReferencesInClosedPIC(CogMethod *cPIC);
 static void mapObjectReferencesInGeneratedRuntime(void);
@@ -11085,7 +11085,7 @@ gMoveRR(sqInt reg1, sqInt reg2)
 /*	Answer the address of the null byte at the end of the method map. */
 
 	/* Cogit>>#mapEndFor: */
-static usqInt NoDbgRegParms
+static sqInt NoDbgRegParms
 mapEndFor(CogMethod *cogMethod)
 {
     usqInt end;