diff options
| author | Nick Clifton <nickc@redhat.com> | 2006-03-05 08:38:53 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2006-03-05 08:38:53 +0000 |
| commit | ed963e2de8fb9d28b2540e2bc23ad19b3670ebea (patch) | |
| tree | 6aecf5a6023f9cbe35a0ba771724965aea3640dc /opcodes/ip2k-ibld.c | |
| parent | 3c568553f111f6a986a5a9fbd882fcd09ae4656a (diff) | |
| download | binutils-gdb-ed963e2de8fb9d28b2540e2bc23ad19b3670ebea.tar.gz | |
* cgen-ibld.in (insert_normal): Cope with attempts to insert a signed 32-bit
value into an unsigned 32-bit field when the host is a 64-bit machine.
Diffstat (limited to 'opcodes/ip2k-ibld.c')
| -rw-r--r-- | opcodes/ip2k-ibld.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/opcodes/ip2k-ibld.c b/opcodes/ip2k-ibld.c index cd39392c98a..fb080275c64 100644 --- a/opcodes/ip2k-ibld.c +++ b/opcodes/ip2k-ibld.c @@ -3,7 +3,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN: Cpu tools GENerator. - the resultant file is machine generated, cgen-ibld.in isn't - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2005 + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU Binutils and GDB, the GNU debugger. @@ -168,13 +168,21 @@ insert_normal (CGEN_CPU_DESC cd, else if (! CGEN_BOOL_ATTR (attrs, CGEN_IFLD_SIGNED)) { unsigned long maxval = mask; - - if ((unsigned long) value > maxval) + unsigned long val = (unsigned long) value; + + /* For hosts with a word size > 32 check to see if value has been sign + extended beyond 32 bits. If so then ignore these higher sign bits + as the user is attempting to store a 32-bit signed value into an + unsigned 32-bit field which is allowed. */ + if (sizeof (unsigned long) > 4 && ((value >> 32) == -1)) + val &= 0xFFFFFFFF; + + if (val > maxval) { /* xgettext:c-format */ sprintf (errbuf, - _("operand out of range (%lu not between 0 and %lu)"), - value, maxval); + _("operand out of range (0x%lx not between 0 and 0x%lx)"), + val, maxval); return errbuf; } } @@ -440,9 +448,8 @@ extract_normal (CGEN_CPU_DESC cd, word_length may be too big. */ if (cd->min_insn_bitsize < cd->base_insn_bitsize) { - if (word_offset == 0 - && word_length > total_length) - word_length = total_length; + if (word_offset + word_length > total_length) + word_length = total_length - word_offset; } /* Does the value reside in INSN_VALUE, and at the right alignment? */ |