Skip to content

R
riscv-gcc-1
Commit fd7de64c by Anatoly Sokolov Committed by Anatoly Sokolov
Options

double-int.h (double_int_to_shwi, [...]): Implement as static inline. 

	* double-int.h (double_int_to_shwi, double_int_to_uhwi,
	double_int_fits_in_uhwi_p): Implement as static inline.
	(double_int_xor): New inline function.
	(double_int_lrotate, double_int_rrotate, double_int_max,
	double_int_umax, double_int_smax, double_int_min, double_int_umin,
	double_int_smin): Declare.
	(lrotate_double, rrotate_double): Remove declaration.
	* double-int.c (double_int_fits_in_uhwi_p, double_int_to_shwi,
	double_int_to_uhwi, lrotate_double, rrotate_double): Remove function.
	(double_int_lrotate, double_int_rrotate, double_int_max,
	double_int_umax, double_int_smax, double_int_min, double_int_umin,
	double_int_smin): New function.
	* fold-const.c (int_const_binop): Clean up, use double_int_*
	functions.
	* simplify-rtx.c (simplify_const_binary_operation): Clean up, use
	double_int_* and immed_double_int_const functions.

From-SVN: r161002
parent bc87224e
Showing with 264 additions and 217 deletions
gcc/ChangeLog
2010-06-18 Anatoly Sokolov <aesok@post.ru>
* double-int.h (double_int_to_shwi, double_int_to_uhwi,
double_int_fits_in_uhwi_p): Implement as static inline.
(double_int_xor): New inline function.
(double_int_lrotate, double_int_rrotate, double_int_max,
double_int_umax, double_int_smax, double_int_min, double_int_umin,
double_int_smin): Declare.
(lrotate_double, rrotate_double): Remove declaration.
* double-int.c (double_int_fits_in_uhwi_p, double_int_to_shwi,
double_int_to_uhwi, lrotate_double, rrotate_double): Remove function.
(double_int_lrotate, double_int_rrotate, double_int_max,
double_int_umax, double_int_smax, double_int_min, double_int_umin,
double_int_smin): New function.
* fold-const.c (int_const_binop): Clean up, use double_int_*
functions.
* simplify-rtx.c (simplify_const_binary_operation): Clean up, use
double_int_* and immed_double_int_const functions.
2010-06-18 Nathan Froyd <froydnj@codesourcery.com> 2010-06-18 Nathan Froyd <froydnj@codesourcery.com>
* function.h (types_used_by_cur_var_decl): Change type to a VEC. * function.h (types_used_by_cur_var_decl): Change type to a VEC.
......
gcc/double-int.c
...@@ -432,51 +432,6 @@ rshift_double (unsigned HOST_WIDE_INT l1, HOST_WIDE_INT h1, ...@@ -432,51 +432,6 @@ rshift_double (unsigned HOST_WIDE_INT l1, HOST_WIDE_INT h1,
} }
} }
/* Rotate the doubleword integer in L1, H1 left by COUNT places
keeping only PREC bits of result.
Rotate right if COUNT is negative.
Store the value as two `HOST_WIDE_INT' pieces in *LV and *HV. */
void
lrotate_double (unsigned HOST_WIDE_INT l1, HOST_WIDE_INT h1,
HOST_WIDE_INT count, unsigned int prec,
unsigned HOST_WIDE_INT *lv, HOST_WIDE_INT *hv)
{
unsigned HOST_WIDE_INT s1l, s2l;
HOST_WIDE_INT s1h, s2h;
count %= prec;
if (count < 0)
count += prec;
lshift_double (l1, h1, count, prec, &s1l, &s1h, 0);
rshift_double (l1, h1, prec - count, prec, &s2l, &s2h, 0);
*lv = s1l | s2l;
*hv = s1h | s2h;
}
/* Rotate the doubleword integer in L1, H1 left by COUNT places
keeping only PREC bits of result. COUNT must be positive.
Store the value as two `HOST_WIDE_INT' pieces in *LV and *HV. */
void
rrotate_double (unsigned HOST_WIDE_INT l1, HOST_WIDE_INT h1,
HOST_WIDE_INT count, unsigned int prec,
unsigned HOST_WIDE_INT *lv, HOST_WIDE_INT *hv)
{
unsigned HOST_WIDE_INT s1l, s2l;
HOST_WIDE_INT s1h, s2h;
count %= prec;
if (count < 0)
count += prec;
rshift_double (l1, h1, count, prec, &s1l, &s1h, 0);
lshift_double (l1, h1, prec - count, prec, &s2l, &s2h, 0);
*lv = s1l | s2l;
*hv = s1h | s2h;
}
/* Divide doubleword integer LNUM, HNUM by doubleword integer LDEN, HDEN /* Divide doubleword integer LNUM, HNUM by doubleword integer LDEN, HDEN
for a quotient (stored in *LQUO, *HQUO) and remainder (in *LREM, *HREM). for a quotient (stored in *LQUO, *HQUO) and remainder (in *LREM, *HREM).
CODE is a tree code for a kind of division, one of CODE is a tree code for a kind of division, one of
...@@ -842,14 +797,6 @@ double_int_sext (double_int cst, unsigned prec) ...@@ -842,14 +797,6 @@ double_int_sext (double_int cst, unsigned prec)
return r; return r;
} }
/* Returns true if CST fits in unsigned HOST_WIDE_INT. */
bool
double_int_fits_in_uhwi_p (double_int cst)
{
return cst.high == 0;
}
/* Returns true if CST fits in signed HOST_WIDE_INT. */ /* Returns true if CST fits in signed HOST_WIDE_INT. */
bool bool
...@@ -875,24 +822,6 @@ double_int_fits_in_hwi_p (double_int cst, bool uns) ...@@ -875,24 +822,6 @@ double_int_fits_in_hwi_p (double_int cst, bool uns)
return double_int_fits_in_shwi_p (cst); return double_int_fits_in_shwi_p (cst);
} }
/* Returns value of CST as a signed number. CST must satisfy
double_int_fits_in_shwi_p. */
HOST_WIDE_INT
double_int_to_shwi (double_int cst)
{
return (HOST_WIDE_INT) cst.low;
}
/* Returns value of CST as an unsigned number. CST must satisfy
double_int_fits_in_uhwi_p. */
unsigned HOST_WIDE_INT
double_int_to_uhwi (double_int cst)
{
return cst.low;
}
/* Returns A * B. */ /* Returns A * B. */
double_int double_int
...@@ -1049,6 +978,42 @@ double_int_rshift (double_int a, HOST_WIDE_INT count, unsigned int prec, bool ar ...@@ -1049,6 +978,42 @@ double_int_rshift (double_int a, HOST_WIDE_INT count, unsigned int prec, bool ar
return ret; return ret;
} }
/* Rotate A left by COUNT places keeping only PREC bits of result.
Rotate right if COUNT is negative. */
double_int
double_int_lrotate (double_int a, HOST_WIDE_INT count, unsigned int prec)
{
double_int t1, t2;
count %= prec;
if (count < 0)
count += prec;
t1 = double_int_lshift (a, count, prec, false);
t2 = double_int_rshift (a, prec - count, prec, false);
return double_int_ior (t1, t2);
}
/* Rotate A rigth by COUNT places keeping only PREC bits of result.
Rotate right if COUNT is negative. */
double_int
double_int_rrotate (double_int a, HOST_WIDE_INT count, unsigned int prec)
{
double_int t1, t2;
count %= prec;
if (count < 0)
count += prec;
t1 = double_int_rshift (a, count, prec, false);
t2 = double_int_lshift (a, prec - count, prec, false);
return double_int_ior (t1, t2);
}
/* Returns -1 if A < B, 0 if A == B and 1 if A > B. Signedness of the /* Returns -1 if A < B, 0 if A == B and 1 if A > B. Signedness of the
comparison is given by UNS. */ comparison is given by UNS. */
...@@ -1097,6 +1062,51 @@ double_int_scmp (double_int a, double_int b) ...@@ -1097,6 +1062,51 @@ double_int_scmp (double_int a, double_int b)
return 0; return 0;
} }
/* Compares two values A and B. Returns max value. Signedness of the
comparison is given by UNS. */
double_int
double_int_max (double_int a, double_int b, bool uns)
{
return (double_int_cmp (a, b, uns) == 1) ? a : b;
}
/* Compares two signed values A and B. Returns max value. */
double_int double_int_smax (double_int a, double_int b)
{
return (double_int_scmp (a, b) == 1) ? a : b;
}
/* Compares two unsigned values A and B. Returns max value. */
double_int double_int_umax (double_int a, double_int b)
{
return (double_int_ucmp (a, b) == 1) ? a : b;
}
/* Compares two values A and B. Returns mix value. Signedness of the
comparison is given by UNS. */
double_int double_int_min (double_int a, double_int b, bool uns)
{
return (double_int_cmp (a, b, uns) == -1) ? a : b;
}
/* Compares two signed values A and B. Returns min value. */
double_int double_int_smin (double_int a, double_int b)
{
return (double_int_scmp (a, b) == -1) ? a : b;
}
/* Compares two unsigned values A and B. Returns min value. */
double_int double_int_umin (double_int a, double_int b)
{
return (double_int_ucmp (a, b) == -1) ? a : b;
}
/* Splits last digit of *CST (taken as unsigned) in BASE and returns it. */ /* Splits last digit of *CST (taken as unsigned) in BASE and returns it. */
static unsigned static unsigned
......
gcc/double-int.h
...@@ -97,6 +97,35 @@ uhwi_to_double_int (unsigned HOST_WIDE_INT cst) ...@@ -97,6 +97,35 @@ uhwi_to_double_int (unsigned HOST_WIDE_INT cst)
return r; return r;
} }
/* Returns value of CST as a signed number. CST must satisfy
double_int_fits_in_shwi_p. */
static inline HOST_WIDE_INT
double_int_to_shwi (double_int cst)
{
return (HOST_WIDE_INT) cst.low;
}
/* Returns value of CST as an unsigned number. CST must satisfy
double_int_fits_in_uhwi_p. */
static inline unsigned HOST_WIDE_INT
double_int_to_uhwi (double_int cst)
{
return cst.low;
}
bool double_int_fits_in_hwi_p (double_int, bool);
bool double_int_fits_in_shwi_p (double_int);
/* Returns true if CST fits in unsigned HOST_WIDE_INT. */
static inline bool
double_int_fits_in_uhwi_p (double_int cst)
{
return cst.high == 0;
}
/* The following operations perform arithmetics modulo 2^precision, /* The following operations perform arithmetics modulo 2^precision,
so you do not need to call double_int_ext between them, even if so you do not need to call double_int_ext between them, even if
you are representing numbers with precision less than you are representing numbers with precision less than
...@@ -109,11 +138,6 @@ double_int double_int_neg (double_int); ...@@ -109,11 +138,6 @@ double_int double_int_neg (double_int);
/* You must ensure that double_int_ext is called on the operands /* You must ensure that double_int_ext is called on the operands
of the following operations, if the precision of the numbers of the following operations, if the precision of the numbers
is less than 2 * HOST_BITS_PER_WIDE_INT bits. */ is less than 2 * HOST_BITS_PER_WIDE_INT bits. */
bool double_int_fits_in_hwi_p (double_int, bool);
bool double_int_fits_in_shwi_p (double_int);
bool double_int_fits_in_uhwi_p (double_int);
HOST_WIDE_INT double_int_to_shwi (double_int);
unsigned HOST_WIDE_INT double_int_to_uhwi (double_int);
double_int double_int_div (double_int, double_int, bool, unsigned); double_int double_int_div (double_int, double_int, bool, unsigned);
double_int double_int_sdiv (double_int, double_int, unsigned); double_int double_int_sdiv (double_int, double_int, unsigned);
double_int double_int_udiv (double_int, double_int, unsigned); double_int double_int_udiv (double_int, double_int, unsigned);
...@@ -157,9 +181,22 @@ double_int_and (double_int a, double_int b) ...@@ -157,9 +181,22 @@ double_int_and (double_int a, double_int b)
return a; return a;
} }
/* Returns A ^ B. */
static inline double_int
double_int_xor (double_int a, double_int b)
{
a.low ^= b.low;
a.high ^= b.high;
return a;
}
/* Shift operations. */ /* Shift operations. */
double_int double_int_lshift (double_int, HOST_WIDE_INT, unsigned int, bool); double_int double_int_lshift (double_int, HOST_WIDE_INT, unsigned int, bool);
double_int double_int_rshift (double_int, HOST_WIDE_INT, unsigned int, bool); double_int double_int_rshift (double_int, HOST_WIDE_INT, unsigned int, bool);
double_int double_int_lrotate (double_int, HOST_WIDE_INT, unsigned int);
double_int double_int_rrotate (double_int, HOST_WIDE_INT, unsigned int);
/* Returns true if CST is negative. Of course, CST is considered to /* Returns true if CST is negative. Of course, CST is considered to
be signed. */ be signed. */
...@@ -173,6 +210,15 @@ double_int_negative_p (double_int cst) ...@@ -173,6 +210,15 @@ double_int_negative_p (double_int cst)
int double_int_cmp (double_int, double_int, bool); int double_int_cmp (double_int, double_int, bool);
int double_int_scmp (double_int, double_int); int double_int_scmp (double_int, double_int);
int double_int_ucmp (double_int, double_int); int double_int_ucmp (double_int, double_int);
double_int double_int_max (double_int, double_int, bool);
double_int double_int_smax (double_int, double_int);
double_int double_int_umax (double_int, double_int);
double_int double_int_min (double_int, double_int, bool);
double_int double_int_smin (double_int, double_int);
double_int double_int_umin (double_int, double_int);
void dump_double_int (FILE *, double_int, bool); void dump_double_int (FILE *, double_int, bool);
/* Zero and sign extension of numbers in smaller precisions. */ /* Zero and sign extension of numbers in smaller precisions. */
...@@ -248,12 +294,6 @@ extern void lshift_double (unsigned HOST_WIDE_INT, HOST_WIDE_INT, ...@@ -248,12 +294,6 @@ extern void lshift_double (unsigned HOST_WIDE_INT, HOST_WIDE_INT,
extern void rshift_double (unsigned HOST_WIDE_INT, HOST_WIDE_INT, extern void rshift_double (unsigned HOST_WIDE_INT, HOST_WIDE_INT,
HOST_WIDE_INT, unsigned int, HOST_WIDE_INT, unsigned int,
unsigned HOST_WIDE_INT *, HOST_WIDE_INT *, bool); unsigned HOST_WIDE_INT *, HOST_WIDE_INT *, bool);
extern void lrotate_double (unsigned HOST_WIDE_INT, HOST_WIDE_INT,
HOST_WIDE_INT, unsigned int,
unsigned HOST_WIDE_INT *, HOST_WIDE_INT *);
extern void rrotate_double (unsigned HOST_WIDE_INT, HOST_WIDE_INT,
HOST_WIDE_INT, unsigned int,
unsigned HOST_WIDE_INT *, HOST_WIDE_INT *);
extern int div_and_round_double (unsigned, int, unsigned HOST_WIDE_INT, extern int div_and_round_double (unsigned, int, unsigned HOST_WIDE_INT,
HOST_WIDE_INT, unsigned HOST_WIDE_INT, HOST_WIDE_INT, unsigned HOST_WIDE_INT,
HOST_WIDE_INT, unsigned HOST_WIDE_INT *, HOST_WIDE_INT, unsigned HOST_WIDE_INT *,
......
gcc/fold-const.c
...@@ -924,145 +924,140 @@ int_binop_types_match_p (enum tree_code code, const_tree type1, const_tree type2 ...@@ -924,145 +924,140 @@ int_binop_types_match_p (enum tree_code code, const_tree type1, const_tree type2
tree tree
int_const_binop (enum tree_code code, const_tree arg1, const_tree arg2, int notrunc) int_const_binop (enum tree_code code, const_tree arg1, const_tree arg2, int notrunc)
{ {
unsigned HOST_WIDE_INT int1l, int2l; double_int op1, op2, res, tmp;
HOST_WIDE_INT int1h, int2h;
unsigned HOST_WIDE_INT low;
HOST_WIDE_INT hi;
unsigned HOST_WIDE_INT garbagel;
HOST_WIDE_INT garbageh;
tree t; tree t;
tree type = TREE_TYPE (arg1); tree type = TREE_TYPE (arg1);
int uns = TYPE_UNSIGNED (type); bool uns = TYPE_UNSIGNED (type);
int is_sizetype bool is_sizetype
= (TREE_CODE (type) == INTEGER_TYPE && TYPE_IS_SIZETYPE (type)); = (TREE_CODE (type) == INTEGER_TYPE && TYPE_IS_SIZETYPE (type));
int overflow = 0; bool overflow = false;
int1l = TREE_INT_CST_LOW (arg1); op1 = tree_to_double_int (arg1);
int1h = TREE_INT_CST_HIGH (arg1); op2 = tree_to_double_int (arg2);
int2l = TREE_INT_CST_LOW (arg2);
int2h = TREE_INT_CST_HIGH (arg2);
switch (code) switch (code)
{ {
case BIT_IOR_EXPR: case BIT_IOR_EXPR:
low = int1l | int2l, hi = int1h | int2h; res = double_int_ior (op1, op2);
break; break;
case BIT_XOR_EXPR: case BIT_XOR_EXPR:
low = int1l ^ int2l, hi = int1h ^ int2h; res = double_int_xor (op1, op2);
break; break;
case BIT_AND_EXPR: case BIT_AND_EXPR:
low = int1l & int2l, hi = int1h & int2h; res = double_int_and (op1, op2);
break; break;
case RSHIFT_EXPR: case RSHIFT_EXPR:
int2l = -int2l; res = double_int_rshift (op1, double_int_to_shwi (op2),
TYPE_PRECISION (type), !uns);
break;
case LSHIFT_EXPR: case LSHIFT_EXPR:
/* It's unclear from the C standard whether shifts can overflow. /* It's unclear from the C standard whether shifts can overflow.
The following code ignores overflow; perhaps a C standard The following code ignores overflow; perhaps a C standard
interpretation ruling is needed. */ interpretation ruling is needed. */
lshift_double (int1l, int1h, int2l, TYPE_PRECISION (type), res = double_int_lshift (op1, double_int_to_shwi (op2),
&low, &hi, !uns); TYPE_PRECISION (type), !uns);
break; break;
case RROTATE_EXPR: case RROTATE_EXPR:
int2l = - int2l; res = double_int_rrotate (op1, double_int_to_shwi (op2),
TYPE_PRECISION (type));
break;
case LROTATE_EXPR: case LROTATE_EXPR:
lrotate_double (int1l, int1h, int2l, TYPE_PRECISION (type), res = double_int_lrotate (op1, double_int_to_shwi (op2),
&low, &hi); TYPE_PRECISION (type));
break; break;
case PLUS_EXPR: case PLUS_EXPR:
overflow = add_double (int1l, int1h, int2l, int2h, &low, &hi); overflow = add_double (op1.low, op1.high, op2.low, op2.high,
&res.low, &res.high);
break; break;
case MINUS_EXPR: case MINUS_EXPR:
neg_double (int2l, int2h, &low, &hi); neg_double (op2.low, op2.high, &res.low, &res.high);
add_double (int1l, int1h, low, hi, &low, &hi); add_double (op1.low, op1.high, res.low, res.high,
overflow = OVERFLOW_SUM_SIGN (hi, int2h, int1h); &res.low, &res.high);
overflow = OVERFLOW_SUM_SIGN (res.high, op2.high, op1.high);
break; break;
case MULT_EXPR: case MULT_EXPR:
overflow = mul_double (int1l, int1h, int2l, int2h, &low, &hi); overflow = mul_double (op1.low, op1.high, op2.low, op2.high,
&res.low, &res.high);
break; break;
case TRUNC_DIV_EXPR: case TRUNC_DIV_EXPR:
case FLOOR_DIV_EXPR: case CEIL_DIV_EXPR: case FLOOR_DIV_EXPR: case CEIL_DIV_EXPR:
case EXACT_DIV_EXPR: case EXACT_DIV_EXPR:
/* This is a shortcut for a common special case. */ /* This is a shortcut for a common special case. */
if (int2h == 0 && (HOST_WIDE_INT) int2l > 0 if (op2.high == 0 && (HOST_WIDE_INT) op2.low > 0
&& !TREE_OVERFLOW (arg1) && !TREE_OVERFLOW (arg1)
&& !TREE_OVERFLOW (arg2) && !TREE_OVERFLOW (arg2)
&& int1h == 0 && (HOST_WIDE_INT) int1l >= 0) && op1.high == 0 && (HOST_WIDE_INT) op1.low >= 0)
{ {
if (code == CEIL_DIV_EXPR) if (code == CEIL_DIV_EXPR)
int1l += int2l - 1; op1.low += op2.low - 1;
low = int1l / int2l, hi = 0; res.low = op1.low / op2.low, res.high = 0;
break; break;
} }
/* ... fall through ... */ /* ... fall through ... */
case ROUND_DIV_EXPR: case ROUND_DIV_EXPR:
if (int2h == 0 && int2l == 0) if (double_int_zero_p (op2))
return NULL_TREE; return NULL_TREE;
if (int2h == 0 && int2l == 1) if (double_int_one_p (op2))
{ {
low = int1l, hi = int1h; res = op1;
break; break;
} }
if (int1l == int2l && int1h == int2h if (double_int_equal_p (op1, op2)
&& ! (int1l == 0 && int1h == 0)) && ! double_int_zero_p (op1))
{ {
low = 1, hi = 0; res = double_int_one;
break; break;
} }
overflow = div_and_round_double (code, uns, int1l, int1h, int2l, int2h, overflow = div_and_round_double (code, uns,
&low, &hi, &garbagel, &garbageh); op1.low, op1.high, op2.low, op2.high,
&res.low, &res.high,
&tmp.low, &tmp.high);
break; break;
case TRUNC_MOD_EXPR: case TRUNC_MOD_EXPR:
case FLOOR_MOD_EXPR: case CEIL_MOD_EXPR: case FLOOR_MOD_EXPR: case CEIL_MOD_EXPR:
/* This is a shortcut for a common special case. */ /* This is a shortcut for a common special case. */
if (int2h == 0 && (HOST_WIDE_INT) int2l > 0 if (op2.high == 0 && (HOST_WIDE_INT) op2.low > 0
&& !TREE_OVERFLOW (arg1) && !TREE_OVERFLOW (arg1)
&& !TREE_OVERFLOW (arg2) && !TREE_OVERFLOW (arg2)
&& int1h == 0 && (HOST_WIDE_INT) int1l >= 0) && op1.high == 0 && (HOST_WIDE_INT) op1.low >= 0)
{ {
if (code == CEIL_MOD_EXPR) if (code == CEIL_MOD_EXPR)
int1l += int2l - 1; op1.low += op2.low - 1;
low = int1l % int2l, hi = 0; res.low = op1.low % op2.low, res.high = 0;
break; break;
} }
/* ... fall through ... */ /* ... fall through ... */
case ROUND_MOD_EXPR: case ROUND_MOD_EXPR:
if (int2h == 0 && int2l == 0) if (double_int_zero_p (op2))
return NULL_TREE; return NULL_TREE;
overflow = div_and_round_double (code, uns, overflow = div_and_round_double (code, uns,
int1l, int1h, int2l, int2h, op1.low, op1.high, op2.low, op2.high,
&garbagel, &garbageh, &low, &hi); &tmp.low, &tmp.high,
&res.low, &res.high);
break; break;
case MIN_EXPR: case MIN_EXPR:
case MAX_EXPR: res = double_int_min (op1, op2, uns);
if (uns) break;
low = (((unsigned HOST_WIDE_INT) int1h
< (unsigned HOST_WIDE_INT) int2h)
|| (((unsigned HOST_WIDE_INT) int1h
== (unsigned HOST_WIDE_INT) int2h)
&& int1l < int2l));
else
low = (int1h < int2h
|| (int1h == int2h && int1l < int2l));
if (low == (code == MIN_EXPR)) case MAX_EXPR:
low = int1l, hi = int1h; res = double_int_max (op1, op2, uns);
else
low = int2l, hi = int2h;
break; break;
default: default:
...@@ -1071,7 +1066,7 @@ int_const_binop (enum tree_code code, const_tree arg1, const_tree arg2, int notr ...@@ -1071,7 +1066,7 @@ int_const_binop (enum tree_code code, const_tree arg1, const_tree arg2, int notr
if (notrunc) if (notrunc)
{ {
t = build_int_cst_wide (TREE_TYPE (arg1), low, hi); t = build_int_cst_wide (TREE_TYPE (arg1), res.low, res.high);
/* Propagate overflow flags ourselves. */ /* Propagate overflow flags ourselves. */
if (((!uns || is_sizetype) && overflow) if (((!uns || is_sizetype) && overflow)
...@@ -1082,7 +1077,7 @@ int_const_binop (enum tree_code code, const_tree arg1, const_tree arg2, int notr ...@@ -1082,7 +1077,7 @@ int_const_binop (enum tree_code code, const_tree arg1, const_tree arg2, int notr
} }
} }
else else
t = force_fit_type_double (TREE_TYPE (arg1), low, hi, 1, t = force_fit_type_double (TREE_TYPE (arg1), res.low, res.high, 1,
((!uns || is_sizetype) && overflow) ((!uns || is_sizetype) && overflow)
| TREE_OVERFLOW (arg1) | TREE_OVERFLOW (arg2)); | TREE_OVERFLOW (arg1) | TREE_OVERFLOW (arg2));
......
gcc/simplify-rtx.c
...@@ -3268,141 +3268,124 @@ simplify_const_binary_operation (enum rtx_code code, enum machine_mode mode, ...@@ -3268,141 +3268,124 @@ simplify_const_binary_operation (enum rtx_code code, enum machine_mode mode,
/* We can fold some multi-word operations. */ /* We can fold some multi-word operations. */
if (GET_MODE_CLASS (mode) == MODE_INT if (GET_MODE_CLASS (mode) == MODE_INT
&& width == HOST_BITS_PER_WIDE_INT * 2 && width == HOST_BITS_PER_DOUBLE_INT
&& (GET_CODE (op0) == CONST_DOUBLE || CONST_INT_P (op0)) && (CONST_DOUBLE_P (op0) || CONST_INT_P (op0))
&& (GET_CODE (op1) == CONST_DOUBLE || CONST_INT_P (op1))) && (CONST_DOUBLE_P (op1) || CONST_INT_P (op1)))
{ {
unsigned HOST_WIDE_INT l1, l2, lv, lt; double_int o0, o1, res, tmp;
HOST_WIDE_INT h1, h2, hv, ht;
if (GET_CODE (op0) == CONST_DOUBLE) o0 = rtx_to_double_int (op0);
l1 = CONST_DOUBLE_LOW (op0), h1 = CONST_DOUBLE_HIGH (op0); o1 = rtx_to_double_int (op1);
else
l1 = INTVAL (op0), h1 = HWI_SIGN_EXTEND (l1);
if (GET_CODE (op1) == CONST_DOUBLE)
l2 = CONST_DOUBLE_LOW (op1), h2 = CONST_DOUBLE_HIGH (op1);
else
l2 = INTVAL (op1), h2 = HWI_SIGN_EXTEND (l2);
switch (code) switch (code)
{ {
case MINUS: case MINUS:
/* A - B == A + (-B). */ /* A - B == A + (-B). */
neg_double (l2, h2, &lv, &hv); o1 = double_int_neg (o1);
l2 = lv, h2 = hv;
/* Fall through.... */ /* Fall through.... */
case PLUS: case PLUS:
add_double (l1, h1, l2, h2, &lv, &hv); res = double_int_add (o0, o1);
break; break;
case MULT: case MULT:
mul_double (l1, h1, l2, h2, &lv, &hv); res = double_int_mul (o0, o1);
break; break;
case DIV: case DIV:
if (div_and_round_double (TRUNC_DIV_EXPR, 0, l1, h1, l2, h2, if (div_and_round_double (TRUNC_DIV_EXPR, 0,
&lv, &hv, &lt, &ht)) o0.low, o0.high, o1.low, o1.high,
&res.low, &res.high,
&tmp.low, &tmp.high))
return 0; return 0;
break; break;
case MOD: case MOD:
if (div_and_round_double (TRUNC_DIV_EXPR, 0, l1, h1, l2, h2, if (div_and_round_double (TRUNC_DIV_EXPR, 0,
&lt, &ht, &lv, &hv)) o0.low, o0.high, o1.low, o1.high,
&tmp.low, &tmp.high,
&res.low, &res.high))
return 0; return 0;
break; break;
case UDIV: case UDIV:
if (div_and_round_double (TRUNC_DIV_EXPR, 1, l1, h1, l2, h2, if (div_and_round_double (TRUNC_DIV_EXPR, 1,
&lv, &hv, &lt, &ht)) o0.low, o0.high, o1.low, o1.high,
&res.low, &res.high,
&tmp.low, &tmp.high))
return 0; return 0;
break; break;
case UMOD: case UMOD:
if (div_and_round_double (TRUNC_DIV_EXPR, 1, l1, h1, l2, h2, if (div_and_round_double (TRUNC_DIV_EXPR, 1,
&lt, &ht, &lv, &hv)) o0.low, o0.high, o1.low, o1.high,
&tmp.low, &tmp.high,
&res.low, &res.high))
return 0; return 0;
break; break;
case AND: case AND:
lv = l1 & l2, hv = h1 & h2; res = double_int_and (o0, o1);
break; break;
case IOR: case IOR:
lv = l1 | l2, hv = h1 | h2; res = double_int_ior (o0, o1);
break; break;
case XOR: case XOR:
lv = l1 ^ l2, hv = h1 ^ h2; res = double_int_xor (o0, o1);
break; break;
case SMIN: case SMIN:
if (h1 < h2 res = double_int_smin (o0, o1);
|| (h1 == h2
&& ((unsigned HOST_WIDE_INT) l1
< (unsigned HOST_WIDE_INT) l2)))
lv = l1, hv = h1;
else
lv = l2, hv = h2;
break; break;
case SMAX: case SMAX:
if (h1 > h2 res = double_int_smax (o0, o1);
|| (h1 == h2
&& ((unsigned HOST_WIDE_INT) l1
> (unsigned HOST_WIDE_INT) l2)))
lv = l1, hv = h1;
else
lv = l2, hv = h2;
break; break;
case UMIN: case UMIN:
if ((unsigned HOST_WIDE_INT) h1 < (unsigned HOST_WIDE_INT) h2 res = double_int_umin (o0, o1);
|| (h1 == h2
&& ((unsigned HOST_WIDE_INT) l1
< (unsigned HOST_WIDE_INT) l2)))
lv = l1, hv = h1;
else
lv = l2, hv = h2;
break; break;
case UMAX: case UMAX:
if ((unsigned HOST_WIDE_INT) h1 > (unsigned HOST_WIDE_INT) h2 res = double_int_umax (o0, o1);
|| (h1 == h2
&& ((unsigned HOST_WIDE_INT) l1
> (unsigned HOST_WIDE_INT) l2)))
lv = l1, hv = h1;
else
lv = l2, hv = h2;
break; break;
case LSHIFTRT: case ASHIFTRT: case LSHIFTRT: case ASHIFTRT:
case ASHIFT: case ASHIFT:
case ROTATE: case ROTATERT: case ROTATE: case ROTATERT:
if (SHIFT_COUNT_TRUNCATED) {
l2 &= (GET_MODE_BITSIZE (mode) - 1), h2 = 0; unsigned HOST_WIDE_INT cnt;
if (h2 != 0 || l2 >= GET_MODE_BITSIZE (mode)) if (SHIFT_COUNT_TRUNCATED)
return 0; o1 = double_int_zext (o1, GET_MODE_BITSIZE (mode));
if (code == LSHIFTRT || code == ASHIFTRT) if (!double_int_fits_in_uhwi_p (o1)
rshift_double (l1, h1, l2, GET_MODE_BITSIZE (mode), &lv, &hv, || double_int_to_uhwi (o1) >= GET_MODE_BITSIZE (mode))
code == ASHIFTRT); return 0;
else if (code == ASHIFT)
lshift_double (l1, h1, l2, GET_MODE_BITSIZE (mode), &lv, &hv, 1); cnt = double_int_to_uhwi (o1);
else if (code == ROTATE)
lrotate_double (l1, h1, l2, GET_MODE_BITSIZE (mode), &lv, &hv); if (code == LSHIFTRT || code == ASHIFTRT)
else /* code == ROTATERT */ res = double_int_rshift (o0, cnt, GET_MODE_BITSIZE (mode),
rrotate_double (l1, h1, l2, GET_MODE_BITSIZE (mode), &lv, &hv); code == ASHIFTRT);
else if (code == ASHIFT)
res = double_int_lshift (o0, cnt, GET_MODE_BITSIZE (mode),
true);
else if (code == ROTATE)
res = double_int_lrotate (o0, cnt, GET_MODE_BITSIZE (mode));
else /* code == ROTATERT */
res = double_int_rrotate (o0, cnt, GET_MODE_BITSIZE (mode));
}
break; break;
default: default:
return 0; return 0;
} }
return immed_double_const (lv, hv, mode); return immed_double_int_const (res, mode);
} }
if (CONST_INT_P (op0) && CONST_INT_P (op1) if (CONST_INT_P (op0) && CONST_INT_P (op1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment