[gcc(refs/vendors/ARM/heads/morello)] Refactor builtin-types.def

public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed

* [gcc(refs/vendors/ARM/heads/morello)] Refactor builtin-types.def
@ 2022-05-06 14:43 Matthew Malcomson
  0 siblings, 0 replies; only message in thread
From: Matthew Malcomson @ 2022-05-06 14:43 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:7a5176c335ab6d381a352ed3bcd95eee8586016e

commit 7a5176c335ab6d381a352ed3bcd95eee8586016e
Author: Richard Sandiford <richard.sandiford@arm.com>
Date:   Thu Apr 21 19:35:25 2022 +0100

    Refactor builtin-types.def
    
    This patch refactors builtin-types.def for similar reasons to the
    previous sync-builtins.def patch.

Diff:
---
 gcc/builtin-types.def | 123 ++++++++++++++++++++++----------------------------
 gcc/fortran/types.def | 123 ++++++++++++++++++++++----------------------------
 2 files changed, 106 insertions(+), 140 deletions(-)

diff --git a/gcc/builtin-types.def b/gcc/builtin-types.def
index ae321f983ec..2aff3e6a4c9 100644
--- a/gcc/builtin-types.def
+++ b/gcc/builtin-types.def
@@ -171,6 +171,14 @@ DEF_PRIMITIVE_TYPE (BT_I4, builtin_type_for_size (BITS_PER_UNIT*4, 1))
 DEF_PRIMITIVE_TYPE (BT_I8, builtin_type_for_size (BITS_PER_UNIT*8, 1))
 DEF_PRIMITIVE_TYPE (BT_I16, builtin_type_for_size (BITS_PER_UNIT*16, 1))
 
