CogVM sources as per VMMaker.oscog-eem.3189

Fix regression in building the v3 VMs caused by VMMaker.oscog-eem.3183. [New]ObjectMemory (i.e. v3) must export storeLong32:ofObject:withValue:.
OpenSmalltalk · Jun 14, 2022 · 1964ef3 · 1964ef3
1 parent f419257
commit 1964ef3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 29 deletions.
diff --git a/src/v3.cog/cointerp.c b/src/v3.cog/cointerp.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25
    from
-	CoInterpreter VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc
+	CoInterpreter VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1063,7 +1063,7 @@ static sqInt sixtyFourBitIndexableFormat(void);
 extern sqInt slotSizeOf(sqInt oop);
 extern sqInt splObj(sqInt index);
 EXPORT(sqInt) statNumGCs(void);
-EXPORT(sqInt) storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord);
+extern sqInt storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord);
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valuePointer);
 extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valuePointer);
 extern sqInt stringForCString(const char *aCString);
@@ -2244,7 +2244,7 @@ sqInt debugCallbackInvokes;
 sqInt debugCallbackReturns;
 sqInt cannotDeferDisplayUpdates;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3187]";
+const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3189]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 char expensiveAsserts = 0;
 int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -40821,7 +40821,7 @@ statNumGCs(void)
 }
 
 	/* ObjectMemory>>#storeLong32:ofObject:withValue: */
-EXPORT(sqInt)
+sqInt
 storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord)
 {
 	return long32Atput((oop + BaseHeaderSize) + (((sqInt)((usqInt)(fieldIndex) << 2))), valueWord);
@@ -57347,7 +57347,6 @@ void* vm_exports[][3] = {
 	{(void*)_m, "shortPrintFramesOnStackPageListInUse", (void*)shortPrintFramesOnStackPageListInUse},
 	{(void*)_m, "shortPrintFrameAndNCallers", (void*)shortPrintFrameAndNCallers},
 	{(void*)_m, "statNumGCs", (void*)statNumGCs},
-	{(void*)_m, "storeLong32ofObjectwithValue", (void*)storeLong32ofObjectwithValue},
 	{(void*)_m, "whereIs", (void*)whereIs},
 	{NULL, NULL, NULL}
 };
diff --git a/src/v3.cog/cointerp.h b/src/v3.cog/cointerp.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25
  */
 
 
@@ -213,6 +213,7 @@ extern sqInt remap(sqInt oop);
 extern sqInt shouldRemapObj(sqInt oop);
 extern sqInt shouldRemapOop(sqInt oop);
 extern sqInt splObj(sqInt index);
+extern sqInt storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord);
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valuePointer);
 extern sqInt stringForCString(const char *aCString);
 extern void tenuringIncrementalGC(void);

diff --git a/src/v3.cog/gcc3x-cointerp.c b/src/v3.cog/gcc3x-cointerp.c
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25
    from
-	CoInterpreter VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc
+	CoInterpreter VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1066,7 +1066,7 @@ static sqInt sixtyFourBitIndexableFormat(void);
 extern sqInt slotSizeOf(sqInt oop);
 extern sqInt splObj(sqInt index);
 EXPORT(sqInt) statNumGCs(void);
-EXPORT(sqInt) storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord);
+extern sqInt storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord);
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valuePointer);
 extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valuePointer);
 extern sqInt stringForCString(const char *aCString);
@@ -2247,7 +2247,7 @@ sqInt debugCallbackInvokes;
 sqInt debugCallbackReturns;
 sqInt cannotDeferDisplayUpdates;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3187]";
+const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3189]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 char expensiveAsserts = 0;
 int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -40830,7 +40830,7 @@ statNumGCs(void)
 }
 
 	/* ObjectMemory>>#storeLong32:ofObject:withValue: */
