From 4208399956021cee8e42931d06c4b6182dfc4d3e Mon Sep 17 00:00:00 2001 From: Greta Yorsh Date: Wed, 17 Oct 2012 14:17:30 +0100 Subject: [PATCH] arm.md (UNSPEC_PROLOGUE_USE): Rename this... * config/arm/arm.md (UNSPEC_PROLOGUE_USE): Rename this... (UNSPEC_REGISTER_USE): ... to this. (prologue_use): Rename this... (force_register_use): ... to this and update output assembly. (epilogue) Rename gen_prologue_use to gen_force_register_use. * config/arm/arm.c (arm_expand_prologue): Likewise. (thumb1_expand_epilogue): Likewise. (arm_expand_epilogue): Likewise. (arm_expand_epilogue): Likewise. From-SVN: r192533 --- gcc/ChangeLog | 12 ++++++++++++ gcc/config/arm/arm.c | 10 +++++----- gcc/config/arm/arm.md | 12 ++++++------ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 84a1667bb94..6c0e29c4a3b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2012-10-17 Greta Yorsh + + * config/arm/arm.md (UNSPEC_PROLOGUE_USE): Rename this... + (UNSPEC_REGISTER_USE): ... to this. + (prologue_use): Rename this... + (force_register_use): ... to this and update output assembly. + (epilogue) Rename gen_prologue_use to gen_force_register_use. + * config/arm/arm.c (arm_expand_prologue): Likewise. + (thumb1_expand_epilogue): Likewise. + (arm_expand_epilogue): Likewise. + (arm_expand_epilogue): Likewise. + 2012-10-17 Georg-Johann Lay * config/avr/avr-arch.h (avr_extra_arch_macro): Remove prototype. diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 866385ccabb..fc3a5080987 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -16732,7 +16732,7 @@ arm_expand_prologue (void) } emit_set_insn (ip_rtx, insn); /* Add a USE to stop propagate_one_insn() from barfing. */ - emit_insn (gen_prologue_use (ip_rtx)); + emit_insn (gen_force_register_use (ip_rtx)); } } else @@ -22621,7 +22621,7 @@ thumb1_expand_epilogue (void) /* Emit a USE (stack_pointer_rtx), so that the stack adjustment will not be deleted. */ - emit_insn (gen_prologue_use (stack_pointer_rtx)); + emit_insn (gen_force_register_use (stack_pointer_rtx)); if (crtl->profile || !TARGET_SCHED_PROLOG) emit_insn (gen_blockage ()); @@ -22845,7 +22845,7 @@ arm_expand_epilogue (bool really_return) /* Emit USE(stack_pointer_rtx) to ensure that stack adjustment is not deleted. */ - emit_insn (gen_prologue_use (stack_pointer_rtx)); + emit_insn (gen_force_register_use (stack_pointer_rtx)); } else { @@ -22863,7 +22863,7 @@ arm_expand_epilogue (bool really_return) emit_insn (gen_movsi (stack_pointer_rtx, hard_frame_pointer_rtx)); /* Emit USE(stack_pointer_rtx) to ensure that stack adjustment is not deleted. */ - emit_insn (gen_prologue_use (stack_pointer_rtx)); + emit_insn (gen_force_register_use (stack_pointer_rtx)); } } else @@ -22881,7 +22881,7 @@ arm_expand_epilogue (bool really_return) GEN_INT (amount))); /* Emit USE(stack_pointer_rtx) to ensure that stack adjustment is not deleted. */ - emit_insn (gen_prologue_use (stack_pointer_rtx)); + emit_insn (gen_force_register_use (stack_pointer_rtx)); } } diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index b45fea02120..7c80f91fb94 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -76,7 +76,7 @@ ; that points at the containing instruction. UNSPEC_PRLG_STK ; A special barrier that prevents frame accesses ; being scheduled before the stack adjustment insn. - UNSPEC_PROLOGUE_USE ; As USE insns are not meaningful after reload, + UNSPEC_REGISTER_USE ; As USE insns are not meaningful after reload, ; this unspec is used to prevent the deletion of ; instructions setting registers for EH handling ; and stack frame generation. Operand 0 is the @@ -10610,7 +10610,7 @@ "TARGET_EITHER" " if (crtl->calls_eh_return) - emit_insn (gen_prologue_use (gen_rtx_REG (Pmode, 2))); + emit_insn (gen_force_register_use (gen_rtx_REG (Pmode, 2))); if (TARGET_THUMB1) { thumb1_expand_epilogue (); @@ -10644,7 +10644,7 @@ ;; does not think that it is unused by the sibcall branch that ;; will replace the standard function epilogue. (define_expand "sibcall_epilogue" - [(parallel [(unspec:SI [(reg:SI LR_REGNUM)] UNSPEC_PROLOGUE_USE) + [(parallel [(unspec:SI [(reg:SI LR_REGNUM)] UNSPEC_REGISTER_USE) (unspec_volatile [(return)] VUNSPEC_EPILOGUE)])] "TARGET_32BIT" " @@ -11260,10 +11260,10 @@ "" ) -(define_insn "prologue_use" - [(unspec:SI [(match_operand:SI 0 "register_operand" "")] UNSPEC_PROLOGUE_USE)] +(define_insn "force_register_use" + [(unspec:SI [(match_operand:SI 0 "register_operand" "")] UNSPEC_REGISTER_USE)] "" - "%@ %0 needed for prologue" + "%@ %0 needed" [(set_attr "length" "0")] ) -- 2.30.2