+#define FOR_ALL_SYNC_N(DEF) \
+  DEF (I1, BT_I1) \
+  DEF (I2, BT_I2) \
+  DEF (I4, BT_I4) \
+  DEF (I8, BT_I8) \
+  DEF (I16, BT_I16) \
+  DEF (ICAP, BT_ICAP)
+
 /* The C type `char * const *'.  */
 DEF_PRIMITIVE_TYPE (BT_PTR_CONST_STRING,
 		    build_pointer_type
@@ -328,6 +336,18 @@ DEF_FUNCTION_TYPE_1 (BT_FN_INT_CONST_FENV_T_PTR, BT_INT, BT_CONST_FENV_T_PTR)
 
 DEF_POINTER_TYPE (BT_PTR_FN_VOID_PTR, BT_FN_VOID_PTR)
 
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_2 (BT_FN_##DTYPE##_VPTR_##DTYPE, BT_DTYPE, \
+		       BT_VOLATILE_PTR, BT_DTYPE)
+FOR_ALL_SYNC_N(DEF_SYNC)
+#undef DEF_SYNC
+
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_2 (BT_FN_##DTYPE##_CONST_VPTR_INT, BT_DTYPE, \
+		       BT_CONST_VOLATILE_PTR, BT_INT)
+FOR_ALL_SYNC_N(DEF_SYNC)
+#undef DEF_SYNC
+
 DEF_FUNCTION_TYPE_2 (BT_FN_VOID_PTR_INT, BT_VOID, BT_PTR, BT_INT)
 DEF_FUNCTION_TYPE_2 (BT_FN_STRING_STRING_CONST_STRING,
 		     BT_STRING, BT_STRING, BT_CONST_STRING)
@@ -477,28 +497,10 @@ DEF_FUNCTION_TYPE_2 (BT_FN_VOID_PTR_PTR, BT_VOID, BT_PTR, BT_PTR)
 DEF_FUNCTION_TYPE_2 (BT_FN_INT_CONST_STRING_PTR_CONST_STRING,
 		     BT_INT, BT_CONST_STRING, BT_PTR_CONST_STRING)
 DEF_FUNCTION_TYPE_2 (BT_FN_SIZE_CONST_PTR_INT, BT_SIZE, BT_CONST_PTR, BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_I1_VPTR_I1, BT_I1, BT_VOLATILE_PTR, BT_I1)
-DEF_FUNCTION_TYPE_2 (BT_FN_I2_VPTR_I2, BT_I2, BT_VOLATILE_PTR, BT_I2)
-DEF_FUNCTION_TYPE_2 (BT_FN_I4_VPTR_I4, BT_I4, BT_VOLATILE_PTR, BT_I4)
-DEF_FUNCTION_TYPE_2 (BT_FN_I8_VPTR_I8, BT_I8, BT_VOLATILE_PTR, BT_I8)
-DEF_FUNCTION_TYPE_2 (BT_FN_I16_VPTR_I16, BT_I16, BT_VOLATILE_PTR, BT_I16)
-DEF_FUNCTION_TYPE_2 (BT_FN_ICAP_VPTR_ICAP, BT_ICAP, BT_VOLATILE_PTR, BT_ICAP)
 DEF_FUNCTION_TYPE_2 (BT_FN_BOOL_LONGPTR_LONGPTR,
 		     BT_BOOL, BT_PTR_LONG, BT_PTR_LONG)
 DEF_FUNCTION_TYPE_2 (BT_FN_BOOL_ULONGLONGPTR_ULONGLONGPTR,
 		     BT_BOOL, BT_PTR_ULONGLONG, BT_PTR_ULONGLONG)
-DEF_FUNCTION_TYPE_2 (BT_FN_I1_CONST_VPTR_INT, BT_I1, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_I2_CONST_VPTR_INT, BT_I2, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_I4_CONST_VPTR_INT, BT_I4, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_I8_CONST_VPTR_INT, BT_I8, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_I16_CONST_VPTR_INT, BT_I16, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_ICAP_CONST_VPTR_INT, BT_ICAP, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
 DEF_FUNCTION_TYPE_2 (BT_FN_VOID_VPTR_INT, BT_VOID, BT_VOLATILE_PTR, BT_INT)
 DEF_FUNCTION_TYPE_2 (BT_FN_BOOL_VPTR_INT, BT_BOOL, BT_VOLATILE_PTR, BT_INT)
 DEF_FUNCTION_TYPE_2 (BT_FN_BOOL_SIZE_CONST_VPTR, BT_BOOL, BT_SIZE,
@@ -521,6 +523,30 @@ DEF_FUNCTION_TYPE_2 (BT_FN_INT_CONST_FEXCEPT_T_PTR_INT, BT_INT,
 
 DEF_POINTER_TYPE (BT_PTR_FN_VOID_PTR_PTR, BT_FN_VOID_PTR_PTR)
 
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_##DTYPE##_##DTYPE, BT_BOOL, \
+		       BT_VOLATILE_PTR, BT_DTYPE, BT_DTYPE)
+FOR_ALL_SYNC_N (DEF_SYNC)
+#undef DEF_SYNC
+
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_3 (BT_FN_##DTYPE##_VPTR_##DTYPE##_##DTYPE, BT_DTYPE, \
+		       BT_VOLATILE_PTR, BT_DTYPE, BT_DTYPE)
+FOR_ALL_SYNC_N (DEF_SYNC)
+#undef DEF_SYNC
+
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_3 (BT_FN_##DTYPE##_VPTR_##DTYPE##_INT, BT_DTYPE, \
+		       BT_VOLATILE_PTR, BT_DTYPE, BT_INT)
+FOR_ALL_SYNC_N (DEF_SYNC)
+#undef DEF_SYNC
+
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_##DTYPE##_INT, BT_VOID, \
+		       BT_VOLATILE_PTR, BT_DTYPE, BT_INT)
+FOR_ALL_SYNC_N (DEF_SYNC)
+#undef DEF_SYNC
+
 DEF_FUNCTION_TYPE_3 (BT_FN_STRING_STRING_CONST_STRING_SIZE,
 		     BT_STRING, BT_STRING, BT_CONST_STRING, BT_SIZE)
 DEF_FUNCTION_TYPE_3 (BT_FN_INT_CONST_STRING_CONST_STRING_SIZE,
@@ -605,42 +631,8 @@ DEF_FUNCTION_TYPE_3 (BT_FN_INT_CONST_STRING_PTR_CONST_STRING_PTR_CONST_STRING,
 		     BT_INT, BT_CONST_STRING, BT_PTR_CONST_STRING, BT_PTR_CONST_STRING)
 DEF_FUNCTION_TYPE_3 (BT_FN_INT_INT_CONST_STRING_VALIST_ARG,
 		     BT_INT, BT_INT, BT_CONST_STRING, BT_VALIST_ARG)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_I1_I1, BT_BOOL, BT_VOLATILE_PTR,
-		     BT_I1, BT_I1)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_I2_I2, BT_BOOL, BT_VOLATILE_PTR,
-		     BT_I2, BT_I2)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_I4_I4, BT_BOOL, BT_VOLATILE_PTR,
-		     BT_I4, BT_I4)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_I8_I8, BT_BOOL, BT_VOLATILE_PTR,
-		     BT_I8, BT_I8)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_I16_I16, BT_BOOL, BT_VOLATILE_PTR,
-		     BT_I16, BT_I16)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_ICAP_ICAP, BT_BOOL, BT_VOLATILE_PTR,
-		     BT_ICAP, BT_ICAP)
-DEF_FUNCTION_TYPE_3 (BT_FN_I1_VPTR_I1_I1, BT_I1, BT_VOLATILE_PTR, BT_I1, BT_I1)
-DEF_FUNCTION_TYPE_3 (BT_FN_I2_VPTR_I2_I2, BT_I2, BT_VOLATILE_PTR, BT_I2, BT_I2)
-DEF_FUNCTION_TYPE_3 (BT_FN_I4_VPTR_I4_I4, BT_I4, BT_VOLATILE_PTR, BT_I4, BT_I4)
-DEF_FUNCTION_TYPE_3 (BT_FN_I8_VPTR_I8_I8, BT_I8, BT_VOLATILE_PTR, BT_I8, BT_I8)
-DEF_FUNCTION_TYPE_3 (BT_FN_I16_VPTR_I16_I16, BT_I16, BT_VOLATILE_PTR,
-		     BT_I16, BT_I16)
-DEF_FUNCTION_TYPE_3 (BT_FN_ICAP_VPTR_ICAP_ICAP, BT_ICAP, BT_VOLATILE_PTR,
-		     BT_ICAP, BT_ICAP)
 DEF_FUNCTION_TYPE_3 (BT_FN_PTR_CONST_PTR_INT_SIZE, BT_PTR,
 		     BT_CONST_PTR, BT_INT, BT_SIZE)
