Generate ThreadedFFIPlugins as per VMMaker.oscog-nice.2109 to fix 64b…

…its FFI. The moduleHandle (a pointer) was incorrectly truncated to an int (32bits).
OpenSmalltalk · Jan 24, 2017 · 6df2f02 · 6df2f02
1 parent 62e6114
commit 6df2f02
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c b/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a
+	VMPluginCodeGenerator VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff
    from
-	ThreadedARMFFIPlugin VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a
+	ThreadedARMFFIPlugin VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff
  */
-static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a " __DATE__ ;
+static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff " __DATE__ ;
 
 
 
@@ -489,9 +489,9 @@ extern
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"ARM32FFIPlugin VMMaker.oscog-eem.2079 (i)"
+	"ARM32FFIPlugin VMMaker.oscog-nice.2109 (i)"
 #else
-	"ARM32FFIPlugin VMMaker.oscog-eem.2079 (e)"
+	"ARM32FFIPlugin VMMaker.oscog-nice.2109 (e)"
 #endif
 ;
 
@@ -2811,7 +2811,7 @@ ffiLoadCalloutModule(sqInt module)
     sqInt moduleHandle;
     sqInt moduleHandlePtr;
     sqInt moduleLength;
-    int *ptr;
+    sqInt *ptr;
     sqInt rcvr;
 
 	if (isBytes(module)) {

diff --git a/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c b/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a
+	VMPluginCodeGenerator VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff
    from
-	ThreadedIA32FFIPlugin VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a
+	ThreadedIA32FFIPlugin VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff
  */
-static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a " __DATE__ ;
+static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff " __DATE__ ;
 
 
 
@@ -480,9 +480,9 @@ extern
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"IA32FFIPlugin VMMaker.oscog-eem.2079 (i)"
+	"IA32FFIPlugin VMMaker.oscog-nice.2109 (i)"
 #else
-	"IA32FFIPlugin VMMaker.oscog-eem.2079 (e)"
+	"IA32FFIPlugin VMMaker.oscog-nice.2109 (e)"
 #endif
 ;
 
@@ -2582,7 +2582,7 @@ ffiLoadCalloutModule(sqInt module)
     sqInt moduleHandle;
     sqInt moduleHandlePtr;
     sqInt moduleLength;
-    int *ptr;
+    sqInt *ptr;
     sqInt rcvr;
 
 	if (isBytes(module)) {

diff --git a/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c b/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	ThreadedFFIPlugin VMMaker.oscog-nice.2038 uuid: f98d3e8c-e81d-fb42-b790-8e514777bfff
+	ThreadedFFIPlugin VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff
  */
 
 #if defined(__ARM_ARCH__) || defined(__arm__) || defined(__arm32__) || defined(ARM32)

diff --git a/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c b/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a
+	VMPluginCodeGenerator VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff
    from
-	ThreadedX64SysVFFIPlugin VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a
+	ThreadedX64SysVFFIPlugin VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff
  */
-static char __buildInfo[] = "ThreadedX64SysVFFIPlugin VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a " __DATE__ ;
+static char __buildInfo[] = "ThreadedX64SysVFFIPlugin VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff " __DATE__ ;
 
 
 
@@ -499,9 +499,9 @@ extern
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"X64SysVFFIPlugin VMMaker.oscog-eem.2079 (i)"
+	"X64SysVFFIPlugin VMMaker.oscog-nice.2109 (i)"
 #else
-	"X64SysVFFIPlugin VMMaker.oscog-eem.2079 (e)"
+	"X64SysVFFIPlugin VMMaker.oscog-nice.2109 (e)"
 #endif
 ;
 
@@ -2963,7 +2963,7 @@ ffiLoadCalloutModule(sqInt module)
     sqInt moduleHandle;
     sqInt moduleHandlePtr;
     sqInt moduleLength;
-    int *ptr;
+    sqInt *ptr;
     sqInt rcvr;
 
 	if (isBytes(module)) {

diff --git a/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c b/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a
+	VMPluginCodeGenerator VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff
    from
-	ThreadedX64Win64FFIPlugin VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a
+	ThreadedX64Win64FFIPlugin VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff
  */
-static char __buildInfo[] = "ThreadedX64Win64FFIPlugin VMMaker.oscog-eem.2079 uuid: 00ef0ca2-fca0-4dc0-baa9-e65e98fda15a " __DATE__ ;
+static char __buildInfo[] = "ThreadedX64Win64FFIPlugin VMMaker.oscog-nice.2109 uuid: 75960d07-50a0-4d6c-a9b0-e4795bdb4eff " __DATE__ ;
 
 
 
@@ -493,9 +493,9 @@ extern
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"X64Win64FFIPlugin VMMaker.oscog-eem.2079 (i)"
+	"X64Win64FFIPlugin VMMaker.oscog-nice.2109 (i)"
 #else
-	"X64Win64FFIPlugin VMMaker.oscog-eem.2079 (e)"
+	"X64Win64FFIPlugin VMMaker.oscog-nice.2109 (e)"
 #endif
 ;
 
@@ -2801,7 +2801,7 @@ ffiLoadCalloutModule(sqInt module)
     sqInt moduleHandle;
     sqInt moduleHandlePtr;
     sqInt moduleLength;
-    int *ptr;
+    sqInt *ptr;
     sqInt rcvr;
 
 	if (isBytes(module)) {