ffi 1.9.23 → 1.9.24

data/ext/ffi_c/libffi/src/xtensa/sysv.S

@@ -169,8 +169,13 @@ ENTRY(ffi_cacheflush)
 
 	entry	a1, 16
 
-1:	dhwbi	a2, 0
+1:	
+#if XCHAL_DCACHE_SIZE
+	dhwbi	a2, 0
+#endif
+#if XCHAL_ICACHE_SIZE
 	ihi	a2, 0
+#endif
 	addi	a2, a2, 4
 	blt	a2, a3, 1b
 

data/ext/ffi_c/libffi/testsuite/Makefile.am

@@ -6,81 +6,112 @@ EXTRA_DEJAGNU_SITE_CONFIG=../local.exp
 
 CLEANFILES = *.exe core* *.log *.sum
 
-EXTRA_DIST = config/default.exp libffi.call/cls_19byte.c		\
-libffi.call/cls_align_longdouble_split.c				\
-libffi.call/closure_loc_fn0.c libffi.call/cls_schar.c			\
-libffi.call/closure_fn1.c \
-libffi.call/return_ul.c libffi.call/cls_align_double.c			\
-libffi.call/return_fl2.c libffi.call/cls_1_1byte.c			\
-libffi.call/cls_64byte.c libffi.call/nested_struct7.c			\
-libffi.call/cls_align_sint32.c libffi.call/nested_struct2.c		\
-libffi.call/ffitest.h libffi.call/nested_struct4.c			\
-libffi.call/cls_multi_ushort.c libffi.call/struct3.c			\
-libffi.call/cls_3byte1.c libffi.call/cls_16byte.c			\
-libffi.call/struct8.c libffi.call/nested_struct8.c			\
-libffi.call/cls_multi_sshort.c libffi.call/cls_3byte2.c			\
-libffi.call/cls_pointer.c			\
+EXTRA_DIST = lib/target-libpath.exp lib/libffi.exp lib/wrapper.exp	\
+libffi.call/strlen4.c libffi.call/cls_multi_sshort.c			\
+libffi.call/cls_align_longdouble_split2.c libffi.call/cls_1_1byte.c	\
+libffi.call/struct10.c libffi.call/cls_uint_va.c			\
+libffi.call/many_mixed.c libffi.call/float.c libffi.call/struct5.c	\
+libffi.call/return_fl3.c libffi.call/cls_3_1byte.c			\
+libffi.call/return_fl1.c libffi.call/cls_many_mixed_args.c		\
+libffi.call/cls_20byte1.c libffi.call/cls_pointer_stack.c		\
+libffi.call/cls_align_float.c libffi.call/call.exp			\
+libffi.call/pyobjc-tc.c libffi.call/float_va.c				\
+libffi.call/cls_5_1_byte.c libffi.call/cls_9byte1.c			\
+libffi.call/cls_align_uint32.c libffi.call/stret_medium.c		\
+libffi.call/cls_3byte1.c libffi.call/cls_align_uint64.c			\
+libffi.call/cls_longdouble_va.c libffi.call/cls_align_pointer.c		\
+libffi.call/cls_19byte.c libffi.call/cls_ushort.c			\
+libffi.call/cls_align_sint32.c libffi.call/struct8.c			\
+libffi.call/pr1172638.c libffi.call/cls_ulonglong.c			\
+libffi.call/cls_struct_va1.c libffi.call/cls_9byte2.c			\
+libffi.call/closure_fn5.c libffi.call/cls_5byte.c			\
+libffi.call/cls_3float.c libffi.call/return_sc.c			\
+libffi.call/cls_schar.c libffi.call/closure_fn4.c			\
+libffi.call/cls_uchar_va.c libffi.call/closure_fn0.c			\
+libffi.call/huge_struct.c libffi.call/va_struct1.c			\
+libffi.call/cls_ushort_va.c libffi.call/struct9.c libffi.call/va_1.c	\
+libffi.call/cls_64byte.c libffi.call/va_struct2.c			\
+libffi.call/cls_longdouble.c libffi.call/return_fl2.c			\
+libffi.call/cls_ulong_va.c libffi.call/cls_6_1_byte.c			\
+libffi.call/cls_align_uint16.c libffi.call/closure_fn2.c		\
+libffi.call/align_mixed.c libffi.call/unwindtest_ffi_call.cc		\
+libffi.call/cls_multi_ushortchar.c libffi.call/cls_8byte.c		\
+libffi.call/ffitest.h libffi.call/nested_struct8.c			\
+libffi.call/cls_pointer.c libffi.call/nested_struct2.c			\
+libffi.call/nested_struct.c libffi.call/struct4.c			\
+libffi.call/cls_multi_schar.c libffi.call/cls_align_longdouble_split.c	\
+libffi.call/cls_uchar.c libffi.call/return_ldl.c			\
+libffi.call/nested_struct9.c libffi.call/cls_float.c			\
+libffi.call/stret_medium2.c libffi.call/closure_loc_fn0.c		\
+libffi.call/float3.c libffi.call/cls_6byte.c libffi.call/return_sl.c	\
+libffi.call/closure_simple.c libffi.call/return_dbl1.c			\
+libffi.call/cls_align_double.c libffi.call/cls_multi_uchar.c		\
 libffi.call/err_bad_typedef.c libffi.call/cls_4_1byte.c			\