-DEF_FUNCTION_TYPE_3 (BT_FN_I1_VPTR_I1_INT, BT_I1, BT_VOLATILE_PTR, BT_I1, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_I2_VPTR_I2_INT, BT_I2, BT_VOLATILE_PTR, BT_I2, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_I4_VPTR_I4_INT, BT_I4, BT_VOLATILE_PTR, BT_I4, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_I8_VPTR_I8_INT, BT_I8, BT_VOLATILE_PTR, BT_I8, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_I16_VPTR_I16_INT, BT_I16, BT_VOLATILE_PTR, BT_I16, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_ICAP_VPTR_ICAP_INT, BT_ICAP, BT_VOLATILE_PTR,
-		     BT_ICAP, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_I1_INT, BT_VOID, BT_VOLATILE_PTR, BT_I1, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_I2_INT, BT_VOID, BT_VOLATILE_PTR, BT_I2, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_I4_INT, BT_VOID, BT_VOLATILE_PTR, BT_I4, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_I8_INT, BT_VOID, BT_VOLATILE_PTR, BT_I8, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_I16_INT, BT_VOID, BT_VOLATILE_PTR, BT_I16, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_ICAP_INT, BT_VOID, BT_VOLATILE_PTR,
-		     BT_ICAP, BT_INT)
 DEF_FUNCTION_TYPE_3 (BT_FN_INT_PTRPTR_SIZE_SIZE, BT_INT, BT_PTR_PTR, BT_SIZE, BT_SIZE)
 DEF_FUNCTION_TYPE_3 (BT_FN_PTR_CONST_PTR_CONST_PTR_SIZE, BT_PTR, BT_CONST_PTR, BT_CONST_PTR, BT_SIZE)
 DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_INT_INT_INTPTR, BT_BOOL, BT_INT, BT_INT,
