Changeset 677

Timestamp:

Sep 9, 2003, 8:40:31 PM (22 years ago)

Author:

zap

Message:

.

Location:

trunk/src/gcc/gcc

Files:

• config/i386/emx.c (modified) (1 diff, 1 prop)
• config/i386/i386.c (modified) (4 diffs, 1 prop)
• reg-stack.c (modified) (5 diffs, 1 prop)
• rtl.h (modified) (1 diff, 1 prop)

trunk/src/gcc/gcc/config/i386/emx.c

@@ -350 +350 @@
         *no_add_attrs = true;
         break;
-
 
       /* Types!

trunk/src/gcc/gcc/config/i386/i386.c

@@ -2430 +2430 @@
                   cum->ec_slots--;
                 }
-#ifdef NOT_WORKING_YET
-              else if (TREE_CODE (type) == REAL_TYPE)
+              else if (FLOAT_MODE_P (mode))
                 {
                   /* Fixed-point parameters are passed in FPU registers */
@@ -2438 +2437 @@
                       cum->fpu_nregs--;
                       cum->fpu_regno++;
-                      regstack_first_undef_reg = FIRST_FLOAT_REG + cum->fpu_regno;
                       /* Args passed in FPU stack takes one eyecatcher slot */
                       cum->ec_slots--;
@@ -2452 +2450 @@
                     return;
                 }
-#endif
               else
                 {
@@ -2544 +2541 @@
         break;
 
-#if defined TARGET_OPTLINK_DECL_ATTRIBUTES && defined NOT_WORKING_YET
+#if defined TARGET_OPTLINK_DECL_ATTRIBUTES
         case QFmode:
         case HFmode:

trunk/src/gcc/gcc/reg-stack.c

@@ -232 +232 @@
 /* Used to initialize uninitialized registers.  */
 static rtx nan;
-
-/* The first undefined stack register at the beginning of this function.
-   This variable is set from machine-dependent code when placing certain
-   function arguments in stack registers at function entry, in this case
-   the variable is set to first stack register that has undefined contents
-   at the beginning of function. */
-int regstack_first_undef_reg = FIRST_STACK_REG;
 
 /* Forward declarations */
@@ -2412 +2405 @@
   int inserted = 0, i;
   edge e;
+  tree parm = DECL_ARGUMENTS (current_function_decl);
+  int incoming_arg [REG_STACK_SIZE];
 
   for (i = n_basic_blocks - 1; i >= 0; --i)
@@ -2432 +2427 @@
     }
 
+  /* Figure out the arguments passed in stack registers.  */
+  memset (incoming_arg, 0, sizeof (incoming_arg));
+  while (parm)
+    {
+      rtx x = DECL_INCOMING_RTL (parm);
+      if (STACK_REG_P (x))
+        incoming_arg[REGNO (x) - FIRST_STACK_REG] = x;
+      parm = TREE_CHAIN (parm);
+    }
+
   /* Load something into each stack register live at function entry. 
      Such live registers can be caused by uninitialized variables or
@@ -2446 +2451 @@
       block_info bi = BLOCK_INFO (block);
       int reg, top = -1;
-
-      for (reg = LAST_STACK_REG; reg >= regstack_first_undef_reg; --reg)
-        if (TEST_HARD_REG_BIT (bi->stack_in.reg_set, reg))
+      int dead_arguments = 0;
+
+      /* Put the incoming arguments to the stack.  */
+      for (i = LAST_STACK_REG; i >= FIRST_STACK_REG; i--)
+        if (incoming_arg [i - FIRST_STACK_REG])
+          bi->stack_in.reg[++top] = i;
+
+      for (reg = LAST_STACK_REG; reg >= FIRST_STACK_REG; --reg)
+        if (TEST_HARD_REG_BIT (bi->stack_in.reg_set, reg)
+            && !incoming_arg [reg - FIRST_STACK_REG])
           {
             rtx init;
@@ -2454 +2466 @@
             bi->stack_in.reg[++top] = reg;
 
-            init = gen_rtx_SET (VOIDmode,
-                                FP_MODE_REG (FIRST_STACK_REG, SFmode),
-                                nan);
-            insert_insn_on_edge (init, e);
-            inserted = 1;
+            init = gen_rtx_SET (VOIDmode,
+                                FP_MODE_REG (FIRST_STACK_REG, SFmode),
+                                nan);
+            insert_insn_on_edge (init, e);
+            inserted = 1;
           }
 
-      /* All registers that are valid on function entry should be
-         marked as such. ??? Possibly we should do it in flow.c ??? */
-      for (reg = regstack_first_undef_reg - 1; reg >= FIRST_STACK_REG; --reg)
-        {
-          bi->stack_in.reg[++top] = reg;
-        }
-
-      /* At the start of next block we cannot assume anything about
-         stack register contents.  */
-      regstack_first_undef_reg = FIRST_STACK_REG;
       bi->stack_in.top = top;
+
+      /* Check whether there are any dead arguments that needs
+         to be popped.  */
+      for (i = LAST_STACK_REG; i >= FIRST_STACK_REG; i--)
+        if (incoming_arg [i - FIRST_STACK_REG]
+            && !TEST_HARD_REG_BIT (bi->stack_in.reg_set, i))
+          {
+            dead_arguments = 1;
+            break;
+          }
+
+      if (dead_arguments)
+        {
+          rtx seq;
+          rtx after;
+          start_sequence ();
+                  
+          /* ??? pop_stack needs some point to emit insns after.
+             Also needed to keep gen_sequence from returning a 
+             pattern as opposed to a sequence, which would lose
+             REG_DEAD notes.  */
+          after = emit_note (NULL, NOTE_INSN_DELETED);
+
+          for (i = LAST_STACK_REG; i >= FIRST_STACK_REG; i--)
+            if (incoming_arg [i - FIRST_STACK_REG]
+                && !TEST_HARD_REG_BIT (bi->stack_in.reg_set,i))
+              after = emit_pop_insn (after, &bi->stack_in,
+                                     FP_MODE_REG (i, DFmode), EMIT_AFTER);
+
+          seq = gen_sequence ();
+          end_sequence ();
+          inserted = 1;
+          insert_insn_on_edge (seq, e);
+        }
     }
 

trunk/src/gcc/gcc/rtl.h

@@ -2007 +2007 @@
 /* In reg-stack.c */
 #ifdef BUFSIZ
-extern int regstack_first_undef_reg;
 extern void reg_to_stack                PARAMS ((rtx, FILE *));
 #endif