[patch] Replace gen_rtx with gen_rtx_fmt_e*.

Kazu Hirata kazu@cs.umass.edu
Sat Feb 21 13:45:00 GMT 2004


Hi Richard,

> There's several places in this patch (and in other similar ones) when 
> you've not correctly updated the indentation on continuation lines, so now 
> the files are not fully conforming to the GNU coding standards.

Fixed thus.

Kazu Hirata

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

	* config/arm/arm.md, config/c4x/c4x.md, config/cris/cris.md,
	config/h8300/h8300.c, config/ip2k/ip2k.md,
	config/iq2000/iq2000.c, config/mips/mips.c,
	config/rs6000/rs6000.c, config/rs6000/rs6000.md,
	config/sh/sh.c, config/sh/sh.md, config/stormy16/stormy16.c,
	config/v850/v850.md: Fix indentation.

Index: arm/arm.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arm/arm.md,v
retrieving revision 1.156
diff -u -r1.156 arm.md
--- arm/arm.md	2 Feb 2004 06:30:59 -0000	1.156
+++ arm/arm.md	2 Feb 2004 15:05:44 -0000
@@ -2491,8 +2491,8 @@
    (clobber (reg:CC CC_REGNUM))]
   "TARGET_ARM"
   "*
-  operands[3] = gen_rtx_fmt_ee (minmax_code (operands[3]), SImode, operands[1],
-			 operands[2]);
+  operands[3] = gen_rtx_fmt_ee (minmax_code (operands[3]), SImode,
+				operands[1], operands[2]);
   output_asm_insn (\"cmp\\t%1, %2\", operands);
   output_asm_insn (\"str%d3\\t%1, %0\", operands);
   output_asm_insn (\"str%D3\\t%2, %0\", operands);
@@ -2521,8 +2521,8 @@
   {
     enum rtx_code code = GET_CODE (operands[4]);
 
-    operands[5] = gen_rtx_fmt_ee (minmax_code (operands[5]), SImode, operands[2],
-			   operands[3]);
+    operands[5] = gen_rtx_fmt_ee (minmax_code (operands[5]), SImode,
+				  operands[2], operands[3]);
     output_asm_insn (\"cmp\\t%2, %3\", operands);
     output_asm_insn (\"%i4%d5\\t%0, %1, %2\", operands);
     if (which_alternative != 0 || operands[3] != const0_rtx
Index: c4x/c4x.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/c4x/c4x.md,v
retrieving revision 1.85
diff -u -r1.85 c4x.md
--- c4x/c4x.md	2 Feb 2004 06:31:00 -0000	1.85
+++ c4x/c4x.md	2 Feb 2004 15:05:46 -0000
@@ -4248,7 +4248,7 @@
     emit_insn (gen_rtx_SET (QImode, operands[0],
                             gen_rtx_IF_THEN_ELSE (QImode,
                                  gen_rtx_fmt_ee (code, VOIDmode, ccreg, const0_rtx),
-                                          operands[2], operands[3])));
+						 operands[2], operands[3])));
     DONE;}")
                       
 (define_insn "*ldf_conditional"
@@ -4292,7 +4292,7 @@
     emit_insn (gen_rtx_SET (QFmode, operands[0],
                             gen_rtx_IF_THEN_ELSE (QFmode,
                                  gen_rtx_fmt_ee (code, VOIDmode, ccreg, const0_rtx),
-                                          operands[2], operands[3])));
+						 operands[2], operands[3])));
     DONE;}")
 
 (define_insn "*ldhf_conditional"
@@ -4335,7 +4335,7 @@
     emit_insn (gen_rtx_SET (HFmode, operands[0],
                             gen_rtx_IF_THEN_ELSE (HFmode,
                                  gen_rtx_fmt_ee (code, VOIDmode, ccreg, const0_rtx),
-                                          operands[2], operands[3])));
+						 operands[2], operands[3])));
     DONE;}")
 
 (define_expand "seq"
Index: cris/cris.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/cris/cris.md,v
retrieving revision 1.12
diff -u -r1.12 cris.md
--- cris/cris.md	2 Feb 2004 06:31:00 -0000	1.12
+++ cris/cris.md	2 Feb 2004 15:05:49 -0000
@@ -4546,8 +4546,8 @@
 			       (match_dup 4)))
    (set (match_dup 0) (match_op_dup 6 [(match_dup 1) (match_dup 8)]))]
   "operands[8] = gen_rtx_fmt_e (GET_CODE (operands[7]), GET_MODE (operands[7]),