@@ -733,6 +725,13 @@ DEF_FUNCTION_TYPE_5 (BT_FN_BOOL_UINT_ULLPTR_ULL_ULLPTR_ULLPTR,
 		     BT_BOOL, BT_UINT, BT_PTR_ULONGLONG, BT_ULONGLONG,
 		     BT_PTR_ULONGLONG, BT_PTR_ULONGLONG)
 
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_##DTYPE##_BOOL_INT_INT, \
+		       BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_DTYPE, \
+		       BT_BOOL, BT_INT, BT_INT)
+FOR_ALL_SYNC_N (DEF_SYNC)
+#undef DEF_SYNC
+
 DEF_FUNCTION_TYPE_6 (BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VALIST_ARG,
 		     BT_INT, BT_STRING, BT_SIZE, BT_INT, BT_SIZE,
 		     BT_CONST_STRING, BT_VALIST_ARG)
@@ -742,24 +741,6 @@ DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_LONG_LONG_LONG_LONG_LONGPTR_LONGPTR,
 DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_BOOL_ULL_ULL_ULL_ULLPTR_ULLPTR,
 		     BT_BOOL, BT_BOOL, BT_ULONGLONG, BT_ULONGLONG,
 		     BT_ULONGLONG, BT_PTR_ULONGLONG, BT_PTR_ULONGLONG)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I1_BOOL_INT_INT, 
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I1, BT_BOOL, BT_INT,
-		     BT_INT)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I2_BOOL_INT_INT, 
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I2, BT_BOOL, BT_INT,
-		     BT_INT)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I4_BOOL_INT_INT, 
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I4, BT_BOOL, BT_INT,
-		     BT_INT)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I8_BOOL_INT_INT, 
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I8, BT_BOOL, BT_INT,
-		     BT_INT)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I16_BOOL_INT_INT, 
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I16, BT_BOOL, BT_INT,
-		     BT_INT)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_ICAP_BOOL_INT_INT,
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_ICAP, BT_BOOL, BT_INT,
-		     BT_INT)
 DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_SIZE_VPTR_PTR_PTR_INT_INT, BT_BOOL, BT_SIZE,
 		     BT_VOLATILE_PTR, BT_PTR, BT_PTR, BT_INT, BT_INT)
 
@@ -896,3 +877,5 @@ DEF_FUNCTION_TYPE_2 (BT_FN_VOID_VPTR_LDOUBLE, BT_VOID,
 		     BT_VOLATILE_PTR, BT_LONGDOUBLE)
 DEF_FUNCTION_TYPE_2 (BT_FN_VOID_VPTR_SIZE, BT_VOID,
 		     BT_VOLATILE_PTR, BT_SIZE)
+
+#undef FOR_ALL_SYNC_N
diff --git a/gcc/fortran/types.def b/gcc/fortran/types.def
index 4482547c41b..a770291eb73 100644
--- a/gcc/fortran/types.def
+++ b/gcc/fortran/types.def
@@ -63,6 +63,14 @@ DEF_PRIMITIVE_TYPE (BT_I4, builtin_type_for_size (BITS_PER_UNIT*4, 1))
 DEF_PRIMITIVE_TYPE (BT_I8, builtin_type_for_size (BITS_PER_UNIT*8, 1))
 DEF_PRIMITIVE_TYPE (BT_I16, builtin_type_for_size (BITS_PER_UNIT*16, 1))
 