-libffi.call/cls_9byte2.c libffi.call/cls_multi_schar.c			\
-libffi.call/stret_medium2.c libffi.call/cls_5_1_byte.c			\
-libffi.call/call.exp libffi.call/cls_double.c				\
-libffi.call/cls_align_sint16.c libffi.call/cls_uint.c			\
-libffi.call/return_ll1.c libffi.call/nested_struct3.c			\
-libffi.call/cls_20byte1.c libffi.call/closure_fn4.c			\
-libffi.call/cls_uchar.c libffi.call/struct2.c libffi.call/cls_7byte.c	\
-libffi.call/strlen.c libffi.call/many.c libffi.call/testclosure.c	\
-libffi.call/return_fl.c libffi.call/struct5.c				\
-libffi.call/cls_12byte.c libffi.call/cls_multi_sshortchar.c		\
-libffi.call/cls_align_longdouble_split2.c libffi.call/return_dbl2.c	\
-libffi.call/return_fl3.c libffi.call/stret_medium.c			\
-libffi.call/nested_struct6.c libffi.call/closure_fn3.c			\
-libffi.call/float3.c libffi.call/many2.c				\
-libffi.call/closure_simple.c libffi.call/cls_align_uint16.c		\
-libffi.call/cls_9byte1.c libffi.call/closure_fn6.c			\
-libffi.call/cls_double_va.c libffi.call/cls_align_pointer.c		\
-libffi.call/cls_align_longdouble.c libffi.call/closure_fn2.c		\
-libffi.call/cls_sshort.c \
-libffi.call/nested_struct.c libffi.call/cls_20byte.c			\
-libffi.call/cls_longdouble.c libffi.call/cls_multi_uchar.c		\
-libffi.call/return_uc.c \
-libffi.call/cls_18byte.c libffi.call/cls_8byte.c			\
-libffi.call/promotion.c \
-libffi.call/return_dbl.c libffi.call/cls_24byte.c			\
-libffi.call/struct4.c libffi.call/cls_6byte.c				\
-libffi.call/cls_align_uint32.c libffi.call/float.c			\
-libffi.call/float1.c libffi.call/float_va.c libffi.call/negint.c	\
-libffi.call/return_dbl1.c libffi.call/cls_3_1byte.c			\
-libffi.call/cls_align_float.c libffi.call/return_fl1.c			\
-libffi.call/nested_struct10.c libffi.call/nested_struct5.c		\
-libffi.call/cls_align_sint64.c		\
-libffi.call/stret_large2.c libffi.call/return_sl.c			\
-libffi.call/closure_fn0.c libffi.call/cls_5byte.c			\
-libffi.call/cls_2byte.c libffi.call/float2.c				\
-libffi.call/cls_dbls_struct.c libffi.call/cls_sint.c			\
-libffi.call/stret_large.c libffi.call/cls_ulonglong.c			\
-libffi.call/cls_ushort.c libffi.call/nested_struct1.c			\
-libffi.call/err_bad_abi.c libffi.call/cls_longdouble_va.c		\
-libffi.call/cls_float.c libffi.call/cls_pointer_stack.c		\
-libffi.call/pyobjc-tc.c libffi.call/cls_multi_ushortchar.c		\
-libffi.call/struct1.c libffi.call/nested_struct9.c			\
-libffi.call/huge_struct.c libffi.call/problem1.c			\
-libffi.call/float4.c \
-libffi.call/return_ldl.c \
-libffi.call/closure_fn5.c \
-libffi.call/struct6.c libffi.call/return_ll.c libffi.call/struct9.c	\
-libffi.call/return_sc.c libffi.call/struct7.c				\
-libffi.call/cls_align_uint64.c libffi.call/cls_4byte.c			\
-libffi.call/cls_6_1_byte.c			\
-libffi.call/cls_7_1_byte.c libffi.call/unwindtest.cc			\
-libffi.call/unwindtest_ffi_call.cc	\
-lib/wrapper.exp lib/target-libpath.exp	\
-lib/libffi.exp libffi.call/cls_struct_va1.c				\
-libffi.call/cls_uchar_va.c libffi.call/cls_uint_va.c			\
-libffi.call/cls_ulong_va.c libffi.call/cls_ushort_va.c			\
-libffi.call/nested_struct11.c libffi.call/uninitialized.c		\
-libffi.call/va_1.c libffi.call/va_struct1.c libffi.call/va_struct2.c	\
-libffi.call/va_struct3.c \
-libffi.call/strlen2.c \
-libffi.call/strlen3.c \
-libffi.call/strlen4.c \
-libffi.call/cls_3float.c
+libffi.call/closure_fn3.c libffi.call/return_ll1.c			\
+libffi.call/return_dbl2.c libffi.call/cls_align_sint64.c		\
+libffi.call/nested_struct1.c libffi.call/negint.c			\
+libffi.call/nested_struct3.c libffi.call/unwindtest.cc			\
+libffi.call/struct2.c libffi.call/struct3.c libffi.call/return_fl.c	\
+libffi.call/nested_struct5.c libffi.call/cls_multi_ushort.c		\
+libffi.call/nested_struct11.c libffi.call/cls_multi_sshortchar.c	\
+libffi.call/cls_align_longdouble.c libffi.call/cls_dbls_struct.c	\
+libffi.call/cls_many_mixed_float_double.c libffi.call/stret_large.c	\
+libffi.call/stret_large2.c libffi.call/cls_align_sint16.c		\
+libffi.call/cls_2byte.c libffi.call/offsets.c libffi.call/struct7.c	\
+libffi.call/nested_struct4.c libffi.call/problem1.c			\
+libffi.call/va_struct3.c libffi.call/testclosure.c			\
+libffi.call/float1.c libffi.call/nested_struct6.c			\
+libffi.call/cls_4byte.c libffi.call/cls_24byte.c			\
+libffi.call/uninitialized.c libffi.call/many2.c				\
+libffi.call/nested_struct10.c libffi.call/struct6.c			\
+libffi.call/strlen2.c libffi.call/float2.c libffi.call/cls_uint.c	\
+libffi.call/cls_12byte.c libffi.call/return_ul.c			\
+libffi.call/cls_sint.c libffi.call/cls_7_1_byte.c			\
+libffi.call/struct1.c libffi.call/cls_sshort.c				\
+libffi.call/cls_16byte.c libffi.call/strlen3.c				\
+libffi.call/nested_struct7.c libffi.call/cls_double_va.c		\
+libffi.call/return_dbl.c libffi.call/cls_3byte2.c libffi.call/float4.c	\
+libffi.call/cls_double.c libffi.call/many.c libffi.call/cls_7byte.c	\
+libffi.call/strlen.c libffi.call/closure_fn6.c libffi.call/return_uc.c	\
+libffi.call/closure_fn1.c libffi.call/cls_20byte.c			\
+libffi.call/cls_18byte.c libffi.call/err_bad_abi.c			\
+libffi.call/many_double.c libffi.call/return_ll.c			\
+libffi.call/promotion.c libffi.complex/complex_defs_longdouble.inc	\
+libffi.complex/cls_align_complex_float.c				\
+libffi.complex/cls_complex_va_float.c					\
+libffi.complex/cls_complex_struct_float.c				\
+libffi.complex/return_complex2_longdouble.c				\
+libffi.complex/cls_complex_float.c					\
+libffi.complex/return_complex_longdouble.c				\
+libffi.complex/return_complex2_float.c libffi.complex/cls_complex.inc	\
+libffi.complex/cls_complex_va_longdouble.c				\
+libffi.complex/return_complex_double.c					\
+libffi.complex/return_complex.inc libffi.complex/many_complex.inc	\
+libffi.complex/complex_float.c libffi.complex/cls_align_complex.inc	\
+libffi.complex/return_complex2_double.c					\
+libffi.complex/many_complex_float.c libffi.complex/ffitest.h		\
+libffi.complex/return_complex1_double.c					\
+libffi.complex/cls_complex_struct_longdouble.c				\
+libffi.complex/complex_defs_double.inc					\
+libffi.complex/cls_complex_va_double.c					\
+libffi.complex/many_complex_double.c					\
+libffi.complex/return_complex2.inc					\
+libffi.complex/return_complex1_float.c					\
+libffi.complex/complex_longdouble.c					\
+libffi.complex/complex_defs_float.inc					\
+libffi.complex/cls_complex_double.c					\
+libffi.complex/cls_align_complex_double.c				\
+libffi.complex/cls_align_complex_longdouble.c				\
+libffi.complex/complex_double.c libffi.complex/cls_complex_va.inc	\
+libffi.complex/many_complex_longdouble.c libffi.complex/complex.inc	\
+libffi.complex/return_complex1_longdouble.c				\
+libffi.complex/complex_int.c libffi.complex/cls_complex_longdouble.c	\
+libffi.complex/cls_complex_struct_double.c				\
+libffi.complex/return_complex1.inc libffi.complex/complex.exp		\
+libffi.complex/cls_complex_struct.inc					\
+libffi.complex/return_complex_float.c libffi.go/closure1.c		\
+libffi.go/aa-direct.c libffi.go/ffitest.h libffi.go/go.exp		\
+libffi.go/static-chain.h libffi.bhaible/bhaible.exp			\
+libffi.bhaible/test-call.c libffi.bhaible/alignof.h			\
+libffi.bhaible/testcases.c libffi.bhaible/test-callback.c		\
+libffi.bhaible/Makefile libffi.bhaible/README config/default.exp  

