From 2966b00e88d24531be8ff24ac6c82d5cf70ae116 Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Fri, 28 May 2004 16:00:00 +0000 Subject: [PATCH] * config/arm/arm.c (arm_output_epilogue): Remove redundant code. From-SVN: r82361 --- gcc/ChangeLog | 4 ++++ gcc/config/arm/arm.c | 17 ++--------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5c42a0c69d7..1ff5cd7c0df 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2004-05-28 Paul Brook + * config/arm/arm.c (arm_output_epilogue): Remove redundant code. + +2004-05-28 Paul Brook + * config/arm/arm.c (thumb_force_lr_save): New function. (arm_get_frame_offsets, thumb_unexpanded_epilogue, thumb_output_function_prologue): Use it. diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index a484eb74972..6bbe8f68098 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -9704,6 +9704,7 @@ arm_output_epilogue (rtx sibling) } } + /* We may have already restored PC directly from the stack. */ if (! really_return || (ARM_FUNC_TYPE (func_type) == ARM_FT_NORMAL && current_function_pretend_args_size == 0 @@ -9714,8 +9715,6 @@ arm_output_epilogue (rtx sibling) switch ((int) ARM_FUNC_TYPE (func_type)) { case ARM_FT_EXCEPTION_HANDLER: - /* Even in 26-bit mode we do a mov (rather than a movs) - because we don't have the PSR bits set in the address. */ asm_fprintf (f, "\tmov\t%r, %r\n", PC_REGNUM, EXCEPTION_LR_REGNUM); break; @@ -9733,19 +9732,7 @@ arm_output_epilogue (rtx sibling) break; default: - if (frame_pointer_needed) - /* If we used the frame pointer then the return address - will have been loaded off the stack directly into the - PC, so there is no need to issue a MOV instruction - here. */ - ; - else if (current_function_pretend_args_size == 0 - && (saved_regs_mask & (1 << LR_REGNUM))) - /* Similarly we may have been able to load LR into the PC - even if we did not create a stack frame. */ - ; - else - asm_fprintf (f, "\tmov\t%r, %r\n", PC_REGNUM, LR_REGNUM); + asm_fprintf (f, "\tmov\t%r, %r\n", PC_REGNUM, LR_REGNUM); break; } -- 2.11.4.GIT