+#define FOR_ALL_SYNC_N(DEF) \
+  DEF (I1, BT_I1) \
+  DEF (I2, BT_I2) \
+  DEF (I4, BT_I4) \
+  DEF (I8, BT_I8) \
+  DEF (I16, BT_I16) \
+  DEF (ICAP, BT_ICAP)
+
 DEF_PRIMITIVE_TYPE (BT_PTR, ptr_type_node)
 DEF_PRIMITIVE_TYPE (BT_CONST_PTR, const_ptr_type_node)
 DEF_PRIMITIVE_TYPE (BT_VOLATILE_PTR,
@@ -94,29 +102,23 @@ DEF_FUNCTION_TYPE_1 (BT_FN_BOOL_INT, BT_BOOL, BT_INT)
 
 DEF_POINTER_TYPE (BT_PTR_FN_VOID_PTR, BT_FN_VOID_PTR)
 
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_2 (BT_FN_##DTYPE##_VPTR_##DTYPE, BT_DTYPE, \
+		       BT_VOLATILE_PTR, BT_DTYPE)
+FOR_ALL_SYNC_N(DEF_SYNC)
+#undef DEF_SYNC
+
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_2 (BT_FN_##DTYPE##_CONST_VPTR_INT, BT_DTYPE, \
+		       BT_CONST_VOLATILE_PTR, BT_INT)
+FOR_ALL_SYNC_N(DEF_SYNC)
+#undef DEF_SYNC
+
 DEF_FUNCTION_TYPE_2 (BT_FN_BOOL_LONGPTR_LONGPTR,
                      BT_BOOL, BT_PTR_LONG, BT_PTR_LONG)
 DEF_FUNCTION_TYPE_2 (BT_FN_BOOL_ULONGLONGPTR_ULONGLONGPTR,
 		     BT_BOOL, BT_PTR_ULONGLONG, BT_PTR_ULONGLONG)
-DEF_FUNCTION_TYPE_2 (BT_FN_I1_VPTR_I1, BT_I1, BT_VOLATILE_PTR, BT_I1)
-DEF_FUNCTION_TYPE_2 (BT_FN_I2_VPTR_I2, BT_I2, BT_VOLATILE_PTR, BT_I2)
-DEF_FUNCTION_TYPE_2 (BT_FN_I4_VPTR_I4, BT_I4, BT_VOLATILE_PTR, BT_I4)
-DEF_FUNCTION_TYPE_2 (BT_FN_I8_VPTR_I8, BT_I8, BT_VOLATILE_PTR, BT_I8)
-DEF_FUNCTION_TYPE_2 (BT_FN_I16_VPTR_I16, BT_I16, BT_VOLATILE_PTR, BT_I16)
-DEF_FUNCTION_TYPE_2 (BT_FN_ICAP_VPTR_ICAP, BT_ICAP, BT_VOLATILE_PTR, BT_ICAP)
 DEF_FUNCTION_TYPE_2 (BT_FN_VOID_PTR_PTR, BT_VOID, BT_PTR, BT_PTR)
-DEF_FUNCTION_TYPE_2 (BT_FN_I1_CONST_VPTR_INT, BT_I1, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_I2_CONST_VPTR_INT, BT_I2, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_I4_CONST_VPTR_INT, BT_I4, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_I8_CONST_VPTR_INT, BT_I8, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_I16_CONST_VPTR_INT, BT_I16, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
-DEF_FUNCTION_TYPE_2 (BT_FN_ICAP_CONST_VPTR_INT, BT_ICAP, BT_CONST_VOLATILE_PTR,
-		     BT_INT)
 DEF_FUNCTION_TYPE_2 (BT_FN_VOID_VPTR_INT, BT_VOID, BT_VOLATILE_PTR, BT_INT)
 DEF_FUNCTION_TYPE_2 (BT_FN_BOOL_VPTR_INT, BT_BOOL, BT_VOLATILE_PTR, BT_INT)
 DEF_FUNCTION_TYPE_2 (BT_FN_BOOL_SIZE_CONST_VPTR, BT_BOOL, BT_SIZE,
@@ -126,40 +128,30 @@ DEF_FUNCTION_TYPE_2 (BT_FN_VOID_UINT_UINT, BT_VOID, BT_UINT, BT_UINT)
 
 DEF_POINTER_TYPE (BT_PTR_FN_VOID_PTR_PTR, BT_FN_VOID_PTR_PTR)
 
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_I1_I1, BT_BOOL, BT_VOLATILE_PTR,
-                     BT_I1, BT_I1)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_I2_I2, BT_BOOL, BT_VOLATILE_PTR,
-                     BT_I2, BT_I2)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_I4_I4, BT_BOOL, BT_VOLATILE_PTR,
-                     BT_I4, BT_I4)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_I8_I8, BT_BOOL, BT_VOLATILE_PTR,
-                     BT_I8, BT_I8)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_I16_I16, BT_BOOL, BT_VOLATILE_PTR,
-                     BT_I16, BT_I16)
-DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_ICAP_ICAP, BT_BOOL, BT_VOLATILE_PTR,
-		     BT_ICAP, BT_ICAP)
-DEF_FUNCTION_TYPE_3 (BT_FN_I1_VPTR_I1_I1, BT_I1, BT_VOLATILE_PTR, BT_I1, BT_I1)
-DEF_FUNCTION_TYPE_3 (BT_FN_I2_VPTR_I2_I2, BT_I2, BT_VOLATILE_PTR, BT_I2, BT_I2)
-DEF_FUNCTION_TYPE_3 (BT_FN_I4_VPTR_I4_I4, BT_I4, BT_VOLATILE_PTR, BT_I4, BT_I4)
-DEF_FUNCTION_TYPE_3 (BT_FN_I8_VPTR_I8_I8, BT_I8, BT_VOLATILE_PTR, BT_I8, BT_I8)
-DEF_FUNCTION_TYPE_3 (BT_FN_I16_VPTR_I16_I16, BT_I16, BT_VOLATILE_PTR,
-		     BT_I16, BT_I16)
-DEF_FUNCTION_TYPE_3 (BT_FN_ICAP_VPTR_ICAP_ICAP, BT_ICAP, BT_VOLATILE_PTR,
-		     BT_ICAP, BT_ICAP)
-DEF_FUNCTION_TYPE_3 (BT_FN_I1_VPTR_I1_INT, BT_I1, BT_VOLATILE_PTR, BT_I1, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_I2_VPTR_I2_INT, BT_I2, BT_VOLATILE_PTR, BT_I2, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_I4_VPTR_I4_INT, BT_I4, BT_VOLATILE_PTR, BT_I4, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_I8_VPTR_I8_INT, BT_I8, BT_VOLATILE_PTR, BT_I8, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_I16_VPTR_I16_INT, BT_I16, BT_VOLATILE_PTR, BT_I16, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_ICAP_VPTR_ICAP_INT, BT_ICAP, BT_VOLATILE_PTR,
-		     BT_ICAP, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_I1_INT, BT_VOID, BT_VOLATILE_PTR, BT_I1, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_I2_INT, BT_VOID, BT_VOLATILE_PTR, BT_I2, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_I4_INT, BT_VOID, BT_VOLATILE_PTR, BT_I4, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_I8_INT, BT_VOID, BT_VOLATILE_PTR, BT_I8, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_I16_INT, BT_VOID, BT_VOLATILE_PTR, BT_I16, BT_INT)
-DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_ICAP_INT, BT_VOID, BT_VOLATILE_PTR,
-		     BT_ICAP, BT_INT)
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_3 (BT_FN_BOOL_VPTR_##DTYPE##_##DTYPE, BT_BOOL, \
+		       BT_VOLATILE_PTR, BT_DTYPE, BT_DTYPE)
+FOR_ALL_SYNC_N (DEF_SYNC)
+#undef DEF_SYNC
+
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_3 (BT_FN_##DTYPE##_VPTR_##DTYPE##_##DTYPE, BT_DTYPE, \
+		       BT_VOLATILE_PTR, BT_DTYPE, BT_DTYPE)
+FOR_ALL_SYNC_N (DEF_SYNC)
+#undef DEF_SYNC
+
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_3 (BT_FN_##DTYPE##_VPTR_##DTYPE##_INT, BT_DTYPE, \
+		       BT_VOLATILE_PTR, BT_DTYPE, BT_INT)
+FOR_ALL_SYNC_N (DEF_SYNC)
+#undef DEF_SYNC
+
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_3 (BT_FN_VOID_VPTR_##DTYPE##_INT, BT_VOID, \
+		       BT_VOLATILE_PTR, BT_DTYPE, BT_INT)
+FOR_ALL_SYNC_N (DEF_SYNC)
+#undef DEF_SYNC
+
 DEF_FUNCTION_TYPE_3 (BT_FN_VOID_SIZE_SIZE_PTR, BT_VOID, BT_SIZE, BT_SIZE,
 		     BT_PTR)
 DEF_FUNCTION_TYPE_3 (BT_FN_UINT_UINT_PTR_PTR, BT_UINT, BT_UINT, BT_PTR, BT_PTR)
