[patch] Use const0_rtx instead of GEN_INT (0), etc.

Kazu Hirata kazu@cs.umass.edu
Tue Feb 3 05:40:00 GMT 2004


Hi,

Bootstrapped on i686-pc-linux-gnu.  Committed as obvious.

Kazu Hirata

2004-02-03  Kazu Hirata  <kazu@cs.umass.edu>

	* doloop.c, optabs.c, regmove.c, sched-deps.c,
	config/i386/i386.c, config/i386/i386.md: Use const0_rtx
	instead of GEN_INT (0).  Do the same for other constants that
	are readily available.

Index: doloop.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/doloop.c,v
retrieving revision 1.29
diff -u -p -r1.29 doloop.c
--- doloop.c	29 Jun 2003 15:19:13 -0000	1.29
+++ doloop.c	3 Feb 2004 05:29:13 -0000
@@ -475,7 +475,7 @@ doloop_modify (const struct loop *loop, 
 	count = GEN_INT (INTVAL (count) - 1);
       else
 	count = expand_simple_binop (GET_MODE (counter_reg), MINUS,
-				     count, GEN_INT (1),
+				     count, const1_rtx,
 				     0, 0, OPTAB_LIB_WIDEN);
     }
 
Index: optabs.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/optabs.c,v
retrieving revision 1.205
diff -u -p -r1.205 optabs.c
--- optabs.c	21 Jan 2004 20:40:03 -0000	1.205
+++ optabs.c	3 Feb 2004 05:29:16 -0000
@@ -2358,7 +2358,7 @@ expand_parity (enum machine_mode mode, r
 	      temp = expand_unop (wider_mode, popcount_optab, xop0, NULL_RTX,
 				  true);
 	      if (temp != 0)
-		temp = expand_binop (wider_mode, and_optab, temp, GEN_INT (1),
+		temp = expand_binop (wider_mode, and_optab, temp, const1_rtx,
 				     target, true, OPTAB_DIRECT);
 	      if (temp == 0)
 		delete_insns_since (last);
@@ -3337,9 +3337,9 @@ emit_libcall_block (rtx insns, rtx targe
 	  rtx note = find_reg_note (insn, REG_EH_REGION, NULL_RTX);
 
 	  if (note != 0)
-	    XEXP (note, 0) = GEN_INT (-1);
+	    XEXP (note, 0) = constm1_rtx;
 	  else
-	    REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_EH_REGION, GEN_INT (-1),
+	    REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_EH_REGION, constm1_rtx,
 						  REG_NOTES (insn));
 	}
 
Index: regmove.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/regmove.c,v
retrieving revision 1.154
diff -u -p -r1.154 regmove.c
--- regmove.c	2 Feb 2004 00:17:17 -0000	1.154
+++ regmove.c	3 Feb 2004 05:29:17 -0000
@@ -167,7 +167,7 @@ discover_flags_reg (void)
 {
   rtx tmp;
   tmp = gen_rtx_REG (word_mode, 10000);
-  tmp = gen_add3_insn (tmp, tmp, GEN_INT (2));
+  tmp = gen_add3_insn (tmp, tmp, const2_rtx);
 
   /* If we get something that isn't a simple set, or a
      [(set ..) (clobber ..)], this whole function will go wrong.  */
Index: sched-deps.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/sched-deps.c,v
retrieving revision 1.67
diff -u -p -r1.67 sched-deps.c
--- sched-deps.c	2 Feb 2004 00:17:18 -0000	1.67
+++ sched-deps.c	3 Feb 2004 05:29:17 -0000
@@ -1267,7 +1267,7 @@ sched_analyze (struct deps *deps, rtx he
 	      || NOTE_LINE_NUMBER (insn) == NOTE_INSN_EH_REGION_END)
 	    rtx_region = GEN_INT (NOTE_EH_HANDLER (insn));
 	  else
-	    rtx_region = GEN_INT (0);
+	    rtx_region = const0_rtx;
 
 	  loop_notes = alloc_EXPR_LIST (REG_SAVE_NOTE,
 					rtx_region,
Index: config/i386/i386.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/i386.c,v
retrieving revision 1.642
diff -u -p -r1.642 i386.c
--- config/i386/i386.c	31 Jan 2004 18:42:55 -0000	1.642
+++ config/i386/i386.c	3 Feb 2004 05:29:25 -0000
@@ -11632,9 +11632,9 @@ ix86_expand_strlensi_unroll_1 (rtx out, 
 
 	  emit_cmp_and_jump_insns (align_rtx, const0_rtx, EQ, NULL,
 				   Pmode, 1, align_4_label);
-	  emit_cmp_and_jump_insns (align_rtx, GEN_INT (2), EQ, NULL,
+	  emit_cmp_and_jump_insns (align_rtx, const2_rtx, EQ, NULL,
 				   Pmode, 1, align_2_label);
-	  emit_cmp_and_jump_insns (align_rtx, GEN_INT (2), GTU, NULL,
+	  emit_cmp_and_jump_insns (align_rtx, const2_rtx, GTU, NULL,
 				   Pmode, 1, align_3_label);
 	}
       else
@@ -11642,7 +11642,7 @@ ix86_expand_strlensi_unroll_1 (rtx out, 
 	  /* Since the alignment is 2, we have to check 2 or 0 bytes;
 	     check if is aligned to 4 - byte.  */
 
-	  align_rtx = expand_binop (Pmode, and_optab, scratch1, GEN_INT (2),
+	  align_rtx = expand_binop (Pmode, and_optab, scratch1, const2_rtx,
 				    NULL_RTX, 0, OPTAB_WIDEN);
 
 	  emit_cmp_and_jump_insns (align_rtx, const0_rtx, EQ, NULL,
@@ -11728,7 +11728,7 @@ ix86_expand_strlensi_unroll_1 (rtx out, 
 						     tmpreg)));
        /* Emit lea manually to avoid clobbering of flags.  */
        emit_insn (gen_rtx_SET (SImode, reg2,
-			       gen_rtx_PLUS (Pmode, out, GEN_INT (2))));
+			       gen_rtx_PLUS (Pmode, out, const2_rtx)));
 
        tmp = gen_rtx_REG (CCNOmode, FLAGS_REG);
        tmp = gen_rtx_EQ (VOIDmode, tmp, const0_rtx);
@@ -11755,9 +11755,9 @@ ix86_expand_strlensi_unroll_1 (rtx out, 
        /* Not in the first two.  Move two bytes forward.  */
        emit_insn (gen_lshrsi3 (tmpreg, tmpreg, GEN_INT (16)));
        if (TARGET_64BIT)
-	 emit_insn (gen_adddi3 (out, out, GEN_INT (2)));
+	 emit_insn (gen_adddi3 (out, out, const2_rtx));
        else
-	 emit_insn (gen_addsi3 (out, out, GEN_INT (2)));
+	 emit_insn (gen_addsi3 (out, out, const2_rtx));
 
        emit_label (end_2_label);
 
@@ -14487,7 +14487,7 @@ ix86_expand_builtin (tree exp, rtx targe
 		      expand_expr (arg0, NULL_RTX, VOIDmode, 0));
       op0 = gen_reg_rtx (V2DFmode);
       emit_insn (gen_sse2_loadsd (op0, adjust_address (target, V2DFmode, 0)));
-      emit_insn (gen_sse2_shufpd (op0, op0, op0, GEN_INT (0)));
+      emit_insn (gen_sse2_shufpd (op0, op0, op0, const0_rtx));
       return op0;
 
     case IX86_BUILTIN_SETPD:
@@ -14505,7 +14505,7 @@ ix86_expand_builtin (tree exp, rtx targe
     case IX86_BUILTIN_LOADRPD:
       target = ix86_expand_unop_builtin (CODE_FOR_sse2_movapd, arglist,
 					 gen_reg_rtx (V2DFmode), 1);
-      emit_insn (gen_sse2_shufpd (target, target, target, GEN_INT (1)));
+      emit_insn (gen_sse2_shufpd (target, target, target, const1_rtx));
       return target;
 
     case IX86_BUILTIN_LOADPD1:
Index: config/i386/i386.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/i386.md,v
retrieving revision 1.506
diff -u -p -r1.506 i386.md
--- config/i386/i386.md	29 Jan 2004 08:05:47 -0000	1.506
+++ config/i386/i386.md	3 Feb 2004 05:29:30 -0000
@@ -4887,7 +4887,7 @@
  
         emit_move_insn (tmp, operands[1]);
         emit_insn (gen_sse_shufps (op0, tmp, tmp,
-                                   GEN_INT (1)));
+                                   const1_rtx));
       }
     case 2:
       {



More information about the Gcc-patches mailing list