Add new SmallInteger test method in the right place and hence restore

compilability of v3 Cog VMs.
OpenSmalltalk · Feb 25, 2017 · 0528f6e · 0528f6e
1 parent 4518eb2
commit 0528f6e
Show file tree

Hide file tree

Showing 28 changed files with 215 additions and 200 deletions.
diff --git a/nsspur64src/vm/cogit.h b/nsspur64src/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
  */
 
 

diff --git a/nsspur64src/vm/cogitX64.c b/nsspur64src/vm/cogitX64.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -643,7 +643,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void);
 static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc);
 static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg);
 static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg);
-static sqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod);
+static usqInt 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);
@@ -2814,7 +2814,7 @@ static sqInt NoDbgRegParms
 blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg)
 {
     sqInt blockEntry;
-    sqInt end;
+    usqInt end;
     sqInt pc;
     sqInt result;
     usqInt targetpc;
@@ -7265,7 +7265,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg)
 /*	Answer the address of the null byte at the end of the method map. */
 
 	/* Cogit>>#mapEndFor: */
-static sqInt NoDbgRegParms
+static usqInt NoDbgRegParms
 mapEndFor(CogMethod *cogMethod)
 {
     usqInt end;
@@ -28748,7 +28748,6 @@ genSpecialSelectorArithmetic(void)
 							genoperandoperand(MoveRR, ReceiverResultReg, TempReg),
 							/* begin AndR:R: */
 							genoperandoperand(AndRR, Arg0Reg, TempReg),
-							/* begin genJumpNotSmallIntegerInScratchReg: */
 							genJumpNotSmallInteger(TempReg))))
 		: 0);
 
@@ -28993,7 +28992,6 @@ genSpecialSelectorComparison(void)
 							genoperandoperand(MoveRR, ReceiverResultReg, TempReg),
 							/* begin AndR:R: */
 							genoperandoperand(AndRR, Arg0Reg, TempReg),
-							/* begin genJumpNotSmallIntegerInScratchReg: */
 							genJumpNotSmallInteger(TempReg))))
 		: 0);
 	if (argIsIntConst) {

diff --git a/nsspursrc/vm/cogit.h b/nsspursrc/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
  */
 
 

diff --git a/nsspursrc/vm/cogitARMv5.c b/nsspursrc/vm/cogitARMv5.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -7590,7 +7590,7 @@ static sqInt NoDbgRegParms
 blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg)
 {
     sqInt blockEntry;
-    sqInt end;
+    usqInt end;
     sqInt pc;
     sqInt result;
     usqInt targetpc;

diff --git a/nsspursrc/vm/cogitIA32.c b/nsspursrc/vm/cogitIA32.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -707,7 +707,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void);
 static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc);
 static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg);
 static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg);
-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);
@@ -7590,7 +7590,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod)
     sqInt byte;
     BytecodeDescriptor *descriptor;
     sqInt distance;
-    usqInt endbcpc;
+    sqInt endbcpc;
     CogMethod *homeMethod;
     sqInt isBackwardBranch;
     sqInt isInBlock;
