From 5bd5034e244983cb1d6655a759efafcd5b6287aa Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Mon, 2 Apr 2012 12:04:10 +0200 Subject: [PATCH] Partially revert: 2012-03-29 Richard Guenther * rtl.h (extended_count): Remove. * combine.c (extended_count): Remove. From-SVN: r186077 --- gcc/ChangeLog | 8 ++++++++ gcc/combine.c | 25 +++++++++++++++++++++++++ gcc/rtl.h | 1 + 3 files changed, 34 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ea1bd80..e5abe45 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2012-04-02 Uros Bizjak + + Partially revert: + 2012-03-29 Richard Guenther + + * rtl.h (extended_count): Remove. + * combine.c (extended_count): Remove. + 2012-04-02 Dodji Seketeli PR c++/40942 diff --git a/gcc/combine.c b/gcc/combine.c index de3afcc..7eaaf47 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -9674,6 +9674,31 @@ reg_num_sign_bit_copies_for_combine (const_rtx x, enum machine_mode mode, return NULL; } +/* Return the number of "extended" bits there are in X, when interpreted + as a quantity in MODE whose signedness is indicated by UNSIGNEDP. For + unsigned quantities, this is the number of high-order zero bits. + For signed quantities, this is the number of copies of the sign bit + minus 1. In both case, this function returns the number of "spare" + bits. For example, if two quantities for which this function returns + at least 1 are added, the addition is known not to overflow. + + This function will always return 0 unless called during combine, which + implies that it must be called from a define_split. */ + +unsigned int +extended_count (const_rtx x, enum machine_mode mode, int unsignedp) +{ + if (nonzero_sign_valid == 0) + return 0; + + return (unsignedp + ? (HWI_COMPUTABLE_MODE_P (mode) + ? (unsigned int) (GET_MODE_PRECISION (mode) - 1 + - floor_log2 (nonzero_bits (x, mode))) + : 0) + : num_sign_bit_copies (x, mode) - 1); +} + /* This function is called from `simplify_shift_const' to merge two outer operations. Specifically, we have already found that we need to perform operation *POP0 with constant *PCONST0 at the outermost diff --git a/gcc/rtl.h b/gcc/rtl.h index bfb0cf9..30931b7 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -2455,6 +2455,7 @@ extern bool validate_subreg (enum machine_mode, enum machine_mode, const_rtx, unsigned int); /* In combine.c */ +extern unsigned int extended_count (const_rtx, enum machine_mode, int); extern rtx remove_death (unsigned int, rtx); extern void dump_combine_stats (FILE *); extern void dump_combine_total_stats (FILE *); -- 2.7.4