OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pa.c (compute_zdepwi_operands): Limit deposit length to 32 - lsb. 

* pa.c (compute_zdepwi_operands): Limit deposit length to 32 - lsb.
	Cast "1" to unsigned HOST_WIDE_INT.
	(compute_zdepdi_operands): Limit maximum length to 64 bits.  Limit
	deposit length to the maximum length - lsb.  Extend length if
	HOST_BITS_PER_WIDE_INT is 32.

From-SVN: r150124
This commit is contained in:
John David Anglin 2009-07-27 15:26:05 +00:00 committed by John David Anglin
parent f274dc27fc
commit fbcf58dd8e
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2009-07-20 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
Backport from mainline:
2009-07-20 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
* pa.c (compute_zdepwi_operands): Limit deposit length to 32 - lsb.
Cast "1" to unsigned HOST_WIDE_INT.
(compute_zdepdi_operands): Limit maximum length to 64 bits. Limit
deposit length to the maximum length - lsb. Extend length if
HOST_BITS_PER_WIDE_INT is 32.
2009-07-25 Mark Loeser <mark@halcy0n.com>
PR build/40010

19
gcc/config/pa/pa.c
View File

@ -2217,9 +2217,9 @@ compute_zdepwi_operands (unsigned HOST_WIDE_INT imm, unsigned *op)
else
{
/* Find the width of the bitstring in IMM. */
for (len = 5; len < 32; len++)
for (len = 5; len < 32 - lsb; len++)
{
if ((imm & (1 << len)) == 0)
if ((imm & ((unsigned HOST_WIDE_INT) 1 << len)) == 0)
break;
}
@ -2238,10 +2238,12 @@ compute_zdepwi_operands (unsigned HOST_WIDE_INT imm, unsigned *op)
void
compute_zdepdi_operands (unsigned HOST_WIDE_INT imm, unsigned *op)
{
HOST_WIDE_INT lsb, len;
int lsb, len, maxlen;
maxlen = MIN (HOST_BITS_PER_WIDE_INT, 64);
/* Find the least significant set bit in IMM. */
for (lsb = 0; lsb < HOST_BITS_PER_WIDE_INT; lsb++)
for (lsb = 0; lsb < maxlen; lsb++)
{
if ((imm & 1) != 0)
break;
@ -2250,17 +2252,20 @@ compute_zdepdi_operands (unsigned HOST_WIDE_INT imm, unsigned *op)
/* Choose variants based on *sign* of the 5-bit field. */
if ((imm & 0x10) == 0)
len = ((lsb <= HOST_BITS_PER_WIDE_INT - 4)
? 4 : HOST_BITS_PER_WIDE_INT - lsb);
len = (lsb <= maxlen - 4) ? 4 : maxlen - lsb;
else
{
/* Find the width of the bitstring in IMM. */
for (len = 5; len < HOST_BITS_PER_WIDE_INT; len++)
for (len = 5; len < maxlen - lsb; len++)
{
if ((imm & ((unsigned HOST_WIDE_INT) 1 << len)) == 0)
break;
}
/* Extend length if host is narrow and IMM is negative. */
if (HOST_BITS_PER_WIDE_INT == 32 && len == maxlen - lsb)
len += 32;
/* Sign extend IMM as a 5-bit value. */
imm = (imm & 0xf) - 0x10;
}