174 lines
5.5 KiB
Diff
174 lines
5.5 KiB
Diff
From b5f147d84761dc673ffe01d6af82bcde4ea47928 Mon Sep 17 00:00:00 2001
|
|
From: Richard Henderson <rth@redhat.com>
|
|
Date: Tue, 21 Oct 2014 13:27:57 -0400
|
|
Subject: [PATCH 054/415] aarch64: Always distinguish LONGDOUBLE
|
|
|
|
Avoid if-deffery by forcing FFI_TYPE_LONGDOUBLE different
|
|
from FFI_TYPE_DOUBLE. This will simply be unused on hosts
|
|
that define them identically.
|
|
---
|
|
src/aarch64/ffi.c | 41 ++++++++++++++---------------------------
|
|
1 file changed, 14 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/src/aarch64/ffi.c b/src/aarch64/ffi.c
|
|
index 0834614..f065be5 100644
|
|
--- a/src/aarch64/ffi.c
|
|
+++ b/src/aarch64/ffi.c
|
|
@@ -20,11 +20,20 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
|
|
#include <stdio.h>
|
|
-
|
|
+#include <stdlib.h>
|
|
#include <ffi.h>
|
|
#include <ffi_common.h>
|
|
|
|
-#include <stdlib.h>
|
|
+/* Force FFI_TYPE_LONGDOUBLE to be different than FFI_TYPE_DOUBLE;
|
|
+ all further uses in this file will refer to the 128-bit type. */
|
|
+#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
+# if FFI_TYPE_LONGDOUBLE != 4
|
|
+# error FFI_TYPE_LONGDOUBLE out of date
|
|
+# endif
|
|
+#else
|
|
+# undef FFI_TYPE_LONGDOUBLE
|
|
+# define FFI_TYPE_LONGDOUBLE 4
|
|
+#endif
|
|
|
|
/* Stack alignment requirement in bytes */
|
|
#if defined (__APPLE__)
|
|
@@ -115,10 +124,8 @@ get_basic_type_addr (unsigned short type, struct call_context *context,
|
|
return get_s_addr (context, n);
|
|
case FFI_TYPE_DOUBLE:
|
|
return get_d_addr (context, n);
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
case FFI_TYPE_LONGDOUBLE:
|
|
return get_v_addr (context, n);
|
|
-#endif
|
|
case FFI_TYPE_UINT8:
|
|
case FFI_TYPE_SINT8:
|
|
case FFI_TYPE_UINT16:
|
|
@@ -151,10 +158,8 @@ get_basic_type_alignment (unsigned short type)
|
|
#endif
|
|
case FFI_TYPE_DOUBLE:
|
|
return sizeof (UINT64);
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
case FFI_TYPE_LONGDOUBLE:
|
|
return sizeof (long double);
|
|
-#endif
|
|
case FFI_TYPE_UINT8:
|
|
case FFI_TYPE_SINT8:
|
|
#if defined (__APPLE__)
|
|
@@ -193,10 +198,8 @@ get_basic_type_size (unsigned short type)
|
|
return sizeof (UINT32);
|
|
case FFI_TYPE_DOUBLE:
|
|
return sizeof (UINT64);
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
case FFI_TYPE_LONGDOUBLE:
|
|
return sizeof (long double);
|
|
-#endif
|
|
case FFI_TYPE_UINT8:
|
|
return sizeof (UINT8);
|
|
case FFI_TYPE_SINT8:
|
|
@@ -390,9 +393,7 @@ is_register_candidate (ffi_type *ty)
|
|
case FFI_TYPE_VOID:
|
|
case FFI_TYPE_FLOAT:
|
|
case FFI_TYPE_DOUBLE:
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
case FFI_TYPE_LONGDOUBLE:
|
|
-#endif
|
|
case FFI_TYPE_UINT8:
|
|
case FFI_TYPE_UINT16:
|
|
case FFI_TYPE_UINT32:
|
|
@@ -557,11 +558,9 @@ copy_basic_type (void *dest, void *source, unsigned short type)
|
|
case FFI_TYPE_DOUBLE:
|
|
*(double *) dest = *(double *) source;
|
|
break;
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
case FFI_TYPE_LONGDOUBLE:
|
|
*(long double *) dest = *(long double *) source;
|
|
break;
|
|
-#endif
|
|
case FFI_TYPE_UINT8:
|
|
*(ffi_arg *) dest = *(UINT8 *) source;
|
|
break;
|
|
@@ -653,13 +652,11 @@ allocate_to_register_or_stack (struct call_context *context,
|
|
return allocate_to_d (context, state);
|
|
state->nsrn = N_V_ARG_REG;
|
|
break;
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
case FFI_TYPE_LONGDOUBLE:
|
|
if (state->nsrn < N_V_ARG_REG)
|
|
return allocate_to_v (context, state);
|
|
state->nsrn = N_V_ARG_REG;
|
|
break;
|
|
-#endif
|
|
case FFI_TYPE_UINT8:
|
|
case FFI_TYPE_SINT8:
|
|
case FFI_TYPE_UINT16:
|
|
@@ -722,9 +719,7 @@ aarch64_prep_args (struct call_context *context, unsigned char *stack,
|
|
appropriate register, or if none are available, to the stack. */
|
|
case FFI_TYPE_FLOAT:
|
|
case FFI_TYPE_DOUBLE:
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
case FFI_TYPE_LONGDOUBLE:
|
|
-#endif
|
|
case FFI_TYPE_UINT8:
|
|
case FFI_TYPE_SINT8:
|
|
case FFI_TYPE_UINT16:
|
|
@@ -887,9 +882,7 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
|
|
case FFI_TYPE_VOID:
|
|
case FFI_TYPE_FLOAT:
|
|
case FFI_TYPE_DOUBLE:
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
case FFI_TYPE_LONGDOUBLE:
|
|
-#endif
|
|
case FFI_TYPE_UINT8:
|
|
case FFI_TYPE_SINT8:
|
|
case FFI_TYPE_UINT16:
|
|
@@ -1040,14 +1033,12 @@ ffi_closure_SYSV_inner (ffi_closure *closure, struct call_context *context,
|
|
case FFI_TYPE_POINTER:
|
|
case FFI_TYPE_UINT64:
|
|
case FFI_TYPE_SINT64:
|
|
- case FFI_TYPE_FLOAT:
|
|
- case FFI_TYPE_DOUBLE:
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
- case FFI_TYPE_LONGDOUBLE:
|
|
+ case FFI_TYPE_FLOAT:
|
|
+ case FFI_TYPE_DOUBLE:
|
|
+ case FFI_TYPE_LONGDOUBLE:
|
|
avalue[i] = allocate_to_register_or_stack (context, stack,
|
|
&state, ty->type);
|
|
break;
|
|
-#endif
|
|
|
|
case FFI_TYPE_STRUCT:
|
|
h = is_hfa (ty);
|
|
@@ -1106,13 +1097,11 @@ ffi_closure_SYSV_inner (ffi_closure *closure, struct call_context *context,
|
|
break;
|
|
}
|
|
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
case FFI_TYPE_LONGDOUBLE:
|
|
memcpy (&avalue[i],
|
|
allocate_to_v (context, &state),
|
|
sizeof (*avalue));
|
|
break;
|
|
-#endif
|
|
|
|
default:
|
|
FFI_ASSERT (0);
|
|
@@ -1183,9 +1172,7 @@ ffi_closure_SYSV_inner (ffi_closure *closure, struct call_context *context,
|
|
case FFI_TYPE_SINT64:
|
|
case FFI_TYPE_FLOAT:
|
|
case FFI_TYPE_DOUBLE:
|
|
-#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE
|
|
case FFI_TYPE_LONGDOUBLE:
|
|
-#endif
|
|
{
|
|
void *addr = get_basic_type_addr (cif->rtype->type, context, 0);
|
|
copy_basic_type (addr, rvalue, cif->rtype->type);
|
|
--
|
|
2.7.4.huawei.3
|
|
|