* [PATCH 2/7] remove most ifdef STACK_GROWS_DOWNWARD
2015-05-21 2:11 [PATCH 0/7] Some ifdef removal tbsaunde+gcc
@ 2015-05-21 2:11 ` tbsaunde+gcc
2015-05-21 12:33 ` Jeff Law
2015-05-21 2:11 ` [PATCH 3/7] move default for STACK_PUSH_CODE to defaults.h tbsaunde+gcc
` (5 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: tbsaunde+gcc @ 2015-05-21 2:11 UTC (permalink / raw)
To: gcc-patches
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
gcc/c-family/ChangeLog:
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* c-cppbuiltin.c (c_cpp_builtins): Use if instead of #if with
STACK_GROWS_DOWNWARD.
gcc/ChangeLog:
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* *.c: Use if instead of preprocessor checks with
STACK_GROWS_DOWNWARD.
---
gcc/ChangeLog | 5 ++++
gcc/builtins.c | 30 +++++++++++------------
gcc/c-family/ChangeLog | 5 ++++
gcc/c-family/c-cppbuiltin.c | 5 ++--
gcc/dwarf2cfi.c | 12 +++++-----
gcc/explow.c | 33 ++++++++++++--------------
gcc/expr.c | 58 +++++++++++++++++++--------------------------
gcc/recog.c | 8 ++-----
gcc/sched-deps.c | 9 ++++---
9 files changed, 78 insertions(+), 87 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2dec0c3..1e6bad9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+ * *.c: Use if instead of preprocessor checks with
+ STACK_GROWS_DOWNWARD.
+
+2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
* *.c: Check the value of STACK_GROWS_DOWNWARD rather than if it
is defined.
* config/**/*.h: Define STACK_GROWS_DOWNWARD to an integer.
diff --git a/gcc/builtins.c b/gcc/builtins.c
index e81ab04..d92535e 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -1521,14 +1521,14 @@ expand_builtin_apply_args_1 (void)
/* Save the arg pointer to the block. */
tem = copy_to_reg (crtl->args.internal_arg_pointer);
-#if STACK_GROWS_DOWNWARD
/* We need the pointer as the caller actually passed them to us, not
as we might have pretended they were passed. Make sure it's a valid
operand, as emit_move_insn isn't expected to handle a PLUS. */
- tem
- = force_operand (plus_constant (Pmode, tem, crtl->args.pretend_args_size),
- NULL_RTX);
-#endif
+ if (STACK_GROWS_DOWNWARD)
+ tem
+ = force_operand (plus_constant (Pmode, tem,
+ crtl->args.pretend_args_size),
+ NULL_RTX);
emit_move_insn (adjust_address (registers, Pmode, 0), tem);
size = GET_MODE_SIZE (Pmode);
@@ -1613,10 +1613,9 @@ expand_builtin_apply (rtx function, rtx arguments, rtx argsize)
/* Fetch the arg pointer from the ARGUMENTS block. */
incoming_args = gen_reg_rtx (Pmode);
emit_move_insn (incoming_args, gen_rtx_MEM (Pmode, arguments));
-#if !STACK_GROWS_DOWNWARD
- incoming_args = expand_simple_binop (Pmode, MINUS, incoming_args, argsize,
- incoming_args, 0, OPTAB_LIB_WIDEN);
-#endif
+ if (!STACK_GROWS_DOWNWARD)
+ incoming_args = expand_simple_binop (Pmode, MINUS, incoming_args, argsize,
+ incoming_args, 0, OPTAB_LIB_WIDEN);
/* Push a new argument block and copy the arguments. Do not allow
the (potential) memcpy call below to interfere with our stack
@@ -1646,12 +1645,13 @@ expand_builtin_apply (rtx function, rtx arguments, rtx argsize)
crtl->need_drap = true;
dest = virtual_outgoing_args_rtx;
-#if !STACK_GROWS_DOWNWARD
- if (CONST_INT_P (argsize))
- dest = plus_constant (Pmode, dest, -INTVAL (argsize));
- else
- dest = gen_rtx_PLUS (Pmode, dest, negate_rtx (Pmode, argsize));
-#endif
+ if (!STACK_GROWS_DOWNWARD)
+ {
+ if (CONST_INT_P (argsize))
+ dest = plus_constant (Pmode, dest, -INTVAL (argsize));
+ else
+ dest = gen_rtx_PLUS (Pmode, dest, negate_rtx (Pmode, argsize));
+ }
dest = gen_rtx_MEM (BLKmode, dest);
set_mem_align (dest, PARM_BOUNDARY);
src = gen_rtx_MEM (BLKmode, incoming_args);
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 7b526a6..b219cb9 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,5 +1,10 @@
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+ * c-cppbuiltin.c (c_cpp_builtins): Use if instead of #if with
+ STACK_GROWS_DOWNWARD.
+
+2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
* c-cppbuiltin.c (c_cpp_builtins): Check the value of
STACK_GROWS_DOWNWARD rather than if it is defined.
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index da9cb2f..4170154 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -1138,9 +1138,8 @@ c_cpp_builtins (cpp_reader *pfile)
TRAMPOLINE_SIZE);
/* For libgcc generic-morestack.c and unwinder code. */
-#if STACK_GROWS_DOWNWARD
- cpp_define (pfile, "__LIBGCC_STACK_GROWS_DOWNWARD__");
-#endif
+ if (STACK_GROWS_DOWNWARD)
+ cpp_define (pfile, "__LIBGCC_STACK_GROWS_DOWNWARD__");
/* For libgcc unwinder code. */
#ifdef DONT_USE_BUILTIN_SETJMP
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 8b8931f..4b6929e 100644
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -944,9 +944,9 @@ notice_args_size (rtx_insn *insn)
/* Convert a change in args_size (always a positive in the
direction of stack growth) to a change in stack pointer. */
-#if !STACK_GROWS_DOWNWARD
- delta = -delta;
-#endif
+ if (!STACK_GROWS_DOWNWARD)
+ delta = -delta;
+
cur_cfa->offset += delta;
}
}
@@ -2347,9 +2347,9 @@ maybe_record_trace_start_abnormal (rtx_insn *start, rtx_insn *origin)
{
/* Convert a change in args_size (always a positive in the
direction of stack growth) to a change in stack pointer. */
-#if !STACK_GROWS_DOWNWARD
- delta = -delta;
-#endif
+ if (!STACK_GROWS_DOWNWARD)
+ delta = -delta;
+
cur_row->cfa.offset += delta;
}
diff --git a/gcc/explow.c b/gcc/explow.c
index 39b63ed..d1a2bf8 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -866,10 +866,9 @@ adjust_stack_1 (rtx adjust, bool anti_p)
rtx temp;
rtx_insn *insn;
-#if !STACK_GROWS_DOWNWARD
/* Hereafter anti_p means subtract_p. */
- anti_p = !anti_p;
-#endif
+ if (!STACK_GROWS_DOWNWARD)
+ anti_p = !anti_p;
temp = expand_binop (Pmode,
anti_p ? sub_optab : add_optab,
@@ -1414,24 +1413,23 @@ allocate_dynamic_stack_space (rtx size, unsigned size_align,
{
int saved_stack_pointer_delta;
-#if !STACK_GROWS_DOWNWARD
- emit_move_insn (target, virtual_stack_dynamic_rtx);
-#endif
+ if (!STACK_GROWS_DOWNWARD)
+ emit_move_insn (target, virtual_stack_dynamic_rtx);
/* Check stack bounds if necessary. */
if (crtl->limit_stack)
{
rtx available;
rtx_code_label *space_available = gen_label_rtx ();
-#if STACK_GROWS_DOWNWARD
- available = expand_binop (Pmode, sub_optab,
- stack_pointer_rtx, stack_limit_rtx,
- NULL_RTX, 1, OPTAB_WIDEN);
-#else
- available = expand_binop (Pmode, sub_optab,
- stack_limit_rtx, stack_pointer_rtx,
- NULL_RTX, 1, OPTAB_WIDEN);
-#endif
+ if (STACK_GROWS_DOWNWARD)
+ available = expand_binop (Pmode, sub_optab,
+ stack_pointer_rtx, stack_limit_rtx,
+ NULL_RTX, 1, OPTAB_WIDEN);
+ else
+ available = expand_binop (Pmode, sub_optab,
+ stack_limit_rtx, stack_pointer_rtx,
+ NULL_RTX, 1, OPTAB_WIDEN);
+
emit_cmp_and_jump_insns (available, size, GEU, NULL_RTX, Pmode, 1,
space_available);
#ifdef HAVE_trap
@@ -1456,9 +1454,8 @@ allocate_dynamic_stack_space (rtx size, unsigned size_align,
crtl->preferred_stack_boundary alignment. */
stack_pointer_delta = saved_stack_pointer_delta;
-#if STACK_GROWS_DOWNWARD
- emit_move_insn (target, virtual_stack_dynamic_rtx);
-#endif
+ if (STACK_GROWS_DOWNWARD)
+ emit_move_insn (target, virtual_stack_dynamic_rtx);
}
suppress_reg_args_size = false;
diff --git a/gcc/expr.c b/gcc/expr.c
index 3d691de..09fc694 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -869,11 +869,10 @@ move_by_pieces (rtx to, rtx from, unsigned HOST_WIDE_INT len,
to_addr = NULL_RTX;
data.to = NULL_RTX;
data.autinc_to = 1;
-#if STACK_GROWS_DOWNWARD
- data.reverse = 1;
-#else
- data.reverse = 0;
-#endif
+ if (STACK_GROWS_DOWNWARD)
+ data.reverse = 1;
+ else
+ data.reverse = 0;
}
data.to_addr = to_addr;
data.from = from;
@@ -4000,9 +3999,9 @@ fixup_args_size_notes (rtx_insn *prev, rtx_insn *last, int end_args_size)
saw_unknown = true;
add_reg_note (insn, REG_ARGS_SIZE, GEN_INT (args_size));
-#if STACK_GROWS_DOWNWARD
- this_delta = -(unsigned HOST_WIDE_INT) this_delta;
-#endif
+ if (STACK_GROWS_DOWNWARD)
+ this_delta = -(unsigned HOST_WIDE_INT) this_delta;
+
args_size -= this_delta;
}
@@ -4045,42 +4044,38 @@ emit_single_push_insn_1 (machine_mode mode, rtx x, tree type)
emit_move_insn (stack_pointer_rtx,
expand_binop (Pmode,
-#if STACK_GROWS_DOWNWARD
- sub_optab,
-#else
- add_optab,
-#endif
+ STACK_GROWS_DOWNWARD ? sub_optab
+ : add_optab,
stack_pointer_rtx,
gen_int_mode (rounded_size, Pmode),
NULL_RTX, 0, OPTAB_LIB_WIDEN));
offset = (HOST_WIDE_INT) padding_size;
-#if STACK_GROWS_DOWNWARD
- if (STACK_PUSH_CODE == POST_DEC)
+ if (STACK_GROWS_DOWNWARD && STACK_PUSH_CODE == POST_DEC)
/* We have already decremented the stack pointer, so get the
previous value. */
offset += (HOST_WIDE_INT) rounded_size;
-#else
- if (STACK_PUSH_CODE == POST_INC)
+
+ if (!STACK_GROWS_DOWNWARD && STACK_PUSH_CODE == POST_INC)
/* We have already incremented the stack pointer, so get the
previous value. */
offset -= (HOST_WIDE_INT) rounded_size;
-#endif
+
dest_addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
gen_int_mode (offset, Pmode));
}
else
{
-#if STACK_GROWS_DOWNWARD
- /* ??? This seems wrong if STACK_PUSH_CODE == POST_DEC. */
- dest_addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
- gen_int_mode (-(HOST_WIDE_INT) rounded_size,
- Pmode));
-#else
- /* ??? This seems wrong if STACK_PUSH_CODE == POST_INC. */
- dest_addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
- gen_int_mode (rounded_size, Pmode));
-#endif
+ if (STACK_GROWS_DOWNWARD)
+ /* ??? This seems wrong if STACK_PUSH_CODE == POST_DEC. */
+ dest_addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
+ gen_int_mode (-(HOST_WIDE_INT) rounded_size,
+ Pmode));
+ else
+ /* ??? This seems wrong if STACK_PUSH_CODE == POST_INC. */
+ dest_addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
+ gen_int_mode (rounded_size, Pmode));
+
dest_addr = gen_rtx_PRE_MODIFY (Pmode, stack_pointer_rtx, dest_addr);
}
@@ -4163,12 +4158,7 @@ emit_push_insn (rtx x, machine_mode mode, tree type, rtx size,
rtx alignment_pad)
{
rtx xinner;
- enum direction stack_direction
-#if STACK_GROWS_DOWNWARD
- = downward;
-#else
- = upward;
-#endif
+ enum direction stack_direction = STACK_GROWS_DOWNWARD ? downward : upward;
/* Decide where to pad the argument: `downward' for below,
`upward' for above, or `none' for don't pad it.
diff --git a/gcc/recog.c b/gcc/recog.c
index 4a7aa67..524be67 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -1332,12 +1332,8 @@ push_operand (rtx op, machine_mode mode)
|| GET_CODE (XEXP (op, 1)) != PLUS
|| XEXP (XEXP (op, 1), 0) != XEXP (op, 0)
|| !CONST_INT_P (XEXP (XEXP (op, 1), 1))
-#if STACK_GROWS_DOWNWARD
- || INTVAL (XEXP (XEXP (op, 1), 1)) != - (int) rounded_size
-#else
- || INTVAL (XEXP (XEXP (op, 1), 1)) != (int) rounded_size
-#endif
- )
+ || INTVAL (XEXP (XEXP (op, 1), 1))
+ != ((STACK_GROWS_DOWNWARD ? -1 : 1) * (int) rounded_size))
return 0;
}
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index 206da5a..c1cfc1f 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -4734,11 +4734,10 @@ parse_add_or_inc (struct mem_inc_info *mii, rtx_insn *insn, bool before_mem)
if (regs_equal && REGNO (SET_DEST (pat)) == STACK_POINTER_REGNUM)
{
/* Note that the sign has already been reversed for !before_mem. */
-#if STACK_GROWS_DOWNWARD
- return mii->inc_constant > 0;
-#else
- return mii->inc_constant < 0;
-#endif
+ if (STACK_GROWS_DOWNWARD)
+ return mii->inc_constant > 0;
+ else
+ return mii->inc_constant < 0;
}
return true;
}
--
2.4.0.78.g7c6ecbf
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 2/7] remove most ifdef STACK_GROWS_DOWNWARD
2015-05-21 2:11 ` [PATCH 2/7] remove most ifdef STACK_GROWS_DOWNWARD tbsaunde+gcc
@ 2015-05-21 12:33 ` Jeff Law
0 siblings, 0 replies; 16+ messages in thread
From: Jeff Law @ 2015-05-21 12:33 UTC (permalink / raw)
To: tbsaunde+gcc, gcc-patches
On 05/20/2015 08:09 PM, tbsaunde+gcc@tbsaunde.org wrote:
> From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> gcc/c-family/ChangeLog:
>
> 2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> * c-cppbuiltin.c (c_cpp_builtins): Use if instead of #if with
> STACK_GROWS_DOWNWARD.
>
> gcc/ChangeLog:
>
> 2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> * *.c: Use if instead of preprocessor checks with
> STACK_GROWS_DOWNWARD.
> ---
> gcc/ChangeLog | 5 ++++
> gcc/builtins.c | 30 +++++++++++------------
> gcc/c-family/ChangeLog | 5 ++++
> gcc/c-family/c-cppbuiltin.c | 5 ++--
> gcc/dwarf2cfi.c | 12 +++++-----
> gcc/explow.c | 33 ++++++++++++--------------
> gcc/expr.c | 58 +++++++++++++++++++--------------------------
> gcc/recog.c | 8 ++-----
> gcc/sched-deps.c | 9 ++++---
> 9 files changed, 78 insertions(+), 87 deletions(-)
OK with the usual request to list filenames in the ChangeLogs.
jeff
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 3/7] move default for STACK_PUSH_CODE to defaults.h
2015-05-21 2:11 [PATCH 0/7] Some ifdef removal tbsaunde+gcc
2015-05-21 2:11 ` [PATCH 2/7] remove most ifdef STACK_GROWS_DOWNWARD tbsaunde+gcc
@ 2015-05-21 2:11 ` tbsaunde+gcc
2015-05-21 12:32 ` Jeff Law
2015-05-21 2:11 ` [PATCH 1/7] always define STACK_GROWS_DOWNWARD tbsaunde+gcc
` (4 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: tbsaunde+gcc @ 2015-05-21 2:11 UTC (permalink / raw)
To: gcc-patches
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
gcc/ChangeLog:
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* defaults.h: Add default for STACK_PUSH_CODE.
* expr.c: Don't redefine STACK_PUSH_CODE.
* recog.c: Likewise.
---
gcc/ChangeLog | 6 ++++++
gcc/defaults.h | 8 ++++++++
gcc/expr.c | 8 --------
gcc/recog.c | 8 --------
4 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1e6bad9..2d51c33 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+ * defaults.h: Add default for STACK_PUSH_CODE.
+ * expr.c: Don't redefine STACK_PUSH_CODE.
+ * recog.c: Likewise.
+
+2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
* *.c: Use if instead of preprocessor checks with
STACK_GROWS_DOWNWARD.
diff --git a/gcc/defaults.h b/gcc/defaults.h
index a01969a..e7bbcb8 100644
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -1233,6 +1233,14 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define STACK_GROWS_DOWNWARD 0
#endif
+#ifndef STACK_PUSH_CODE
+#if STACK_GROWS_DOWNWARD
+#define STACK_PUSH_CODE PRE_DEC
+#else
+#define STACK_PUSH_CODE PRE_INC
+#endif
+#endif
+
#ifdef GCC_INSN_FLAGS_H
/* Dependent default target macro definitions
diff --git a/gcc/expr.c b/gcc/expr.c
index 09fc694..275c636 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -98,14 +98,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl-chkp.h"
#include "ccmp.h"
-#ifndef STACK_PUSH_CODE
-#if STACK_GROWS_DOWNWARD
-#define STACK_PUSH_CODE PRE_DEC
-#else
-#define STACK_PUSH_CODE PRE_INC
-#endif
-#endif
-
/* If this is nonzero, we do not bother generating VOLATILE
around volatile memory references, and we are willing to
diff --git a/gcc/recog.c b/gcc/recog.c
index 524be67..39a5d1f 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -68,14 +68,6 @@ along with GCC; see the file COPYING3. If not see
#include "df.h"
#include "insn-codes.h"
-#ifndef STACK_PUSH_CODE
-#if STACK_GROWS_DOWNWARD
-#define STACK_PUSH_CODE PRE_DEC
-#else
-#define STACK_PUSH_CODE PRE_INC
-#endif
-#endif
-
#ifndef STACK_POP_CODE
#if STACK_GROWS_DOWNWARD
#define STACK_POP_CODE POST_INC
--
2.4.0.78.g7c6ecbf
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH 1/7] always define STACK_GROWS_DOWNWARD
2015-05-21 2:11 [PATCH 0/7] Some ifdef removal tbsaunde+gcc
2015-05-21 2:11 ` [PATCH 2/7] remove most ifdef STACK_GROWS_DOWNWARD tbsaunde+gcc
2015-05-21 2:11 ` [PATCH 3/7] move default for STACK_PUSH_CODE to defaults.h tbsaunde+gcc
@ 2015-05-21 2:11 ` tbsaunde+gcc
2015-05-21 12:38 ` Jeff Law
2015-05-21 16:59 ` Joseph Myers
2015-05-21 2:11 ` [PATCH 6/7] remove #if HAVE_conditional_move tbsaunde+gcc
` (3 subsequent siblings)
6 siblings, 2 replies; 16+ messages in thread
From: tbsaunde+gcc @ 2015-05-21 2:11 UTC (permalink / raw)
To: gcc-patches
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
gcc/c-family/ChangeLog:
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* c-cppbuiltin.c (c_cpp_builtins): Check the value of
STACK_GROWS_DOWNWARD rather than if it is defined.
gcc/ChangeLog:
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* *.c: Check the value of STACK_GROWS_DOWNWARD rather than if it
is defined.
* config/**/*.h: Define STACK_GROWS_DOWNWARD to an integer.
* defaults.h: Provide default for STACK_GROWS_DOWNWARD.
---
gcc/ChangeLog | 7 +++++++
gcc/builtins.c | 6 +++---
gcc/c-family/ChangeLog | 5 +++++
gcc/c-family/c-cppbuiltin.c | 2 +-
gcc/calls.c | 8 --------
gcc/combine-stack-adj.c | 8 --------
gcc/config/alpha/alpha.h | 2 +-
gcc/config/arc/arc.h | 2 +-
gcc/config/avr/avr.h | 2 +-
gcc/config/bfin/bfin.h | 2 +-
gcc/config/c6x/c6x.h | 2 +-
gcc/config/cr16/cr16.h | 2 +-
gcc/config/cris/cris.h | 2 +-
gcc/config/epiphany/epiphany.h | 2 +-
gcc/config/h8300/h8300.h | 2 +-
gcc/config/i386/i386.h | 2 +-
gcc/config/iq2000/iq2000.h | 2 +-
gcc/config/m32r/m32r.h | 2 +-
gcc/config/mcore/mcore.h | 2 +-
gcc/config/microblaze/microblaze.h | 2 +-
gcc/config/mips/mips.h | 2 +-
gcc/config/mmix/mmix.h | 2 +-
gcc/config/mn10300/mn10300.h | 2 +-
gcc/config/moxie/moxie.h | 2 +-
gcc/config/nds32/nds32.h | 2 +-
gcc/config/nios2/nios2.h | 2 +-
gcc/config/nvptx/nvptx.h | 2 +-
gcc/config/pdp11/pdp11.h | 2 +-
gcc/config/rs6000/rs6000.h | 2 +-
gcc/config/s390/s390.h | 2 +-
gcc/config/sh/sh.h | 2 +-
gcc/config/sparc/sparc.h | 2 +-
gcc/config/spu/spu.h | 2 +-
gcc/config/tilegx/tilegx.h | 2 +-
gcc/config/tilepro/tilepro.h | 2 +-
gcc/config/v850/v850.h | 2 +-
gcc/config/vax/vax.h | 2 +-
gcc/config/xtensa/xtensa.h | 2 +-
gcc/defaults.h | 4 ++++
gcc/dwarf2cfi.c | 4 ++--
gcc/explow.c | 10 +++++-----
gcc/expr.c | 20 ++++++++------------
gcc/ira-color.c | 8 --------
gcc/lower-subreg.c | 7 -------
gcc/lra-spills.c | 8 --------
gcc/recog.c | 6 +++---
gcc/sched-deps.c | 2 +-
47 files changed, 71 insertions(+), 98 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5bcbcb4..2dec0c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
+ * *.c: Check the value of STACK_GROWS_DOWNWARD rather than if it
+ is defined.
+ * config/**/*.h: Define STACK_GROWS_DOWNWARD to an integer.
+ * defaults.h: Provide default for STACK_GROWS_DOWNWARD.
+
2015-05-20 Mikhail Maltsev <maltsevm@gmail.com>
* bb-reorder.c (set_edge_can_fallthru_flag): Use rtx_jump_insn where
diff --git a/gcc/builtins.c b/gcc/builtins.c
index f6012af..e81ab04 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -1521,7 +1521,7 @@ expand_builtin_apply_args_1 (void)
/* Save the arg pointer to the block. */
tem = copy_to_reg (crtl->args.internal_arg_pointer);
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
/* We need the pointer as the caller actually passed them to us, not
as we might have pretended they were passed. Make sure it's a valid
operand, as emit_move_insn isn't expected to handle a PLUS. */
@@ -1613,7 +1613,7 @@ expand_builtin_apply (rtx function, rtx arguments, rtx argsize)
/* Fetch the arg pointer from the ARGUMENTS block. */
incoming_args = gen_reg_rtx (Pmode);
emit_move_insn (incoming_args, gen_rtx_MEM (Pmode, arguments));
-#ifndef STACK_GROWS_DOWNWARD
+#if !STACK_GROWS_DOWNWARD
incoming_args = expand_simple_binop (Pmode, MINUS, incoming_args, argsize,
incoming_args, 0, OPTAB_LIB_WIDEN);
#endif
@@ -1646,7 +1646,7 @@ expand_builtin_apply (rtx function, rtx arguments, rtx argsize)
crtl->need_drap = true;
dest = virtual_outgoing_args_rtx;
-#ifndef STACK_GROWS_DOWNWARD
+#if !STACK_GROWS_DOWNWARD
if (CONST_INT_P (argsize))
dest = plus_constant (Pmode, dest, -INTVAL (argsize));
else
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 9d7736e..7b526a6 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
+ * c-cppbuiltin.c (c_cpp_builtins): Check the value of
+ STACK_GROWS_DOWNWARD rather than if it is defined.
+
2015-05-20 Marek Polacek <polacek@redhat.com>
* c-omp.c (check_omp_for_incr_expr): Use BINARY_CLASS_P.
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index 60c2d7f..da9cb2f 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -1138,7 +1138,7 @@ c_cpp_builtins (cpp_reader *pfile)
TRAMPOLINE_SIZE);
/* For libgcc generic-morestack.c and unwinder code. */
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
cpp_define (pfile, "__LIBGCC_STACK_GROWS_DOWNWARD__");
#endif
diff --git a/gcc/calls.c b/gcc/calls.c
index 9cd488d..afe61f4 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -82,14 +82,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl-chkp.h"
-/* Redefine STACK_GROWS_DOWNWARD in terms of 0 or 1. */
-#ifdef STACK_GROWS_DOWNWARD
-# undef STACK_GROWS_DOWNWARD
-# define STACK_GROWS_DOWNWARD 1
-#else
-# define STACK_GROWS_DOWNWARD 0
-#endif
-
/* Like PREFERRED_STACK_BOUNDARY but in units of bytes, not bits. */
#define STACK_BYTES (PREFERRED_STACK_BOUNDARY / BITS_PER_UNIT)
diff --git a/gcc/combine-stack-adj.c b/gcc/combine-stack-adj.c
index 83cdfae..4d40e4e 100644
--- a/gcc/combine-stack-adj.c
+++ b/gcc/combine-stack-adj.c
@@ -84,14 +84,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl-iter.h"
\f
-/* Turn STACK_GROWS_DOWNWARD into a boolean. */
-#ifdef STACK_GROWS_DOWNWARD
-#undef STACK_GROWS_DOWNWARD
-#define STACK_GROWS_DOWNWARD 1
-#else
-#define STACK_GROWS_DOWNWARD 0
-#endif
-
/* This structure records two kinds of stack references between stack
adjusting instructions: stack references in memory addresses for
regular insns and all stack references for debug insns. */
diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index 196349d..8d2ab23 100644
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -564,7 +564,7 @@ extern int alpha_memory_latency;
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this to nonzero if the nominal address of the stack frame
is at the high-address end of the local variables;
diff --git a/gcc/config/arc/arc.h b/gcc/config/arc/arc.h
index 66965b0..4fdd654 100644
--- a/gcc/config/arc/arc.h
+++ b/gcc/config/arc/arc.h
@@ -765,7 +765,7 @@ extern enum reg_class arc_regno_reg_class[];
/* Define this macro if pushing a word onto the stack moves the stack
pointer to a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this if the nominal address of the stack frame
is at the high-address end of the local variables;
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index d8bee77..7439964 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -290,7 +290,7 @@ enum reg_class {
#define STACK_PUSH_CODE POST_DEC
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define STARTING_FRAME_OFFSET avr_starting_frame_offset()
diff --git a/gcc/config/bfin/bfin.h b/gcc/config/bfin/bfin.h
index 49cc741..b0d017e 100644
--- a/gcc/config/bfin/bfin.h
+++ b/gcc/config/bfin/bfin.h
@@ -233,7 +233,7 @@ extern const char *bfin_library_id_string;
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define STACK_PUSH_CODE PRE_DEC
diff --git a/gcc/config/c6x/c6x.h b/gcc/config/c6x/c6x.h
index 9b3fcfb..1c30469 100644
--- a/gcc/config/c6x/c6x.h
+++ b/gcc/config/c6x/c6x.h
@@ -313,7 +313,7 @@ enum reg_class
#define FIRST_PARM_OFFSET(fundecl) 4
#define STARTING_FRAME_OFFSET 0
#define FRAME_GROWS_DOWNWARD 1
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define STACK_POINTER_REGNUM REG_B15
#define HARD_FRAME_POINTER_REGNUM REG_A15
diff --git a/gcc/config/cr16/cr16.h b/gcc/config/cr16/cr16.h
index e5df6f9..5767be9 100644
--- a/gcc/config/cr16/cr16.h
+++ b/gcc/config/cr16/cr16.h
@@ -368,7 +368,7 @@ enum reg_class
&& GET_CODE (XEXP ((XEXP (OP, 0)), 1)) == CONST_INT))
/* Stack layout and calling conventions. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define STARTING_FRAME_OFFSET 0
diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h
index cb7baf7..aa7dc17 100644
--- a/gcc/config/cris/cris.h
+++ b/gcc/config/cris/cris.h
@@ -620,7 +620,7 @@ enum reg_class
/* Node: Frame Layout */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define FRAME_GROWS_DOWNWARD 1
/* It seems to be indicated in the code (at least 2.1) that this is
diff --git a/gcc/config/epiphany/epiphany.h b/gcc/config/epiphany/epiphany.h
index dab368c..5515edb 100644
--- a/gcc/config/epiphany/epiphany.h
+++ b/gcc/config/epiphany/epiphany.h
@@ -467,7 +467,7 @@ typedef struct GTY (()) machine_function
/* Define this macro if pushing a word onto the stack moves the stack
pointer to a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this to nonzero if the nominal address of the stack frame
is at the high-address end of the local variables;
diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h
index a17d7d5..a829cfa 100644
--- a/gcc/config/h8300/h8300.h
+++ b/gcc/config/h8300/h8300.h
@@ -360,7 +360,7 @@ enum reg_class {
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this to nonzero if the nominal address of the stack frame
is at the high-address end of the local variables;
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 5279b2d..40e8f83 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -1564,7 +1564,7 @@ enum reg_class
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this to nonzero if the nominal address of the stack frame
is at the high-address end of the local variables;
diff --git a/gcc/config/iq2000/iq2000.h b/gcc/config/iq2000/iq2000.h
index a10eda3..14a68ce 100644
--- a/gcc/config/iq2000/iq2000.h
+++ b/gcc/config/iq2000/iq2000.h
@@ -230,7 +230,7 @@ enum reg_class
\f
/* Basic Stack Layout. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define FRAME_GROWS_DOWNWARD 0
diff --git a/gcc/config/m32r/m32r.h b/gcc/config/m32r/m32r.h
index ee0c447..66ceae0 100644
--- a/gcc/config/m32r/m32r.h
+++ b/gcc/config/m32r/m32r.h
@@ -524,7 +524,7 @@ extern enum reg_class m32r_regno_reg_class[FIRST_PSEUDO_REGISTER];
/* Define this macro if pushing a word onto the stack moves the stack
pointer to a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Offset from frame pointer to start allocating local variables at.
If FRAME_GROWS_DOWNWARD, this is the offset to the END of the
diff --git a/gcc/config/mcore/mcore.h b/gcc/config/mcore/mcore.h
index 74860df..0aa9680 100644
--- a/gcc/config/mcore/mcore.h
+++ b/gcc/config/mcore/mcore.h
@@ -415,7 +415,7 @@ extern const enum reg_class regno_reg_class[FIRST_PSEUDO_REGISTER];
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Offset within stack frame to start allocating local variables at.
If FRAME_GROWS_DOWNWARD, this is the offset to the END of the
diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h
index fa53848..c832fa0 100644
--- a/gcc/config/microblaze/microblaze.h
+++ b/gcc/config/microblaze/microblaze.h
@@ -413,7 +413,7 @@ extern enum reg_class microblaze_regno_to_class[];
/* Stack layout; function entry, exit and calling. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Changed the starting frame offset to including the new link stuff */
#define STARTING_FRAME_OFFSET \
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index b4c6e5f..bceef31 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -2234,7 +2234,7 @@ enum reg_class
\f
/* Stack layout; function entry, exit and calling. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define FRAME_GROWS_DOWNWARD flag_stack_protect
diff --git a/gcc/config/mmix/mmix.h b/gcc/config/mmix/mmix.h
index 1a17582..61ae4d6 100644
--- a/gcc/config/mmix/mmix.h
+++ b/gcc/config/mmix/mmix.h
@@ -451,7 +451,7 @@ enum reg_class
/* Node: Frame Layout */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define FRAME_GROWS_DOWNWARD 1
#define STARTING_FRAME_OFFSET \
diff --git a/gcc/config/mn10300/mn10300.h b/gcc/config/mn10300/mn10300.h
index d41dc4e..e5fa70b 100644
--- a/gcc/config/mn10300/mn10300.h
+++ b/gcc/config/mn10300/mn10300.h
@@ -404,7 +404,7 @@ enum reg_class
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this to nonzero if the nominal address of the stack frame
is at the high-address end of the local variables;
diff --git a/gcc/config/moxie/moxie.h b/gcc/config/moxie/moxie.h
index 89e6a38..d20d214 100644
--- a/gcc/config/moxie/moxie.h
+++ b/gcc/config/moxie/moxie.h
@@ -247,7 +247,7 @@ enum reg_class
/* Define this macro if pushing a word onto the stack moves the stack
pointer to a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define INITIAL_FRAME_POINTER_OFFSET(DEPTH) (DEPTH) = 0
diff --git a/gcc/config/nds32/nds32.h b/gcc/config/nds32/nds32.h
index 963b3a2..dcecea7 100644
--- a/gcc/config/nds32/nds32.h
+++ b/gcc/config/nds32/nds32.h
@@ -696,7 +696,7 @@ enum reg_class
\f
/* Stack Layout and Calling Conventions. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define FRAME_GROWS_DOWNWARD 1
diff --git a/gcc/config/nios2/nios2.h b/gcc/config/nios2/nios2.h
index ac33978..45eb70b 100644
--- a/gcc/config/nios2/nios2.h
+++ b/gcc/config/nios2/nios2.h
@@ -230,7 +230,7 @@ enum reg_class
#define TRAMPOLINE_SIZE 20
/* Stack layout. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define STARTING_FRAME_OFFSET 0
#define FIRST_PARM_OFFSET(FUNDECL) 0
diff --git a/gcc/config/nvptx/nvptx.h b/gcc/config/nvptx/nvptx.h
index 8835906..502e43d 100644
--- a/gcc/config/nvptx/nvptx.h
+++ b/gcc/config/nvptx/nvptx.h
@@ -150,7 +150,7 @@ enum reg_class
#define STARTING_FRAME_OFFSET 0
#define FRAME_GROWS_DOWNWARD 0
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define STACK_POINTER_REGNUM 1
#define HARD_FRAME_POINTER_REGNUM 2
diff --git a/gcc/config/pdp11/pdp11.h b/gcc/config/pdp11/pdp11.h
index a827f3a..1d947f3 100644
--- a/gcc/config/pdp11/pdp11.h
+++ b/gcc/config/pdp11/pdp11.h
@@ -289,7 +289,7 @@ enum reg_class { NO_REGS, MUL_REGS, GENERAL_REGS, LOAD_FPU_REGS, NO_LOAD_FPU_REG
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this to nonzero if the nominal address of the stack frame
is at the high-address end of the local variables;
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index c93c3ce..bbecf58 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -1563,7 +1563,7 @@ extern enum reg_class rs6000_constraints[RS6000_CONSTRAINT_MAX];
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Offsets recorded in opcodes are a multiple of this alignment factor. */
#define DWARF_CIE_DATA_ALIGNMENT (-((int) (TARGET_32BIT ? 4 : 8)))
diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h
index 6ddd8aa..a9bf9b5 100644
--- a/gcc/config/s390/s390.h
+++ b/gcc/config/s390/s390.h
@@ -561,7 +561,7 @@ extern const enum reg_class regclass_map[FIRST_PSEUDO_REGISTER];
/* Our stack grows from higher to lower addresses. However, local variables
are accessed by positive offsets, and function arguments are stored at
increasing addresses. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define FRAME_GROWS_DOWNWARD 1
/* #undef ARGS_GROW_DOWNWARD */
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index a9b7fa0..3078880 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -1223,7 +1223,7 @@ extern enum reg_class regno_reg_class[FIRST_PSEUDO_REGISTER];
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this macro to nonzero if the addresses of local variable slots
are at negative offsets from the frame pointer. */
diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index 2fae9e8..ce1b68b 100644
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -1074,7 +1074,7 @@ extern char leaf_reg_remap[];
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this to nonzero if the nominal address of the stack frame
is at the high-address end of the local variables;
diff --git a/gcc/config/spu/spu.h b/gcc/config/spu/spu.h
index 24d8047..25fa435 100644
--- a/gcc/config/spu/spu.h
+++ b/gcc/config/spu/spu.h
@@ -237,7 +237,7 @@ targetm.resolve_overloaded_builtin = spu_resolve_overloaded_builtin; \
\f
/* Frame Layout */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define FRAME_GROWS_DOWNWARD 1
diff --git a/gcc/config/tilegx/tilegx.h b/gcc/config/tilegx/tilegx.h
index 72a0324..5fa10b3 100644
--- a/gcc/config/tilegx/tilegx.h
+++ b/gcc/config/tilegx/tilegx.h
@@ -257,7 +257,7 @@ enum reg_class
/* Stack layout; function entry, exit and calling. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define FRAME_GROWS_DOWNWARD 1
#define STARTING_FRAME_OFFSET 0
diff --git a/gcc/config/tilepro/tilepro.h b/gcc/config/tilepro/tilepro.h
index e1c790d..f2b7b16 100644
--- a/gcc/config/tilepro/tilepro.h
+++ b/gcc/config/tilepro/tilepro.h
@@ -221,7 +221,7 @@ enum reg_class
/* Stack layout; function entry, exit and calling. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
#define FRAME_GROWS_DOWNWARD 1
#define STARTING_FRAME_OFFSET 0
diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index 2f0118c..e40fd87 100644
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -411,7 +411,7 @@ enum reg_class
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this to nonzero if the nominal address of the stack frame
is at the high-address end of the local variables;
diff --git a/gcc/config/vax/vax.h b/gcc/config/vax/vax.h
index 7c2d8c6..0b19014 100644
--- a/gcc/config/vax/vax.h
+++ b/gcc/config/vax/vax.h
@@ -238,7 +238,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
/* Define this if pushing a word on the stack
makes the stack pointer a smaller address. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Define this to nonzero if the nominal address of the stack frame
is at the high-address end of the local variables;
diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
index 011411c..615f741 100644
--- a/gcc/config/xtensa/xtensa.h
+++ b/gcc/config/xtensa/xtensa.h
@@ -459,7 +459,7 @@ enum reg_class
/* Stack layout; function entry, exit and calling. */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
/* Offset within stack frame to start allocating local variables at. */
#define STARTING_FRAME_OFFSET \
diff --git a/gcc/defaults.h b/gcc/defaults.h
index b3edcc9..a01969a 100644
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -1229,6 +1229,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define ARGS_GROW_DOWNWARD 0
#endif
+#ifndef STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 0
+#endif
+
#ifdef GCC_INSN_FLAGS_H
/* Dependent default target macro definitions
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 7b5cecd..8b8931f 100644
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -944,7 +944,7 @@ notice_args_size (rtx_insn *insn)
/* Convert a change in args_size (always a positive in the
direction of stack growth) to a change in stack pointer. */
-#ifndef STACK_GROWS_DOWNWARD
+#if !STACK_GROWS_DOWNWARD
delta = -delta;
#endif
cur_cfa->offset += delta;
@@ -2347,7 +2347,7 @@ maybe_record_trace_start_abnormal (rtx_insn *start, rtx_insn *origin)
{
/* Convert a change in args_size (always a positive in the
direction of stack growth) to a change in stack pointer. */
-#ifndef STACK_GROWS_DOWNWARD
+#if !STACK_GROWS_DOWNWARD
delta = -delta;
#endif
cur_row->cfa.offset += delta;
diff --git a/gcc/explow.c b/gcc/explow.c
index b41feb6..39b63ed 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -866,7 +866,7 @@ adjust_stack_1 (rtx adjust, bool anti_p)
rtx temp;
rtx_insn *insn;
-#ifndef STACK_GROWS_DOWNWARD
+#if !STACK_GROWS_DOWNWARD
/* Hereafter anti_p means subtract_p. */
anti_p = !anti_p;
#endif
@@ -1414,7 +1414,7 @@ allocate_dynamic_stack_space (rtx size, unsigned size_align,
{
int saved_stack_pointer_delta;
-#ifndef STACK_GROWS_DOWNWARD
+#if !STACK_GROWS_DOWNWARD
emit_move_insn (target, virtual_stack_dynamic_rtx);
#endif
@@ -1423,7 +1423,7 @@ allocate_dynamic_stack_space (rtx size, unsigned size_align,
{
rtx available;
rtx_code_label *space_available = gen_label_rtx ();
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
available = expand_binop (Pmode, sub_optab,
stack_pointer_rtx, stack_limit_rtx,
NULL_RTX, 1, OPTAB_WIDEN);
@@ -1456,7 +1456,7 @@ allocate_dynamic_stack_space (rtx size, unsigned size_align,
crtl->preferred_stack_boundary alignment. */
stack_pointer_delta = saved_stack_pointer_delta;
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
emit_move_insn (target, virtual_stack_dynamic_rtx);
#endif
}
@@ -1545,7 +1545,7 @@ emit_stack_probe (rtx address)
#define PROBE_INTERVAL (1 << STACK_CHECK_PROBE_INTERVAL_EXP)
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
#define STACK_GROW_OP MINUS
#define STACK_GROW_OPTAB sub_optab
#define STACK_GROW_OFF(off) -(off)
diff --git a/gcc/expr.c b/gcc/expr.c
index 8d75ef5..3d691de 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -99,7 +99,7 @@ along with GCC; see the file COPYING3. If not see
#include "ccmp.h"
#ifndef STACK_PUSH_CODE
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
#define STACK_PUSH_CODE PRE_DEC
#else
#define STACK_PUSH_CODE PRE_INC
@@ -869,7 +869,7 @@ move_by_pieces (rtx to, rtx from, unsigned HOST_WIDE_INT len,
to_addr = NULL_RTX;
data.to = NULL_RTX;
data.autinc_to = 1;
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
data.reverse = 1;
#else
data.reverse = 0;
@@ -3792,11 +3792,7 @@ push_block (rtx size, int extra, int below)
anti_adjust_stack (temp);
}
-#ifndef STACK_GROWS_DOWNWARD
- if (0)
-#else
- if (1)
-#endif
+ if (STACK_GROWS_DOWNWARD)
{
temp = virtual_outgoing_args_rtx;
if (extra != 0 && below)
@@ -4004,7 +4000,7 @@ fixup_args_size_notes (rtx_insn *prev, rtx_insn *last, int end_args_size)
saw_unknown = true;
add_reg_note (insn, REG_ARGS_SIZE, GEN_INT (args_size));
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
this_delta = -(unsigned HOST_WIDE_INT) this_delta;
#endif
args_size -= this_delta;
@@ -4049,7 +4045,7 @@ emit_single_push_insn_1 (machine_mode mode, rtx x, tree type)
emit_move_insn (stack_pointer_rtx,
expand_binop (Pmode,
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
sub_optab,
#else
add_optab,
@@ -4059,7 +4055,7 @@ emit_single_push_insn_1 (machine_mode mode, rtx x, tree type)
NULL_RTX, 0, OPTAB_LIB_WIDEN));
offset = (HOST_WIDE_INT) padding_size;
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
if (STACK_PUSH_CODE == POST_DEC)
/* We have already decremented the stack pointer, so get the
previous value. */
@@ -4075,7 +4071,7 @@ emit_single_push_insn_1 (machine_mode mode, rtx x, tree type)
}
else
{
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
/* ??? This seems wrong if STACK_PUSH_CODE == POST_DEC. */
dest_addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
gen_int_mode (-(HOST_WIDE_INT) rounded_size,
@@ -4168,7 +4164,7 @@ emit_push_insn (rtx x, machine_mode mode, tree type, rtx size,
{
rtx xinner;
enum direction stack_direction
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
= downward;
#else
= upward;
diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index 47430b0..4750714 100644
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -3854,14 +3854,6 @@ coalesced_pseudo_reg_freq_compare (const void *v1p, const void *v2p)
It is used for sorting pseudo registers. */
static unsigned int *regno_max_ref_width;
-/* Redefine STACK_GROWS_DOWNWARD in terms of 0 or 1. */
-#ifdef STACK_GROWS_DOWNWARD
-# undef STACK_GROWS_DOWNWARD
-# define STACK_GROWS_DOWNWARD 1
-#else
-# define STACK_GROWS_DOWNWARD 0
-#endif
-
/* Sort pseudos according their slot numbers (putting ones with
smaller numbers first, or last when the frame pointer is not
needed). */
diff --git a/gcc/lower-subreg.c b/gcc/lower-subreg.c
index 3535a07..6d2ba29 100644
--- a/gcc/lower-subreg.c
+++ b/gcc/lower-subreg.c
@@ -68,13 +68,6 @@ along with GCC; see the file COPYING3. If not see
#include "lower-subreg.h"
#include "rtl-iter.h"
-#ifdef STACK_GROWS_DOWNWARD
-# undef STACK_GROWS_DOWNWARD
-# define STACK_GROWS_DOWNWARD 1
-#else
-# define STACK_GROWS_DOWNWARD 0
-#endif
-
/* Decompose multi-word pseudo-registers into individual
pseudo-registers when possible and profitable. This is possible
diff --git a/gcc/lra-spills.c b/gcc/lra-spills.c
index ed678d5..19ece20 100644
--- a/gcc/lra-spills.c
+++ b/gcc/lra-spills.c
@@ -230,14 +230,6 @@ regno_freq_compare (const void *v1p, const void *v2p)
return regno1 - regno2;
}
-/* Redefine STACK_GROWS_DOWNWARD in terms of 0 or 1. */
-#ifdef STACK_GROWS_DOWNWARD
-# undef STACK_GROWS_DOWNWARD
-# define STACK_GROWS_DOWNWARD 1
-#else
-# define STACK_GROWS_DOWNWARD 0
-#endif
-
/* Sort pseudos according to their slots, putting the slots in the order
that they should be allocated. Slots with lower numbers have the highest
priority and should get the smallest displacement from the stack or
diff --git a/gcc/recog.c b/gcc/recog.c
index b251299..4a7aa67 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -69,7 +69,7 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#ifndef STACK_PUSH_CODE
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
#define STACK_PUSH_CODE PRE_DEC
#else
#define STACK_PUSH_CODE PRE_INC
@@ -77,7 +77,7 @@ along with GCC; see the file COPYING3. If not see
#endif
#ifndef STACK_POP_CODE
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
#define STACK_POP_CODE POST_INC
#else
#define STACK_POP_CODE POST_DEC
@@ -1332,7 +1332,7 @@ push_operand (rtx op, machine_mode mode)
|| GET_CODE (XEXP (op, 1)) != PLUS
|| XEXP (XEXP (op, 1), 0) != XEXP (op, 0)
|| !CONST_INT_P (XEXP (XEXP (op, 1), 1))
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
|| INTVAL (XEXP (XEXP (op, 1), 1)) != - (int) rounded_size
#else
|| INTVAL (XEXP (XEXP (op, 1), 1)) != (int) rounded_size
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index 3a10d26..206da5a 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -4734,7 +4734,7 @@ parse_add_or_inc (struct mem_inc_info *mii, rtx_insn *insn, bool before_mem)
if (regs_equal && REGNO (SET_DEST (pat)) == STACK_POINTER_REGNUM)
{
/* Note that the sign has already been reversed for !before_mem. */
-#ifdef STACK_GROWS_DOWNWARD
+#if STACK_GROWS_DOWNWARD
return mii->inc_constant > 0;
#else
return mii->inc_constant < 0;
--
2.4.0.78.g7c6ecbf
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 1/7] always define STACK_GROWS_DOWNWARD
2015-05-21 2:11 ` [PATCH 1/7] always define STACK_GROWS_DOWNWARD tbsaunde+gcc
@ 2015-05-21 12:38 ` Jeff Law
2015-05-21 16:59 ` Joseph Myers
1 sibling, 0 replies; 16+ messages in thread
From: Jeff Law @ 2015-05-21 12:38 UTC (permalink / raw)
To: tbsaunde+gcc, gcc-patches
On 05/20/2015 08:09 PM, tbsaunde+gcc@tbsaunde.org wrote:
> From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> gcc/c-family/ChangeLog:
>
> 2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> * c-cppbuiltin.c (c_cpp_builtins): Check the value of
> STACK_GROWS_DOWNWARD rather than if it is defined.
>
> gcc/ChangeLog:
>
> 2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> * *.c: Check the value of STACK_GROWS_DOWNWARD rather than if it
> is defined.
> * config/**/*.h: Define STACK_GROWS_DOWNWARD to an integer.
> * defaults.h: Provide default for STACK_GROWS_DOWNWARD.
> ---
> gcc/ChangeLog | 7 +++++++
> gcc/builtins.c | 6 +++---
> gcc/c-family/ChangeLog | 5 +++++
> gcc/c-family/c-cppbuiltin.c | 2 +-
> gcc/calls.c | 8 --------
> gcc/combine-stack-adj.c | 8 --------
> gcc/config/alpha/alpha.h | 2 +-
> gcc/config/arc/arc.h | 2 +-
> gcc/config/avr/avr.h | 2 +-
> gcc/config/bfin/bfin.h | 2 +-
> gcc/config/c6x/c6x.h | 2 +-
> gcc/config/cr16/cr16.h | 2 +-
> gcc/config/cris/cris.h | 2 +-
> gcc/config/epiphany/epiphany.h | 2 +-
> gcc/config/h8300/h8300.h | 2 +-
> gcc/config/i386/i386.h | 2 +-
> gcc/config/iq2000/iq2000.h | 2 +-
> gcc/config/m32r/m32r.h | 2 +-
> gcc/config/mcore/mcore.h | 2 +-
> gcc/config/microblaze/microblaze.h | 2 +-
> gcc/config/mips/mips.h | 2 +-
> gcc/config/mmix/mmix.h | 2 +-
> gcc/config/mn10300/mn10300.h | 2 +-
> gcc/config/moxie/moxie.h | 2 +-
> gcc/config/nds32/nds32.h | 2 +-
> gcc/config/nios2/nios2.h | 2 +-
> gcc/config/nvptx/nvptx.h | 2 +-
> gcc/config/pdp11/pdp11.h | 2 +-
> gcc/config/rs6000/rs6000.h | 2 +-
> gcc/config/s390/s390.h | 2 +-
> gcc/config/sh/sh.h | 2 +-
> gcc/config/sparc/sparc.h | 2 +-
> gcc/config/spu/spu.h | 2 +-
> gcc/config/tilegx/tilegx.h | 2 +-
> gcc/config/tilepro/tilepro.h | 2 +-
> gcc/config/v850/v850.h | 2 +-
> gcc/config/vax/vax.h | 2 +-
> gcc/config/xtensa/xtensa.h | 2 +-
> gcc/defaults.h | 4 ++++
> gcc/dwarf2cfi.c | 4 ++--
> gcc/explow.c | 10 +++++-----
> gcc/expr.c | 20 ++++++++------------
> gcc/ira-color.c | 8 --------
> gcc/lower-subreg.c | 7 -------
> gcc/lra-spills.c | 8 --------
> gcc/recog.c | 6 +++---
> gcc/sched-deps.c | 2 +-
> 47 files changed, 71 insertions(+), 98 deletions(-)
OK. Not going to require each filename to be listed in the ChangeLog :-)
Thanks for taking care of this stuff!
Jeff
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/7] always define STACK_GROWS_DOWNWARD
2015-05-21 2:11 ` [PATCH 1/7] always define STACK_GROWS_DOWNWARD tbsaunde+gcc
2015-05-21 12:38 ` Jeff Law
@ 2015-05-21 16:59 ` Joseph Myers
1 sibling, 0 replies; 16+ messages in thread
From: Joseph Myers @ 2015-05-21 16:59 UTC (permalink / raw)
To: tbsaunde+gcc; +Cc: gcc-patches
This patch needs to update tm.texi.in and regenerate tm.texi to describe
the new semantics of STACK_GROWS_DOWNWARD.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 6/7] remove #if HAVE_conditional_move
2015-05-21 2:11 [PATCH 0/7] Some ifdef removal tbsaunde+gcc
` (2 preceding siblings ...)
2015-05-21 2:11 ` [PATCH 1/7] always define STACK_GROWS_DOWNWARD tbsaunde+gcc
@ 2015-05-21 2:11 ` tbsaunde+gcc
2015-05-21 12:31 ` Jeff Law
2015-05-21 2:11 ` [PATCH 5/7] always define HAVE_conditional_move tbsaunde+gcc
` (2 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: tbsaunde+gcc @ 2015-05-21 2:11 UTC (permalink / raw)
To: gcc-patches
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
gcc/ChangeLog:
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* *.c, *.h: DOn't check HAVE_conditional_move with the preprocessor.
---
gcc/ChangeLog | 4 ++++
gcc/combine.c | 5 ++---
gcc/expmed.c | 13 +++++--------
gcc/expr.c | 10 ++--------
gcc/optabs.c | 30 ++++++++++++------------------
gcc/optabs.h | 2 --
gcc/toplev.c | 11 ++++++-----
7 files changed, 31 insertions(+), 44 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d115f6e..c20d608 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+ * *.c, *.h: DOn't check HAVE_conditional_move with the preprocessor.
+
+2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
* genconfig.c (main): Always define HAVE_conditional_move.
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
diff --git a/gcc/combine.c b/gcc/combine.c
index 45177c8..9615c79 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -6816,9 +6816,8 @@ simplify_set (rtx x)
&& (GET_CODE (XEXP (src, 0)) == EQ || GET_CODE (XEXP (src, 0)) == NE)
&& XEXP (XEXP (src, 0), 1) == const0_rtx
&& GET_MODE (src) == GET_MODE (XEXP (XEXP (src, 0), 0))
-#if HAVE_conditional_move
- && ! can_conditionally_move_p (GET_MODE (src))
-#endif
+ && (!HAVE_conditional_move
+ || ! can_conditionally_move_p (GET_MODE (src)))
&& (num_sign_bit_copies (XEXP (XEXP (src, 0), 0),
GET_MODE (XEXP (XEXP (src, 0), 0)))
== GET_MODE_PRECISION (GET_MODE (XEXP (XEXP (src, 0), 0))))
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 589a7a3..fa13f8c 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -3797,9 +3797,8 @@ expand_sdiv_pow2 (machine_mode mode, rtx op0, HOST_WIDE_INT d)
return expand_shift (RSHIFT_EXPR, mode, temp, logd, NULL_RTX, 0);
}
-#if HAVE_conditional_move
- if (BRANCH_COST (optimize_insn_for_speed_p (), false)
- >= 2)
+ if (HAVE_conditional_move
+ && BRANCH_COST (optimize_insn_for_speed_p (), false) >= 2)
{
rtx temp2;
@@ -3821,7 +3820,6 @@ expand_sdiv_pow2 (machine_mode mode, rtx op0, HOST_WIDE_INT d)
}
end_sequence ();
}
-#endif
if (BRANCH_COST (optimize_insn_for_speed_p (),
false) >= 2)
@@ -5555,7 +5553,9 @@ emit_store_flag (rtx target, enum rtx_code code, rtx op0, rtx op1,
target_mode);
}
-#if HAVE_conditional_move
+ if (!HAVE_conditional_move)
+ return 0;
+
/* Try using a setcc instruction for ORDERED/UNORDERED, followed by a
conditional move. */
tem = emit_store_flag_1 (subtarget, first_code, op0, op1, mode, 0,
@@ -5573,9 +5573,6 @@ emit_store_flag (rtx target, enum rtx_code code, rtx op0, rtx op1,
if (tem == 0)
delete_insns_since (last);
return tem;
-#else
- return 0;
-#endif
}
/* The remaining tricks only apply to integer comparisons. */
diff --git a/gcc/expr.c b/gcc/expr.c
index efbf9fb..3605e99 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -2423,7 +2423,6 @@ get_def_for_expr (tree name, enum tree_code code)
return def_stmt;
}
-#if HAVE_conditional_move
/* Return the defining gimple statement for SSA_NAME NAME if it is an
assigment and the class of the expresion on the RHS is CLASS. Return
NULL otherwise. */
@@ -2443,7 +2442,6 @@ get_def_for_expr_class (tree name, enum tree_code_class tclass)
return def_stmt;
}
-#endif
\f
/* Determine whether the LEN bytes generated by CONSTFUN can be
@@ -7517,7 +7515,6 @@ highest_pow2_factor_for_target (const_tree target, const_tree exp)
return MAX (factor, talign);
}
\f
-#if HAVE_conditional_move
/* Convert the tree comparison code TCODE to the rtl one where the
signedness is UNSIGNEDP. */
@@ -7575,7 +7572,6 @@ convert_tree_comp_to_rtx (enum tree_code tcode, int unsignedp)
}
return code;
}
-#endif
/* Subroutine of expand_expr. Expand the two operands of a binary
expression EXP0 and EXP1 placing the results in OP0 and OP1.
@@ -8021,7 +8017,6 @@ expand_cond_expr_using_cmove (tree treeop0 ATTRIBUTE_UNUSED,
tree treeop1 ATTRIBUTE_UNUSED,
tree treeop2 ATTRIBUTE_UNUSED)
{
-#if HAVE_conditional_move
rtx insn;
rtx op00, op01, op1, op2;
enum rtx_code comparison_code;
@@ -8105,7 +8100,6 @@ expand_cond_expr_using_cmove (tree treeop0 ATTRIBUTE_UNUSED,
/* Otherwise discard the sequence and fall back to code with
branches. */
end_sequence ();
-#endif
return NULL_RTX;
}
@@ -8892,7 +8886,7 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode,
if (code == MIN_EXPR)
comparison_code = LT;
}
-#if HAVE_conditional_move
+
/* Use a conditional move if possible. */
if (can_conditionally_move_p (mode))
{
@@ -8920,7 +8914,7 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode,
branches. */
end_sequence ();
}
-#endif
+
if (target != op0)
emit_move_insn (target, op0);
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 7a79148..21150db 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -929,7 +929,6 @@ expand_subword_shift (machine_mode op1_mode, optab binoptab,
}
-#if HAVE_conditional_move
/* Try implementing expand_doubleword_shift using conditional moves.
The shift is by < BITS_PER_WORD if (CMP_CODE CMP1 CMP2) is true,
otherwise it is by >= BITS_PER_WORD. SUBWORD_OP1 and SUPERWORD_OP1
@@ -989,7 +988,6 @@ expand_doubleword_shift_condmove (machine_mode op1_mode, optab binoptab,
return true;
}
-#endif
/* Expand a doubleword shift (ashl, ashr or lshr) using word-mode shifts.
OUTOF_INPUT and INTO_INPUT are the two word-sized halves of the first
@@ -1096,20 +1094,19 @@ expand_doubleword_shift (machine_mode op1_mode, optab binoptab,
unsignedp, methods, shift_mask);
}
-#if HAVE_conditional_move
/* Try using conditional moves to generate straight-line code. */
- {
- rtx_insn *start = get_last_insn ();
- if (expand_doubleword_shift_condmove (op1_mode, binoptab,
- cmp_code, cmp1, cmp2,
- outof_input, into_input,
- op1, superword_op1,
- outof_target, into_target,
- unsignedp, methods, shift_mask))
- return true;
- delete_insns_since (start);
- }
-#endif
+ if (HAVE_conditional_move)
+ {
+ rtx_insn *start = get_last_insn ();
+ if (expand_doubleword_shift_condmove (op1_mode, binoptab,
+ cmp_code, cmp1, cmp2,
+ outof_input, into_input,
+ op1, superword_op1,
+ outof_target, into_target,
+ unsignedp, methods, shift_mask))
+ return true;
+ delete_insns_since (start);
+ }
/* As a last resort, use branches to select the correct alternative. */
rtx_code_label *subword_label = gen_label_rtx ();
@@ -4518,7 +4515,6 @@ emit_indirect_jump (rtx loc ATTRIBUTE_UNUSED)
#endif
}
\f
-#if HAVE_conditional_move
/* Emit a conditional move instruction if the machine supports one for that
condition and machine mode.
@@ -4636,8 +4632,6 @@ can_conditionally_move_p (machine_mode mode)
return 0;
}
-#endif /* HAVE_conditional_move */
-
/* Emit a conditional addition instruction if the machine supports one for that
condition and machine mode.
diff --git a/gcc/optabs.h b/gcc/optabs.h
index ff45eb8..8bff2f9 100644
--- a/gcc/optabs.h
+++ b/gcc/optabs.h
@@ -364,7 +364,6 @@ extern void emit_indirect_jump (rtx);
#error "insn-config.h must be included before optabs.h"
#endif
-#if HAVE_conditional_move
/* Emit a conditional move operation. */
rtx emit_conditional_move (rtx, enum rtx_code, rtx, rtx, machine_mode,
rtx, rtx, machine_mode, int);
@@ -372,7 +371,6 @@ rtx emit_conditional_move (rtx, enum rtx_code, rtx, rtx, machine_mode,
/* Return nonzero if the conditional move is supported. */
int can_conditionally_move_p (machine_mode mode);
-#endif
rtx emit_conditional_add (rtx, enum rtx_code, rtx, rtx, machine_mode,
rtx, rtx, machine_mode, int);
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 9be15d7..18a725a 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1576,11 +1576,12 @@ process_options (void)
warning (0, "var-tracking-assignments changes selective scheduling");
if (flag_tree_cselim == AUTODETECT_VALUE)
-#if HAVE_conditional_move
- flag_tree_cselim = 1;
-#else
- flag_tree_cselim = 0;
-#endif
+ {
+ if (HAVE_conditional_move)
+ flag_tree_cselim = 1;
+ else
+ flag_tree_cselim = 0;
+ }
/* If auxiliary info generation is desired, open the output file.
This goes in the same directory as the source file--unlike
--
2.4.0.78.g7c6ecbf
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 6/7] remove #if HAVE_conditional_move
2015-05-21 2:11 ` [PATCH 6/7] remove #if HAVE_conditional_move tbsaunde+gcc
@ 2015-05-21 12:31 ` Jeff Law
0 siblings, 0 replies; 16+ messages in thread
From: Jeff Law @ 2015-05-21 12:31 UTC (permalink / raw)
To: tbsaunde+gcc, gcc-patches
On 05/20/2015 08:09 PM, tbsaunde+gcc@tbsaunde.org wrote:
> From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> gcc/ChangeLog:
>
> 2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> * *.c, *.h: DOn't check HAVE_conditional_move with the preprocessor.
You know what I'm going to say here :-) FWIW, I think just mentioning
the filename is fine for these kinds of mechanical changes -- no need to
list each function that got twiddled.
OK for the trunk.
Jeff
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 5/7] always define HAVE_conditional_move
2015-05-21 2:11 [PATCH 0/7] Some ifdef removal tbsaunde+gcc
` (3 preceding siblings ...)
2015-05-21 2:11 ` [PATCH 6/7] remove #if HAVE_conditional_move tbsaunde+gcc
@ 2015-05-21 2:11 ` tbsaunde+gcc
2015-05-21 12:29 ` Jeff Law
2015-05-21 5:13 ` [PATCH 7/7] always define HAVE_peephole tbsaunde+gcc
2015-05-21 5:35 ` [PATCH 4/7] don't compare ARG_FRAME_POINTER_REGNUM and FRAME_POINTER_REGNUM with the preprocessor tbsaunde+gcc
6 siblings, 1 reply; 16+ messages in thread
From: tbsaunde+gcc @ 2015-05-21 2:11 UTC (permalink / raw)
To: gcc-patches
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
gcc/ChangeLog:
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* genconfig.c (main): Always define HAVE_conditional_move.
* *.c: Don't check if HAVE_conditional_move is defined.
---
gcc/ChangeLog | 4 ++++
gcc/combine.c | 2 +-
gcc/expmed.c | 4 ++--
gcc/expr.c | 8 ++++----
gcc/genconfig.c | 2 ++
gcc/ifcvt.c | 11 -----------
gcc/optabs.c | 6 +++---
gcc/optabs.h | 2 +-
gcc/toplev.c | 2 +-
gcc/tree-ssa-phiopt.c | 4 ----
10 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 21ff1b8..d115f6e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+ * genconfig.c (main): Always define HAVE_conditional_move.
+
+2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
* *.c: Remove comparison of ARG_FRAME_POINTER_REGNUM and
FRAME_POINTER_REGNUM with the preprocessor.
diff --git a/gcc/combine.c b/gcc/combine.c
index 812b917..45177c8 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -6816,7 +6816,7 @@ simplify_set (rtx x)
&& (GET_CODE (XEXP (src, 0)) == EQ || GET_CODE (XEXP (src, 0)) == NE)
&& XEXP (XEXP (src, 0), 1) == const0_rtx
&& GET_MODE (src) == GET_MODE (XEXP (XEXP (src, 0), 0))
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
&& ! can_conditionally_move_p (GET_MODE (src))
#endif
&& (num_sign_bit_copies (XEXP (XEXP (src, 0), 0),
diff --git a/gcc/expmed.c b/gcc/expmed.c
index c95299c..589a7a3 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -3797,7 +3797,7 @@ expand_sdiv_pow2 (machine_mode mode, rtx op0, HOST_WIDE_INT d)
return expand_shift (RSHIFT_EXPR, mode, temp, logd, NULL_RTX, 0);
}
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
if (BRANCH_COST (optimize_insn_for_speed_p (), false)
>= 2)
{
@@ -5555,7 +5555,7 @@ emit_store_flag (rtx target, enum rtx_code code, rtx op0, rtx op1,
target_mode);
}
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
/* Try using a setcc instruction for ORDERED/UNORDERED, followed by a
conditional move. */
tem = emit_store_flag_1 (subtarget, first_code, op0, op1, mode, 0,
diff --git a/gcc/expr.c b/gcc/expr.c
index 275c636..efbf9fb 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -2423,7 +2423,7 @@ get_def_for_expr (tree name, enum tree_code code)
return def_stmt;
}
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
/* Return the defining gimple statement for SSA_NAME NAME if it is an
assigment and the class of the expresion on the RHS is CLASS. Return
NULL otherwise. */
@@ -7517,7 +7517,7 @@ highest_pow2_factor_for_target (const_tree target, const_tree exp)
return MAX (factor, talign);
}
\f
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
/* Convert the tree comparison code TCODE to the rtl one where the
signedness is UNSIGNEDP. */
@@ -8021,7 +8021,7 @@ expand_cond_expr_using_cmove (tree treeop0 ATTRIBUTE_UNUSED,
tree treeop1 ATTRIBUTE_UNUSED,
tree treeop2 ATTRIBUTE_UNUSED)
{
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
rtx insn;
rtx op00, op01, op1, op2;
enum rtx_code comparison_code;
@@ -8892,7 +8892,7 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode,
if (code == MIN_EXPR)
comparison_code = LT;
}
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
/* Use a conditional move if possible. */
if (can_conditionally_move_p (mode))
{
diff --git a/gcc/genconfig.c b/gcc/genconfig.c
index 2247eef..a3e5b31 100644
--- a/gcc/genconfig.c
+++ b/gcc/genconfig.c
@@ -352,6 +352,8 @@ main (int argc, char **argv)
if (have_cmove_flag)
printf ("#define HAVE_conditional_move 1\n");
+ else
+ printf ("#define HAVE_conditional_move 0\n");
if (have_cond_exec_flag)
printf ("#define HAVE_conditional_execution 1\n");
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index b00aaa4..37117b7 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -72,9 +72,6 @@
#include "shrink-wrap.h"
#include "ifcvt.h"
-#ifndef HAVE_conditional_move
-#define HAVE_conditional_move 0
-#endif
#ifndef HAVE_incscc
#define HAVE_incscc 0
#endif
@@ -1505,7 +1502,6 @@ noce_emit_cmove (struct noce_if_info *if_info, rtx x, enum rtx_code code,
return NULL_RTX;
}
-#if HAVE_conditional_move
unsignedp = (code == LTU || code == GEU
|| code == LEU || code == GTU);
@@ -1562,13 +1558,6 @@ noce_emit_cmove (struct noce_if_info *if_info, rtx x, enum rtx_code code,
}
else
return NULL_RTX;
-#else
- /* We'll never get here, as noce_process_if_block doesn't call the
- functions involved. Ifdef code, however, should be discouraged
- because it leads to typos in the code not selected. However,
- emit_conditional_move won't exist either. */
- return NULL_RTX;
-#endif
}
/* Try only simple constants and registers here. More complex cases
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 26dbe87..7a79148 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -929,7 +929,7 @@ expand_subword_shift (machine_mode op1_mode, optab binoptab,
}
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
/* Try implementing expand_doubleword_shift using conditional moves.
The shift is by < BITS_PER_WORD if (CMP_CODE CMP1 CMP2) is true,
otherwise it is by >= BITS_PER_WORD. SUBWORD_OP1 and SUPERWORD_OP1
@@ -1096,7 +1096,7 @@ expand_doubleword_shift (machine_mode op1_mode, optab binoptab,
unsignedp, methods, shift_mask);
}
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
/* Try using conditional moves to generate straight-line code. */
{
rtx_insn *start = get_last_insn ();
@@ -4518,7 +4518,7 @@ emit_indirect_jump (rtx loc ATTRIBUTE_UNUSED)
#endif
}
\f
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
/* Emit a conditional move instruction if the machine supports one for that
condition and machine mode.
diff --git a/gcc/optabs.h b/gcc/optabs.h
index 5c30ce5..ff45eb8 100644
--- a/gcc/optabs.h
+++ b/gcc/optabs.h
@@ -364,7 +364,7 @@ extern void emit_indirect_jump (rtx);
#error "insn-config.h must be included before optabs.h"
#endif
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
/* Emit a conditional move operation. */
rtx emit_conditional_move (rtx, enum rtx_code, rtx, rtx, machine_mode,
rtx, rtx, machine_mode, int);
diff --git a/gcc/toplev.c b/gcc/toplev.c
index c73368f..9be15d7 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1576,7 +1576,7 @@ process_options (void)
warning (0, "var-tracking-assignments changes selective scheduling");
if (flag_tree_cselim == AUTODETECT_VALUE)
-#ifdef HAVE_conditional_move
+#if HAVE_conditional_move
flag_tree_cselim = 1;
#else
flag_tree_cselim = 0;
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index 09d6f67..b8c77ab 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -83,10 +83,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-scalar-evolution.h"
#include "tree-inline.h"
-#ifndef HAVE_conditional_move
-#define HAVE_conditional_move (0)
-#endif
-
static unsigned int tree_ssa_phiopt_worker (bool, bool);
static bool conditional_replacement (basic_block, basic_block,
edge, edge, gphi *, tree, tree);
--
2.4.0.78.g7c6ecbf
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 5/7] always define HAVE_conditional_move
2015-05-21 2:11 ` [PATCH 5/7] always define HAVE_conditional_move tbsaunde+gcc
@ 2015-05-21 12:29 ` Jeff Law
0 siblings, 0 replies; 16+ messages in thread
From: Jeff Law @ 2015-05-21 12:29 UTC (permalink / raw)
To: tbsaunde+gcc, gcc-patches
On 05/20/2015 08:09 PM, tbsaunde+gcc@tbsaunde.org wrote:
> From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> gcc/ChangeLog:
>
> 2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> * genconfig.c (main): Always define HAVE_conditional_move.
> * *.c: Don't check if HAVE_conditional_move is defined.
Again, you're hitting just a handful of files, if you could go ahead and
list them it'd be appreciated.
OK for the trunk.
jeff
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 7/7] always define HAVE_peephole
2015-05-21 2:11 [PATCH 0/7] Some ifdef removal tbsaunde+gcc
` (4 preceding siblings ...)
2015-05-21 2:11 ` [PATCH 5/7] always define HAVE_conditional_move tbsaunde+gcc
@ 2015-05-21 5:13 ` tbsaunde+gcc
2015-05-21 6:17 ` Jeff Law
2015-05-21 5:35 ` [PATCH 4/7] don't compare ARG_FRAME_POINTER_REGNUM and FRAME_POINTER_REGNUM with the preprocessor tbsaunde+gcc
6 siblings, 1 reply; 16+ messages in thread
From: tbsaunde+gcc @ 2015-05-21 5:13 UTC (permalink / raw)
To: gcc-patches
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
gcc/ChangeLog:
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* final.c (final_scan_insn): Don't check HAVE_peephole with the
preprocessor.
* output.h: Likewise.
* genconfig.c (main): Alwways define HAVE_peephole.
* genpeep.c: Don't emit checks of HAVE_peephole.
---
gcc/ChangeLog | 8 ++++++++
gcc/final.c | 4 +---
gcc/genconfig.c | 2 ++
gcc/genpeep.c | 2 --
gcc/output.h | 2 --
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c20d608..f41c46e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+ * final.c (final_scan_insn): Don't check HAVE_peephole with the
+ preprocessor.
+ * output.h: Likewise.
+ * genconfig.c (main): Alwways define HAVE_peephole.
+ * genpeep.c: Don't emit checks of HAVE_peephole.
+
+2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
* *.c, *.h: DOn't check HAVE_conditional_move with the preprocessor.
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
diff --git a/gcc/final.c b/gcc/final.c
index f0585ca..c8f059b 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -2905,10 +2905,9 @@ final_scan_insn (rtx_insn *insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED,
#endif
-#ifdef HAVE_peephole
/* Do machine-specific peephole optimizations if desired. */
- if (optimize_p && !flag_no_peephole && !nopeepholes)
+ if (HAVE_peephole && optimize_p && !flag_no_peephole && !nopeepholes)
{
rtx_insn *next = peephole (insn);
/* When peepholing, if there were notes within the peephole,
@@ -2937,7 +2936,6 @@ final_scan_insn (rtx_insn *insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED,
/* PEEPHOLE might have changed this. */
body = PATTERN (insn);
}
-#endif
/* Try to recognize the instruction.
If successful, verify that the operands satisfy the
diff --git a/gcc/genconfig.c b/gcc/genconfig.c
index a3e5b31..7237dede 100644
--- a/gcc/genconfig.c
+++ b/gcc/genconfig.c
@@ -369,6 +369,8 @@ main (int argc, char **argv)
if (have_peephole_flag)
printf ("#define HAVE_peephole 1\n");
+ else
+ printf ("#define HAVE_peephole 0\n");
if (have_peephole2_flag)
{
diff --git a/gcc/genpeep.c b/gcc/genpeep.c
index 3ba930c..b914e85 100644
--- a/gcc/genpeep.c
+++ b/gcc/genpeep.c
@@ -389,7 +389,6 @@ from the machine description file `md'. */\n\n");
printf ("#include \"flags.h\"\n");
printf ("#include \"tm-constrs.h\"\n\n");
- printf ("#ifdef HAVE_peephole\n");
printf ("extern rtx peep_operand[];\n\n");
printf ("#define operands peep_operand\n\n");
@@ -423,7 +422,6 @@ from the machine description file `md'. */\n\n");
max_opno = 1;
printf ("rtx peep_operand[%d];\n", max_opno + 1);
- printf ("#endif\n");
fflush (stdout);
return (ferror (stdout) != 0 ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE);
diff --git a/gcc/output.h b/gcc/output.h
index 81d2ad2..4ce6eea 100644
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -289,9 +289,7 @@ extern void assemble_addr_to_section (rtx, section *);
/* Return the size of the constant pool. */
extern int get_pool_size (void);
-#ifdef HAVE_peephole
extern rtx_insn *peephole (rtx_insn *);
-#endif
extern void output_shared_constant_pool (void);
--
2.4.0.78.g7c6ecbf
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 7/7] always define HAVE_peephole
2015-05-21 5:13 ` [PATCH 7/7] always define HAVE_peephole tbsaunde+gcc
@ 2015-05-21 6:17 ` Jeff Law
0 siblings, 0 replies; 16+ messages in thread
From: Jeff Law @ 2015-05-21 6:17 UTC (permalink / raw)
To: tbsaunde+gcc, gcc-patches
On 05/20/2015 08:09 PM, tbsaunde+gcc@tbsaunde.org wrote:
> From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> gcc/ChangeLog:
>
> 2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> * final.c (final_scan_insn): Don't check HAVE_peephole with the
> preprocessor.
> * output.h: Likewise.
> * genconfig.c (main): Alwways define HAVE_peephole.
> * genpeep.c: Don't emit checks of HAVE_peephole.
OK.
jeff
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 4/7] don't compare ARG_FRAME_POINTER_REGNUM and FRAME_POINTER_REGNUM with the preprocessor
2015-05-21 2:11 [PATCH 0/7] Some ifdef removal tbsaunde+gcc
` (5 preceding siblings ...)
2015-05-21 5:13 ` [PATCH 7/7] always define HAVE_peephole tbsaunde+gcc
@ 2015-05-21 5:35 ` tbsaunde+gcc
2015-05-21 12:28 ` Jeff Law
6 siblings, 1 reply; 16+ messages in thread
From: tbsaunde+gcc @ 2015-05-21 5:35 UTC (permalink / raw)
To: gcc-patches
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
gcc/ChangeLog:
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* *.c: Remove comparison of ARG_FRAME_POINTER_REGNUM and
FRAME_POINTER_REGNUM with the preprocessor.
---
gcc/ChangeLog | 5 +++++
gcc/combine.c | 18 +++++++-----------
gcc/df-problems.c | 5 ++---
gcc/df-scan.c | 19 +++++++------------
gcc/emit-rtl.c | 5 +++--
gcc/reginfo.c | 5 ++---
gcc/reload.c | 5 ++---
gcc/rtlanal.c | 5 ++---
8 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2d51c33..21ff1b8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+ * *.c: Remove comparison of ARG_FRAME_POINTER_REGNUM and
+ FRAME_POINTER_REGNUM with the preprocessor.
+
+2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
* defaults.h: Add default for STACK_PUSH_CODE.
* expr.c: Don't redefine STACK_PUSH_CODE.
* recog.c: Likewise.
diff --git a/gcc/combine.c b/gcc/combine.c
index a90849e..812b917 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -1028,10 +1028,8 @@ can_combine_def_p (df_ref def)
|| (regno == HARD_FRAME_POINTER_REGNUM
&& (!reload_completed || frame_pointer_needed))
#endif
-#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
- || (regno == ARG_POINTER_REGNUM && fixed_regs[regno])
-#endif
- )
+ || (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
+ && regno == ARG_POINTER_REGNUM && fixed_regs[regno]))
return false;
return true;
@@ -2247,10 +2245,9 @@ combinable_i3pat (rtx_insn *i3, rtx *loc, rtx i2dest, rtx i1dest, rtx i0dest,
#if !HARD_FRAME_POINTER_IS_FRAME_POINTER
&& REGNO (subdest) != HARD_FRAME_POINTER_REGNUM
#endif
-#if ARG_POINTER_REGNUM != FRAME_POINTER_REGNUM
- && (REGNO (subdest) != ARG_POINTER_REGNUM
- || ! fixed_regs [REGNO (subdest)])
-#endif
+ && (FRAME_POINTER_REGNUM == ARG_POINTER_REGNUM
+ || (REGNO (subdest) != ARG_POINTER_REGNUM
+ || ! fixed_regs [REGNO (subdest)]))
&& REGNO (subdest) != STACK_POINTER_REGNUM)
{
if (*pi3dest_killed)
@@ -13338,9 +13335,8 @@ mark_used_regs_combine (rtx x)
#if !HARD_FRAME_POINTER_IS_FRAME_POINTER
|| regno == HARD_FRAME_POINTER_REGNUM
#endif
-#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
- || (regno == ARG_POINTER_REGNUM && fixed_regs[regno])
-#endif
+ || (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
+ && regno == ARG_POINTER_REGNUM && fixed_regs[regno])
|| regno == FRAME_POINTER_REGNUM)
return;
diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index 25cfe08..ff08abd 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -933,12 +933,11 @@ df_lr_local_compute (bitmap all_blocks ATTRIBUTE_UNUSED)
reference of the frame pointer. */
bitmap_set_bit (&df->hardware_regs_used, FRAME_POINTER_REGNUM);
-#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
/* Pseudos with argument area equivalences may require
reloading via the argument pointer. */
- if (fixed_regs[ARG_POINTER_REGNUM])
+ if (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
+ && fixed_regs[ARG_POINTER_REGNUM])
bitmap_set_bit (&df->hardware_regs_used, ARG_POINTER_REGNUM);
-#endif
/* Any constant, or pseudo with constant equivalences, may
require reloading from memory using the pic register. */
diff --git a/gcc/df-scan.c b/gcc/df-scan.c
index c831730..389ce1c 100644
--- a/gcc/df-scan.c
+++ b/gcc/df-scan.c
@@ -3446,12 +3446,11 @@ df_get_regular_block_artificial_uses (bitmap regular_block_artificial_uses)
bitmap_set_bit (regular_block_artificial_uses,
HARD_FRAME_POINTER_REGNUM);
-#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
/* Pseudos with argument area equivalences may require
reloading via the argument pointer. */
- if (fixed_regs[ARG_POINTER_REGNUM])
+ if (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
+ && fixed_regs[ARG_POINTER_REGNUM])
bitmap_set_bit (regular_block_artificial_uses, ARG_POINTER_REGNUM);
-#endif
/* Any constant, or pseudo with constant equivalences, may
require reloading from memory using the pic register. */
@@ -3498,10 +3497,9 @@ df_get_eh_block_artificial_uses (bitmap eh_block_artificial_uses)
bitmap_set_bit (eh_block_artificial_uses,
HARD_FRAME_POINTER_REGNUM);
}
-#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
- if (fixed_regs[ARG_POINTER_REGNUM])
+ if (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
+ && fixed_regs[ARG_POINTER_REGNUM])
bitmap_set_bit (eh_block_artificial_uses, ARG_POINTER_REGNUM);
-#endif
}
}
@@ -3579,12 +3577,11 @@ df_get_entry_block_def_set (bitmap entry_block_defs)
/* These registers are live everywhere. */
if (!reload_completed)
{
-#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
/* Pseudos with argument area equivalences may require
reloading via the argument pointer. */
- if (fixed_regs[ARG_POINTER_REGNUM])
+ if (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
+ && fixed_regs[ARG_POINTER_REGNUM])
bitmap_set_bit (entry_block_defs, ARG_POINTER_REGNUM);
-#endif
/* Any constant, or pseudo with constant equivalences, may
require reloading from memory using the pic register. */
@@ -3781,16 +3778,14 @@ df_exit_block_uses_collect (struct df_collection_rec *collection_rec, bitmap exi
df_ref_record (DF_REF_ARTIFICIAL, collection_rec, regno_reg_rtx[i], NULL,
EXIT_BLOCK_PTR_FOR_FN (cfun), NULL, DF_REF_REG_USE, 0);
-#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
/* It is deliberate that this is not put in the exit block uses but
I do not know why. */
- if (reload_completed
+ if (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM && reload_completed
&& !bitmap_bit_p (exit_block_uses, ARG_POINTER_REGNUM)
&& bb_has_eh_pred (EXIT_BLOCK_PTR_FOR_FN (cfun))
&& fixed_regs[ARG_POINTER_REGNUM])
df_ref_record (DF_REF_ARTIFICIAL, collection_rec, regno_reg_rtx[ARG_POINTER_REGNUM], NULL,
EXIT_BLOCK_PTR_FOR_FN (cfun), NULL, DF_REF_REG_USE, 0);
-#endif
df_canonize_collection_rec (collection_rec);
}
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 8270ce9..360f37d 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -739,8 +739,9 @@ gen_rtx_REG (machine_mode mode, unsigned int regno)
&& regno == HARD_FRAME_POINTER_REGNUM
&& (!reload_completed || frame_pointer_needed))
return hard_frame_pointer_rtx;
-#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM && !HARD_FRAME_POINTER_IS_ARG_POINTER
- if (regno == ARG_POINTER_REGNUM)
+#if !HARD_FRAME_POINTER_IS_ARG_POINTER
+ if (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
+ && regno == ARG_POINTER_REGNUM)
return arg_pointer_rtx;
#endif
#ifdef RETURN_ADDRESS_POINTER_REGNUM
diff --git a/gcc/reginfo.c b/gcc/reginfo.c
index bc2f8de..e26520b 100644
--- a/gcc/reginfo.c
+++ b/gcc/reginfo.c
@@ -464,10 +464,9 @@ init_reg_sets_1 (void)
else if (!HARD_FRAME_POINTER_IS_FRAME_POINTER
&& i == HARD_FRAME_POINTER_REGNUM)
;
-#if ARG_POINTER_REGNUM != FRAME_POINTER_REGNUM
- else if (i == ARG_POINTER_REGNUM && fixed_regs[i])
+ else if (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
+ && i == ARG_POINTER_REGNUM && fixed_regs[i])
;
-#endif
else if (!PIC_OFFSET_TABLE_REG_CALL_CLOBBERED
&& i == (unsigned) PIC_OFFSET_TABLE_REGNUM && fixed_regs[i])
;
diff --git a/gcc/reload.c b/gcc/reload.c
index f2482fc..fe2ffe6 100644
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -5184,9 +5184,8 @@ find_reloads_address (machine_mode mode, rtx *memrefloc, rtx ad,
#if !HARD_FRAME_POINTER_IS_FRAME_POINTER
|| operand == hard_frame_pointer_rtx
#endif
-#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
- || operand == arg_pointer_rtx
-#endif
+ || (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
+ && operand == arg_pointer_rtx)
|| operand == stack_pointer_rtx)
&& ! maybe_memory_address_addr_space_p
(mode, ad, as, &XEXP (XEXP (ad, 0), 1 - op_index)))
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 377b31f..fce93ab 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -1445,9 +1445,8 @@ refers_to_regno_p (unsigned int regno, unsigned int endregno, const_rtx x,
clobber a virtual register. In fact, we could be more precise,
but it isn't worth it. */
if ((x_regno == STACK_POINTER_REGNUM
-#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
- || x_regno == ARG_POINTER_REGNUM
-#endif
+ || (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
+ && x_regno == ARG_POINTER_REGNUM)
|| x_regno == FRAME_POINTER_REGNUM)
&& regno >= FIRST_VIRTUAL_REGISTER && regno <= LAST_VIRTUAL_REGISTER)
return true;
--
2.4.0.78.g7c6ecbf
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 4/7] don't compare ARG_FRAME_POINTER_REGNUM and FRAME_POINTER_REGNUM with the preprocessor
2015-05-21 5:35 ` [PATCH 4/7] don't compare ARG_FRAME_POINTER_REGNUM and FRAME_POINTER_REGNUM with the preprocessor tbsaunde+gcc
@ 2015-05-21 12:28 ` Jeff Law
0 siblings, 0 replies; 16+ messages in thread
From: Jeff Law @ 2015-05-21 12:28 UTC (permalink / raw)
To: tbsaunde+gcc, gcc-patches
On 05/20/2015 08:09 PM, tbsaunde+gcc@tbsaunde.org wrote:
> From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> gcc/ChangeLog:
>
> 2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
>
> * *.c: Remove comparison of ARG_FRAME_POINTER_REGNUM and
> FRAME_POINTER_REGNUM with the preprocessor.
This only hits a handful of files. If you could go ahead and list them
in the ChangeLog that'd probably be better than *.c :-)
> @@ -3781,16 +3778,14 @@ df_exit_block_uses_collect (struct df_collection_rec *collection_rec, bitmap exi
> df_ref_record (DF_REF_ARTIFICIAL, collection_rec, regno_reg_rtx[i], NULL,
> EXIT_BLOCK_PTR_FOR_FN (cfun), NULL, DF_REF_REG_USE, 0);
>
> -#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
> /* It is deliberate that this is not put in the exit block uses but
> I do not know why. */
> - if (reload_completed
> + if (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM && reload_completed
Minor nit, go ahead and put the && reload_completed on the next line.
While it fits in 80 columns, ISTM like it more naturally (in GNU style)
belongs on its own line. Interestingly enough this is the only instance
where you formatted this way -- all the others have the FP/AP comparison
on on its own line.
OK for the trunk.
jeff
^ permalink raw reply [flat|nested] 16+ messages in thread