mips.h (INITIALIZE_TRAMPOLINE): Simplify.

	* config/mips/mips.h (INITIALIZE_TRAMPOLINE): Simplify.
	* config/mips/mips.c (mips_load_got): Assume Pmode == ptr_mode.
	* config/mips/mips.md (extendsidi2, *extendsidi2): Merge. Don't accept
	contant operands.

From-SVN: r72671

gcc/ChangeLog

+2003-10-19  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/mips/mips.h (INITIALIZE_TRAMPOLINE): Simplify.
+	* config/mips/mips.c (mips_load_got): Assume Pmode == ptr_mode.
+	* config/mips/mips.md (extendsidi2, *extendsidi2): Merge. Don't accept
+	contant operands.
+
 2003-10-18  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* doc/extend.texi: Fix typos.

gcc/config/mips/mips.c

@@ -1656,9 +1656,6 @@ mips_load_got (rtx base, rtx addr, int reloc)
   if (reloc != RELOC_CALL16 && reloc != RELOC_CALL_LO)
     RTX_UNCHANGING_P (mem) = 1;
 
-  if (Pmode != ptr_mode)
-    mem = gen_rtx_SIGN_EXTEND (Pmode, mem);
-
   return mem;
 }
 

gcc/config/mips/mips.h

@@ -2524,10 +2524,8 @@ typedef struct mips_args {
 									    \
   func_addr = plus_constant (ADDR, 32);					    \
   chain_addr = plus_constant (func_addr, GET_MODE_SIZE (ptr_mode));	    \
-  emit_move_insn (gen_rtx_MEM (ptr_mode, func_addr),			    \
-		  gen_lowpart (ptr_mode, force_reg (Pmode, FUNC)));	    \
-  emit_move_insn (gen_rtx_MEM (ptr_mode, chain_addr),			    \
-		  gen_lowpart (ptr_mode, force_reg (Pmode, CHAIN)));	    \
+  emit_move_insn (gen_rtx_MEM (ptr_mode, func_addr), FUNC);		    \
+  emit_move_insn (gen_rtx_MEM (ptr_mode, chain_addr), CHAIN);		    \
 									    \
   /* Flush both caches.  We need to flush the data cache in case	    \
      the system has a write-back cache.  */				    \

gcc/config/mips/mips.md

@@ -3479,20 +3479,7 @@ dsrl\t%3,%3,1\n\
 ;; Extension insns.
 ;; Those for integer source operand are ordered widest source type first.
 
-(define_expand "extendsidi2"
-  [(set (match_operand:DI 0 "register_operand" "")
-        (sign_extend:DI (match_operand:SI 1 "move_operand" "")))]
-  "TARGET_64BIT"
-{
-  if (symbolic_operand (operands[1], SImode))
-    {
-      emit_move_insn (operands[0],
-		      convert_memory_address (DImode, operands[1]));
-      DONE;
-    }
-})
-
-(define_insn "*extendsidi2"
+(define_insn "extendsidi2"
   [(set (match_operand:DI 0 "register_operand" "=d,d")
         (sign_extend:DI (match_operand:SI 1 "nonimmediate_operand" "d,m")))]
   "TARGET_64BIT"