data/ext/ffi_c/libffi/testsuite/lib/libffi.exp

@@ -24,6 +24,183 @@ load_lib libgloss.exp
 load_gcc_lib target-libpath.exp
 load_gcc_lib wrapper.exp
 
+proc check_effective_target_gccbug { } {
+    global has_gccbug
+    return $has_gccbug
+}
+
+# Return 1 if the target matches the effective target 'arg', 0 otherwise.
+# This can be used with any check_* proc that takes no argument and
+# returns only 1 or 0.  It could be used with check_* procs that take
+# arguments with keywords that pass particular arguments.
+
+proc is-effective-target { arg } {
+    global et_index
+    set selected 0
+    if { ![info exists et_index] } {
+	# Initialize the effective target index that is used in some
+	# check_effective_target_* procs.
+	set et_index 0
+    }
+    if { [info procs check_effective_target_${arg}] != [list] } {
+	set selected [check_effective_target_${arg}]
+    } else {
+	error "unknown effective target keyword `$arg'" 
+    }
+    verbose "is-effective-target: $arg $selected" 2
+    return $selected
+}
+
+proc is-effective-target-keyword { arg } {
+    if { [info procs check_effective_target_${arg}] != [list] } {
+	return 1
+    } else {
+	return 0
+    }
+}
+
+# Intercept the call to the DejaGnu version of dg-process-target to
+# support use of an effective-target keyword in place of a list of
+# target triplets to xfail or skip a test.
+#
+# The argument to dg-process-target is the keyword "target" or "xfail"
+# followed by a selector:
+#    target-triplet-1 ...
+#    effective-target-keyword
+#    selector-expression
+#
+# For a target list the result is "S" if the target is selected, "N" otherwise.
+# For an xfail list the result is "F" if the target is affected, "P" otherwise.
+
+# In contexts that allow either "target" or "xfail" the argument can be
+#    target selector1 xfail selector2
+# which returns "N" if selector1 is not selected, otherwise the result of
+# "xfail selector2".
+#
+# A selector expression appears within curly braces and uses a single logical
+# operator: !, &&, or ||.  An operand is another selector expression, an
+# effective-target keyword, or a list of target triplets within quotes or
+# curly braces.
+
+if { [info procs saved-dg-process-target] == [list] } {
+    rename dg-process-target saved-dg-process-target
+
+    # Evaluate an operand within a selector expression.
+    proc selector_opd { op } {
+	set selector "target"
+	lappend selector $op
+	set answer [ expr { [dg-process-target $selector] == "S" } ]
+	verbose "selector_opd: `$op' $answer" 2
+	return $answer
+    }
+
+    # Evaluate a target triplet list within a selector expression.
+    # Unlike other operands, this needs to be expanded from a list to
+    # the same string as "target".
+    proc selector_list { op } {
+	set selector "target [join $op]"
+	set answer [ expr { [dg-process-target $selector] == "S" } ]
+	verbose "selector_list: `$op' $answer" 2
+	return $answer
+    }
+
+    # Evaluate a selector expression.
+    proc selector_expression { exp } {
+	if { [llength $exp] == 2 } {
+	    if [string match "!" [lindex $exp 0]] {
+		set op1 [lindex $exp 1]
+		set answer [expr { ! [selector_opd $op1] }]
+	    } else {
+		# Assume it's a list of target triplets.
+		set answer [selector_list $exp]
+	    }
+	} elseif { [llength $exp] == 3 } {
+	    set op1 [lindex $exp 0]
+	    set opr [lindex $exp 1]
+	    set op2 [lindex $exp 2]
+	    if [string match "&&" $opr] {
+		set answer [expr { [selector_opd $op1] && [selector_opd $op2] }]
+	    } elseif [string match "||" $opr] {
+		set answer [expr { [selector_opd $op1] || [selector_opd $op2] }]
+	    } else {
+		# Assume it's a list of target triplets.
+		set answer [selector_list $exp]
+	    }
+	} else {
+	    # Assume it's a list of target triplets.
+	    set answer [selector_list $exp]
+	}
+
+	verbose "selector_expression: `$exp' $answer" 2
+	return $answer
+    }
+
+    # Evaluate "target selector" or "xfail selector".
+
+    proc dg-process-target-1 { args } {
+	verbose "dg-process-target-1: `$args'" 2
+
+	# Extract the 'what' keyword from the argument list.
+	set selector [string trim [lindex $args 0]]
+	if [regexp "^xfail " $selector] {
+	    set what "xfail"
+	} elseif [regexp "^target " $selector] {
+	    set what "target"
+	} else {
+	    error "syntax error in target selector \"$selector\""
+	}
+
+	# Extract the rest of the list, which might be a keyword.
+	regsub "^${what}" $selector "" rest
+	set rest [string trim $rest]
+
+	if [is-effective-target-keyword $rest] {
+	    # The selector is an effective target keyword.
+	    if [is-effective-target $rest] {
+		return [expr { $what == "xfail" ? "F" : "S" }]
+	    } else {
+		return [expr { $what == "xfail" ? "P" : "N" }]
+	    }
+	}
+
+	if [string match "{*}" $rest] {
+	    if [selector_expression [lindex $rest 0]] {
+		return [expr { $what == "xfail" ? "F" : "S" }]
+	    } else {
+		return [expr { $what == "xfail" ? "P" : "N" }]
+	    }
+	}
+
+	# The selector is not an effective-target keyword, so process
+	# the list of target triplets.
+	return [saved-dg-process-target $selector]
+    }
+
+    # Intercept calls to the DejaGnu function.  In addition to
+    # processing "target selector" or "xfail selector", handle
+    # "target selector1 xfail selector2".
+
+    proc dg-process-target { args } {
+	verbose "replacement dg-process-target: `$args'" 2
+
+	set selector [string trim [lindex $args 0]]
+
+	# If the argument list contains both 'target' and 'xfail',
+	# process 'target' and, if that succeeds, process 'xfail'.
+	if [regexp "^target .* xfail .*" $selector] {
+	    set xfail_index [string first "xfail" $selector]
+	    set xfail_selector [string range $selector $xfail_index end]
+	    set target_selector [string range $selector 0 [expr $xfail_index-1]]
+	    set target_selector [string trim $target_selector]
+	    if { [dg-process-target-1 $target_selector] == "N" } {
+		return "N"
+	    }
+	    return [dg-process-target-1 $xfail_selector]
+	    
+	}
+	return [dg-process-target-1 $selector]
+    }
+}
 
 # Define libffi callbacks for dg.exp.
 
