From 6090e016ea54d1aab91e50e9a7c5014ed3422740 Mon Sep 17 00:00:00 2001 From: jakub Date: Thu, 14 Sep 2017 08:05:42 +0000 Subject: * combine.c (make_compound_operation_int): Formatting fixes. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@252751 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 2 ++ gcc/combine.c | 49 ++++++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5a6a211982d..7d827291278 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,7 @@ 2017-09-14 Jakub Jelinek + * combine.c (make_compound_operation_int): Formatting fixes. + * config/alpha/elf.h (LINK_EH_SPEC): Add -static-pie support. * config/alpha/linux.h (LINK_GCC_C_SEQUENCE_SPEC): Likewise. * config/netbsd.h (LINK_EH_SPEC): Likewise. diff --git a/gcc/combine.c b/gcc/combine.c index 84ce8736107..1832c3cb2bc 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -7976,8 +7976,8 @@ make_compound_operation_int (scalar_int_mode mode, rtx *x_ptr, && (i = exact_log2 (UINTVAL (XEXP (x, 1)) + 1)) >= 0) { new_rtx = make_compound_operation (XEXP (XEXP (x, 0), 0), next_code); - new_rtx = make_extraction (mode, new_rtx, 0, XEXP (XEXP (x, 0), 1), i, 1, - 0, in_code == COMPARE); + new_rtx = make_extraction (mode, new_rtx, 0, XEXP (XEXP (x, 0), 1), + i, 1, 0, in_code == COMPARE); } /* Same as previous, but for (subreg (lshiftrt ...)) in first op. */ @@ -8016,10 +8016,10 @@ make_compound_operation_int (scalar_int_mode mode, rtx *x_ptr, { /* Apply the distributive law, and then try to make extractions. */ new_rtx = gen_rtx_fmt_ee (GET_CODE (XEXP (x, 0)), mode, - gen_rtx_AND (mode, XEXP (XEXP (x, 0), 0), - XEXP (x, 1)), - gen_rtx_AND (mode, XEXP (XEXP (x, 0), 1), - XEXP (x, 1))); + gen_rtx_AND (mode, XEXP (XEXP (x, 0), 0), + XEXP (x, 1)), + gen_rtx_AND (mode, XEXP (XEXP (x, 0), 1), + XEXP (x, 1))); new_rtx = make_compound_operation (new_rtx, in_code); } @@ -8033,9 +8033,9 @@ make_compound_operation_int (scalar_int_mode mode, rtx *x_ptr, { new_rtx = make_compound_operation (XEXP (XEXP (x, 0), 0), next_code); new_rtx = make_extraction (mode, new_rtx, - (GET_MODE_PRECISION (mode) - - INTVAL (XEXP (XEXP (x, 0), 1))), - NULL_RTX, i, 1, 0, in_code == COMPARE); + (GET_MODE_PRECISION (mode) + - INTVAL (XEXP (XEXP (x, 0), 1))), + NULL_RTX, i, 1, 0, in_code == COMPARE); } /* On machines without logical shifts, if the operand of the AND is @@ -8055,8 +8055,10 @@ make_compound_operation_int (scalar_int_mode mode, rtx *x_ptr, if ((INTVAL (XEXP (x, 1)) & ~mask) == 0) SUBST (XEXP (x, 0), gen_rtx_ASHIFTRT (mode, - make_compound_operation - (XEXP (XEXP (x, 0), 0), next_code), + make_compound_operation (XEXP (XEXP (x, + 0), + 0), + next_code), XEXP (XEXP (x, 0), 1))); } @@ -8066,9 +8068,9 @@ make_compound_operation_int (scalar_int_mode mode, rtx *x_ptr, we are in a COMPARE. */ else if ((i = exact_log2 (UINTVAL (XEXP (x, 1)) + 1)) >= 0) new_rtx = make_extraction (mode, - make_compound_operation (XEXP (x, 0), - next_code), - 0, NULL_RTX, i, 1, 0, in_code == COMPARE); + make_compound_operation (XEXP (x, 0), + next_code), + 0, NULL_RTX, i, 1, 0, in_code == COMPARE); /* If we are in a comparison and this is an AND with a power of two, convert this into the appropriate bit extract. */ @@ -8119,9 +8121,9 @@ make_compound_operation_int (scalar_int_mode mode, rtx *x_ptr, && (nonzero_bits (XEXP (x, 0), mode) & (1 << (mode_width - 1))) == 0) { new_rtx = gen_rtx_ASHIFTRT (mode, - make_compound_operation (XEXP (x, 0), - next_code), - XEXP (x, 1)); + make_compound_operation (XEXP (x, 0), + next_code), + XEXP (x, 1)); break; } @@ -8142,9 +8144,9 @@ make_compound_operation_int (scalar_int_mode mode, rtx *x_ptr, { new_rtx = make_compound_operation (XEXP (lhs, 0), next_code); new_rtx = make_extraction (mode, new_rtx, - INTVAL (rhs) - INTVAL (XEXP (lhs, 1)), - NULL_RTX, mode_width - INTVAL (rhs), - code == LSHIFTRT, 0, in_code == COMPARE); + INTVAL (rhs) - INTVAL (XEXP (lhs, 1)), + NULL_RTX, mode_width - INTVAL (rhs), + code == LSHIFTRT, 0, in_code == COMPARE); break; } @@ -8161,9 +8163,10 @@ make_compound_operation_int (scalar_int_mode mode, rtx *x_ptr, && INTVAL (rhs) < HOST_BITS_PER_WIDE_INT && INTVAL (rhs) < mode_width && (new_rtx = extract_left_shift (mode, lhs, INTVAL (rhs))) != 0) - new_rtx = make_extraction (mode, make_compound_operation (new_rtx, next_code), - 0, NULL_RTX, mode_width - INTVAL (rhs), - code == LSHIFTRT, 0, in_code == COMPARE); + new_rtx = make_extraction (mode, make_compound_operation (new_rtx, + next_code), + 0, NULL_RTX, mode_width - INTVAL (rhs), + code == LSHIFTRT, 0, in_code == COMPARE); break; -- cgit v1.2.1