Re: [RFT/RFA] gimplify pa va_arg

[Paolo Bonzini <paolo.bonzini@polimi.it>]

[-- Attachment #1: Type: text/plain, Size: 731 bytes --]

Paolo Bonzini wrote:

> And here is the second.  This gives several differences for both PA and 
> PA64 in the struct case.  For PA64, it looks like awful optimization on 
> part of the current mainline GCC (but HPPA assembly is not my forte). 
> For PA, the only important change is that the frame grows from 64 to 128 
> bytes, but again I cannot figure it out.
> 
> I attach two sdiffs to help review.
> 
> Ok for mainline?
> 
> Paolo
> 
> 2004-07-09  Paolo Bonzini  <bonzini@gnu.org>
> 
>     * config/pa/pa.h (EXPAND_BUILTIN_VA_ARG): Do not define.
>     * config/pa/pa.c (hppa_gimplify_va_arg_expr): New, based on
>     hppa_va_arg.  Produce GIMPLE in the pre-queue instead of
>     expanding trees to RTL.

ENOPATCH

Paolo


[-- Attachment #2: gimplify-va-arg-pa.patch --]
[-- Type: text/plain, Size: 4263 bytes --]

Index: pa.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/pa/pa.h,v
retrieving revision 1.221
diff -u -r1.221 pa.h
--- pa.h	5 Jul 2004 19:49:16 -0000	1.221
+++ pa.h	9 Jul 2004 09:22:56 -0000
@@ -1141,10 +1141,6 @@
 #define EXPAND_BUILTIN_VA_START(valist, nextarg) \
   hppa_va_start (valist, nextarg)
 
-/* Implement `va_arg'.  */
-
-#define EXPAND_BUILTIN_VA_ARG(valist, type) \
-  hppa_va_arg (valist, type)
 \f
 /* Addressing modes, and classification of registers for them. 
 
Index: pa.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/pa/pa.c,v
retrieving revision 1.255
diff -u -r1.255 pa.c
--- pa.c	7 Jul 2004 19:24:34 -0000	1.255
+++ pa.c	9 Jul 2004 09:22:57 -0000
@@ -47,6 +47,7 @@
 #include "tm_p.h"
 #include "target.h"
 #include "target-def.h"
+#include "tree-gimple.h"
 
 #undef TARGET_SCHED_USE_DFA_PIPELINE_INTERFACE 
 #define TARGET_SCHED_USE_DFA_PIPELINE_INTERFACE hook_int_void_1
@@ -142,6 +143,7 @@
 static void pa_hpux_init_libfuncs (void);
 #endif
 static rtx pa_struct_value_rtx (tree, int);
+static tree hppa_gimplify_va_arg_expr (tree, tree, tree *, tree *);
 
 /* Save the operands last given to a compare for use when we
    generate a scc or bcc insn.  */
@@ -268,6 +270,9 @@
 #undef TARGET_EXPAND_BUILTIN_SAVEREGS
 #define TARGET_EXPAND_BUILTIN_SAVEREGS hppa_builtin_saveregs
 
+#undef TARGET_GIMPLIFY_VA_ARG_EXPR
+#define TARGET_GIMPLIFY_VA_ARG_EXPR hppa_gimplify_va_arg_expr
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 \f
 void
@@ -5948,8 +5953,8 @@
   std_expand_builtin_va_start (valist, nextarg);
 }
 
-rtx
-hppa_va_arg (tree valist, tree type)
+static tree
+hppa_gimplify_va_arg_expr (tree valist, tree type, tree *pre_p, tree *post_p)
 {
   HOST_WIDE_INT size = int_size_in_bytes (type);
   HOST_WIDE_INT ofs;
@@ -5975,27 +5980,21 @@
           t = build (BIT_AND_EXPR, TREE_TYPE (t), t,
                      build_int_2 (-2 * UNITS_PER_WORD, -1));
           t = build (MODIFY_EXPR, TREE_TYPE (valist), valist, t);
-          TREE_SIDE_EFFECTS (t) = 1;
-	  expand_expr (t, const0_rtx, VOIDmode, EXPAND_NORMAL);
+	  gimplify_and_add (t, pre_p);
         }
 
       if (size > 0)
-	return std_expand_builtin_va_arg (valist, type);
+	return std_gimplify_va_arg_expr (valist, type, pre_p, post_p);
       else
 	{
 	  ptr = build_pointer_type (type);
+	  pptr = build_pointer_type (ptr);
 
 	  /* Args grow upward.  */
 	  t = build (POSTINCREMENT_EXPR, TREE_TYPE (valist), valist,
 		     build_int_2 (POINTER_SIZE / BITS_PER_UNIT, 0));
-	  TREE_SIDE_EFFECTS (t) = 1;
-
-	  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;
+	  t = fold_convert (pptr, t);
+	  t = build_fold_indirect_ref (t);
 	}
     }
   else /* !TARGET_64BIT */
@@ -6006,16 +6005,12 @@
       if (size > 8 || size <= 0)
 	{
 	  /* Args grow downward.  */
-	  t = build (PREDECREMENT_EXPR, TREE_TYPE (valist), valist,
-		     build_int_2 (POINTER_SIZE / BITS_PER_UNIT, 0));
-	  TREE_SIDE_EFFECTS (t) = 1;
-
 	  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;
+	  t = build2 (PREDECREMENT_EXPR, TREE_TYPE (valist), valist,
+		      build_int_2 (POINTER_SIZE / BITS_PER_UNIT, 0));
+	  t = fold_convert (pptr, t);
+	  t = build_fold_indirect_ref (t);
 	}
       else
 	{
@@ -6028,23 +6023,21 @@
 		     build_int_2 ((size > 4 ? -8 : -4), -1));
 
 	  t = build (MODIFY_EXPR, TREE_TYPE (valist), valist, t);
-	  TREE_SIDE_EFFECTS (t) = 1;
+	  gimplify_and_add (t, pre_p);
 
 	  ofs = (8 - size) % 4;
 	  if (ofs)
-	    {
-	      t = build (PLUS_EXPR, TREE_TYPE (valist), t,
-			 build_int_2 (ofs, 0));
-	      TREE_SIDE_EFFECTS (t) = 1;
-	    }
+	    t = build (PLUS_EXPR, TREE_TYPE (valist), valist,
+		       build_int_2 (ofs, 0));
+	  else
+	    t = valist;
 
-	  t = build1 (NOP_EXPR, ptr, t);
-	  TREE_SIDE_EFFECTS (t) = 1;
+	  t = fold_convert (ptr, t);
 	}
     }
 
   /* Calculate!  */
-  return expand_expr (t, NULL_RTX, VOIDmode, EXPAND_NORMAL);
+  return build_fold_indirect_ref (t);
 }