ffi 1.9.24 → 1.16.3

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint32.c

@@ -13,7 +13,7 @@ typedef struct cls_struct_align {
   unsigned char c;
 } cls_struct_align;
 
-cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
+static cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
 			    struct cls_struct_align a2)
 {
   struct cls_struct_align result;
@@ -23,6 +23,17 @@ cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
   result.c = a1.c + a2.c;
 
   printf("%d %d %d %d %d %d: %d %d %d\n", a1.a, a1.b, a1.c, a2.a, a2.b, a2.c, result.a, result.b, result.c);
+  CHECK(a1.a == 12);
+  CHECK(a1.b == 4951);
+  CHECK(a1.c == 127);
+
+  CHECK(a2.a == 1);
+  CHECK(a2.b == 9320);
+  CHECK(a2.c == 13);
+
+  CHECK(result.a == 13);
+  CHECK(result.b == 14271);
+  CHECK(result.c == 140);
 
   return  result;
 }
@@ -79,13 +90,17 @@ int main (void)
   /* { dg-output "12 4951 127 1 9320 13: 13 14271 140" } */
   printf("res: %d %d %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 13 14271 140" } */
-
+  CHECK(res_dbl.a == 13);
+  CHECK(res_dbl.b == 14271);
+  CHECK(res_dbl.c == 140);
   CHECK(ffi_prep_closure_loc(pcl, &cif, cls_struct_align_gn, NULL, code) == FFI_OK);
 
   res_dbl = ((cls_struct_align(*)(cls_struct_align, cls_struct_align))(code))(g_dbl, f_dbl);
   /* { dg-output "\n12 4951 127 1 9320 13: 13 14271 140" } */
   printf("res: %d %d %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 13 14271 140" } */
-
+  CHECK(res_dbl.a == 13);
+  CHECK(res_dbl.b == 14271);
+  CHECK(res_dbl.c == 140);
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint64.c

@@ -14,7 +14,7 @@ typedef struct cls_struct_align {
   unsigned char c;
 } cls_struct_align;
 
-cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
+static cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
 			    struct cls_struct_align a2)
 {
   struct cls_struct_align result;
@@ -24,6 +24,17 @@ cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
   result.c = a1.c + a2.c;
 
   printf("%d %" PRIdLL " %d %d %" PRIdLL " %d: %d %" PRIdLL " %d\n", a1.a, a1.b, a1.c, a2.a, a2.b, a2.c, result.a, result.b, result.c);
+  CHECK(a1.a == 12);
+  CHECK(a1.b == 4951);
+  CHECK(a1.c == 127);
+
+  CHECK(a2.a == 1);
+  CHECK(a2.b == 9320);
+  CHECK(a2.c == 13);
+
+  CHECK(result.a == 13);
+  CHECK(result.b == 14271);
+  CHECK(result.c == 140);
 
   return  result;
 }
@@ -80,6 +91,9 @@ int main (void)
   /* { dg-output "12 4951 127 1 9320 13: 13 14271 140" } */
   printf("res: %d %" PRIdLL " %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 13 14271 140" } */
+  CHECK(res_dbl.a == 13);
+  CHECK(res_dbl.b == 14271);
+  CHECK(res_dbl.c == 140);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, cls_struct_align_gn, NULL, code) == FFI_OK);
 
@@ -87,6 +101,9 @@ int main (void)
   /* { dg-output "\n12 4951 127 1 9320 13: 13 14271 140" } */
   printf("res: %d %" PRIdLL " %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 13 14271 140" } */
+  CHECK(res_dbl.a == 13);
+  CHECK(res_dbl.b == 14271);
+  CHECK(res_dbl.c == 140);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint16.c

@@ -13,7 +13,7 @@ typedef struct cls_struct_align {
   unsigned char c;
 } cls_struct_align;
 
-cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
+static cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
 			    struct cls_struct_align a2)
 {
   struct cls_struct_align result;
@@ -23,6 +23,17 @@ cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
   result.c = a1.c + a2.c;
 
   printf("%d %d %d %d %d %d: %d %d %d\n", a1.a, a1.b, a1.c, a2.a, a2.b, a2.c, result.a, result.b, result.c);
+  CHECK(a1.a == 12);
+  CHECK(a1.b == 4951);
+  CHECK(a1.c == 127);
+
+  CHECK(a2.a == 1);
+  CHECK(a2.b == 9320);
+  CHECK(a2.c == 13);
+
+  CHECK(result.a == 13);
+  CHECK(result.b == 14271);
+  CHECK(result.c == 140);
 
   return  result;
 }
