From de824c8b5dff45cd3ecd63b393d15f98a4f28e57 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Thu, 9 Jul 2015 02:50:14 +0000 Subject: [PATCH] use #if for HARD_FRAME_POINTER_IS_FRAME_POINTER less gcc/ChangeLog: 2015-07-08 Trevor Saunders * combine.c (can_combine_def_p): Don't check the value of HARD_FRAME_POINTER_IS_FRAME_POINTER with the preprocessor. (combinable_i3pat): Likewise. (mark_used_regs_combine): Likewise. * regrename.c (rename_chains): Likewise. * reload.c (find_reloads_address): Likewise. * sel-sched.c (mark_unavailable_hard_regs): Likewise. From-SVN: r225594 --- gcc/ChangeLog | 10 ++++++++++ gcc/combine.c | 15 ++++++--------- gcc/regrename.c | 10 ++++------ gcc/reload.c | 5 ++--- gcc/sel-sched.c | 9 ++++----- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2275e3b6b79..62ca364299d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2015-07-08 Trevor Saunders + + * combine.c (can_combine_def_p): Don't check the value of + HARD_FRAME_POINTER_IS_FRAME_POINTER with the preprocessor. + (combinable_i3pat): Likewise. + (mark_used_regs_combine): Likewise. + * regrename.c (rename_chains): Likewise. + * reload.c (find_reloads_address): Likewise. + * sel-sched.c (mark_unavailable_hard_regs): Likewise. + 2015-07-08 Trevor Saunders * combine.c (update_rsp_from_reg_equal): Don't check if diff --git a/gcc/combine.c b/gcc/combine.c index 14d1468699a..2188926090e 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -1004,10 +1004,9 @@ can_combine_def_p (df_ref def) /* Do not combine frame pointer adjustments. */ if ((regno == FRAME_POINTER_REGNUM && (!reload_completed || frame_pointer_needed)) -#if !HARD_FRAME_POINTER_IS_FRAME_POINTER - || (regno == HARD_FRAME_POINTER_REGNUM + || (!HARD_FRAME_POINTER_IS_FRAME_POINTER + && regno == HARD_FRAME_POINTER_REGNUM && (!reload_completed || frame_pointer_needed)) -#endif || (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM && regno == ARG_POINTER_REGNUM && fixed_regs[regno])) return false; @@ -2221,9 +2220,8 @@ combinable_i3pat (rtx_insn *i3, rtx *loc, rtx i2dest, rtx i1dest, rtx i0dest, && REG_P (subdest) && reg_referenced_p (subdest, PATTERN (i3)) && REGNO (subdest) != FRAME_POINTER_REGNUM -#if !HARD_FRAME_POINTER_IS_FRAME_POINTER - && REGNO (subdest) != HARD_FRAME_POINTER_REGNUM -#endif + && (HARD_FRAME_POINTER_IS_FRAME_POINTER + || REGNO (subdest) != HARD_FRAME_POINTER_REGNUM) && (FRAME_POINTER_REGNUM == ARG_POINTER_REGNUM || (REGNO (subdest) != ARG_POINTER_REGNUM || ! fixed_regs [REGNO (subdest)])) @@ -13322,9 +13320,8 @@ mark_used_regs_combine (rtx x) { /* None of this applies to the stack, frame or arg pointers. */ if (regno == STACK_POINTER_REGNUM -#if !HARD_FRAME_POINTER_IS_FRAME_POINTER - || regno == HARD_FRAME_POINTER_REGNUM -#endif + || (!HARD_FRAME_POINTER_IS_FRAME_POINTER + && regno == HARD_FRAME_POINTER_REGNUM) || (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM && regno == ARG_POINTER_REGNUM && fixed_regs[regno]) || regno == FRAME_POINTER_REGNUM) diff --git a/gcc/regrename.c b/gcc/regrename.c index 174d3b57368..e5248a54f62 100644 --- a/gcc/regrename.c +++ b/gcc/regrename.c @@ -442,12 +442,10 @@ rename_chains (void) continue; if (fixed_regs[reg] || global_regs[reg] -#if !HARD_FRAME_POINTER_IS_FRAME_POINTER - || (frame_pointer_needed && reg == HARD_FRAME_POINTER_REGNUM) -#else - || (frame_pointer_needed && reg == FRAME_POINTER_REGNUM) -#endif - ) + || (!HARD_FRAME_POINTER_IS_FRAME_POINTER && frame_pointer_needed + && reg == HARD_FRAME_POINTER_REGNUM) + || (HARD_FRAME_POINTER_REGNUM && frame_pointer_needed + && reg == FRAME_POINTER_REGNUM)) continue; COPY_HARD_REG_SET (this_unavailable, unavailable); diff --git a/gcc/reload.c b/gcc/reload.c index bf57707f60d..771f9b46bf3 100644 --- a/gcc/reload.c +++ b/gcc/reload.c @@ -5169,9 +5169,8 @@ find_reloads_address (machine_mode mode, rtx *memrefloc, rtx ad, if ((regno_ok_for_base_p (REGNO (operand), mode, as, inner_code, GET_CODE (addend)) || operand == frame_pointer_rtx -#if !HARD_FRAME_POINTER_IS_FRAME_POINTER - || operand == hard_frame_pointer_rtx -#endif + || (!HARD_FRAME_POINTER_IS_FRAME_POINTER + && operand == hard_frame_pointer_rtx) || (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM && operand == arg_pointer_rtx) || operand == stack_pointer_rtx) diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index 40dd503dae1..ec2ab05c3b3 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -1191,11 +1191,10 @@ mark_unavailable_hard_regs (def_t def, struct reg_rename *reg_rename_p, frame pointer, or we could not discover its class. */ if (fixed_regs[regno] || global_regs[regno] -#if !HARD_FRAME_POINTER_IS_FRAME_POINTER - || (frame_pointer_needed && regno == HARD_FRAME_POINTER_REGNUM) -#else - || (frame_pointer_needed && regno == FRAME_POINTER_REGNUM) -#endif + || (!HARD_FRAME_POINTER_IS_FRAME_POINTER && frame_pointer_needed + && regno == HARD_FRAME_POINTER_REGNUM) + || (HARD_FRAME_POINTER_REGNUM && frame_pointer_needed + && regno == FRAME_POINTER_REGNUM) || (reload_completed && cl == NO_REGS)) { SET_HARD_REG_SET (reg_rename_p->unavailable_hard_regs); -- 2.30.2