-EXPORT(sqInt)
+sqInt
 storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord)
 {
 	return long32Atput((oop + BaseHeaderSize) + (((sqInt)((usqInt)(fieldIndex) << 2))), valueWord);
@@ -57356,7 +57356,6 @@ void* vm_exports[][3] = {
 	{(void*)_m, "shortPrintFramesOnStackPageListInUse", (void*)shortPrintFramesOnStackPageListInUse},
 	{(void*)_m, "shortPrintFrameAndNCallers", (void*)shortPrintFrameAndNCallers},
 	{(void*)_m, "statNumGCs", (void*)statNumGCs},
-	{(void*)_m, "storeLong32ofObjectwithValue", (void*)storeLong32ofObjectwithValue},
 	{(void*)_m, "whereIs", (void*)whereIs},
 	{NULL, NULL, NULL}
 };
diff --git a/src/v3.stack/gcc3x-interp.c b/src/v3.stack/gcc3x-interp.c
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25
    from
-	StackInterpreter VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc
+	StackInterpreter VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -773,7 +773,7 @@ static sqInt sixtyFourBitIndexableFormat(void);
 extern sqInt slotSizeOf(sqInt oop);
 extern sqInt splObj(sqInt index);
 EXPORT(sqInt) statNumGCs(void);
-EXPORT(sqInt) storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord);
+extern sqInt storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord);
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valuePointer);
 extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valuePointer);
 extern sqInt stringForCString(const char *aCString);
@@ -1978,7 +1978,7 @@ sqInt debugCallbackInvokes;
 sqInt debugCallbackReturns;
 sqInt cannotDeferDisplayUpdates;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3187]";
+const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3189]";
 sqInt suppressHeartbeatFlag;
 char expensiveAsserts = 0;
 int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -29875,7 +29875,7 @@ statNumGCs(void)
 }
 
 	/* ObjectMemory>>#storeLong32:ofObject:withValue: */
-EXPORT(sqInt)
+sqInt
 storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord)
 {
 	return long32Atput((oop + BaseHeaderSize) + (((sqInt)((usqInt)(fieldIndex) << 2))), valueWord);
@@ -49214,7 +49214,6 @@ void* vm_exports[][3] = {
 	{(void*)_m, "shortPrintFramesOnStackPageListInUse", (void*)shortPrintFramesOnStackPageListInUse},
 	{(void*)_m, "shortPrintFrameAndNCallers", (void*)shortPrintFrameAndNCallers},
 	{(void*)_m, "statNumGCs", (void*)statNumGCs},
-	{(void*)_m, "storeLong32ofObjectwithValue", (void*)storeLong32ofObjectwithValue},
 	{(void*)_m, "whereIs", (void*)whereIs},
 	{NULL, NULL, NULL}
 };
diff --git a/src/v3.stack/interp.c b/src/v3.stack/interp.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25
    from
-	StackInterpreter VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc
+	StackInterpreter VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3187 uuid: 409db813-9691-40ab-8d5b-8960d3b50fbc " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3189 uuid: c257f883-eae2-443b-9022-ddfa15061b25 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -770,7 +770,7 @@ static sqInt sixtyFourBitIndexableFormat(void);
 extern sqInt slotSizeOf(sqInt oop);
 extern sqInt splObj(sqInt index);
 EXPORT(sqInt) statNumGCs(void);
-EXPORT(sqInt) storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord);
+extern sqInt storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord);
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valuePointer);
 extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valuePointer);
 extern sqInt stringForCString(const char *aCString);
@@ -1975,7 +1975,7 @@ sqInt debugCallbackInvokes;
 sqInt debugCallbackReturns;
 sqInt cannotDeferDisplayUpdates;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3187]";
+const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3189]";
 sqInt suppressHeartbeatFlag;
 char expensiveAsserts = 0;
 int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -29866,7 +29866,7 @@ statNumGCs(void)
 }
 
 	/* ObjectMemory>>#storeLong32:ofObject:withValue: */
-EXPORT(sqInt)
+sqInt
 storeLong32ofObjectwithValue(sqInt fieldIndex, sqInt oop, sqInt valueWord)
 {
 	return long32Atput((oop + BaseHeaderSize) + (((sqInt)((usqInt)(fieldIndex) << 2))), valueWord);
@@ -49205,7 +49205,6 @@ void* vm_exports[][3] = {
 	{(void*)_m, "shortPrintFramesOnStackPageListInUse", (void*)shortPrintFramesOnStackPageListInUse},
 	{(void*)_m, "shortPrintFrameAndNCallers", (void*)shortPrintFrameAndNCallers},
 	{(void*)_m, "statNumGCs", (void*)statNumGCs},
-	{(void*)_m, "storeLong32ofObjectwithValue", (void*)storeLong32ofObjectwithValue},
 	{(void*)_m, "whereIs", (void*)whereIs},
 	{NULL, NULL, NULL}
 };