@@ -79,6 +90,9 @@ int main (void)
   /* { dg-output "12 4951 127 1 9320 13: 13 14271 140" } */
   printf("res: %d %d %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 13 14271 140" } */
+  CHECK(res_dbl.a == 13);
+  CHECK(res_dbl.b == 14271);
+  CHECK(res_dbl.c == 140);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, cls_struct_align_gn, NULL, code) == FFI_OK);
 
@@ -86,6 +100,9 @@ int main (void)
   /* { dg-output "\n12 4951 127 1 9320 13: 13 14271 140" } */
   printf("res: %d %d %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 13 14271 140" } */
+  CHECK(res_dbl.a == 13);
+  CHECK(res_dbl.b == 14271);
+  CHECK(res_dbl.c == 140);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint32.c

@@ -13,7 +13,7 @@ typedef struct cls_struct_align {
   unsigned char c;
 } cls_struct_align;
 
-cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
+static cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
 			    struct cls_struct_align a2)
 {
   struct cls_struct_align result;
@@ -24,6 +24,18 @@ cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
 
   printf("%d %d %d %d %d %d: %d %d %d\n", a1.a, a1.b, a1.c, a2.a, a2.b, a2.c, result.a, result.b, result.c);
 
+  CHECK(a1.a == 12);
+  CHECK(a1.b == 4951);
+  CHECK(a1.c == 127);
+
+  CHECK(a2.a == 1);
+  CHECK(a2.b == 9320);
+  CHECK(a2.c == 13);
+
+  CHECK(result.a == 13);
+  CHECK(result.b == 14271);
+  CHECK(result.c == 140);
+
   return  result;
 }
 
@@ -79,6 +91,9 @@ int main (void)
   /* { dg-output "12 4951 127 1 9320 13: 13 14271 140" } */
   printf("res: %d %d %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 13 14271 140" } */
+  CHECK(res_dbl.a == 13);
+  CHECK(res_dbl.b == 14271);
+  CHECK(res_dbl.c == 140);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, cls_struct_align_gn, NULL, code) == FFI_OK);
 
@@ -86,6 +101,9 @@ int main (void)
   /* { dg-output "\n12 4951 127 1 9320 13: 13 14271 140" } */
   printf("res: %d %d %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 13 14271 140" } */
+  CHECK(res_dbl.a == 13);
+  CHECK(res_dbl.b == 14271);
+  CHECK(res_dbl.c == 140);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint64.c

@@ -15,7 +15,7 @@ typedef struct cls_struct_align {
   unsigned char c;
 } cls_struct_align;
 
-cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
+static cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
 			    struct cls_struct_align a2)
 {
   struct cls_struct_align result;
@@ -26,6 +26,18 @@ cls_struct_align cls_struct_align_fn(struct cls_struct_align a1,
 
   printf("%d %" PRIdLL " %d %d %" PRIdLL " %d: %d %" PRIdLL " %d\n", a1.a, a1.b, a1.c, a2.a, a2.b, a2.c, result.a, result.b, result.c);
 
+  CHECK(a1.a == 12);
+  CHECK(a1.b == 4951);
+  CHECK(a1.c == 127);
+
+  CHECK(a2.a == 1);
+  CHECK(a2.b == 9320);
+  CHECK(a2.c == 13);
+
+  CHECK(result.a == 13);
+  CHECK(result.b == 14271);
+  CHECK(result.c == 140);
+
   return  result;
 }
 
@@ -81,6 +93,9 @@ int main (void)
   /* { dg-output "12 4951 127 1 9320 13: 13 14271 140" } */
   printf("res: %d %" PRIdLL " %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 13 14271 140" } */
+  CHECK(res_dbl.a == 13);
+  CHECK(res_dbl.b == 14271);
+  CHECK(res_dbl.c == 140);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, cls_struct_align_gn, NULL, code) == FFI_OK);
 
@@ -88,6 +103,9 @@ int main (void)
   /* { dg-output "\n12 4951 127 1 9320 13: 13 14271 140" } */
   printf("res: %d %" PRIdLL " %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 13 14271 140" } */
+  CHECK(res_dbl.a == 13);
+  CHECK(res_dbl.b == 14271);
+  CHECK(res_dbl.c == 140);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_dbls_struct.c

