*** empty log message ***

From-SVN: r617

gcc/config/mips/mips.md

@@ -1628,11 +1628,18 @@ move\\t%0,%z4\\n\\
   extern rtx gen_movsi_ulw ();
   extern rtx gen_movsi ();
 
-  if (GET_CODE (operands[0]) == MEM && !reg_or_0_operand (operands[1], SImode))
+  /* Handle loads.  */
+  if (GET_CODE (operands[0]) == MEM)
     {
       rtx reg = gen_reg_rtx (SImode);
+      rtx insn = emit_insn (gen_movsi_ulw (reg, operands[1]));
+      rtx addr = XEXP (operands[0], 0);
+      if (CONSTANT_P (addr))
+	REG_NOTES (insn) = gen_rtx (EXPR_LIST, REG_EQUIV, addr, REG_NOTES (insn));
+
+      if (reg_or_0_operand (operands[1], SImode))
+	DONE;
 
-      emit_insn (gen_movsi_ulw (reg, operands[1]));
       operands[1] = reg;
     }
 
@@ -1733,7 +1740,7 @@ move\\t%0,%z4\\n\\
 
   return \"usw\\t%z1,%0\";
 }"
-  [(set_attr "type"	"load,load")
+  [(set_attr "type"	"store,store")
    (set_attr "mode"	"SI,SI")
    (set_attr "length"	"2,4")])
 
@@ -1881,6 +1888,23 @@ move\\t%0,%z4\\n\\
     }
 }")
 
+;; Insn generated by block moves
+
+(define_insn "movstrsi_internal"
+  [(set (match_operand:BLK 0 "memory_operand" "Ro")
+	(match_operand:BLK 1 "memory_operand" "Ro"))
+   (clobber (match_scratch:SI 4 "d"))
+   (clobber (match_scratch:SI 5 "d"))
+   (clobber (match_scratch:SI 6 "d"))
+   (clobber (match_scratch:SI 7 "d"))
+   (use (match_operand:SI 2 "small_int" "I"))
+   (use (match_operand:SI 3 "small_int" "I"))]
+  ""
+  "* return output_block_move (insn, operands, 4);"
+  [(set_attr "type"	"multi")
+   (set_attr "mode"	"none")
+   (set_attr "length"	"20")])
+
 
 ;;
 ;;  ....................

gcc/config/mips/svr3-4.h

@@ -46,4 +46,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define MACHINE_TYPE "RISC-OS System V Mips"
 
+/* Override defaults for finding the MIPS tools.  */
+#define MD_STARTFILE_PREFIX "/sysv/usr/lib/cmplrs/cc/"
+#define MD_EXEC_PREFIX "/sysv/usr/lib/cmplrs/cc/"
+
 #include "mips.h"

gcc/config/mips/svr4-4.h

@@ -46,4 +46,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define MACHINE_TYPE "RISC-OS System V.4 Mips"
 
+/* Override defaults for finding the MIPS tools.  */
+#define MD_STARTFILE_PREFIX "/svr4/usr/lib/cmplrs/cc/"
+#define MD_EXEC_PREFIX "/svr4/usr/lib/cmplrs/cc/"
+
 #include "mips.h"