aboutsummaryrefslogtreecommitdiff
path: root/gas/write.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>1999-07-28 23:19:26 +0000
committerAlan Modra <amodra@gmail.com>1999-07-28 23:19:26 +0000
commitb77ad1d4c9165935726e6d9a90bc42d5e2a876ed (patch)
tree5dba675e29306bea840b26eabeced8c77f3d3a47 /gas/write.c
parent25ef477f61afa0ec1c42a2f1beee6c39588ef46e (diff)
downloadgdb-b77ad1d4c9165935726e6d9a90bc42d5e2a876ed.zip
gdb-b77ad1d4c9165935726e6d9a90bc42d5e2a876ed.tar.gz
gdb-b77ad1d4c9165935726e6d9a90bc42d5e2a876ed.tar.bz2
Fix an overflow checking bug uncovered when a 32 bit target is compiled
with a 64 bit bfd.
Diffstat (limited to 'gas/write.c')
-rw-r--r--gas/write.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/gas/write.c b/gas/write.c
index 0c28ac7..536e76d 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -2733,24 +2733,12 @@ fixup_segment (fixP, this_segment_type)
{
if ((size_t) size < sizeof (valueT))
{
- valueT mask, hibit;
+ valueT mask;
- /* set all bits to one */
mask = 0;
- mask--;
- /* Technically, combining these produces an undefined result
- if size is sizeof (valueT), though I think these two
- half-way operations should both be defined. And the
- compiler should be able to combine them if it's valid on
- the host architecture. */
- mask <<= size * 4;
- mask <<= size * 4;
- hibit = (valueT) 1 << (size * 8 - 1);
- if (((add_number & mask) != 0
- || (fixP->fx_signed
- && (add_number & hibit) != 0))
- && ((add_number & mask) != mask
- || (add_number & hibit) == 0))
+ mask--; /* set all bits to one */
+ mask <<= size * 8 - (fixP->fx_signed ? 1 : 0);
+ if ((add_number & mask) != 0 && (add_number & mask) != mask)
{
char buf[50], buf2[50];
sprint_value (buf, fragP->fr_address + where);