[gcc(refs/users/aoliva/heads/testme)] untyped calls: use wrapper class type for implicit plus_one
Alexandre Oliva
aoliva@gcc.gnu.org
Wed Dec 6 20:01:33 GMT 2023
https://gcc.gnu.org/g:f2ed8f2699b0de17ef66b11d2f14c0120702c6a9
commit f2ed8f2699b0de17ef66b11d2f14c0120702c6a9
Author: Alexandre Oliva <oliva@adacore.com>
Date: Fri Dec 1 10:28:19 2023 -0300
untyped calls: use wrapper class type for implicit plus_one
Instead of get and set macros to apply a delta, use a single macro
that resorts to a temporary wrapper class to apply it.
To be combined (or not) with the previous patch.
Diff:
---
gcc/builtins.cc | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index d2884bd60af..3b75e074388 100644
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -1403,16 +1403,24 @@ get_memory_rtx (tree exp, tree len)
/* Built-in functions to perform an untyped call and return. */
-#define set_apply_args_size(x) \
- (this_target_builtins->x_apply_args_size_plus_one = 1 + (x))
-#define get_apply_args_size() \
- (this_target_builtins->x_apply_args_size_plus_one - 1)
+/* Wrapper that implicitly applies a delta when getting or setting the
+ enclosed value. */
+template <typename T>
+class delta_type
+{
+ T &value; T const delta;
+public:
+ delta_type (T &val, T dlt) : value (val), delta (dlt) {}
+ operator T () const { return value + delta; }
+ T operator = (T val) const { value = val - delta; return val; }
+};
+
+#define saved_apply_args_size \
+ (delta_type<int> (this_target_builtins->x_apply_args_size_plus_one, -1))
#define apply_args_mode \
(this_target_builtins->x_apply_args_mode)
-#define set_apply_result_size(x) \
- (this_target_builtins->x_apply_result_size_plus_one = 1 + (x))
-#define get_apply_result_size() \
- (this_target_builtins->x_apply_result_size_plus_one - 1)
+#define saved_apply_result_size \
+ (delta_type<int> (this_target_builtins->x_apply_result_size_plus_one, -1))
#define apply_result_mode \
(this_target_builtins->x_apply_result_mode)
@@ -1422,7 +1430,7 @@ get_memory_rtx (tree exp, tree len)
static int
apply_args_size (void)
{
- int size = get_apply_args_size ();
+ int size = saved_apply_args_size;
int align;
unsigned int regno;
@@ -1456,7 +1464,7 @@ apply_args_size (void)
else
apply_args_mode[regno] = as_a <fixed_size_mode> (VOIDmode);
- set_apply_args_size (size);
+ saved_apply_args_size = size;
}
return size;
}
@@ -1467,7 +1475,7 @@ apply_args_size (void)
static int
apply_result_size (void)
{
- int size = get_apply_result_size ();
+ int size = saved_apply_result_size;
int align, regno;
/* The values computed by this function never change. */
@@ -1500,7 +1508,7 @@ apply_result_size (void)
size = APPLY_RESULT_SIZE;
#endif
- set_apply_result_size (size);
+ saved_apply_result_size = size;
}
return size;
}
More information about the Gcc-cvs
mailing list