diff options
| author | danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-27 15:26:05 +0000 |
|---|---|---|
| committer | danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-27 15:26:05 +0000 |
| commit | 12319594b7995991792987236bd884e7d75147df (patch) | |
| tree | c549c3a96fb1f57fc54c7de222fac801578c8f49 | |
| parent | c0e7798443d16b168c0f05f421ea6cc65030434c (diff) | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_4-branch@150124 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/config/pa/pa.c | 19 |
2 files changed, 23 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b70d1946eda..114216e20b3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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 diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c index 5d080658864..52b787870f7 100644 --- a/gcc/config/pa/pa.c +++ b/gcc/config/pa/pa.c @@ -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; } |