@@ -17,6 +17,8 @@ void
 closure_test_fn(Dbls p)
 {
 	printf("%.1f %.1f\n", p.x, p.y);
+	CHECK(p.x == 1);
+	CHECK(p.y == 2);
 }
 
 void
@@ -56,7 +58,7 @@ int main(int argc __UNUSED__, char** argv __UNUSED__)
 
 	CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_gn, NULL, code) == FFI_OK);
 
-	((void*(*)(Dbls))(code))(arg);
+	((void (*)(Dbls))(code))(arg);
 	/* { dg-output "1.0 2.0" } */
 
 	closure_test_fn(arg);

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_double_va.c

@@ -10,14 +10,20 @@
 
 #include "ffitest.h"
 
+#define BUF_SIZE 50
+static char buffer[BUF_SIZE];
+
 static void
-cls_double_va_fn(ffi_cif* cif __UNUSED__, void* resp, 
+cls_double_va_fn(ffi_cif* cif __UNUSED__, void* resp,
 		 void** args, void* userdata __UNUSED__)
 {
 	char*	format		= *(char**)args[0];
 	double	doubleValue	= *(double*)args[1];
 
 	*(ffi_arg*)resp = printf(format, doubleValue);
+	CHECK(*(ffi_arg*)resp == 4);
+	snprintf(buffer, BUF_SIZE, format, doubleValue);
+	CHECK(strncmp(buffer, "7.0\n", 4) == 0);
 }
 
 int main (void)
@@ -48,6 +54,7 @@ int main (void)
 	/* { dg-output "7.0" } */
 	printf("res: %d\n", (int) res);
 	/* { dg-output "\nres: 4" } */
+	CHECK(res == 4);
 
 	CHECK(ffi_prep_closure_loc(pcl, &cif, cls_double_va_fn, NULL,
 				   code) == FFI_OK);
@@ -56,6 +63,7 @@ int main (void)
 	/* { dg-output "\n7.0" } */
 	printf("res: %d\n", (int) res);
 	/* { dg-output "\nres: 4" } */
+	CHECK(res == 4);
 
 	exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_float.c

@@ -14,6 +14,9 @@ static void cls_ret_float_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
 
    printf("%g: %g\n",*(float *)args[0],
 	  *(float *)resp);
+
+   CHECK((int)(*(float *)args[0]) == -2122);
+   CHECK((int)(*(float *)resp) == -2122);
  }
 
 typedef float (*cls_ret_float)(float);
@@ -38,5 +41,6 @@ int main (void)
   /* { dg-output "\\-2122.12: \\-2122.12" } */
   printf("res: %.6f\n", res);
   /* { dg-output "\nres: \-2122.120117" } */
+  CHECK((int)res == -2122);
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble.c

@@ -7,7 +7,7 @@
 /* This test is known to PASS on armv7l-unknown-linux-gnueabihf, so I have
    remove the xfail for arm*-*-* below, until we know more.  */
 /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
-/* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
+/* { dg-options -mlong-double-128 { target powerpc64*-*-linux-gnu* } } */
 
 #include "ffitest.h"
 
@@ -25,6 +25,14 @@ long double cls_ldouble_fn(
 
 	printf("%Lg %Lg %Lg %Lg %Lg %Lg %Lg %Lg: %Lg\n",
 		a1, a2, a3, a4, a5, a6, a7, a8, r);
+	CHECK(a1 == 1);
+	CHECK(a2 == 2);
+	CHECK(a3 == 3);
+	CHECK(a4 == 4);
+	CHECK(a5 == 5);
+	CHECK(a6 == 6);
+	CHECK(a7 == 7);
+	CHECK(a8 == 8);
 
 	return r;
 }
@@ -91,6 +99,7 @@ int main(void)
 	/* { dg-output "1 2 3 4 5 6 7 8: 36" } */
 	printf("res: %Lg\n", res);
 	/* { dg-output "\nres: 36" } */
+	CHECK(res == 36);
 
 	CHECK(ffi_prep_closure_loc(pcl, &cif, cls_ldouble_gn, NULL, code) == FFI_OK);
 
@@ -100,6 +109,7 @@ int main(void)
 	/* { dg-output "\n1 2 3 4 5 6 7 8: 36" } */
 	printf("res: %Lg\n", res);
 	/* { dg-output "\nres: 36" } */
+	CHECK(res == 36);
 
 	return 0;
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble_va.c

