CogVM source as per VMMaker.oscog-eem.3025

Cogit: Fix a bad slip with SPReg ~= NativeSPReg platforms (ARMv8) and FastCCall primitives. The NativeSPReg must be restored to CStackPointer after calling the primitive/calling checkForAndFollowForwardedPrimitiveState, otherwise an OS interrupt will call whereever the NativeSPReg was left and the Smalltalk stack will be damaged.
OpenSmalltalk · Aug 4, 2021 · a2a7e97 · a2a7e97
1 parent cfa01f5
commit a2a7e97
Show file tree

Hide file tree

Showing 28 changed files with 90 additions and 84 deletions.
diff --git a/spur64src/vm/cogit.h b/spur64src/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
 
 

diff --git a/spur64src/vm/cogitARMv8.c b/spur64src/vm/cogitARMv8.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -7228,7 +7228,7 @@ rewriteImm19JumpBeforetarget(AbstractInstruction * self_in_rewriteImm19JumpBefor
 static sqInt NoDbgRegParms
 rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBeforetarget, sqInt followingAddress, sqInt targetAddress)
 {
-    sqInt instrOpcode;
+    usqInt instrOpcode;
     sqInt mcpc;
     sqInt offset;
 
@@ -7238,7 +7238,7 @@ rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBefor
 	instrOpcode = ((instructionBeforeAddress(self_in_rewriteImm26JumpBeforetarget, followingAddress))) >> 26;
 	assert((instrOpcode == 5)
 	 || (instrOpcode == 37));
-	codeLong32Atput(mcpc, (((sqInt)((usqInt)(instrOpcode) << 26))) + (((offset) >> 2) & (0x3FFFFFF)));
+	codeLong32Atput(mcpc, (instrOpcode << 26) + (((offset) >> 2) & (0x3FFFFFF)));
 	return 4;
 }
 
@@ -26768,6 +26768,7 @@ compileOnStackExternalPrimitiveflags(void (*primitiveRoutine)(void), sqInt flags
 	}
 	/* begin JumpNonZero: */
 	jmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0));
+	genLoadCStackPointer(backEnd);
 	/* begin MoveAw:R: */
 	address7 = stackPointerAddress();
 	/* begin gen:literal:operand: */
@@ -26848,6 +26849,7 @@ compileOnStackExternalPrimitiveflags(void (*primitiveRoutine)(void), sqInt flags
 			genLoadStackPointersForFastPrimCall(backEnd, ClassReg);
 		}
 	}
+	genLoadCStackPointer(backEnd);
 	/* begin MoveR:R: */
 	genoperandoperand(MoveRR, linkRegSaveRegister, LinkReg);
 	if (((ABICallerSavedRegisterMask & (1U << ReceiverResultReg)) != 0)) {

diff --git a/spur64src/vm/cogitX64SysV.c b/spur64src/vm/cogitX64SysV.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/spur64src/vm/cogitX64WIN64.c b/spur64src/vm/cogitX64WIN64.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/spurlowcode64src/vm/cogit.h b/spurlowcode64src/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
 
 

diff --git a/spurlowcode64src/vm/cogitARMv8.c b/spurlowcode64src/vm/cogitARMv8.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -7411,7 +7411,7 @@ rewriteImm19JumpBeforetarget(AbstractInstruction * self_in_rewriteImm19JumpBefor
 static sqInt NoDbgRegParms
 rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBeforetarget, sqInt followingAddress, sqInt targetAddress)
 {
-    sqInt instrOpcode;
+    usqInt instrOpcode;
     sqInt mcpc;
     sqInt offset;
 
@@ -7421,7 +7421,7 @@ rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBefor
 	instrOpcode = ((instructionBeforeAddress(self_in_rewriteImm26JumpBeforetarget, followingAddress))) >> 26;
 	assert((instrOpcode == 5)
 	 || (instrOpcode == 37));
-	codeLong32Atput(mcpc, (((sqInt)((usqInt)(instrOpcode) << 26))) + (((offset) >> 2) & (0x3FFFFFF)));
+	codeLong32Atput(mcpc, (instrOpcode << 26) + (((offset) >> 2) & (0x3FFFFFF)));
 	return 4;
 }
 
@@ -28786,6 +28786,7 @@ compileOnStackExternalPrimitiveflags(void (*primitiveRoutine)(void), sqInt flags
 	}
 	/* begin JumpNonZero: */
 	jmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0));
+	genLoadCStackPointer(backEnd);
 	/* begin MoveAw:R: */
 	address7 = stackPointerAddress();
 	/* begin gen:literal:operand: */
@@ -28866,6 +28867,7 @@ compileOnStackExternalPrimitiveflags(void (*primitiveRoutine)(void), sqInt flags
 			genLoadStackPointersForFastPrimCall(backEnd, ClassReg);
 		}
 	}