-			  replace_equiv_address (XEXP (operands[7], 0),
-						 operands[5]));")
+				replace_equiv_address (XEXP (operands[7], 0),
+						       operands[5]));")
 
 ;; op(s|u).S1 [rx=rx+i],ry
 
@@ -4571,8 +4571,8 @@
   [(set (match_dup 4) (plus:SI (match_dup 2) (match_dup 3)))
    (set (match_dup 0) (match_op_dup 5 [(match_dup 1) (match_dup 7)]))]
   "operands[7] = gen_rtx_fmt_e (GET_CODE (operands[6]), GET_MODE (operands[6]),
-			  replace_equiv_address (XEXP (operands[6], 0),
-						 operands[4]));")
+				replace_equiv_address (XEXP (operands[6], 0),
+						       operands[4]));")
 
 ;; op(s|u).S1 [rx=rx+rz.S2],ry (swapped, plus or bound)
 
@@ -4598,8 +4598,8 @@
 			       (match_dup 4)))
    (set (match_dup 0) (match_op_dup 6 [(match_dup 8) (match_dup 1)]))]
   "operands[8] = gen_rtx_fmt_e (GET_CODE (operands[6]), GET_MODE (operands[6]),
-			  replace_equiv_address (XEXP (operands[6], 0),
-						 operands[5]));")
+				replace_equiv_address (XEXP (operands[6], 0),
+						       operands[5]));")
 
 ;; op(s|u).S1 [rx=rx+i],ry (swapped, plus or bound)
 
@@ -4622,8 +4622,8 @@
   [(set (match_dup 4) (plus:SI (match_dup 2) (match_dup 3)))
    (set (match_dup 0) (match_op_dup 6 [(match_dup 7) (match_dup 1)]))]
   "operands[7] = gen_rtx_fmt_e (GET_CODE (operands[5]), GET_MODE (operands[5]),
-			  replace_equiv_address (XEXP (operands[5], 0),
-						 operands[4]));")
+				replace_equiv_address (XEXP (operands[5], 0),
+						       operands[4]));")
 
 ;; Splits for addressing prefixes that have no side-effects, so we can
 ;; fill a delay slot.  Never split if we lose something, though.
Index: h8300/h8300.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/h8300/h8300.c,v
retrieving revision 1.268
diff -u -r1.268 h8300.c
--- h8300/h8300.c	2 Feb 2004 06:31:01 -0000	1.268
+++ h8300/h8300.c	2 Feb 2004 15:05:59 -0000
@@ -2733,8 +2733,8 @@
 	     (VOIDmode,
 	      gen_rtvec (2,
 			 gen_rtx_SET (VOIDmode, operands[0],
-				      gen_rtx_fmt_ee (code, mode, operands[0],
-					       operands[2])),
+				      gen_rtx_fmt_ee (code, mode,
+						      operands[0], operands[2])),
 			 gen_rtx_CLOBBER (VOIDmode,
 					  gen_rtx_SCRATCH (QImode)))));
 }
@@ -4101,7 +4101,8 @@
   {
     rtx res = gen_reg_rtx (QImode);
     emit_insn (gen_rtx_SET (VOIDmode, res,
-			    gen_rtx_fmt_ee (type, QImode, operands[1], operands[2])));
+			    gen_rtx_fmt_ee (type, QImode,
+					    operands[1], operands[2])));
     emit_insn (gen_rtx_SET (VOIDmode, operands[0], res));
   }
   return 1;
Index: ip2k/ip2k.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/ip2k/ip2k.md,v
retrieving revision 1.8
diff -u -r1.8 ip2k.md
--- ip2k/ip2k.md	2 Feb 2004 06:31:02 -0000	1.8
+++ ip2k/ip2k.md	2 Feb 2004 15:06:02 -0000
@@ -4848,8 +4848,8 @@
 		      (pc)))]
   "{
     operands[2] = gen_rtx_fmt_ee (reverse_condition (GET_CODE (operands[1])),
-	 		   GET_MODE (operands[1]),
-			   cc0_rtx, const0_rtx);
+				  GET_MODE (operands[1]),
+				  cc0_rtx, const0_rtx);
    }")
 
 ;; This is a bit test and jump sequence.