@@ -5,19 +5,36 @@
    Originator:	Blake Chaffin 6/6/2007	 */
 
 /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
-/* { dg-output "" { xfail avr32*-*-* x86_64-*-mingw* } } */
+/* { dg-output "" { xfail avr32*-*-* } } */
 /* { dg-output "" { xfail mips-sgi-irix6* } } PR libffi/46660 */
 
 #include "ffitest.h"
+#include <stdarg.h>
+
+#define BUF_SIZE 50
+static char buffer[BUF_SIZE];
+
+static int
+wrap_printf(char* fmt, ...) {
+	va_list ap;
+	va_start(ap, fmt);
+	long double ldArg = va_arg(ap, long double);
+	va_end(ap);
+	CHECK((int)ldArg == 7);
+	return printf(fmt, ldArg);	
+}
 
 static void
-cls_longdouble_va_fn(ffi_cif* cif __UNUSED__, void* resp, 
+cls_longdouble_va_fn(ffi_cif* cif __UNUSED__, void* resp,
 		     void** args, void* userdata __UNUSED__)
 {
 	char*		format	= *(char**)args[0];
 	long double	ldValue	= *(long double*)args[1];
 
 	*(ffi_arg*)resp = printf(format, ldValue);
+	CHECK(*(ffi_arg*)resp == 4);
+	snprintf(buffer, BUF_SIZE, format, ldValue);
+	CHECK(strncmp(buffer, "7.0\n", BUF_SIZE) == 0);
 }
 
 int main (void)
@@ -44,10 +61,11 @@ int main (void)
 	args[1] = &ldArg;
 	args[2] = NULL;
 
-	ffi_call(&cif, FFI_FN(printf), &res, args);
+	ffi_call(&cif, FFI_FN(wrap_printf), &res, args);
 	/* { dg-output "7.0" } */
 	printf("res: %d\n", (int) res);
 	/* { dg-output "\nres: 4" } */
+	CHECK(res == 4);
 
 	CHECK(ffi_prep_closure_loc(pcl, &cif, cls_longdouble_va_fn, NULL,
 				   code) == FFI_OK);
@@ -56,6 +74,7 @@ int main (void)
 	/* { dg-output "\n7.0" } */
 	printf("res: %d\n", (int) res);
 	/* { dg-output "\nres: 4" } */
+	CHECK(res == 4);
 
 	exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_schar.c

@@ -7,7 +7,7 @@
 /* { dg-do run } */
 #include "ffitest.h"
 
-signed char test_func_fn(signed char a1, signed char a2)
+static signed char test_func_fn(signed char a1, signed char a2)
 {
   signed char result;
 
@@ -26,6 +26,8 @@ static void test_func_gn(ffi_cif *cif __UNUSED__, void *rval, void **avals,
 
   a1 = *(signed char *)avals[0];
   a2 = *(signed char *)avals[1];
+  CHECK(a1 == 2);
+  CHECK(a2 == 125);
 
   *(ffi_arg *)rval = test_func_fn(a1, a2);
 
@@ -62,6 +64,7 @@ int main (void)
   /* { dg-output "2 125: 127" } */
   printf("res: %d\n", (signed char)res_call);
   /* { dg-output "\nres: 127" } */
+  CHECK((signed char)res_call == 127);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, test_func_gn, NULL, code)  == FFI_OK);
 
@@ -69,6 +72,7 @@ int main (void)
   /* { dg-output "\n2 125: 127" } */
   printf("res: %d\n", res_closure);
   /* { dg-output "\nres: 127" } */
+  CHECK(res_closure == 127);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshort.c

@@ -7,13 +7,16 @@
 /* { dg-do run } */
 #include "ffitest.h"
 
-signed short test_func_fn(signed short a1, signed short a2)
+static signed short test_func_fn(signed short a1, signed short a2)
 {
   signed short result;
 
   result = a1 + a2;
 
   printf("%d %d: %d\n", a1, a2, result);
+  CHECK(a1 == 2);
+  CHECK(a2 == 32765);
+  CHECK(result == 32767);
 
   return result;
 
@@ -62,6 +65,7 @@ int main (void)
   /* { dg-output "2 32765: 32767" } */
   printf("res: %d\n", (unsigned short)res_call);
   /* { dg-output "\nres: 32767" } */
+  CHECK((unsigned short)res_call == 32767);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, test_func_gn, NULL, code)  == FFI_OK);
 
