gimple va_arg for mn10300
Richard Henderson
rth@redhat.com
Fri Jul 9 10:16:00 GMT 2004
Tested as with c4x.
r~
* config/mn10300/mn10300-protos.h (mn10300_va_arg): Remove.
* config/mn10300/mn10300.c (TARGET_GIMPLIFY_VA_ARG_EXPR): New.
(mn10300_gimplify_va_arg_expr): Rewrite from mn10300_va_arg.
* config/mn10300/mn10300.h (EXPAND_BUILTIN_VA_ARG): Remove.
Index: config/mn10300/mn10300-protos.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mn10300/mn10300-protos.h,v
retrieving revision 1.13
diff -u -p -r1.13 mn10300-protos.h
--- config/mn10300/mn10300-protos.h 28 Jun 2004 08:13:06 -0000 1.13
+++ config/mn10300/mn10300-protos.h 9 Jul 2004 09:45:49 -0000
@@ -52,7 +52,6 @@ extern struct rtx_def *function_arg (CUM
enum machine_mode, tree, int);
extern int function_arg_partial_nregs (CUMULATIVE_ARGS *,
enum machine_mode, tree, int);
-extern struct rtx_def *mn10300_va_arg (tree, tree);
#endif /* TREE_CODE */
extern void expand_prologue (void);
Index: config/mn10300/mn10300.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mn10300/mn10300.c,v
retrieving revision 1.69
diff -u -p -r1.69 mn10300.c
--- config/mn10300/mn10300.c 4 Jul 2004 08:07:09 -0000 1.69
+++ config/mn10300/mn10300.c 9 Jul 2004 09:45:50 -0000
@@ -71,7 +71,7 @@ static bool mn10300_rtx_costs (rtx, int,
static void mn10300_file_start (void);
static bool mn10300_return_in_memory (tree, tree);
static rtx mn10300_builtin_saveregs (void);
-
+static tree mn10300_gimplify_va_arg_expr (tree, tree, tree *, tree *);
/* Initialize the GCC target structure. */
#undef TARGET_ASM_ALIGNED_HI_OP
@@ -98,6 +98,8 @@ static rtx mn10300_builtin_saveregs (voi
#undef TARGET_EXPAND_BUILTIN_SAVEREGS
#define TARGET_EXPAND_BUILTIN_SAVEREGS mn10300_builtin_saveregs
+#undef TARGET_GIMPLIFY_VA_ARG_EXPR
+#define TARGET_GIMPLIFY_VA_ARG_EXPR mn10300_gimplify_va_arg_expr
static void mn10300_encode_section_info (tree, rtx, int);
struct gcc_target targetm = TARGET_INITIALIZER;
@@ -1457,40 +1459,13 @@ mn10300_va_start (tree valist, rtx nexta
std_expand_builtin_va_start (valist, nextarg);
}
-rtx
-mn10300_va_arg (tree valist, tree type)
+static tree
+mn10300_gimplify_va_arg_expr (tree valist, tree type, tree *pre_p, tree *post_p)
{
- HOST_WIDE_INT align, rsize;
- tree t, ptr, pptr;
-
- /* Compute the rounded size of the type. */
- align = PARM_BOUNDARY / BITS_PER_UNIT;
- rsize = (((int_size_in_bytes (type) + align - 1) / align) * align);
-
- t = build (POSTINCREMENT_EXPR, TREE_TYPE (valist), valist,
- build_int_2 ((rsize > 8 ? 4 : rsize), 0));
- TREE_SIDE_EFFECTS (t) = 1;
-
- ptr = build_pointer_type (type);
-
- /* "Large" types are passed by reference. */
- if (rsize > 8)
- {
- pptr = build_pointer_type (ptr);
- t = build1 (NOP_EXPR, pptr, t);
- TREE_SIDE_EFFECTS (t) = 1;
-
- t = build1 (INDIRECT_REF, ptr, t);
- TREE_SIDE_EFFECTS (t) = 1;
- }
+ if (FUNCTION_ARG_PASS_BY_REFERENCE (dummy, TYPE_MODE (type), type, dummy))
+ return ind_gimplify_va_arg_expr (valist, type, pre_p, post_p);
else
- {
- t = build1 (NOP_EXPR, ptr, t);
- TREE_SIDE_EFFECTS (t) = 1;
- }
-
- /* Calculate! */
- return expand_expr (t, NULL_RTX, Pmode, EXPAND_NORMAL);
+ return std_gimplify_va_arg_expr (valist, type, pre_p, post_p);
}
/* Return an RTX to represent where a value with mode MODE will be returned
Index: config/mn10300/mn10300.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mn10300/mn10300.h,v
retrieving revision 1.80
diff -u -p -r1.80 mn10300.h
--- config/mn10300/mn10300.h 28 Jun 2004 08:13:06 -0000 1.80
+++ config/mn10300/mn10300.h 9 Jul 2004 09:45:50 -0000
@@ -697,13 +697,6 @@ struct cum_arg {int nbytes; };
/* Implement `va_start' for varargs and stdarg. */
#define EXPAND_BUILTIN_VA_START(valist, nextarg) \
mn10300_va_start (valist, nextarg)
-
-/* Implement `va_arg'. */
-#define EXPAND_BUILTIN_VA_ARG(valist, type) \
- mn10300_va_arg (valist, type)
-
-/* Addressing modes, and classification of registers for them. */
-
/* 1 if X is an rtx for a constant that is a valid address. */
More information about the Gcc-patches
mailing list