Generate VM code from VMMaker.oscog-nice.2501

This will remove a bunch of compiler warnings related to printf format on LLP64 architecture (WIN64) Note: I did not regenerate the plugins There are two changes pending in those plugins: - one in FileAttributePlugin concerning the major/minor VM version compatibility - the other in SqueakFFIPrims for ARM64FFIPlugin, but we do not generate the required ARM64FFIPlugin.c file yet
OpenSmalltalk · Dec 28, 2018 · 968ed91 · 968ed91
1 parent 0ab0a27
commit 968ed91
Show file tree

Hide file tree

Showing 82 changed files with 7,115 additions and 7,159 deletions.
diff --git a/nsspur64src/vm/cogit.h b/nsspur64src/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2496 uuid: 3e0d74b6-074c-4acf-95f3-fd75b2bc33e9
+	CCodeGenerator VMMaker.oscog-nice.2501 uuid: 0a0e26d0-bfc0-8746-ae54-69aaafc3e6c8
  */
 
 

diff --git a/nsspur64src/vm/cogitX64SysV.c b/nsspur64src/vm/cogitX64SysV.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2482 uuid: 7df020b4-6565-4768-9e4a-75bc5464ed95
+	CCodeGenerator VMMaker.oscog-nice.2501 uuid: 0a0e26d0-bfc0-8746-ae54-69aaafc3e6c8
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2482 uuid: 7df020b4-6565-4768-9e4a-75bc5464ed95
+	StackToRegisterMappingCogit VMMaker.oscog-nice.2501 uuid: 0a0e26d0-bfc0-8746-ae54-69aaafc3e6c8
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2482 uuid: 7df020b4-6565-4768-9e4a-75bc5464ed95 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.2501 uuid: 0a0e26d0-bfc0-8746-ae54-69aaafc3e6c8 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -583,7 +583,7 @@ static sqInt NoDbgRegParms fillInBlockHeadersAt(sqInt startAddress);
 static CogMethod * NoDbgRegParms fillInMethodHeadersizeselector(CogMethod *method, sqInt size, sqInt selector);
 static sqInt NoDbgRegParms findBackwardBranchIsBackwardBranchMcpcBcpcMatchingBcpc(BytecodeDescriptor *descriptor, sqInt isBackwardBranchAndAnnotation, char *mcpc, sqInt bcpc, void *targetBcpc);
 static usqInt NoDbgRegParms findBlockMethodWithEntrystartBcpc(sqInt blockEntryMcpc, sqInt startBcpc);
-static sqInt NoDbgRegParms findMapLocationForMcpcinMethod(usqInt targetMcpc, CogMethod *cogMethod);
+static usqInt NoDbgRegParms findMapLocationForMcpcinMethod(usqInt targetMcpc, CogMethod *cogMethod);
 extern CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
 static sqInt NoDbgRegParms findIsBackwardBranchMcpcBcpcMatchingMcpc(BytecodeDescriptor *descriptor, sqInt isBackwardBranchAndAnnotation, char *mcpc, sqInt bcpc, void *targetMcpc);
 static sqInt NoDbgRegParms firstMappedPCFor(CogMethod *cogMethod);
@@ -656,7 +656,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);
@@ -2002,7 +2002,7 @@ static usqInt youngReferrers;
 #define noCheckEntryOffset() cmNoCheckEntryOffset
 #define noContextSwitchBlockEntryOffset() blockNoContextSwitchOffset
 #define notYetImplemented() warning("not yet implemented")
-#define printNum(n) printf("%ld", (long) n)
+#define printNum(n) printf("%" PRIdSQINT, (sqInt) (n))
 #define printOnTrace() (traceFlags & 1)
 #define print(aString) printf("%s", aString)
 #define recordBlockTrace() (traceFlags & 4)
@@ -2790,7 +2790,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;
@@ -5812,7 +5812,7 @@ findBlockMethodWithEntrystartBcpc(sqInt blockEntryMcpc, sqInt startBcpc)
 }
 
 	/* Cogit>>#findMapLocationForMcpc:inMethod: */
-static sqInt NoDbgRegParms
+static usqInt NoDbgRegParms
 findMapLocationForMcpcinMethod(usqInt targetMcpc, CogMethod *cogMethod)
 {
     sqInt annotation;
@@ -7634,7 +7634,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;
@@ -29175,7 +29175,7 @@ genPrimitiveClosureValue(void)
     AbstractInstruction *jumpFailNArgs;
     sqInt literal;
     sqInt offset;
-    void (*primitiveRoutine)();
+    void (*primitiveRoutine)(void);
     sqInt quickConstant;
     sqInt result;
 

diff --git a/nsspur64src/vm/cogitX64WIN64.c b/nsspur64src/vm/cogitX64WIN64.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2482 uuid: 7df020b4-6565-4768-9e4a-75bc5464ed95
+	CCodeGenerator VMMaker.oscog-nice.2501 uuid: 0a0e26d0-bfc0-8746-ae54-69aaafc3e6c8
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2482 uuid: 7df020b4-6565-4768-9e4a-75bc5464ed95
+	StackToRegisterMappingCogit VMMaker.oscog-nice.2501 uuid: 0a0e26d0-bfc0-8746-ae54-69aaafc3e6c8
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2482 uuid: 7df020b4-6565-4768-9e4a-75bc5464ed95 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.2501 uuid: 0a0e26d0-bfc0-8746-ae54-69aaafc3e6c8 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -656,7 +656,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);
@@ -2002,7 +2002,7 @@ static usqInt youngReferrers;
 #define noCheckEntryOffset() cmNoCheckEntryOffset
 #define noContextSwitchBlockEntryOffset() blockNoContextSwitchOffset
 #define notYetImplemented() warning("not yet implemented")
-#define printNum(n) printf("%ld", (long) n)
+#define printNum(n) printf("%" PRIdSQINT, (sqInt) (n))
 #define printOnTrace() (traceFlags & 1)
 #define print(aString) printf("%s", aString)
 #define recordBlockTrace() (traceFlags & 4)
@@ -2790,7 +2790,7 @@ static sqInt NoDbgRegParms
 blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg)
 {
     sqInt blockEntry;
-    usqInt end;
+    sqInt end;
     sqInt pc;
     sqInt result;
     usqInt targetpc;
@@ -7642,7 +7642,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;
@@ -29204,7 +29204,7 @@ genPrimitiveClosureValue(void)
     AbstractInstruction *jumpFailNArgs;
     sqInt literal;
     sqInt offset;
-    void (*primitiveRoutine)();
+    void (*primitiveRoutine)(void);
     sqInt quickConstant;
     sqInt result;