+	genLoadCStackPointer(backEnd);
 	/* begin MoveR:R: */
 	genoperandoperand(MoveRR, linkRegSaveRegister, LinkReg);
 	if (((ABICallerSavedRegisterMask & (1U << ReceiverResultReg)) != 0)) {

diff --git a/spurlowcode64src/vm/cogitX64SysV.c b/spurlowcode64src/vm/cogitX64SysV.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/spurlowcode64src/vm/cogitX64WIN64.c b/spurlowcode64src/vm/cogitX64WIN64.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/spurlowcodesrc/vm/cogit.h b/spurlowcodesrc/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
 
 

diff --git a/spurlowcodesrc/vm/cogitARMv5.c b/spurlowcodesrc/vm/cogitARMv5.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/spurlowcodesrc/vm/cogitIA32.c b/spurlowcodesrc/vm/cogitIA32.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/spurlowcodesrc/vm/cogitMIPSEL.c b/spurlowcodesrc/vm/cogitMIPSEL.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -6631,7 +6631,7 @@ cPICHasForwardedClass(CogMethod *cPIC)
 static sqInt NoDbgRegParms
 cPICHasFreedTargets(CogMethod *cPIC)
 {
-    usqInt entryPoint;
+    sqInt entryPoint;
     sqInt i;
     sqInt pc;
     CogMethod *targetMethod;

diff --git a/spursista64src/vm/cogit.h b/spursista64src/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
 
 

diff --git a/spursista64src/vm/cogitARMv8.c b/spursista64src/vm/cogitARMv8.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -7333,7 +7333,7 @@ rewriteImm19JumpBeforetarget(AbstractInstruction * self_in_rewriteImm19JumpBefor
 static sqInt NoDbgRegParms
 rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBeforetarget, sqInt followingAddress, sqInt targetAddress)
 {
-    usqInt instrOpcode;
+    sqInt instrOpcode;
     sqInt mcpc;
     sqInt offset;
 
@@ -7343,7 +7343,7 @@ rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBefor
 	instrOpcode = ((instructionBeforeAddress(self_in_rewriteImm26JumpBeforetarget, followingAddress))) >> 26;
 	assert((instrOpcode == 5)
 	 || (instrOpcode == 37));
-	codeLong32Atput(mcpc, (instrOpcode << 26) + (((offset) >> 2) & (0x3FFFFFF)));
+	codeLong32Atput(mcpc, (((sqInt)((usqInt)(instrOpcode) << 26))) + (((offset) >> 2) & (0x3FFFFFF)));
 	return 4;
 }
 
@@ -27738,6 +27738,7 @@ compileOnStackExternalPrimitiveflags(void (*primitiveRoutine)(void), sqInt flags
 	}
 	/* begin JumpNonZero: */
 	jmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0));
+	genLoadCStackPointer(backEnd);
 	/* begin MoveAw:R: */
 	address7 = stackPointerAddress();
 	/* begin gen:literal:operand: */
@@ -27818,6 +27819,7 @@ compileOnStackExternalPrimitiveflags(void (*primitiveRoutine)(void), sqInt flags
 			genLoadStackPointersForFastPrimCall(backEnd, ClassReg);
 		}
 	}
+	genLoadCStackPointer(backEnd);
 	/* begin MoveR:R: */
 	genoperandoperand(MoveRR, linkRegSaveRegister, LinkReg);
 	if (((ABICallerSavedRegisterMask & (1U << ReceiverResultReg)) != 0)) {

diff --git a/spursista64src/vm/cogitX64SysV.c b/spursista64src/vm/cogitX64SysV.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/spursista64src/vm/cogitX64WIN64.c b/spursista64src/vm/cogitX64WIN64.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/spursistasrc/vm/cogit.h b/spursistasrc/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
 
 

diff --git a/spursistasrc/vm/cogitARMv5.c b/spursistasrc/vm/cogitARMv5.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/spursistasrc/vm/cogitIA32.c b/spursistasrc/vm/cogitIA32.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/spursistasrc/vm/cogitMIPSEL.c b/spursistasrc/vm/cogitMIPSEL.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -6219,7 +6219,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand,
 static sqInt NoDbgRegParms
 cPICCompactAndIsNowEmpty(CogMethod *cPIC)
 {
-    usqInt entryPoint;
+    sqInt entryPoint;
     sqInt followingAddress;
     sqInt i;
     sqInt methods[MaxCPICCases];
@@ -10197,7 +10197,7 @@ static void NoDbgRegParms
 relocateCallsInClosedPIC(CogMethod *cPIC)
 {
     sqInt callDelta;
-    sqInt entryPoint;
+    usqInt entryPoint;
     sqInt i;
     sqInt pc;
     sqLong refDelta;
@@ -31873,9 +31873,9 @@ picDataForinto(CogMethod *cogMethod, sqInt arrayObj)
 static void NoDbgRegParms
 populatewithPICInfoForfirstCacheTag(sqInt tuple, CogMethod *cPIC, sqInt firstCacheTag)
 {
-    usqInt cacheTag;
+    sqInt cacheTag;
     sqInt classOop;
-    usqInt entryPoint;
+    sqInt entryPoint;
     sqInt i;
     sqInt pc;
     CogMethod *targetMethod;

diff --git a/spursrc/vm/cogit.h b/spursrc/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
 
 

diff --git a/spursrc/vm/cogitARMv5.c b/spursrc/vm/cogitARMv5.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	CCodeGenerator VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3024 uuid: 417aa150-be4e-4631-b35b-948afa18e190 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3025 uuid: f05011b2-d8fc-4b98-aeb2-ee7f640969c1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;