@@ -69,6 +73,7 @@ int main (void)
   /* { dg-output "\n2 32765: 32767" } */
   printf("res: %d\n", res_closure);
   /* { dg-output "\nres: 32767" } */
+  CHECK(res_closure == 32767);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshortchar.c

@@ -7,7 +7,7 @@
 /* { dg-do run } */
 #include "ffitest.h"
 
-signed short test_func_fn(signed char a1, signed short a2,
+static signed short test_func_fn(signed char a1, signed short a2,
 			  signed char a3, signed short a4)
 {
   signed short result;
@@ -16,6 +16,12 @@ signed short test_func_fn(signed char a1, signed short a2,
 
   printf("%d %d %d %d: %d\n", a1, a2, a3, a4, result);
 
+  CHECK(a1 == 1);
+  CHECK(a2 == 32765);
+  CHECK(a3 == 127);
+  CHECK(a4 == -128);
+  CHECK(result == 32765);
+
   return result;
 
 }
@@ -74,6 +80,7 @@ int main (void)
   /* { dg-output "1 32765 127 -128: 32765" } */
   printf("res: %d\n", (signed short)res_call);
   /* { dg-output "\nres: 32765" } */
+  CHECK(res_call == 32765);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, test_func_gn, NULL, code)  == FFI_OK);
 
@@ -81,6 +88,7 @@ int main (void)
   /* { dg-output "\n1 32765 127 -128: 32765" } */
   printf("res: %d\n", res_closure);
   /* { dg-output "\nres: 32765" } */
+  CHECK(res_closure == 32765);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_uchar.c

@@ -7,7 +7,7 @@
 /* { dg-do run } */
 #include "ffitest.h"
 
-unsigned char test_func_fn(unsigned char a1, unsigned char a2,
+static unsigned char test_func_fn(unsigned char a1, unsigned char a2,
 			   unsigned char a3, unsigned char a4)
 {
   unsigned char result;
@@ -16,6 +16,12 @@ unsigned char test_func_fn(unsigned char a1, unsigned char a2,
 
   printf("%d %d %d %d: %d\n", a1, a2, a3, a4, result);
 
+  CHECK(a1 == 1);
+  CHECK(a2 == 2);
+  CHECK(a3 == 127);
+  CHECK(a4 == 125);
+  CHECK(result == 255);
+
   return result;
 
 }
@@ -79,6 +85,7 @@ int main (void)
   /* { dg-output "1 2 127 125: 255" } */
   printf("res: %d\n", (unsigned char)res_call);
   /* { dg-output "\nres: 255" } */
+  CHECK((unsigned char)res_call == 255);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, test_func_gn, NULL, code)  == FFI_OK);
 
@@ -86,6 +93,7 @@ int main (void)
   /* { dg-output "\n1 2 127 125: 255" } */
   printf("res: %d\n", res_closure);
   /* { dg-output "\nres: 255" } */
+  CHECK(res_closure == 255);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushort.c

@@ -7,7 +7,7 @@
 /* { dg-do run } */
 #include "ffitest.h"
 
-unsigned short test_func_fn(unsigned short a1, unsigned short a2)
+static unsigned short test_func_fn(unsigned short a1, unsigned short a2)
 {
   unsigned short result;
 
@@ -15,8 +15,11 @@ unsigned short test_func_fn(unsigned short a1, unsigned short a2)
 
   printf("%d %d: %d\n", a1, a2, result);
 
-  return result;
+  CHECK(a1 == 2);
+  CHECK(a2 == 32765);
+  CHECK(result == 32767);
 
+  return result;
 }
 
 static void test_func_gn(ffi_cif *cif __UNUSED__, void *rval, void **avals,
@@ -69,6 +72,7 @@ int main (void)
   /* { dg-output "\n2 32765: 32767" } */
   printf("res: %d\n", res_closure);
   /* { dg-output "\nres: 32767" } */
+  CHECK(res_closure == 32767);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushortchar.c

@@ -7,7 +7,7 @@
 /* { dg-do run } */
 #include "ffitest.h"
 
-unsigned short test_func_fn(unsigned char a1, unsigned short a2,
+static unsigned short test_func_fn(unsigned char a1, unsigned short a2,
 			    unsigned char a3, unsigned short a4)
 {
   unsigned short result;
@@ -16,6 +16,12 @@ unsigned short test_func_fn(unsigned char a1, unsigned short a2,
 
   printf("%d %d %d %d: %d\n", a1, a2, a3, a4, result);
 
+  CHECK(a1 == 1);
+  CHECK(a2 == 2);
+  CHECK(a3 == 127);
+  CHECK(a4 == 128);
+  CHECK(result == 258);
+
   return result;
 
 }
@@ -74,6 +80,7 @@ int main (void)
   /* { dg-output "1 2 127 128: 258" } */
   printf("res: %d\n", (unsigned short)res_call);
   /* { dg-output "\nres: 258" } */
+  CHECK(res_call == 258);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, test_func_gn, NULL, code)  == FFI_OK);
 
@@ -81,6 +88,7 @@ int main (void)
   /* { dg-output "\n1 2 127 128: 258" } */
   printf("res: %d\n", res_closure);
   /* { dg-output "\nres: 258" } */
+  CHECK(res_closure == 258);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer.c

@@ -16,6 +16,10 @@ void* cls_pointer_fn(void* a1, void* a2)
                (unsigned int)(uintptr_t) a2,
                (unsigned int)(uintptr_t) result);
 
