From 5ef4f6095ebf7adad02f08d7d2f29d9e05363bf4 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Mon, 19 Mar 2012 23:16:45 +0100
Subject: [PATCH] i386.md (allocate_stack): Simplify.

	* config/i386/i386.md (allocate_stack): Simplify.

From-SVN: r185545
---
 gcc/ChangeLog           |  5 ++++-
 gcc/config/i386/i386.md | 31 ++++++++++++++++---------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67a1119d35b4..258bda905ac8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-19  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.md (allocate_stack): Simplify.
+
 2012-03-19  Uros Bizjak  <ubizjak@gmail.com>
 
 	* builtins.c (expand_builtin_cexpi): Use copy_addr_to_reg instead of
@@ -10,7 +14,6 @@
 	(ix86_expand_setmem): Ditto.
 	(ix86_trampoline_init): DItto.
 	* config/i386/i386.md (cmpstrnsi): Ditto.
-	(allocate_stack): Ditto.
 
 2012-03-19  Sandra Loosemore  <sandra@codesourcery.com>
 
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 0db0222af793..4bcb7d2830fe 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -16729,25 +16729,26 @@
 
   if (CHECK_STACK_LIMIT && CONST_INT_P (operands[1])
       && INTVAL (operands[1]) < CHECK_STACK_LIMIT)
-    {
-      x = expand_simple_binop (Pmode, MINUS, stack_pointer_rtx, operands[1],
-			       stack_pointer_rtx, 0, OPTAB_DIRECT);
-      if (x != stack_pointer_rtx)
-	emit_move_insn (stack_pointer_rtx, x);
-    }
+    x = operands[1];
   else
     {
-      x = copy_addr_to_reg (operands[1]);
-      if (TARGET_64BIT)
-        emit_insn (gen_allocate_stack_worker_probe_di (x, x));
-      else
-        emit_insn (gen_allocate_stack_worker_probe_si (x, x));
-      x = expand_simple_binop (Pmode, MINUS, stack_pointer_rtx, x,
-			       stack_pointer_rtx, 0, OPTAB_DIRECT);
-      if (x != stack_pointer_rtx)
-	emit_move_insn (stack_pointer_rtx, x);
+      rtx (*insn) (rtx, rtx);
+
+      x = copy_to_mode_reg (Pmode, operands[1]);
+
+      insn = (TARGET_64BIT
+	      ? gen_allocate_stack_worker_probe_di
+	      : gen_allocate_stack_worker_probe_si);
+
+      emit_insn (insn (x, x));
     }
 
+  x = expand_simple_binop (Pmode, MINUS, stack_pointer_rtx, x,
+			   stack_pointer_rtx, 0, OPTAB_DIRECT);
+
+  if (x != stack_pointer_rtx)
+    emit_move_insn (stack_pointer_rtx, x);
+
   emit_move_insn (operands[0], virtual_stack_dynamic_rtx);
   DONE;
 })