(RTX_COSTS): Rewrite.

From-SVN: r8878

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index a5623a7d87d80e7d1725f7d5e4102c3c8a8d4afe..9fc65dde29594c872041d934c09c2f277a9cd0c3 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -1388,18 +1388,27 @@ while (0)
 /* Provide the costs of a rtl expression.  This is in the body of a
    switch on CODE. */
 
-#define RTX_COSTS(X,CODE,OUTER_CODE)                   \
-  case MULT:                                           \
-    return COSTS_N_INSNS (10);                         \
-  case DIV:                                            \
-  case UDIV:                                           \
-  case MOD:                                            \
-  case UMOD:                                           \
-    return COSTS_N_INSNS (40);                         \
-  case PLUS:                                           \
-    if (GET_CODE (XEXP (X, 0)) == REG                  \
-        && GET_CODE (XEXP (X, 1)) == CONST_INT)                \
-      return 1;                                                \
+#define RTX_COSTS(X,CODE,OUTER_CODE)                           \
+  case MULT:                                                   \
+    return COSTS_N_INSNS (20);                                 \
+  case DIV:                                                    \
+  case UDIV:                                                   \
+  case MOD:                                                    \
+  case UMOD:                                                   \
+    return COSTS_N_INSNS (20);                                 \
+  case ASHIFTRT:                                               \
+  case LSHIFTRT:                                               \
+  case ASHIFT:                                                 \
+    return (4 + rtx_cost (XEXP (X, 0), OUTER_CODE)             \
+           + rtx_cost (XEXP (X, 1), OUTER_CODE));              \
+  case PLUS:                                                   \
+    if (GET_CODE (XEXP (X, 0)) == MULT                         \
+       && GET_CODE (XEXP (XEXP (X, 0), 1)) == CONST_INT        \
+       && (INTVAL (XEXP (XEXP (X, 0), 1)) == 2                 \
+           || INTVAL (XEXP (XEXP (X, 0), 1)) == 4              \
+           || INTVAL (XEXP (XEXP (X, 0), 1)) == 8))            \
+      return (2 + rtx_cost (XEXP (XEXP (X, 0), 0), OUTER_CODE) \
+             + rtx_cost (XEXP (X, 1), OUTER_CODE));            \
     break;