* config/mips/mips.md (addsi3): Remove workaround for adds of -32768.

	(addsi3_internal, adddi3, adddi3_internal_2): Likewise.
	(adddi3_internal_3, addsi3_internal_2): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68822 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 10 insertions, 36 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d76a77c912a..1162a586601 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2003-07-02  Richard Sandiford  <rsandifo@redhat.com>
 
+	* config/mips/mips.md (addsi3): Remove workaround for adds of -32768.
+	(addsi3_internal, adddi3, adddi3_internal_2): Likewise.
+	(adddi3_internal_3, addsi3_internal_2): Likewise.
+
+2003-07-02  Richard Sandiford  <rsandifo@redhat.com>
+
 	* config/mips/mips.c (machine_function): Add new fields:
 	ignore_hazard_length_p and all_noreorder_p.
 	(mips_flag_delayed_branch): New variable.
diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md
index 7621530b0c2..e1cd33f7063 100644
--- a/gcc/config/mips/mips.md
+++ b/gcc/config/mips/mips.md
@@ -703,15 +703,6 @@
   ""
   "
 {
-  /* The mips16 assembler handles -32768 correctly, and so does gas,
-     but some other MIPS assemblers think that -32768 needs to be
-     loaded into a register before it can be added in.  */
-  if (! TARGET_MIPS16
-      && ! TARGET_GAS
-      && GET_CODE (operands[2]) == CONST_INT
-      && INTVAL (operands[2]) == -32768)
-    operands[2] = force_reg (SImode, operands[2]);
-
   /* If a large stack adjustment was forced into a register, we may be
      asked to generate rtx such as:
 
@@ -738,10 +729,7 @@
   [(set (match_operand:SI 0 "register_operand" "=d,d")
 	(plus:SI (match_operand:SI 1 "reg_or_0_operand" "dJ,dJ")
 		 (match_operand:SI 2 "arith_operand" "d,Q")))]
-  "! TARGET_MIPS16
-   && (TARGET_GAS
-       || GET_CODE (operands[2]) != CONST_INT
-       || INTVAL (operands[2]) != -32768)"
+  "!TARGET_MIPS16"
   "@
     addu\\t%0,%z1,%2
     addiu\\t%0,%z1,%2"
@@ -888,15 +876,6 @@
   "TARGET_64BIT || (!TARGET_DEBUG_G_MODE && !TARGET_MIPS16)"
   "
 {
-  /* The mips16 assembler handles -32768 correctly, and so does gas,
-     but some other MIPS assemblers think that -32768 needs to be
-     loaded into a register before it can be added in.  */
-  if (! TARGET_MIPS16
-      && ! TARGET_GAS
-      && GET_CODE (operands[2]) == CONST_INT
-      && INTVAL (operands[2]) == -32768)
-    operands[2] = force_reg (DImode, operands[2]);
-
   /* If a large stack adjustment was forced into a register, we may be
      asked to generate rtx such as:
 
@@ -1010,10 +989,7 @@
 	(plus:DI (match_operand:DI 1 "register_operand" "%d,%d,%d")
 		 (match_operand:DI 2 "small_int" "P,J,N")))
    (clobber (match_operand:SI 3 "register_operand" "=d,d,d"))]
-  "!TARGET_64BIT && !TARGET_DEBUG_G_MODE && !TARGET_MIPS16
-   && (TARGET_GAS
-       || GET_CODE (operands[2]) != CONST_INT
-       || INTVAL (operands[2]) != -32768)"
+  "!TARGET_64BIT && !TARGET_DEBUG_G_MODE && !TARGET_MIPS16"
   "@
    addu\\t%L0,%L1,%2\;sltu\\t%3,%L0,%2\;addu\\t%M0,%M1,%3
    move\\t%L0,%L1\;move\\t%M0,%M1
@@ -1074,11 +1050,7 @@
   [(set (match_operand:DI 0 "register_operand" "=d,d")
 	(plus:DI (match_operand:DI 1 "reg_or_0_operand" "dJ,dJ")
 		 (match_operand:DI 2 "arith_operand" "d,Q")))]
-  "TARGET_64BIT
-   && !TARGET_MIPS16
-   && (TARGET_GAS
-       || GET_CODE (operands[2]) != CONST_INT
-       || INTVAL (operands[2]) != -32768)"
+  "TARGET_64BIT && !TARGET_MIPS16"
   "@
     daddu\\t%0,%z1,%2
     daddiu\\t%0,%z1,%2"
@@ -1221,11 +1193,7 @@
   [(set (match_operand:DI 0 "register_operand" "=d,d")
 	(sign_extend:DI (plus:SI (match_operand:SI 1 "reg_or_0_operand" "dJ,dJ")
 				 (match_operand:SI 2 "arith_operand" "d,Q"))))]
-  "TARGET_64BIT
-   && !TARGET_MIPS16
-   && (TARGET_GAS
-       || GET_CODE (operands[2]) != CONST_INT
-       || INTVAL (operands[2]) != -32768)"
+  "TARGET_64BIT && !TARGET_MIPS16"
   "@
     addu\\t%0,%z1,%2
     addiu\\t%0,%z1,%2"