[commit] r2415 - Merging support files from cogvm branch.

 
Author: andreas
Date: 2011-06-09 01:37:52 -0700 (Thu, 09 Jun 2011)
New Revision: 2415

Added:
   trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c
   trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c
Modified:
   trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h
Log:
Merging support files from cogvm branch.

Modified: trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h
===================================================================
--- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h 2011-06-09 08:30:40 UTC (rev 2414)
+++ trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h 2011-06-09 08:37:52 UTC (rev 2415)
@@ -129,6 +129,10 @@
 /* return the float value from a previous call */
 double ffiReturnFloatValue(void);
 
+/* Set the log file name for logging call-outs */
+int ffiLogFileNameOfLength(void *nameIndex, int nameLength);
+int ffiLogCallOfLength(void *nameIndex, int nameLength);
+
 /* The following are for creating, manipulating, and detroying "manual surfaces".
    These are surfaces that are managed by Squeak code, which has manual control
    over the memory location where the image data is stored (the pointer used may

Added: trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c
===================================================================
--- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c                        (rev 0)
+++ trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c 2011-06-09 08:37:52 UTC (rev 2415)
@@ -0,0 +1,72 @@
+/****************************************************************************
+*   PROJECT: Squeak threaded foreign function interface
+*   FILE:    sqFFIPlugin.c
+*   CONTENT: C support code for the threaded FFIPlugin
+*
+*   AUTHOR:  Eliot Miranda
+*   ADDRESS: Teleplace, Inc.
+*
+*
+*****************************************************************************/
+
+#include <stdio.h>
+#if !WIN32 && !__FreeBSD__
+# include <alloca.h>
+#endif
+#include <string.h>
+
+#ifdef _MSC_VER
+# define alloca _alloca
+#endif
+
+/* this is a stub through which floating-point register arguments can be loaded
+ * prior to an FFI call proper.  e.g. on the PowerPC this would be declared as
+ * extern void loadFloatRegs(double, double, double, double,
+ *                          double, double, double, double);
+ * and called with the appropriate values necessary to load the floating-point
+ * argument registers.  Immediately after the actual call is made, using the
+ * undisturbed register contents created by the call of loadFloatRegs.
+ */
+void
+loadFloatRegs(void) { return; }
+
+static FILE *ffiLogFile = NULL;
+
+int
+ffiLogFileNameOfLength(void *nameIndex, int nameLength)
+{
+ if (nameIndex && nameLength) {
+ char *fileName;
+ FILE *fp;
+
+ if (!(fileName = alloca(nameLength+1)))
+ return 0;
+ strncpy(fileName, nameIndex, nameLength);
+ fileName[nameLength] = 0;
+ /* attempt to open the file and if we can't, fail */
+ if (!(fp = fopen(fileName, "at")))
+ return 0;
+ /* close the old log file if needed and use the new one */
+ if (ffiLogFile)
+ fclose(ffiLogFile);
+ ffiLogFile = fp;
+ fprintf(ffiLogFile, "------- Log started -------\n");
+ fflush(fp);
+ }
+ else {
+ if (ffiLogFile)
+ fclose(ffiLogFile);
+ ffiLogFile = NULL;
+ }
+ return 1;
+}
+
+int
+ffiLogCallOfLength(void *nameIndex, int nameLength)
+{
+    if (!ffiLogFile)
+ return 0;
+    fprintf(ffiLogFile, "%.*s\n", nameLength, (char *)nameIndex);
+    fflush(ffiLogFile);
+ return 1;
+}