+	CHECK((unsigned int)(uintptr_t) a1 == 0x12345678);
+	CHECK((unsigned int)(uintptr_t) a2 == 0x89abcdef);
+	CHECK((unsigned int)(uintptr_t) result == 0x9be02467);
+
 	return result;
 }
 
@@ -69,6 +73,7 @@ int main (void)
 	/* { dg-output "\n0x12345678 0x89abcdef: 0x9be02467" } */
 	printf("res: 0x%08x\n", (unsigned int) res);
 	/* { dg-output "\nres: 0x9be02467" } */
+	CHECK(res == 0x9be02467);
 
 	exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer_stack.c

@@ -40,6 +40,10 @@ void* cls_pointer_fn2(void* a1, void* a2)
                (unsigned int)(uintptr_t) a2,
                (unsigned int)(uintptr_t) result);
 
+	CHECK((unsigned int)(uintptr_t) a1 == 0x8acf1356);
+	CHECK((unsigned int)(uintptr_t) a2 == 0x01234567);
+	CHECK((unsigned int)(uintptr_t) result == 0x8bf258bd);
+
 	return result;
 }
 
@@ -65,6 +69,10 @@ void* cls_pointer_fn1(void* a1, void* a2)
                (unsigned int)(intptr_t) a2,
                (unsigned int)(intptr_t) result);
 
+	CHECK((unsigned int)(uintptr_t) a1 == 0x01234567);
+	CHECK((unsigned int)(uintptr_t) a2 == 0x89abcdef);
+	CHECK((unsigned int)(uintptr_t) result == 0x8acf1356);
+
 	result	= cls_pointer_fn2(result, a1);
 
 	return result;
@@ -128,6 +136,7 @@ int main (void)
 	/* { dg-output "\n0x01234567 0x89abcdef: 0x8acf1356" } */
 	/* { dg-output "\n0x8acf1356 0x01234567: 0x8bf258bd" } */
 	/* { dg-output "\nres: 0x8bf258bd" } */
+	CHECK(res == 0x8bf258bd);
 
 	CHECK(ffi_prep_closure_loc(pcl, &cif, cls_pointer_gn, NULL, code) == FFI_OK);
 
@@ -137,6 +146,7 @@ int main (void)
 	/* { dg-output "\n0x01234567 0x89abcdef: 0x8acf1356" } */
 	/* { dg-output "\n0x8acf1356 0x01234567: 0x8bf258bd" } */
 	/* { dg-output "\nres: 0x8bf258bd" } */
+	CHECK(res == 0x8bf258bd);
 
 	exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_schar.c

@@ -15,6 +15,8 @@ static void cls_ret_schar_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
   *(ffi_arg*)resp = *(signed char *)args[0];
   printf("%d: %d\n",*(signed char *)args[0],
 	 (int)*(ffi_arg *)(resp));
+  CHECK(*(signed char *)args[0] == 127);
+  CHECK((int)*(ffi_arg *)(resp) == 127);
 }
 typedef signed char (*cls_ret_schar)(signed char);
 
@@ -39,6 +41,7 @@ int main (void)
   /* { dg-output "127: 127" } */
   printf("res: %d\n", res);
   /* { dg-output "\nres: 127" } */
+  CHECK(res == 127);
 
   exit(0);
 }