@@ -199,30 +191,19 @@ DEF_FUNCTION_TYPE_5 (BT_FN_BOOL_UINT_ULLPTR_ULL_ULLPTR_ULLPTR,
 		     BT_BOOL, BT_UINT, BT_PTR_ULONGLONG, BT_ULONGLONG,
 		     BT_PTR_ULONGLONG, BT_PTR_ULONGLONG)
 
+#define DEF_SYNC(DTYPE, BT_DTYPE) \
+  DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_##DTYPE##_BOOL_INT_INT, \
+		       BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_DTYPE, \
+		       BT_BOOL, BT_INT, BT_INT)
+FOR_ALL_SYNC_N (DEF_SYNC)
+#undef DEF_SYNC
+
 DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_LONG_LONG_LONG_LONG_LONGPTR_LONGPTR,
                      BT_BOOL, BT_LONG, BT_LONG, BT_LONG, BT_LONG,
 		     BT_PTR_LONG, BT_PTR_LONG)
 DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_BOOL_ULL_ULL_ULL_ULLPTR_ULLPTR,
 		     BT_BOOL, BT_BOOL, BT_ULONGLONG, BT_ULONGLONG,
 		     BT_ULONGLONG, BT_PTR_ULONGLONG, BT_PTR_ULONGLONG)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I1_BOOL_INT_INT, 
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I1, BT_BOOL, BT_INT,
-		     BT_INT)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I2_BOOL_INT_INT, 
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I2, BT_BOOL, BT_INT,
-		     BT_INT)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I4_BOOL_INT_INT, 
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I4, BT_BOOL, BT_INT,
-		     BT_INT)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I8_BOOL_INT_INT, 
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I8, BT_BOOL, BT_INT,
-		     BT_INT)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I16_BOOL_INT_INT, 
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I16, BT_BOOL, BT_INT,
-		     BT_INT)
-DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_ICAP_BOOL_INT_INT,
-		     BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_ICAP, BT_BOOL, BT_INT,
-		     BT_INT)
 DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_SIZE_VPTR_PTR_PTR_INT_INT, BT_BOOL, BT_SIZE,
 		     BT_VOLATILE_PTR, BT_PTR, BT_PTR, BT_INT, BT_INT)
 
@@ -289,3 +270,5 @@ DEF_FUNCTION_TYPE_VAR_7 (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR,
 DEF_FUNCTION_TYPE_VAR_6 (BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_VAR,
 			  BT_VOID, BT_INT, BT_PTR_FN_VOID_PTR, BT_SIZE,
 			  BT_PTR, BT_PTR, BT_PTR)
+
+#undef FOR_ALL_SYNC_N


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-05-06 14:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-06 14:43 [gcc(refs/vendors/ARM/heads/morello)] Refactor builtin-types.def Matthew Malcomson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).