Added: trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c
===================================================================
--- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c                        (rev 0)
+++ trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c 2011-06-09 08:37:52 UTC (rev 2415)
@@ -0,0 +1,175 @@
+/*****************************************************************************/
+/*****************************************************************************/
+/*****************************************************************************/
+/************ Test functions for the foreign function interface **************/
+/*****************************************************************************/
+/*****************************************************************************/
+/*****************************************************************************/
+#ifndef NO_FFI_TEST
+# include "sq.h"
+
+# define LONGLONG sqLong /* should be 64 bits */
+
+typedef struct ffiTestPoint2 {
+ int x;
+ int y;
+} ffiTestPoint2;
+
+typedef struct ffiTestPoint4 {
+ int x;
+ int y;
+ int z;
+ int w;
+} ffiTestPoint4;
+
+#pragma export on
+EXPORT(char) ffiTestChars(char c1, char c2, char c3, char c4);
+EXPORT(short) ffiTestShorts(short c1, short c2, short c3, short c4);
+EXPORT(int) ffiTestInts(int c1, int c2, int c3, int c4);
+EXPORT(int) ffiTestInts8(int c1, int c2, int c3, int c4, int c5, int c6, int c7, int c8);
+EXPORT(float) ffiTestFloats(float f1, float f2);
+EXPORT(float) ffiTestFloats7(float f1, float f2, float f3, float f4, float f5, float f6, float f7);
+EXPORT(float) ffiTestFloats13(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13);
+EXPORT(float) ffiTestFloats14(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13, float f14);
+EXPORT(double) ffiTestDoubles14(double f1, double f2, double f3, double f4, double f5, double f6, double f7, double f8, double f9, double f10, double f11, double f12, double f13, double f14);
+EXPORT(double) ffiTestDoubles(double d1, double d2);
+EXPORT(char *) ffiPrintString(char *string);
+EXPORT(ffiTestPoint2) ffiTestStruct64(ffiTestPoint2 pt1, ffiTestPoint2 pt2);
+EXPORT(ffiTestPoint4) ffiTestStructBig(ffiTestPoint4 pt1, ffiTestPoint4 pt2);
+EXPORT(ffiTestPoint4*) ffiTestPointers(ffiTestPoint4 *pt1, ffiTestPoint4 *pt2);
+EXPORT(LONGLONG) ffiTestLongLong(LONGLONG i1, LONGLONG i2);
+EXPORT(LONGLONG) ffiTestLongLong8(char c1, char c2, char c3, char c4, char c5, char c6, char c7, char c8, LONGLONG i1, LONGLONG i2);
+EXPORT(LONGLONG) ffiTestLongLong8a1(char c1, char c2, char c3, char c4, char c5, char c6, char c7, char c8, char c9, LONGLONG i1, LONGLONG i2);
+EXPORT(LONGLONG) ffiTestLongLong8a2(char c1, char c2, char c3, char c4, char c5, char c6, char c7, char c8, char c9,  char c10, LONGLONG i1, LONGLONG i2);
+EXPORT(LONGLONG) ffiTestLongLonga1(char c1, LONGLONG i1, LONGLONG i2);
+EXPORT(LONGLONG) ffiTestLongLonga2(char c1, char c2, LONGLONG i1, LONGLONG i2);
+#pragma export off
+
+
+/* test passing characters */
+EXPORT(char) ffiTestChars(char c1, char c2, char c3, char c4) {
+ printf("4 characters came in as\nc1 = %c (%x)\nc2 = %c (%x)\nc3 = %c (%x)\nc4 = %c (%x)\n", c1, c1, c2, c2, c3, c3, c4, c4);
+ return c1+c2;
+}
+
+/* test passing shorts */
+EXPORT(short) ffiTestShorts(short c1, short c2, short c3, short c4) {
+ printf("4 shorts came in as\ns1 = %d (%x)\ns2 = %d (%x)\ns3 = %d (%x)\ns4 = %d (%x)\n", c1, c1, c2, c2, c3, c3, c4, c4);
+ return c1+c2;
+}
+
+/* test passing ints */
+EXPORT(int) ffiTestInts(int c1, int c2, int c3, int c4) {
+ printf("4 ints came in as\ni1 = %d (%x)\ni2 = %d (%x)\ni3 = %d (%x)\ni4 = %d (%x)\n", c1, c1, c2, c2, c3, c3, c4, c4);
+ return c1+c2;
+}
+
+EXPORT(int) ffiTestInts8(int c1, int c2, int c3, int c4, int c5, int c6, int c7, int c8) {
+ printf("4 ints came in as\ni1 = %d (%x)\ni2 = %d (%x)\ni3 = %d (%x)\ni4 = %d (%x)\ni5 = %d (%x)\ni6 = %d (%x)\ni7 = %d (%x)\ni8 = %d (%x)\n", c1, c1, c2, c2, c3, c3, c4, c4, c5, c5, c6, c6, c7, c7, c8, c8);
+ return 42;
+}
+
+
+/* test passing and returning floats */
+EXPORT(float) ffiTestFloats(float f1, float f2) {
+ printf("The two floats are %f and %f\n", f1, f2);
+ return (float) (f1 + f2);
+}
+
+EXPORT(float) ffiTestFloats7(float f1, float f2, float f3, float f4, float f5, float f6, float f7) {
+ printf("The 7 floats are %f %f %f %f %f %f %f\n", f1, f2, f3, f4, f5, f6, f7);
+ return (float) (f1 + f2 + f3 + f4 + f5 + f6 + f7);
+}
+
+EXPORT(float) ffiTestFloats13(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13) {
+ printf("The 13 floats are %f %f %f %f %f %f %f %f %f %f %f %f %f\n", f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13);
+ return (float) (f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + f10 + f11 + f12 + f13);
+}
+
+EXPORT(float) ffiTestFloats14(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13, float f14) {
+ printf("The 14 floats are %f %f %f %f %f %f %f %f %f %f %f %f %f\n", f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13);
+ return (float) (f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + f10 + f11 + f12 + f13 + f14);
+}
+
+EXPORT(double) ffiTestDoubles14(double f1, double f2, double f3, double f4, double f5, double f6, double f7, double f8, double f9, double f10, double f11, double f12, double f13, double f14) {
+ printf("The 14 double are %f %f %f %f %f %f %f %f %f %f %f %f %f\n", f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13);
+ return (double) (f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + f10 + f11 + f12 + f13 + f14);
+}
+
+/* test passing and returning doubles */
+EXPORT(double) ffiTestDoubles(double d1, double d2) {
+ printf("The two floats are %f and %f\n", (float)d1, (float)d2);
+ return d1+d2;
+}
+
+/* test passing and returning strings */
+EXPORT(char*) ffiPrintString(char *string) {
+ printf("%s\n", string);
+ return string;
+}
+
+/* test passing and returning 64bit structures */
+EXPORT(ffiTestPoint2) ffiTestStruct64(ffiTestPoint2 pt1, ffiTestPoint2 pt2) {
+ ffiTestPoint2 result;
+ printf("pt1.x = %d\npt1.y = %d\npt2.x = %d\npt2.y = %d\n",
+ pt1.x, pt1.y, pt2.x, pt2.y);
+ result.x = pt1.x + pt2.x;
+ result.y = pt1.y + pt2.y;
+ return result;
+}
+
+/* test passing and returning large structures */
+EXPORT(ffiTestPoint4) ffiTestStructBig(ffiTestPoint4 pt1, ffiTestPoint4 pt2) {
+ ffiTestPoint4 result;
+ printf("pt1.x = %d\npt1.y = %d\npt1.z = %d\npt1.w = %d\n",
+ pt1.x, pt1.y, pt1.z, pt1.w);
+ printf("pt2.x = %d\npt2.y = %d\npt2.z = %d\npt2.w = %d\n",
+ pt2.x, pt2.y, pt2.z, pt2.w);
+ result.x = pt1.x + pt2.x;
+ result.y = pt1.y + pt2.y;
+ result.z = pt1.z + pt2.z;
+ result.w = pt1.w + pt2.w;
+ return result;
+}
+
+/* test passing and returning pointers */
+EXPORT(ffiTestPoint4*) ffiTestPointers(ffiTestPoint4 *pt1, ffiTestPoint4 *pt2) {
+ ffiTestPoint4 *result;
+ printf("pt1.x = %d\npt1.y = %d\npt1.z = %d\npt1.w = %d\n",
+ pt1->x, pt1->y, pt1->z, pt1->w);
+ printf("pt2.x = %d\npt2.y = %d\npt2.z = %d\npt2.w = %d\n",
+ pt2->x, pt2->y, pt2->z, pt2->w);
+ result = (ffiTestPoint4*) malloc(sizeof(ffiTestPoint4));
+ result->x = pt1->x + pt2->x;
+ result->y = pt1->y + pt2->y;
+ result->z = pt1->z + pt2->z;
+ result->w = pt1->w + pt2->w;
+ return result;
+}
+
+/* test passing and returning longlongs */
+EXPORT(LONGLONG) ffiTestLongLong(LONGLONG i1, LONGLONG i2) {
+ return i1 + i2;
+}
+
+EXPORT(LONGLONG) ffiTestLongLonga1(char c1, LONGLONG i1, LONGLONG i2) {
+ return c1 + i1 + i2;
+}
+
+EXPORT(LONGLONG) ffiTestLongLonga2(char c1, char c2, LONGLONG i1, LONGLONG i2) {
+ return c1 + c2 + i1 + i2;
+}
+
+EXPORT(LONGLONG) ffiTestLongLong8(char c1, char c2, char c3, char c4, char c5, char c6, char c7, char c8, LONGLONG i1, LONGLONG i2) {
+ return c1+c2+c3+c4+c5+c6+c7+c8+i1 + i2;
+}
+
+EXPORT(LONGLONG) ffiTestLongLong8a1(char c1, char c2, char c3, char c4, char c5, char c6, char c7, char c8, char c9, LONGLONG i1, LONGLONG i2) {
+ return c1+c2+c3+c4+c5+c6+c7+c8+c9+i1 + i2;
+}
+
+EXPORT(LONGLONG) ffiTestLongLong8a2(char c1, char c2, char c3, char c4, char c5, char c6, char c7, char c8, char c9, char c10, LONGLONG i1, LONGLONG i2) {
+ return c1+c2+c3+c4+c5+c6+c7+c8+c9+c10+i1 + i2;
+}
+
+#endif /* NO_FFI_TEST */