aarch64: Fix closures for win64

AndreRH · tresf · commit 2732f2c052b6 · 2021-01-12T15:17:45.000-05:00
Cherry-pick of libffi/libffi#606
diff --git a/native/libffi/src/aarch64/ffi.c b/native/libffi/src/aarch64/ffi.c
@@ -790,7 +790,7 @@ ffi_prep_closure_loc (ffi_closure *closure,
                       void *user_data,
                       void *codeloc)
 {
-  if (cif->abi != FFI_SYSV)
+  if (cif->abi != FFI_SYSV && cif->abi != FFI_WIN64)
     return FFI_BAD_ABI;
 
   void (*start)(void);
@@ -851,7 +851,7 @@ ffi_prep_go_closure (ffi_go_closure *closure, ffi_cif* cif,
 {
   void (*start)(void);
 
-  if (cif->abi != FFI_SYSV)
+  if (cif->abi != FFI_SYSV && cif->abi != FFI_WIN64)
     return FFI_BAD_ABI;
 
   if (cif->flags & AARCH64_FLAG_ARG_V)
@@ -891,11 +891,18 @@ ffi_closure_SYSV_inner (ffi_cif *cif,
 			void *stack, void *rvalue, void *struct_rvalue)
 {
   void **avalue = (void**) alloca (cif->nargs * sizeof (void*));
-  int i, h, nargs, flags;
+  int i, h, nargs, flags, isvariadic = 0;
   struct arg_state state;
 
   arg_init (&state);
 
+  flags = cif->flags;
+  if (flags & AARCH64_FLAG_VARARG)
+  {
+    isvariadic = 1;
+    flags &= ~AARCH64_FLAG_VARARG;
+  }
+
   for (i = 0, nargs = cif->nargs; i < nargs; i++)
     {
       ffi_type *ty = cif->arg_types[i];
@@ -930,8 +937,7 @@ ffi_closure_SYSV_inner (ffi_cif *cif,
 	  if (h)
 	    {
 	      n = 4 - (h & 3);
-#ifdef _WIN32  /* for handling armasm calling convention */
-              if (cif->is_variadic)
+              if (cif->abi == FFI_WIN64 && isvariadic)
                 {
                   if (state.ngrn + n <= N_X_ARG_REG)
                     {
@@ -957,7 +963,6 @@ ffi_closure_SYSV_inner (ffi_cif *cif,
                 }
               else
                 {
-#endif  /* for handling armasm calling convention */
                   if (state.nsrn + n <= N_V_ARG_REG)
                     {
                       void *reg = &context->v[state.nsrn];
@@ -970,9 +975,7 @@ ffi_closure_SYSV_inner (ffi_cif *cif,
                       avalue[i] = allocate_to_stack(&state, stack,
                                                    ty->alignment, s);
                     }
-#ifdef _WIN32  /* for handling armasm calling convention */
                 }
-#endif  /* for handling armasm calling convention */
             }
           else if (s > 16)
             {
@@ -1013,7 +1016,6 @@ ffi_closure_SYSV_inner (ffi_cif *cif,
 #endif
     }
 
-  flags = cif->flags;
   if (flags & AARCH64_RET_IN_MEM)
     rvalue = struct_rvalue;
 

Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,7 @@ ffi_prep_closure_loc (ffi_closure *closure,`
`790`	`790`	`void *user_data,`
`791`	`791`	`void *codeloc)`
`792`	`792`	`{`
`793`		`- if (cif->abi != FFI_SYSV)`
	`793`	`+ if (cif->abi != FFI_SYSV && cif->abi != FFI_WIN64)`
`794`	`794`	`return FFI_BAD_ABI;`
`795`	`795`
`796`	`796`	`void (*start)(void);`
`@@ -851,7 +851,7 @@ ffi_prep_go_closure (ffi_go_closure closure, ffi_cif cif,`
`851`	`851`	`{`
`852`	`852`	`void (*start)(void);`
`853`	`853`
`854`		`- if (cif->abi != FFI_SYSV)`
	`854`	`+ if (cif->abi != FFI_SYSV && cif->abi != FFI_WIN64)`
`855`	`855`	`return FFI_BAD_ABI;`
`856`	`856`
`857`	`857`	`if (cif->flags & AARCH64_FLAG_ARG_V)`
`@@ -891,11 +891,18 @@ ffi_closure_SYSV_inner (ffi_cif *cif,`
`891`	`891`	`void stack, void rvalue, void *struct_rvalue)`
`892`	`892`	`{`
`893`	`893`	`void avalue = (void) alloca (cif->nargs * sizeof (void*));`
`894`		`- int i, h, nargs, flags;`
	`894`	`+ int i, h, nargs, flags, isvariadic = 0;`
`895`	`895`	`struct arg_state state;`
`896`	`896`
`897`	`897`	`arg_init (&state);`
`898`	`898`
	`899`	`+ flags = cif->flags;`
	`900`	`+ if (flags & AARCH64_FLAG_VARARG)`
	`901`	`+ {`
	`902`	`+ isvariadic = 1;`
	`903`	`+ flags &= ~AARCH64_FLAG_VARARG;`
	`904`	`+ }`
	`905`	`+`
`899`	`906`	`for (i = 0, nargs = cif->nargs; i < nargs; i++)`
`900`	`907`	`{`
`901`	`908`	`ffi_type *ty = cif->arg_types[i];`
`@@ -930,8 +937,7 @@ ffi_closure_SYSV_inner (ffi_cif *cif,`
`930`	`937`	`if (h)`
`931`	`938`	`{`
`932`	`939`	`n = 4 - (h & 3);`
`933`		`-#ifdef _WIN32 /* for handling armasm calling convention */`
`934`		`- if (cif->is_variadic)`
	`940`	`+ if (cif->abi == FFI_WIN64 && isvariadic)`
`935`	`941`	`{`
`936`	`942`	`if (state.ngrn + n <= N_X_ARG_REG)`
`937`	`943`	`{`
`@@ -957,7 +963,6 @@ ffi_closure_SYSV_inner (ffi_cif *cif,`
`957`	`963`	`}`
`958`	`964`	`else`
`959`	`965`	`{`
`960`		`-#endif /* for handling armasm calling convention */`
`961`	`966`	`if (state.nsrn + n <= N_V_ARG_REG)`
`962`	`967`	`{`
`963`	`968`	`void *reg = &context->v[state.nsrn];`
`@@ -970,9 +975,7 @@ ffi_closure_SYSV_inner (ffi_cif *cif,`
`970`	`975`	`avalue[i] = allocate_to_stack(&state, stack,`
`971`	`976`	`ty->alignment, s);`
`972`	`977`	`}`
`973`		`-#ifdef _WIN32 /* for handling armasm calling convention */`
`974`	`978`	`}`
`975`		`-#endif /* for handling armasm calling convention */`
`976`	`979`	`}`
`977`	`980`	`else if (s > 16)`
`978`	`981`	`{`
`@@ -1013,7 +1016,6 @@ ffi_closure_SYSV_inner (ffi_cif *cif,`
`1013`	`1016`	`#endif`
`1014`	`1017`	`}`
`1015`	`1018`
`1016`		`- flags = cif->flags;`
`1017`	`1019`	`if (flags & AARCH64_RET_IN_MEM)`
`1018`	`1020`	`rvalue = struct_rvalue;`
`1019`	`1021`