@@ -10767,12 +10767,12 @@ static sqInt NoDbgRegParms
 generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
 {
     unsigned char annotation;
-    usqIntptr_t delta;
+    sqInt delta;
     sqInt i;
     AbstractInstruction *instruction;
     sqInt length;
-    usqIntptr_t location;
-    usqIntptr_t mapEntry;
+    sqInt location;
+    sqInt mapEntry;
     sqInt maxDelta;
     usqIntptr_t mcpc;
 
@@ -11982,7 +11982,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg)
 /*	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;
@@ -13035,7 +13035,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co
     sqInt byte;
     BytecodeDescriptor *descriptor;
     sqInt distance;
-    usqInt endbcpc;
+    sqInt endbcpc;
     CogMethod *homeMethod;
     sqInt isBackwardBranch;
     sqInt isInBlock;
@@ -23575,7 +23575,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj)
     CogBlockMethod *cogMethod1;
     BytecodeDescriptor *descriptor;
     sqInt distance;
-    usqInt endbcpc;
+    sqInt endbcpc;
     sqInt errCode;
     CogMethod *homeMethod;
     sqInt isBackwardBranch;

diff --git a/nsspursrc/vm/cogitMIPSEL.c b/nsspursrc/vm/cogitMIPSEL.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -2728,7 +2728,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod)
     sqInt byte;
     BytecodeDescriptor *descriptor;
     sqInt distance;
-    usqInt endbcpc;
+    sqInt endbcpc;
     CogMethod *homeMethod;
     sqInt isBackwardBranch;
     sqInt isInBlock;
@@ -4781,7 +4781,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand,
 static sqInt NoDbgRegParms
 cPICCompactAndIsNowEmpty(CogMethod *cPIC)
 {
-    usqInt entryPoint;
+    sqInt entryPoint;
     sqInt followingAddress;
     sqInt i;
     sqInt methods[MaxCPICCases];
@@ -5927,12 +5927,12 @@ static sqInt NoDbgRegParms
 generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
 {
     unsigned char annotation;
-    sqInt delta;
+    usqIntptr_t delta;
     sqInt i;
     AbstractInstruction *instruction;
     sqInt length;
-    sqInt location;
-    sqInt mapEntry;
+    usqIntptr_t location;
+    usqIntptr_t mapEntry;
     sqInt maxDelta;
     usqIntptr_t mcpc;
 
@@ -6630,7 +6630,7 @@ static sqInt NoDbgRegParms
 incrementUsageOfTargetIfLinkedSendmcpcignored(sqInt annotation, char *mcpc, sqInt superfluity)
 {
     usqInt cacheAddress;
-    sqInt entryPoint;
+    usqInt entryPoint;
     usqInt entryPoint1;
     char *mcpc1;
     NSSendCache *nsSendCache;
@@ -8159,7 +8159,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co
     sqInt byte;
     BytecodeDescriptor *descriptor;
     sqInt distance;
-    usqInt endbcpc;
+    sqInt endbcpc;
     CogMethod *homeMethod;
     sqInt isBackwardBranch;
     sqInt isInBlock;
@@ -9392,7 +9392,7 @@ static sqInt NoDbgRegParms
 unlinkIfFreeOrLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector)
 {
     usqInt cacheAddress;
-    sqInt entryPoint;
+    usqInt entryPoint;
     usqInt entryPoint1;
     char *mcpc1;
     NSSendCache *nsSendCache;
@@ -9696,7 +9696,7 @@ static sqInt NoDbgRegParms
 unlinkIfLinkedSendpcto(sqInt annotation, char *mcpc, sqInt theCogMethod)
 {
     usqInt cacheAddress;
-    usqInt entryPoint;
+    sqInt entryPoint;
     usqInt entryPoint1;
     char *mcpc1;
     NSSendCache *nsSendCache;
@@ -14858,7 +14858,7 @@ relocateCallBeforeReturnPCby(AbstractInstruction * self_in_relocateCallBeforeRet
 static AbstractInstruction * NoDbgRegParms
 relocateJumpLongBeforeFollowingAddressby(AbstractInstruction * self_in_relocateJumpLongBeforeFollowingAddressby, sqInt pc, sqInt delta)
 {
-    usqInt newTarget;
+    sqInt newTarget;
     usqInt oldTarget;
 
 	assert((delta % 4) == 0);
@@ -14911,7 +14911,7 @@ relocateJumpLongConditionalBeforeFollowingAddressby(AbstractInstruction * self_i
 static AbstractInstruction * NoDbgRegParms
 relocateMethodReferenceBeforeAddressby(AbstractInstruction * self_in_relocateMethodReferenceBeforeAddressby, sqInt pc, sqInt delta)
 {
-    usqInt newValue;
+    sqInt newValue;
     usqInt oldValue;
 
 	if (((opcodeAtAddress(self_in_relocateMethodReferenceBeforeAddressby, pc - 8)) == ADDIU)
@@ -22837,7 +22837,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj)
     CogBlockMethod *cogMethod1;
     BytecodeDescriptor *descriptor;
     sqInt distance;
-    usqInt endbcpc;
+    sqInt endbcpc;
     sqInt errCode;
     CogMethod *homeMethod;
     sqInt isBackwardBranch;

diff --git a/spur64src/vm/cogit.h b/spur64src/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
  */
 
 

diff --git a/spur64src/vm/cogitX64.c b/spur64src/vm/cogitX64.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -2794,7 +2794,7 @@ static sqInt NoDbgRegParms
 blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg)
 {
     sqInt blockEntry;
-    sqInt end;
+    usqInt end;
     sqInt pc;
     sqInt result;
     usqInt targetpc;
@@ -2838,7 +2838,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod)
     sqInt byte;
     BytecodeDescriptor *descriptor;
     sqInt distance;
-    usqInt endbcpc;
+    sqInt endbcpc;
     CogMethod *homeMethod;
     sqInt isBackwardBranch;
     sqInt isInBlock;
@@ -6091,12 +6091,12 @@ static sqInt NoDbgRegParms
 generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
 {
     unsigned char annotation;
-    sqInt delta;
+    usqIntptr_t delta;
     sqInt i;
     AbstractInstruction *instruction;
     sqInt length;
-    sqInt location;
-    sqInt mapEntry;
+    usqIntptr_t location;
+    usqIntptr_t mapEntry;
     sqInt maxDelta;
     usqIntptr_t mcpc;
 
@@ -8080,7 +8080,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co
     sqInt byte;
     BytecodeDescriptor *descriptor;
     sqInt distance;
-    usqInt endbcpc;
+    sqInt endbcpc;
     CogMethod *homeMethod;
     sqInt isBackwardBranch;
     sqInt isInBlock;
@@ -23778,7 +23778,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj)
     CogBlockMethod *cogMethod1;
     BytecodeDescriptor *descriptor;
     sqInt distance;
-    usqInt endbcpc;
+    sqInt endbcpc;
     sqInt errCode;
     CogMethod *homeMethod;
     sqInt isBackwardBranch;
@@ -28185,7 +28185,6 @@ genSpecialSelectorArithmetic(void)
 							genoperandoperand(MoveRR, ReceiverResultReg, TempReg),
 							/* begin AndR:R: */
 							genoperandoperand(AndRR, Arg0Reg, TempReg),
-							/* begin genJumpNotSmallIntegerInScratchReg: */
 							genJumpNotSmallInteger(TempReg))))
 		: 0);
 
@@ -28430,7 +28429,6 @@ genSpecialSelectorComparison(void)
 							genoperandoperand(MoveRR, ReceiverResultReg, TempReg),
 							/* begin AndR:R: */
 							genoperandoperand(AndRR, Arg0Reg, TempReg),
-							/* begin genJumpNotSmallIntegerInScratchReg: */
 							genJumpNotSmallInteger(TempReg))))
 		: 0);
 	if (argIsIntConst) {

diff --git a/spurlowcode64src/vm/cogit.h b/spurlowcode64src/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802
+	CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5
  */