@@ -299,14 +476,15 @@ proc libffi-dg-runtest { testcases default-extra-flags } {
 
 proc run-many-tests { testcases extra_flags } {
     global compiler_vendor
+    global has_gccbug
     switch $compiler_vendor {
       "clang" {
 	set common "-W -Wall"
-	set optimizations { "-O0" "-O1" "-O2" "-O3" "-Os" }
+	set optimizations { "-O0" "-O2" "-Os" }
       }
       "gnu" {
         set common "-W -Wall -Wno-psabi"
-        set optimizations { "-O0" "-O2" "-O3" "-Os" "-O2 -fomit-frame-pointer" }
+        set optimizations { "-O0" "-O2" "-Os" "-O2 -fomit-frame-pointer" }
       }
       default {
         # Assume we are using the vendor compiler.
@@ -317,7 +495,7 @@ proc run-many-tests { testcases extra_flags } {
 
     set targetabis { "" }
     if [string match $compiler_vendor "gnu"] {
-        if [istarget "i?86-*-*"] {
+        if [libffi_feature_test "#ifdef __i386__"] {
             set targetabis {
                 ""
                 "-DABI_NUM=FFI_STDCALL -DABI_ATTR=__STDCALL__"
@@ -325,10 +503,11 @@ proc run-many-tests { testcases extra_flags } {
                 "-DABI_NUM=FFI_FASTCALL -DABI_ATTR=__FASTCALL__"
             }
         } elseif { [istarget "x86_64-*-*"] \
-		   && [libffi_feature_test "#ifndef __ILP32__"] } {
+		   && [libffi_feature_test "#if !defined __ILP32__  \
+						&& !defined __i386__"] } {
             set targetabis {
                 ""
-                "-DABI_NUM=FFI_WIN64 -DABI_ATTR=__MSABI__"
+                "-DABI_NUM=FFI_GNUW64 -DABI_ATTR=__MSABI__"
             }
         }
     }
@@ -344,6 +523,17 @@ proc run-many-tests { testcases extra_flags } {
         foreach opt $optimizations {
             foreach abi $abis {
                 set options [concat $common $opt $abi]
+		set has_gccbug false;
+		if { [string match $compiler_vendor "gnu"] \
+			 && [string match "*MSABI*" $abi] \
+			 && ( ( [string match "*DGTEST=57 *" $common] \
+				    && [string match "*call.c*" $testname] ) \
+				  || ( [string match "*DGTEST=54 *" $common] \
+					   && [string match "*callback*" $testname] ) \
+				  || [string match "*DGTEST=55 *" $common] \
+				  || [string match "*DGTEST=56 *" $common] ) } then {
+		    set has_gccbug true;
+		}
                 verbose "Testing $testname, $options" 1
                 dg-test $test $options ""
             }

data/ext/ffi_c/libffi/testsuite/libffi.bhaible/Makefile

@@ -0,0 +1,28 @@
+CC = gcc
+CFLAGS = -O2 -Wall
+prefix =
+includedir = $(prefix)/include
+libdir = $(prefix)/lib
+CPPFLAGS = -I$(includedir)
+LDFLAGS = -L$(libdir) -Wl,-rpath,$(libdir)
+
+all: check-call check-callback
+
+test-call: test-call.c testcases.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o test-call test-call.c -lffi
+
+test-callback: test-callback.c testcases.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o test-callback test-callback.c -lffi
+
+check-call: test-call
+	./test-call > test-call.out
+	LC_ALL=C uniq -u < test-call.out > failed-call
+	test '!' -s failed-call
+
+check-callback: test-callback
+	./test-callback > test-callback.out
+	LC_ALL=C uniq -u < test-callback.out > failed-callback
+	test '!' -s failed-callback
+
+clean:
+	rm -f test-call test-callback test-call.out test-callback.out failed-call failed-callback