*** empty log message ***

From-SVN: r1144

2 files changed, 89 insertions, 43 deletions

diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 612b495..2e2a464 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -438,6 +438,25 @@ large_int (op, mode)
   return TRUE;
 }
 
+/* Return truth value of whether OP is an integer which can be loaded
+   with an lui instruction.  */
+
+int
+lui_int (op, mode)
+     rtx op;
+     enum machine_mode mode;
+{
+  long value;
+
+  if (GET_CODE (op) != CONST_INT)
+    return FALSE;
+
+  if ((value & 0x0000ffff) == 0)		/* lui reg,value>>16 */
+    return TRUE;
+
+  return FALSE;
+}
+
 /* Return truth value of whether OP is a register or the constant 0.  */
 
 int
@@ -3545,6 +3564,71 @@ mips_output_lineno (stream, line)
 }
 
 
+/* If defined, a C statement to be executed just prior to the
+   output of assembler code for INSN, to modify the extracted
+   operands so they will be output differently.
+
+   Here the argument OPVEC is the vector containing the operands
+   extracted from INSN, and NOPERANDS is the number of elements of
+   the vector which contain meaningful data for this insn.  The
+   contents of this vector are what will be used to convert the
+   insn template into assembler code, so you can change the
+   assembler output by changing the contents of the vector.
+
+   We use it to check if the current insn needs a nop in front of it
+   because of load delays, and also to update the delay slot
+   statistics.  */
+
+void
+final_prescan_insn (insn, opvec, noperands)
+     rtx insn;
+     rtx opvec[];
+     int noperands;
+{
+  if (dslots_number_nops > 0)
+    {
+      enum machine_mode mode = GET_MODE (mips_load_reg);
+      rtx pattern = PATTERN (insn);
+      int length = get_attr_length (insn);
+
+      /* If this operand is really safe to fill the delay slot, such as an
+	 AND with a large constant integer as operand[2], mark the delay
+	 slot filled.  */
+      if (get_attr_safe (insn) == SAFE_YES && length > 1)
+	dslots_load_filled++;
+
+      /* Do we need to emit a NOP? */
+      else if (length == 0
+	       || (mips_load_reg  != (rtx)0 && reg_mentioned_p (mips_load_reg,  pattern))
+	       || (mips_load_reg2 != (rtx)0 && reg_mentioned_p (mips_load_reg2, pattern))
+	       || (mips_load_reg3 != (rtx)0 && reg_mentioned_p (mips_load_reg3, pattern))
+	       || (mips_load_reg4 != (rtx)0 && reg_mentioned_p (mips_load_reg4, pattern)))
+	fputs ((set_noreorder) ? "\tnop\n" : "\t#nop\n", asm_out_file);
+
+      else
+	dslots_load_filled++;
+
+      while (--dslots_number_nops > 0)
+	fputs ((set_noreorder) ? "\tnop\n" : "\t#nop\n", asm_out_file);
+
+      mips_load_reg  = (rtx)0;
+      mips_load_reg2 = (rtx)0;
+      mips_load_reg3 = (rtx)0;
+      mips_load_reg4 = (rtx)0;
+
+      if (set_noreorder && --set_noreorder == 0)
+	fputs ("\t.set\treorder\n", asm_out_file);
+    }
+
+  if (TARGET_STATS)
+    {
+      enum rtx_code code = GET_CODE (insn);
+      if (code == JUMP_INSN || code == CALL_INSN)
+	dslots_jump_total++;
+    }
+}
+
+
 /* Output at beginning of assembler file.
    If we are optimizing to use the global pointer, create a temporary
    file to hold all of the text stuff, and write it out to the end.
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 0e631e6..fc069d8 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -125,6 +125,7 @@ extern unsigned long	compute_frame_size ();
 extern void		expand_block_move ();
 extern int		equality_op ();
 extern int		fcmp_op ();
+extern void		final_prescan_insn ();
 extern int		fpsw_register_operand ();
 extern struct rtx_def *	function_arg ();
 extern void		function_arg_advance ();
@@ -135,6 +136,7 @@ extern void		gen_conditional_branch ();
 extern struct rtx_def * gen_int_relational ();
 extern void		init_cumulative_args ();
 extern int		large_int ();
+extern int		lui_int ();
 extern int		md_register_operand ();
 extern int		mips_address_cost ();
 extern void		mips_asm_file_end ();
@@ -428,7 +430,7 @@ while (0)
 
 /* Print subsidiary information on the compiler version in use.  */
 
-#define MIPS_VERSION "[AL 1.1, MM 19]"
+#define MIPS_VERSION "[AL 1.1, MM 20]"
 
 #ifndef MACHINE_TYPE
 #define MACHINE_TYPE "BSD Mips"
@@ -2442,8 +2444,8 @@ while (0)
 #define CLASS_DIVMOD_OP		0x02	/* operator is {,U}{DIV,MOD} */
 #define CLASS_UNSIGNED_OP	0x04	/* operator is U{DIV,MOD} */
 #define CLASS_CMP_OP		0x08	/* operator is comparison */
-#define CLASS_EQUALITY_OP	0x10	/* operator is == or != */
 #define CLASS_FCMP_OP		0x08	/* operator is fp. compare */
+#define CLASS_EQUALITY_OP	0x10	/* operator is == or != */
 
 #define CLASS_UNS_CMP_OP	(CLASS_UNSIGNED_OP | CLASS_CMP_OP)
 
@@ -2504,47 +2506,7 @@ while (0)
    statistics.  */
 
 #define FINAL_PRESCAN_INSN(INSN, OPVEC, NOPERANDS)			\
-do									\
-  {									\
-    if (dslots_number_nops > 0 && mips_load_reg != (rtx)0)		\
-      {									\
-	enum machine_mode mode = GET_MODE (mips_load_reg);		\
-	rtx pattern = PATTERN (INSN);					\
-									\
-	if (reg_mentioned_p (mips_load_reg, pattern)			\
-	    || (mips_load_reg2 != (rtx)0				\
-		&& reg_mentioned_p (mips_load_reg2, pattern))		\
-	    || (mips_load_reg3 != (rtx)0				\
-		&& reg_mentioned_p (mips_load_reg3, pattern))		\
-	    || (mips_load_reg4 != (rtx)0				\
-		&& reg_mentioned_p (mips_load_reg4, pattern))		\
-	    || get_attr_length (INSN) == 0)				\
-	  {								\
-	    fputs ((set_noreorder) ? "\tnop\n" : "\t#nop\n", asm_out_file); \
-	  }								\
-	else								\
-	  dslots_load_filled++;						\
-									\
-	while (--dslots_number_nops > 0)				\
-	  fputs ((set_noreorder) ? "\tnop\n" : "\t#nop\n", asm_out_file); \
-									\
-	mips_load_reg  = (rtx)0;					\
-	mips_load_reg2 = (rtx)0;					\
-	mips_load_reg3 = (rtx)0;					\
-	mips_load_reg4 = (rtx)0;					\
-									\
-	if (set_noreorder && --set_noreorder == 0)			\
-	  fputs ("\t.set\treorder\n", asm_out_file);			\
-      }									\
-									\
-    if (TARGET_STATS)							\
-      {									\
-	enum rtx_code code = GET_CODE (INSN);				\
-	if (code == JUMP_INSN || code == CALL_INSN)			\
-	  dslots_jump_total++;						\
-      }									\
-  }									\
-while (0)
+  final_prescan_insn (INSN, OPVEC, NOPERANDS)
 
 
 /* Tell final.c how to eliminate redundant test instructions.