Merge remote-tracking branch 'libffi/master'

Author: KritzelKratzel

configure.ac

@@ -119,6 +119,10 @@ fi
 AC_SUBST(HAVE_LONG_DOUBLE)
 AC_SUBST(HAVE_LONG_DOUBLE_VARIANT)
 
+AC_CHECK_TYPE(__int128_t,
+	      AC_DEFINE(HAVE_INT128, 1,
+			[Define if __int128_t and __uint128_t are supported.]))
+
 AC_C_BIGENDIAN
 
 GCC_AS_CFI_PSEUDO_OP

include/ffi.h.in

@@ -77,9 +77,11 @@ extern "C" {
 #define FFI_TYPE_STRUCT     13
 #define FFI_TYPE_POINTER    14
 #define FFI_TYPE_COMPLEX    15
+#define FFI_TYPE_UINT128    16
+#define FFI_TYPE_SINT128    17
 
 /* This should always refer to the last type code (for sanity checks).  */
-#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
+#define FFI_TYPE_LAST       FFI_TYPE_SINT128
 
 #include <ffitarget.h>
 
@@ -227,6 +229,11 @@ FFI_EXTERN ffi_type ffi_type_complex_float;
 FFI_EXTERN ffi_type ffi_type_complex_double;
 FFI_EXTERN ffi_type ffi_type_complex_longdouble;
 #endif
+
+#ifdef FFI_TARGET_HAS_INT128
+FFI_EXTERN ffi_type ffi_type_uint128;
+FFI_EXTERN ffi_type ffi_type_sint128;
+#endif
 #endif /* LIBFFI_HIDE_BASIC_TYPES */
 
 typedef enum {

libffi.map.in

@@ -91,3 +91,11 @@ LIBFFI_GO_CLOSURE_8.0 {
 	ffi_prep_go_closure;
 } LIBFFI_CLOSURE_8.0;
 #endif
+
+#ifdef FFI_TARGET_HAS_INT128
+LIBFFI_INT128_8.3 {
+  global:
+	ffi_type_sint128;
+	ffi_type_uint128;
+} LIBFFI_BASE_8.1;
+#endif

libtool-version

@@ -26,4 +26,4 @@
 #    release, then set age to 0.
 #
 # CURRENT:REVISION:AGE
-10:0:2
+11:0:3

src/aarch64/ffi.c

@@ -28,6 +28,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include <ffi_common.h>
 #include "internal.h"
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h> /* FlushInstructionCache */
 #endif
 #include <tramp.h>
@@ -537,6 +538,32 @@ allocate_int_to_reg_or_stack (struct call_context *context,
   return allocate_to_stack (state, stack, size, size);
 }
 
+static void *
+allocate_int128_to_reg_or_stack (struct call_context *context,
+			         struct arg_state *state, void *stack)
+{
+  unsigned ngrn = state->ngrn;
+  void *ret;
+
+  /* The normal AArch64 ABI requires even Xreg; Darwin does not. */
+#ifndef __APPLE__
+  ngrn += ngrn & 1;
+#endif
+
+  if (ngrn < N_X_ARG_REG)
+    {
+      ret = &context->x[ngrn];
+      ngrn += 2;
+    }
+  else
+    {
+      ret = allocate_to_stack (state, stack, 16, 16);
+      ngrn = N_X_ARG_REG;
+    }
+  state->ngrn = ngrn;
+  return ret;
+}
+
 ffi_status FFI_HIDDEN
 ffi_prep_cif_machdep (ffi_cif *cif)
 {
@@ -576,6 +603,11 @@ ffi_prep_cif_machdep (ffi_cif *cif)
       flags = (sizeof(void *) == 4 ? AARCH64_RET_UINT32 : AARCH64_RET_INT64);
       break;
 
+    case FFI_TYPE_UINT128:
+    case FFI_TYPE_SINT128:
+      flags = AARCH64_RET_INT128;
+      break;
+
     case FFI_TYPE_FLOAT:
     case FFI_TYPE_DOUBLE:
     case FFI_TYPE_LONGDOUBLE:
@@ -741,6 +773,12 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *orig_rvalue,
 	  }
 	  break;
 
+	case FFI_TYPE_UINT128:
+	case FFI_TYPE_SINT128:
+	  dest = allocate_int128_to_reg_or_stack (context, &state, stack);
+	  memcpy (dest, a, 16);
+	  break;
+
 	case FFI_TYPE_FLOAT:
 	case FFI_TYPE_DOUBLE:
 	case FFI_TYPE_LONGDOUBLE:
@@ -1023,6 +1061,11 @@ ffi_closure_SYSV_inner (ffi_cif *cif,
 	  avalue[i] = allocate_int_to_reg_or_stack (context, &state, stack, s);
 	  break;
 
+	case FFI_TYPE_UINT128:
+	case FFI_TYPE_SINT128:
+	  avalue[i] = allocate_int128_to_reg_or_stack (context, &state, stack);
+	  break;
+
 	case FFI_TYPE_FLOAT:
 	case FFI_TYPE_DOUBLE:
 	case FFI_TYPE_LONGDOUBLE:

src/aarch64/ffitarget.h

@@ -94,4 +94,6 @@ typedef enum ffi_abi
 #define FFI_TARGET_HAS_COMPLEX_TYPE
 #endif
 
+#define FFI_TARGET_HAS_INT128 1
+
 #endif

src/alpha/ffi.c

@@ -95,6 +95,8 @@ ffi_prep_cif_machdep(ffi_cif *cif)
 	  bytes += 8;
 	  break;
 
+	case FFI_TYPE_SINT128:
+	case FFI_TYPE_UINT128:
 	case FFI_TYPE_VOID:
 	case FFI_TYPE_STRUCT:
 	  /* Passed by value in N slots.  */
@@ -149,6 +151,8 @@ ffi_prep_cif_machdep(ffi_cif *cif)
     case FFI_TYPE_POINTER:
       flags = ALPHA_FLAGS(ALPHA_ST_INT, ALPHA_LD_INT64);
       break;
+    case FFI_TYPE_SINT128:
+    case FFI_TYPE_UINT128:
     case FFI_TYPE_LONGDOUBLE:
     case FFI_TYPE_STRUCT:
       /* Passed in memory, with a hidden pointer.  */
@@ -281,6 +285,8 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue,
 	  argp[argn++] = (unsigned long)valp;
 	  break;
 
+	case FFI_TYPE_SINT128:
+	case FFI_TYPE_UINT128:
 	case FFI_TYPE_VOID:
 	case FFI_TYPE_STRUCT:
 	  size = ty->size;
@@ -418,6 +424,8 @@ ffi_closure_osf_inner (ffi_cif *cif,
 	  argn += 1;
 	  break;
 
+	case FFI_TYPE_SINT128:
+	case FFI_TYPE_UINT128:
 	case FFI_TYPE_VOID:
 	case FFI_TYPE_STRUCT:
 	  size = ty->size;

src/alpha/ffitarget.h

@@ -46,6 +46,7 @@ typedef enum ffi_abi {
 
 #define FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION
 #define FFI_TARGET_HAS_COMPLEX_TYPE
+#define FFI_TARGET_HAS_INT128
 
 /* ---- Definitions for closures ----------------------------------------- */
 

src/loongarch64/ffitarget.h

@@ -69,6 +69,8 @@ typedef enum ffi_abi
 
 #endif /* LIBFFI_ASM */
 
+#define FFI_TARGET_HAS_INT128
+
 /* ---- Definitions for closures ----------------------------------------- */
 
 #define FFI_CLOSURES 1

src/loongarch64/sysv.S

@@ -89,17 +89,17 @@ ffi_call_asm:
 	   we preserve the call_context so that it can be read back in the
 	   caller.  */
 
-	.cfi_def_cfa	5, FRAME_LEN # Interim CFA based on a1.
+	.cfi_def_cfa	5, FRAME_LEN /* Interim CFA based on a1. */
 	SARG	$fp, $a1, FRAME_LEN - 2*PTRS
 	.cfi_offset	22, -2*PTRS
 	SARG	$ra, $a1, FRAME_LEN - 1*PTRS
 	.cfi_offset	1, -1*PTRS
 
 	addi.d	$fp, $a1, FRAME_LEN
 	move	$sp, $a0
-	.cfi_def_cfa	22, 0 # Our frame is fully set up.
+	.cfi_def_cfa	22, 0 /* Our frame is fully set up. */
 
-	# Load arguments.
+	/* Load arguments. */
 	move	$t1, $a2
 	move	$t2, $a3