Index: iq2000/iq2000.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/iq2000/iq2000.c,v
retrieving revision 1.10
diff -u -r1.10 iq2000.c
--- iq2000/iq2000.c	2 Feb 2004 06:31:02 -0000	1.10
+++ iq2000/iq2000.c	2 Feb 2004 15:06:05 -0000
@@ -1243,7 +1243,7 @@
       /* For cmp0 != cmp1, build cmp0 == cmp1, and test for result == 0.  */
       emit_insn (gen_rtx_SET (VOIDmode, reg,
 			      gen_rtx_fmt_ee (test_code == NE ? EQ : test_code,
-				       CCmode, cmp0, cmp1)));
+					      CCmode, cmp0, cmp1)));
 
       test_code = test_code == NE ? EQ : NE;
       mode = CCmode;
@@ -1253,7 +1253,8 @@
       break;
 
     default:
-      abort_with_insn (gen_rtx_fmt_ee (test_code, VOIDmode, cmp0, cmp1), "bad test");
+      abort_with_insn (gen_rtx_fmt_ee (test_code, VOIDmode, cmp0, cmp1),
+		       "bad test");
     }
 
   /* Generate the branch.  */
@@ -1268,8 +1269,9 @@
 
   emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx,
 			       gen_rtx_IF_THEN_ELSE (VOIDmode,
-						     gen_rtx_fmt_ee (test_code, mode,
-							      cmp0, cmp1),
+						     gen_rtx_fmt_ee (test_code,
+								     mode,
+								     cmp0, cmp1),
 						     label1, label2)));
 }
 
Index: mips/mips.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/mips.c,v
retrieving revision 1.373
diff -u -r1.373 mips.c
--- mips/mips.c	2 Feb 2004 06:31:03 -0000	1.373
+++ mips/mips.c	2 Feb 2004 15:06:12 -0000
@@ -3149,8 +3149,9 @@
 
   emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx,
 			       gen_rtx_IF_THEN_ELSE (VOIDmode,
-						     gen_rtx_fmt_ee (test_code, mode,
-							      cmp0, cmp1),
+						     gen_rtx_fmt_ee (test_code,
+								     mode,
+								     cmp0, cmp1),
 						     label1, label2)));
 }
 
@@ -3235,8 +3236,8 @@
   emit_insn (gen_rtx_SET (op_mode, operands[0],
 			  gen_rtx_IF_THEN_ELSE (op_mode,
 						gen_rtx_fmt_ee (move_code, VOIDmode,
-							 cmp_reg,
-							 CONST0_RTX (SImode)),
+								cmp_reg,
+								CONST0_RTX (SImode)),
 						operands[2], operands[3])));
 }
 
@@ -3275,7 +3276,8 @@
     op1 = force_reg (mode, op1);
 
   emit_insn (gen_rtx_TRAP_IF (VOIDmode,
-			      gen_rtx_fmt_ee (cmp_code, GET_MODE (operands[0]), op0, op1),
+			      gen_rtx_fmt_ee (cmp_code, GET_MODE (operands[0]),
+					      op0, op1),
 			      operands[1]));
 }
 
Index: rs6000/rs6000.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/rs6000/rs6000.c,v
retrieving revision 1.587
diff -u -r1.587 rs6000.c
--- rs6000/rs6000.c	2 Feb 2004 06:31:05 -0000	1.587
+++ rs6000/rs6000.c	2 Feb 2004 15:06:23 -0000
@@ -9705,7 +9705,7 @@
       cc_mode = GET_MODE (XEXP (condition_rtx, 0));
 
       rev_cond_rtx = gen_rtx_fmt_ee (rs6000_reverse_condition (cc_mode, cond_code),
-			      SImode, XEXP (condition_rtx, 0), const0_rtx);
+				     SImode, XEXP (condition_rtx, 0), const0_rtx);
       not_op = gen_rtx_COMPARE (CCEQmode, rev_cond_rtx, const0_rtx);
       emit_insn (gen_rtx_SET (VOIDmode, not_result, not_op));
       condition_rtx = gen_rtx_EQ (VOIDmode, not_result, const0_rtx);
