alpha.c (alpha_legitimize_reload_address): Add cast to enum type.

	* config/alpha/alpha.c (alpha_legitimize_reload_address): Add cast to
	enum type.
	(alpha_rtx_costs): Ditto.
	(emit_unlikely_jump): Use add_reg_note.
	(emit_frame_store_1): Ditto.
	(alpha_expand_prologue): Ditto.
	(alpha_expand_builtin): Change 0 to EXPAND_NORMAL in function call.
	* config/alpha/alpha.c (Unicos/Mk address splitter): Use add_reg_note.

From-SVN: r146637

4 files changed, 35 insertions, 30 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e3321c3..c4e78f5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-23  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/alpha/alpha.c (alpha_legitimize_reload_address): Add cast to
+	enum type.
+	(alpha_rtx_costs): Ditto.
+	(emit_unlikely_jump): Use add_reg_note.
+	(emit_frame_store_1): Ditto.
+	(alpha_expand_prologue): Ditto.
+	(alpha_expand_builtin): Change 0 to EXPAND_NORMAL in function call.
+	* config/alpha/alpha.c (Unicos/Mk address splitter): Use add_reg_note.
+
 2009-04-23  Nick Clifton  <nickc@redhat.com>
 
 	* config/v850/v850.md (epilogue): Remove suppressed code.
@@ -102,8 +113,7 @@
 	* varasm.c: Likewise.
 	* varray.h: Likewise.
 	* vec.h: Likewise.
-	* coretypes.h: Do not define GTY macro if it is already
-	defined.
+	* coretypes.h: Do not define GTY macro if it is already defined.
 	* doc/gty.texi: Update GTY documentation to new syntax.
 	* gengtype-lex.l: Enforce attribute-like syntax for GTY
 	annotations on structs.
@@ -111,7 +121,7 @@
 
 2009-04-22  Mark Heffernan  <meheff@google.com>
 
-       * gcc.c (LINK_COMMAND_SPEC): Link with gcov with -fprofile-generate=.
+	* gcc.c (LINK_COMMAND_SPEC): Link with gcov with -fprofile-generate=.
 
 2009-04-22  Kazu Hirata  <kazu@codesourcery.com>
 
@@ -127,8 +137,7 @@
 2009-04-22  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
 
 	* Makefile.in: Update dependencies.
-	* errors.c (warning): Remove unused parameter 'opt'. Returns
-	'void'.
+	* errors.c (warning): Remove unused parameter 'opt'. Returns 'void'.
 	* errors.h: Remove bogus comment about compatibility.
 	(warning): Update declaration.
 	* genautomata.c: Update all calls to warning.
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 9df8c11..8597e66 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -1223,7 +1223,7 @@ alpha_legitimize_reload_address (rtx x,
     {
       push_reload (XEXP (x, 0), NULL_RTX, &XEXP (x, 0), NULL,
 		   BASE_REG_CLASS, GET_MODE (x), VOIDmode, 0, 0,
-		   opnum, type);
+		   opnum, (enum reload_type) type);
       return x;
     }
 
@@ -1254,7 +1254,7 @@ alpha_legitimize_reload_address (rtx x,
 
       push_reload (XEXP (x, 0), NULL_RTX, &XEXP (x, 0), NULL,
 		   BASE_REG_CLASS, GET_MODE (x), VOIDmode, 0, 0,
-		   opnum, type);
+		   opnum, (enum reload_type) type);
       return x;
     }
 
@@ -1333,8 +1333,11 @@ alpha_rtx_costs (rtx x, int code, int outer_code, int *total,
       else if (GET_CODE (XEXP (x, 0)) == MULT
 	       && const48_operand (XEXP (XEXP (x, 0), 1), VOIDmode))
 	{
-	  *total = (rtx_cost (XEXP (XEXP (x, 0), 0), outer_code, speed)
-		    + rtx_cost (XEXP (x, 1), outer_code, speed) + COSTS_N_INSNS (1));
+	  *total = (rtx_cost (XEXP (XEXP (x, 0), 0),
+			      (enum rtx_code) outer_code, speed)
+		    + rtx_cost (XEXP (x, 1),
+				(enum rtx_code) outer_code, speed)
+		    + COSTS_N_INSNS (1));
 	  return true;
 	}
       return false;
@@ -4390,7 +4393,7 @@ emit_unlikely_jump (rtx cond, rtx label)
 
   x = gen_rtx_IF_THEN_ELSE (VOIDmode, cond, label, pc_rtx);
   x = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, x));
