i386.c (SAVE_REGS_FIRST): Remove.

        * i386.c (SAVE_REGS_FIRST): Remove.
        (ix86_initial_elimination_offset): Handle only SAVE_REGS_FIRST mode.
        (ix86_compute_frame_size): Likewise.
        (ix86_expand_prologue): Likewise.  Use pro_epilogue_adjust_stack.
        (ix86_emit_restore_regs): Remove.
        (ix86_emit_epilogue_esp_adjustment): Use pro_epilogue_adjust_stack
        when a frame pointer is in use.
        (ix86_expand_epilogue): Handle only SAVE_REGS_FIRST mode.  Use mov
        instead of pop to restore a register when profitable; emit leave
        when profitable.
        (ix86_attr_length_default): Handle pro_epilogue_adjust_stack
        as a TYPE_LEA insn.
        (ix86_adjust_cost): Handle pro_epilogue_adjust_stack as TYPE_ALU.
        * i386.md (prologue_allocate_stack): Remove.
        (epilogue_deallocate_stack): Remove.
        (pro_epilogue_adjust_stack): New.

Co-Authored-By: Richard Henderson <rth@cygnus.com>

From-SVN: r31792

gcc/ChangeLog

+2000-02-04  Jan Hubicka  <jh@suse.cz>
+	    Richard Henderson  <rth@cygnus.com>
+
+        * i386.c (SAVE_REGS_FIRST): Remove.
+        (ix86_initial_elimination_offset): Handle only SAVE_REGS_FIRST mode.
+        (ix86_compute_frame_size): Likewise.
+	(ix86_expand_prologue): Likewise.  Use pro_epilogue_adjust_stack.
+        (ix86_emit_restore_regs): Remove.
+	(ix86_emit_epilogue_esp_adjustment): Use pro_epilogue_adjust_stack
+	when a frame pointer is in use.
+        (ix86_expand_epilogue): Handle only SAVE_REGS_FIRST mode.  Use mov
+	instead of pop to restore a register when profitable; emit leave
+	when profitable.
+        (ix86_attr_length_default): Handle pro_epilogue_adjust_stack
+        as a TYPE_LEA insn.
+	(ix86_adjust_cost): Handle pro_epilogue_adjust_stack as TYPE_ALU.
+        * i386.md (prologue_allocate_stack): Remove.
+	(epilogue_deallocate_stack): Remove.
+	(pro_epilogue_adjust_stack): New.
+
 2000-02-04  Richard Henderson  <rth@cygnus.com>
 
 	* function.c (diddle_return_value): Rework to use a callback function.

gcc/config/i386/i386.md

@@ -8807,35 +8807,47 @@
 ;;
 ;; in proper program order.
 
-(define_insn "prologue_allocate_stack"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-	(plus:SI (match_operand:SI 1 "register_operand" "0")
-		 (match_operand:SI 2 "nonmemory_operand" "ri")))
-   (set (match_operand:SI 3 "register_operand" "=r")
+(define_insn "pro_epilogue_adjust_stack"
+  [(set (match_operand:SI 0 "register_operand" "=r,r")
+	(plus:SI (match_operand:SI 1 "register_operand" "0,r")
+	         (match_operand:SI 2 "immediate_operand" "i,i")))
+   (set (match_operand:SI 3 "register_operand" "+r,r")
 	(match_dup 3))
    (clobber (reg:CC 17))]
   ""
   "*
 {
-  if (GET_CODE (operands[2]) == CONST_INT
-      && (INTVAL (operands[2]) == 128
-	  || (INTVAL (operands[2]) < 0
-	      && INTVAL (operands[2]) != -128)))
+  switch (get_attr_type (insn))
     {
-      operands[2] = GEN_INT (-INTVAL (operands[2]));
-      return \"sub{l}\\t{%2, %0|%0, %2}\";
+    case TYPE_IMOV:
+      return \"mov{l}\\t{%1, %0|%0, %1}\";
+
+    case TYPE_ALU:
+      if (GET_CODE (operands[2]) == CONST_INT
+          && (INTVAL (operands[2]) == 128
+	      || (INTVAL (operands[2]) < 0
+	          && INTVAL (operands[2]) != -128)))
+	{
+	  operands[2] = GEN_INT (-INTVAL (operands[2]));
+	  return \"sub{l}\\t{%2, %0|%0, %2}\";
+	}
+      return \"add{l}\\t{%2, %0|%0, %2}\";
+
+    case TYPE_LEA:
+      operands[2] = SET_SRC (XVECEXP (PATTERN (insn), 0, 0));
+      return \"lea{l}\\t{%a2, %0|%0, %a2}\";
+
+    default:
+      abort ();
     }
-  return \"add{l}\\t{%2, %0|%0, %2}\";
 }"
-  [(set_attr "type" "alu")])
-
-(define_insn "epilogue_deallocate_stack"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-	(match_operand:SI 1 "register_operand" "+r"))
-   (set (match_dup 1) (match_dup 1))]
-  ""
-  "mov{l}\\t{%1, %0|%0, %1}"
-  [(set_attr "type" "imov")])
+  [(set (attr "type")
+	(cond [(eq_attr "alternative" "0")
+		 (const_string "alu")
+	       (match_operand:SI 2 "const0_operand" "")
+		 (const_string "imov")
+	      ]
+	      (const_string "lea")))])
 
 (define_insn "allocate_stack_worker"
   [(unspec:SI [(match_operand:SI 0 "register_operand" "a")] 3)