Index: rs6000/rs6000.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/rs6000/rs6000.md,v
retrieving revision 1.290
diff -u -r1.290 rs6000.md
--- rs6000/rs6000.md	2 Feb 2004 06:31:05 -0000	1.290
+++ rs6000/rs6000.md	2 Feb 2004 15:06:28 -0000
@@ -2584,10 +2584,10 @@
   rtx i;
   i = GEN_INT (INTVAL (operands[2]) & (~ (HOST_WIDE_INT) 0xffff));
   operands[4] = gen_rtx_fmt_ee (GET_CODE (operands[3]), SImode,
-			 operands[1], i);
+				operands[1], i);
   i = GEN_INT (INTVAL (operands[2]) & 0xffff);
   operands[5] = gen_rtx_fmt_ee (GET_CODE (operands[3]), SImode,
-			 operands[0], i);
+				operands[0], i);
 }")
 
 (define_insn "*boolcsi3_internal1"
@@ -7364,9 +7364,9 @@
       i4 = GEN_INT (INTVAL (operands[2]) & 0xffff);
     }
   operands[4] = gen_rtx_fmt_ee (GET_CODE (operands[3]), DImode,
-			 operands[1], i3);
+				operands[1], i3);
   operands[5] = gen_rtx_fmt_ee (GET_CODE (operands[3]), DImode,
-			 operands[0], i4);
+				operands[0], i4);
 }")
 
 (define_insn "*boolcdi3_internal1"
@@ -13686,23 +13686,21 @@
 
   if (! positive_1)
     operands[1] = gen_rtx_fmt_ee (rs6000_reverse_condition (GET_MODE (operands[2]),
-						     GET_CODE (operands[1])),
-			   SImode,
-			   operands[2], const0_rtx);
+							    GET_CODE (operands[1])),
+				  SImode,
+				  operands[2], const0_rtx);
   else if (GET_MODE (operands[1]) != SImode)
-    operands[1] = gen_rtx_fmt_ee (GET_CODE (operands[1]),
-			   SImode,
-			   operands[2], const0_rtx);
+    operands[1] = gen_rtx_fmt_ee (GET_CODE (operands[1]), SImode,
+				  operands[2], const0_rtx);
 
   if (! positive_2)
     operands[3] = gen_rtx_fmt_ee (rs6000_reverse_condition (GET_MODE (operands[4]),
-						     GET_CODE (operands[3])),
-			   SImode,
-			   operands[4], const0_rtx);
+							    GET_CODE (operands[3])),
+				  SImode,
+				  operands[4], const0_rtx);
   else if (GET_MODE (operands[3]) != SImode)
-    operands[3] = gen_rtx_fmt_ee (GET_CODE (operands[3]),
-			   SImode,
-			   operands[4], const0_rtx);
+    operands[3] = gen_rtx_fmt_ee (GET_CODE (operands[3]), SImode,
+				  operands[4], const0_rtx);
 
   if (positive_1 == positive_2)
     {
@@ -14207,8 +14205,8 @@
 			   (match_dup 5)
 			   (match_dup 6)))]
   "
-{ operands[7] = gen_rtx_fmt_ee (GET_CODE (operands[2]), VOIDmode, operands[3],
-			 const0_rtx); }")
+{ operands[7] = gen_rtx_fmt_ee (GET_CODE (operands[2]), VOIDmode,
+				operands[3], const0_rtx); }")
 
 (define_split
   [(set (pc)
@@ -14236,8 +14234,8 @@
 			   (match_dup 5)
 			   (match_dup 6)))]
   "