-  REG_NOTES (x) = gen_rtx_EXPR_LIST (REG_BR_PROB, very_unlikely, NULL_RTX);
+  add_reg_note (x, REG_BR_PROB, very_unlikely);
 }
 
 /* A subroutine of the atomic operation splitters.  Emit a load-locked
@@ -6579,7 +6582,7 @@ alpha_expand_builtin (tree exp, rtx target,
 
       insn_op = &insn_data[icode].operand[arity + nonvoid];
 
-      op[arity] = expand_expr (arg, NULL_RTX, insn_op->mode, 0);
+      op[arity] = expand_expr (arg, NULL_RTX, insn_op->mode, EXPAND_NORMAL);
 
       if (!(*insn_op->predicate) (op[arity], insn_op->mode))
 	op[arity] = copy_to_mode_reg (insn_op->mode, op[arity]);
@@ -7456,10 +7459,8 @@ emit_frame_store_1 (rtx value, rtx base_reg, HOST_WIDE_INT frame_bias,
 	  mem = gen_rtx_MEM (DImode, addr);
 	}
 
-      REG_NOTES (insn)
-	= gen_rtx_EXPR_LIST (REG_FRAME_RELATED_EXPR,
-			     gen_rtx_SET (VOIDmode, mem, frame_reg),
-			     REG_NOTES (insn));
+      add_reg_note (insn, REG_FRAME_RELATED_EXPR,
+		    gen_rtx_SET (VOIDmode, mem, frame_reg));
     }
 }
 
@@ -7637,14 +7638,12 @@ alpha_expand_prologue (void)
          possibly intuit through the loop above.  So we invent this
          note it looks at instead.  */
       RTX_FRAME_RELATED_P (seq) = 1;
-      REG_NOTES (seq)
-        = gen_rtx_EXPR_LIST (REG_FRAME_RELATED_EXPR,
-			     gen_rtx_SET (VOIDmode, stack_pointer_rtx,
-			       gen_rtx_PLUS (Pmode, stack_pointer_rtx,
-					     GEN_INT (TARGET_ABI_UNICOSMK
-						      ? -frame_size + 64
-						      : -frame_size))),
-			     REG_NOTES (seq));
+      add_reg_note (seq, REG_FRAME_RELATED_EXPR,
+		    gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+				 gen_rtx_PLUS (Pmode, stack_pointer_rtx,
+					       GEN_INT (TARGET_ABI_UNICOSMK
+							? -frame_size + 64
+							: -frame_size))));
     }
 
   if (!TARGET_ABI_UNICOSMK)
diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md
index c4b3e13..486551a9 100644
--- a/gcc/config/alpha/alpha.md
+++ b/gcc/config/alpha/alpha.md
@@ -5402,12 +5402,9 @@
       rtx label;
 
       label = XEXP (operands[1], 0);
-      REG_NOTES (insn1) = gen_rtx_EXPR_LIST (REG_LABEL_OPERAND, label,
-					     REG_NOTES (insn1));
-      REG_NOTES (insn2) = gen_rtx_EXPR_LIST (REG_LABEL_OPERAND, label,
-					     REG_NOTES (insn2));
-      REG_NOTES (insn3) = gen_rtx_EXPR_LIST (REG_LABEL_OPERAND, label,
-					     REG_NOTES (insn3));
+      add_reg_note (insn1, REG_LABEL_OPERAND, label);
+      add_reg_note (insn2, REG_LABEL_OPERAND, label);
+      add_reg_note (insn3, REG_LABEL_OPERAND, label);
       LABEL_NUSES (label) += 3;
     }
   DONE;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8869fc1..63d3d3b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -21,7 +21,7 @@
 
 2009-04-22  Mark Heffernan  <meheff@google.com>
 
-       * gcc.dg/profile-generate-3.c: New test.
+	* gcc.dg/profile-generate-3.c: New test.
 
 2009-04-22  Jan Hubicka  <jh@suse.cz>