diff options
| author | Alan Modra <amodra@gmail.com> | 2003-01-11 06:24:12 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2003-01-11 06:24:12 +0000 |
| commit | a0ea3e1db8c4ecb6ed33c135384d35d31a333918 (patch) | |
| tree | 7132902ced6c6a4f714716e7c5ab8779e7a8f95a /gas/config | |
| parent | 1fb309eaa6afba828c4b780e41dd744585fa09b2 (diff) | |
| download | gdb-a0ea3e1db8c4ecb6ed33c135384d35d31a333918.zip gdb-a0ea3e1db8c4ecb6ed33c135384d35d31a333918.tar.gz gdb-a0ea3e1db8c4ecb6ed33c135384d35d31a333918.tar.bz2 | |
* read.c (get_absolute_expr): New, split out from..
(get_absolute_expression): ..here.
* read.h (get_absolute_expr): Declare.
* config/obj-elf.c (elf_common): Use offsetT for "temp" and "size".
Trim size to arch bits_per_address, and test for negative input
via get_absolute_expr.
Diffstat (limited to 'gas/config')
| -rw-r--r-- | gas/config/obj-elf.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c index 5dc4279..7976704 100644 --- a/gas/config/obj-elf.c +++ b/gas/config/obj-elf.c @@ -1,6 +1,6 @@ /* ELF object file format Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002 Free Software Foundation, Inc. + 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -290,9 +290,10 @@ elf_common (is_common) char *name; char c; char *p; - int temp, size; + offsetT temp, size, sign; symbolS *symbolP; int have_align; + expressionS exp; if (flag_mri && is_common) { @@ -313,13 +314,15 @@ elf_common (is_common) return NULL; } input_line_pointer++; /* skip ',' */ - if ((temp = get_absolute_expression ()) < 0) + temp = get_absolute_expr (&exp); + sign = (offsetT) 1 << (stdoutput->arch_info->bits_per_address - 1); + size = temp & ((sign << 1) - 1); + if (temp != size || !exp.X_unsigned) { - as_bad (_(".COMMon length (%d.) <0! Ignored."), temp); + as_bad (_(".COMMon length (%ld) out of range, ignored."), (long) temp); ignore_rest_of_line (); return NULL; } - size = temp; *p = 0; symbolP = symbol_find_or_make (name); *p = c; @@ -333,8 +336,9 @@ elf_common (is_common) { if (S_GET_VALUE (symbolP) != (valueT) size) { - as_warn (_("length of .comm \"%s\" is already %ld; not changed to %d"), - S_GET_NAME (symbolP), (long) S_GET_VALUE (symbolP), size); + as_warn (_("length of .comm \"%s\" is already %ld; not changed to %ld"), + S_GET_NAME (symbolP), (long) S_GET_VALUE (symbolP), + (long) size); } } know (symbolP->sy_frag == &zero_address_frag); @@ -352,8 +356,8 @@ elf_common (is_common) temp = 0; else { - temp = get_absolute_expression (); - if (temp < 0) + temp = get_absolute_expr (&exp); + if (!exp.X_unsigned) { temp = 0; as_warn (_("common alignment negative; 0 assumed")); |