-{ operands[7] = gen_rtx_fmt_ee (GET_CODE (operands[2]), VOIDmode, operands[3],
-			 const0_rtx); }")
+{ operands[7] = gen_rtx_fmt_ee (GET_CODE (operands[2]), VOIDmode,
+				operands[3], const0_rtx); }")
 (define_split
   [(set (pc)
 	(if_then_else (match_operator 2 "comparison_operator"
@@ -14262,8 +14260,8 @@
 			   (match_dup 5)
 			   (match_dup 6)))]
   "
-{ operands[7] = gen_rtx_fmt_ee (GET_CODE (operands[2]), VOIDmode, operands[3],
-			 const0_rtx); }")
+{ operands[7] = gen_rtx_fmt_ee (GET_CODE (operands[2]), VOIDmode,
+				operands[3], const0_rtx); }")
 
 (define_split
   [(set (pc)
@@ -14291,8 +14289,8 @@
 			   (match_dup 5)
 			   (match_dup 6)))]
   "
-{ operands[7] = gen_rtx_fmt_ee (GET_CODE (operands[2]), VOIDmode, operands[3],
-			 const0_rtx); }")
+{ operands[7] = gen_rtx_fmt_ee (GET_CODE (operands[2]), VOIDmode,
+				operands[3], const0_rtx); }")
 
 (define_insn "trap"
   [(trap_if (const_int 1) (const_int 0))]
Index: sh/sh.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/sh/sh.c,v
retrieving revision 1.253
diff -u -r1.253 sh.c
--- sh/sh.c	2 Feb 2004 06:31:06 -0000	1.253
+++ sh/sh.c	2 Feb 2004 15:06:34 -0000
@@ -958,13 +958,13 @@
     (mode == SFmode ? emit_sf_insn : emit_df_insn)
      (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2,
 		gen_rtx_SET (VOIDmode, t_reg,
-			 gen_rtx_fmt_ee (code, SImode,
-				  sh_compare_op0, sh_compare_op1)),
+			     gen_rtx_fmt_ee (code, SImode,
+					     sh_compare_op0, sh_compare_op1)),
 		gen_rtx_USE (VOIDmode, get_fpscr_rtx ()))));
   else
     emit_insn (gen_rtx_SET (VOIDmode, t_reg,
-			gen_rtx_fmt_ee (code, SImode, sh_compare_op0,
-				 sh_compare_op1)));
+			    gen_rtx_fmt_ee (code, SImode,
+					    sh_compare_op0, sh_compare_op1)));
 
   return t_reg;
 }
@@ -997,8 +997,8 @@
   else
     insn = gen_rtx_SET (VOIDmode,
 			gen_rtx_REG (SImode, T_REG),
-			gen_rtx_fmt_ee (code, SImode, sh_compare_op0,
-				 sh_compare_op1));
+			gen_rtx_fmt_ee (code, SImode,
+					sh_compare_op0, sh_compare_op1));
   if (TARGET_SH4 && GET_MODE_CLASS (mode) == MODE_FLOAT)
     {
       insn = gen_rtx_PARALLEL (VOIDmode,
Index: sh/sh.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/sh/sh.md,v
retrieving revision 1.167
diff -u -r1.167 sh.md
--- sh/sh.md	2 Feb 2004 06:31:06 -0000	1.167
+++ sh/sh.md	2 Feb 2004 15:06:39 -0000
@@ -899,7 +899,7 @@
       && GET_MODE (sh_compare_op0) == DImode
       && sh_compare_op1 == const0_rtx)
     operands[1] = gen_rtx_fmt_ee (GET_CODE (operands[1]), VOIDmode,
-			   sh_compare_op0, sh_compare_op1);
+				  sh_compare_op0, sh_compare_op1);
   else
     {
       rtx tmp;
Index: stormy16/stormy16.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/stormy16/stormy16.c,v
retrieving revision 1.55
diff -u -r1.55 stormy16.c
--- stormy16/stormy16.c	2 Feb 2004 06:31:08 -0000	1.55
+++ stormy16/stormy16.c	2 Feb 2004 15:06:41 -0000
@@ -1856,7 +1856,7 @@
 	    continue;
 	  
 	  insn = gen_rtx_SET (VOIDmode, w_dest, gen_rtx_fmt_ee (code, mode,
-							 w_src0, w_src1));
+								w_src0, w_src1));
 	  break;
 
 	case NOT:
Index: v850/v850.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/v850/v850.md,v
retrieving revision 1.27
diff -u -r1.27 v850.md
--- v850/v850.md	2 Feb 2004 06:31:08 -0000	1.27
+++ v850/v850.md	2 Feb 2004 15:06:42 -0000
@@ -1034,8 +1034,8 @@
     operands[7] = operands[1];
   else
     operands[7] = gen_rtx_fmt_ee (reverse_condition (GET_CODE (operands[1])),
-			   GET_MODE (operands[1]), XEXP (operands[1], 0),
-			   XEXP (operands[1], 1));
+				  GET_MODE (operands[1]),
+				  XEXP (operands[1], 0), XEXP (operands[1], 1));
 }")
 ;; ---------------------------------------------------------------------
 ;; BYTE SWAP INSTRUCTIONS



More information about the Gcc-patches mailing list