source: patches/binutils-2.19-branch_update-2.patch@ d57287f4

bfd/ChangeLog

@@ +1 @@
+2008-12-23  Nick Clifton  <nickc@redhat.com>
+
+        * Import this patch from the mainline:
+        2008-11-10  Andreas Schwab  <schwab@suse.de>
+
+        PR 7011
+        * elf.c (assign_file_positions_for_non_load_sections): Handle
+        PT_GNU_RELRO specially.
+
+2008-11-20  Alan Modra  <amodra@bigpond.net.au>
+
+        * elf32-ppc.c (allocate_dynrelocs): Always use tlsld_got for
+        TLS_LD even when symbol is used with other TLS reloc types.
+        (ppc_elf_relocate_section): Bypass symbol checks when using tlsld_got.
+        Leave addend zero on LD DTPMOD dynamic reloc.
+
+2008-11-17  Eric B. Weddington  <eric.weddington@atmel.com>
+
+        PR 7022
+        * elf32-avr.c (bfd_elf_avr_final_write_processing):
+        Add missing break statements.
+
+2008-10-28  Tristan Gingold  <gingold@adacore.com>
+
+        * configure.in: Bump version to 2.19.0
+        * Makefile.am (RELEASE): Unset.
+        * configure, Makefile.in: Regenerated.
+
 2008-10-16  Tristan Gingold  <gingold@adacore.com>
 
         * configure.in: Bump version to 2.19

bfd/Makefile.in

@@ -271 +271 @@
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 
 # Uncomment the following line when doing a release.
-RELEASE = y
+RELEASE=y
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
 MKDEP = gcc -MM

bfd/configure

@@ -3032 +3032 @@
 
 # Define the identity of the package.
  PACKAGE=bfd
- VERSION=2.19
+ VERSION=2.19.0
 
 
 cat >>confdefs.h <<_ACEOF

bfd/configure.in

@@ -8 +8 @@
 AC_CANONICAL_TARGET
 AC_ISC_POSIX
 
-AM_INIT_AUTOMAKE(bfd, 2.19)
+AM_INIT_AUTOMAKE(bfd, 2.19.0)
 
 dnl These must be called before LT_INIT, because it may want
 dnl to call AC_CHECK_PROG.

binutils-2.19

@@ -4606 +4606 @@
        m != NULL;
        m = m->next, p++)
     {
-      if (m->count != 0)
+      if (p->p_type == PT_GNU_RELRO)
+        {
+          const Elf_Internal_Phdr *lp;
+
+          BFD_ASSERT (!m->includes_filehdr && !m->includes_phdrs);
+
+          if (link_info != NULL)
+            {
+              /* During linking the range of the RELRO segment is passed
+                 in link_info.  */
+              for (lp = phdrs; lp < phdrs + count; ++lp)
+                {
+                  if (lp->p_type == PT_LOAD
+                      && lp->p_vaddr >= link_info->relro_start
+                      && lp->p_vaddr < link_info->relro_end
+                      && lp->p_vaddr + lp->p_filesz >= link_info->relro_end)
+                    break;
+                }
+            }
+          else
+            {
+              /* Otherwise we are copying an executable or shared
+                 library, but we need to use the same linker logic.  */
+              for (lp = phdrs; lp < phdrs + count; ++lp)
+                {
+                  if (lp->p_type == PT_LOAD
+                      && lp->p_paddr == p->p_paddr)
+                    break;
+                }
+            }
+
+          if (lp < phdrs + count)
+            {
+              p->p_vaddr = lp->p_vaddr;
+              p->p_paddr = lp->p_paddr;
+              p->p_offset = lp->p_offset;
+              if (link_info != NULL)
+                p->p_filesz = link_info->relro_end - lp->p_vaddr;
+              else if (m->p_size_valid)
+                p->p_filesz = m->p_size;
+              else
+                abort ();
+              p->p_memsz = p->p_filesz;
+              p->p_align = 1;
+              p->p_flags = (lp->p_flags & ~PF_W);
+            }
+          else if (link_info != NULL)
+            {
+              memset (p, 0, sizeof *p);
+              p->p_type = PT_NULL;
+            }
+          else
+            abort ();
+        }
+      else if (m->count != 0)
         {
           if (p->p_type != PT_LOAD
               && (p->p_type != PT_NOTE
@@ -4622 +4676 @@
               p->p_filesz = sect->filepos - m->sections[0]->filepos;
               if (hdr->sh_type != SHT_NOBITS)
                 p->p_filesz += hdr->sh_size;
-
-              if (p->p_type == PT_GNU_RELRO)
-                {
-                  /* When we get here, we are copying executable
-                     or shared library. But we need to use the same
-                     linker logic.  */
-                  Elf_Internal_Phdr *lp;
-
-                  for (lp = phdrs; lp < phdrs + count; ++lp)
-                    {
-                      if (lp->p_type == PT_LOAD
-                          && lp->p_paddr == p->p_paddr)
-                        break;
-                    }
-          
-                  if (lp < phdrs + count)
-                    {
-                      /* We should use p_size if it is valid since it
-                         may contain the first few bytes of the next
-                         SEC_ALLOC section.  */
-                      if (m->p_size_valid)
-                        p->p_filesz = m->p_size;
-                      else
-                        abort ();
-                      p->p_vaddr = lp->p_vaddr;
-                      p->p_offset = lp->p_offset;
-                      p->p_memsz = p->p_filesz;
-                      p->p_align = 1;
-                    }
-                  else
-                    abort ();
-                }
-              else
-                p->p_offset = m->sections[0]->filepos;
+              p->p_offset = m->sections[0]->filepos;
             }
         }
-      else
+      else if (m->includes_filehdr)
         {
-          if (m->includes_filehdr)
-            {
-              p->p_vaddr = filehdr_vaddr;
-              if (! m->p_paddr_valid)
-                p->p_paddr = filehdr_paddr;
-            }
-          else if (m->includes_phdrs)
-            {
-              p->p_vaddr = phdrs_vaddr;
-              if (! m->p_paddr_valid)
-                p->p_paddr = phdrs_paddr;
-            }
-          else if (p->p_type == PT_GNU_RELRO)
-            {
-              Elf_Internal_Phdr *lp;
-
-              for (lp = phdrs; lp < phdrs + count; ++lp)
-                {
-                  if (lp->p_type == PT_LOAD
-                      && lp->p_vaddr <= link_info->relro_end
-                      && lp->p_vaddr >= link_info->relro_start
-                      && (lp->p_vaddr + lp->p_filesz
-                          >= link_info->relro_end))
-                    break;
-                }
-
-              if (lp < phdrs + count
-                  && link_info->relro_end > lp->p_vaddr)
-                {
-                  p->p_vaddr = lp->p_vaddr;
-                  p->p_paddr = lp->p_paddr;
-                  p->p_offset = lp->p_offset;
-                  p->p_filesz = link_info->relro_end - lp->p_vaddr;
-                  p->p_memsz = p->p_filesz;
-                  p->p_align = 1;
-                  p->p_flags = (lp->p_flags & ~PF_W);
-                }
-              else
-                {
-                  memset (p, 0, sizeof *p);
-                  p->p_type = PT_NULL;
-                }
-            }
+          p->p_vaddr = filehdr_vaddr;
+          if (! m->p_paddr_valid)
+            p->p_paddr = filehdr_paddr;
+        }
+      else if (m->includes_phdrs)
+        {
+          p->p_vaddr = phdrs_vaddr;
+          if (! m->p_paddr_valid)
+            p->p_paddr = phdrs_paddr;
         }
     }
 

bfd/elf32-avr.c

@@ -1298 +1298 @@
 
     case bfd_mach_avr25:
       val = E_AVR_MACH_AVR25;
+      break;
 
     case bfd_mach_avr3:
       val = E_AVR_MACH_AVR3;
@@ -1305 +1306 @@
 
     case bfd_mach_avr31:
       val = E_AVR_MACH_AVR31;
+      break;
 
     case bfd_mach_avr35:
       val = E_AVR_MACH_AVR35;
+      break;
 
     case bfd_mach_avr4:
       val = E_AVR_MACH_AVR4;

bfd/elf32-ppc.c

@@ -4997 +4997 @@
   eh = (struct ppc_elf_link_hash_entry *) h;
   if (eh->elf.got.refcount > 0)
     {
+      bfd_boolean dyn;
+      unsigned int need;
+
       /* Make sure this symbol is output as a dynamic symbol.  */
       if (eh->elf.dynindx == -1
           && !eh->elf.forced_local
@@ -5006 +5009 @@
             return FALSE;
         }
 
-      if (eh->tls_mask == (TLS_TLS | TLS_LD)
-          && !eh->elf.def_dynamic)
-        {
-          /* If just an LD reloc, we'll just use htab->tlsld_got.offset.  */
-          htab->tlsld_got.refcount += 1;
-          eh->elf.got.offset = (bfd_vma) -1;
-        }
-      else
+      need = 0;
+      if ((eh->tls_mask & TLS_TLS) != 0)
         {
-          bfd_boolean dyn;
-          unsigned int need = 0;
-          if ((eh->tls_mask & TLS_TLS) != 0)
+          if ((eh->tls_mask & TLS_LD) != 0)
             {
-              if ((eh->tls_mask & TLS_LD) != 0)
-                need += 8;
-              if ((eh->tls_mask & TLS_GD) != 0)
+              if (!eh->elf.def_dynamic)
+                /* We'll just use htab->tlsld_got.offset.  This should
+                   always be the case.  It's a little odd if we have
+                   a local dynamic reloc against a non-local symbol.  */
+                htab->tlsld_got.refcount += 1;
+              else
                 need += 8;
-              if ((eh->tls_mask & (TLS_TPREL | TLS_TPRELGD)) != 0)
-                need += 4;
-              if ((eh->tls_mask & TLS_DTPREL) != 0)
-                need += 4;
             }
-          else
+          if ((eh->tls_mask & TLS_GD) != 0)
+            need += 8;
+          if ((eh->tls_mask & (TLS_TPREL | TLS_TPRELGD)) != 0)
+            need += 4;
+          if ((eh->tls_mask & TLS_DTPREL) != 0)
             need += 4;
+        }
+      else
+        need += 4;
+      if (need == 0)
+        eh->elf.got.offset = (bfd_vma) -1;
+      else
+        {
           eh->elf.got.offset = allocate_got (htab, need);
           dyn = htab->elf.dynamic_sections_created;
           if ((info->shared
@@ -5039 +5044 @@
             {
               /* All the entries we allocated need relocs.
                  Except LD only needs one.  */
-              if ((eh->tls_mask & TLS_LD) != 0)
+              if ((eh->tls_mask & TLS_LD) != 0
+                  && eh->elf.def_dynamic)
                 need -= 4;
               htab->relgot->size += need * (sizeof (Elf32_External_Rela) / 4);
             }
@@ -5275 +5281 @@
       for (; local_got < end_local_got; ++local_got, ++lgot_masks)
         if (*local_got > 0)
           {
-            if (*lgot_masks == (TLS_TLS | TLS_LD))
+            unsigned int need = 0;
+            if ((*lgot_masks & TLS_TLS) != 0)
               {
-                /* If just an LD reloc, we'll just use
-                   htab->tlsld_got.offset.  */
-                htab->tlsld_got.refcount += 1;
-                *local_got = (bfd_vma) -1;
+                if ((*lgot_masks & TLS_GD) != 0)
+                  need += 8;
+                if ((*lgot_masks & TLS_LD) != 0)
+                  htab->tlsld_got.refcount += 1;
+                if ((*lgot_masks & (TLS_TPREL | TLS_TPRELGD)) != 0)
+                  need += 4;
+                if ((*lgot_masks & TLS_DTPREL) != 0)
+                  need += 4;
               }
             else
+              need += 4;
+            if (need == 0)
+              *local_got = (bfd_vma) -1;
+            else
               {
-                unsigned int need = 0;
-                if ((*lgot_masks & TLS_TLS) != 0)
-                  {
-                    if ((*lgot_masks & TLS_GD) != 0)
-                      need += 8;
-                    if ((*lgot_masks & (TLS_TPREL | TLS_TPRELGD)) != 0)
-                      need += 4;
-                    if ((*lgot_masks & TLS_DTPREL) != 0)
-                      need += 4;
-                  }
-                else
-                  need += 4;
                 *local_got = allocate_got (htab, need);
                 if (info->shared)
                   htab->relgot->size += (need
@@ -6560 +6563 @@
 
                     /* Generate relocs for the dynamic linker.  */
                     if ((info->shared || indx != 0)
-                        && (h == NULL
+                        && (offp == &htab->tlsld_got.offset
+                            || h == NULL
                             || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
                             || h->root.type != bfd_link_hash_undefweak))
                       {
@@ -6591 +6595 @@
                           outrel.r_info = ELF32_R_INFO (indx, R_PPC_RELATIVE);
                         else
                           outrel.r_info = ELF32_R_INFO (indx, R_PPC_GLOB_DAT);
-                        if (indx == 0)
+                        if (indx == 0 && tls_ty != (TLS_TLS | TLS_LD))
                           {
                             outrel.r_addend += relocation;
                             if (tls_ty & (TLS_GD | TLS_DTPREL | TLS_TPREL))

bfd/version.h

@@ -1 @@
-#define BFD_VERSION_DATE 20081016
+#define BFD_VERSION_DATE 20081231
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@

binutils/ChangeLog

@@ +1 @@
+2008-12-23  Nick Clifton  <nickc@redhat.com>
+
+        * windmc.c (main): Use correct type for file length.
+        * dlltool.c (gen_exp_file): Likewise.
+
+2008-12-01  Nick Clifton  <nickc@redhat.com>
+
+        PR 7044
+        * dlltool.c (run): Use formatting string to avoid compile time
+        warning.
+        (gen_exp_file): Check return value from fread.
+        * windmc.c (main): Check return value from fread.
+
 2008-09-25  Richard Henderson  <rth@redhat.com>
 
         * dwarf.c (size_of_encoded_value, get_encoded_value): Move up.

binutils/dlltool.c

@@ -1206 +1206 @@
 
   if (pid == -1)
     {
-      inform (strerror (errno));
+      inform ("%s", strerror (errno));
 
       fatal (errmsg_fmt, errmsg_arg);
     }
@@ -1980 +1980 @@
       int addr;
       long need[PAGE_SIZE];
       long page_addr;
-      int numbytes;
+      bfd_size_type numbytes;
       int num_entries;
       long *copy;
       int j;
@@ -1992 +1992 @@
       numbytes = ftell (base_file);
       fseek (base_file, 0, SEEK_SET);
       copy = xmalloc (numbytes);
-      fread (copy, 1, numbytes, base_file);
+      if (fread (copy, 1, numbytes, base_file) < numbytes)
+        fatal (_("failed to read the number of entries from base file"));
       num_entries = numbytes / sizeof (long);
 
-
       fprintf (f, "\t.section\t.reloc\n");
       if (num_entries)
         {

binutils/windmc.c

@@ -1144 +1144 @@
     unichar *u;
     rc_uint_type ul;
     char *buff;
-    long flen;
+    bfd_size_type flen;
     FILE *fp = fopen (input_filename, "rb");
 
     if (!fp)
@@ -1155 +1155 @@
     fseek (fp, 0, SEEK_SET);
     buff = malloc (flen + 3);
     memset (buff, 0, flen + 3);
-    fread (buff, 1, flen, fp);
+    if (fread (buff, 1, flen, fp) < flen)
+      fatal (_("unable to read contents of %s"), input_filename);
     fclose (fp);
     if (mcset_text_in_is_unicode != 1)
       {

configure.ac

@@ -166 +166 @@
 # binutils, gas and ld appear in that order because it makes sense to run
 # "make check" in that particular order.
 # If --enable-gold is used, "gold" will replace "ld".
-host_tools="byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
+host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
 
 # libgcj represents the runtime libraries only used by gcj.
 libgcj="target-libffi \

ld/ChangeLog

@@ +1 @@
+2008-12-23  Tristan Gingold  <gingold@adacore.com>
+
+        * Makefile.am (EXTRA_DIST): Add deffilep.c and deffilep.h
+        * Makefile.in: Regenerate.
+
+2008-11-14  Alan Modra  <amodra@bigpond.net.au>
+
+        * Makefile.am (spu_ovl.o_c): Add missing line continuations.
+        * Makefile.in: Regenerate.
+
 2008-10-05  Alan Modra  <amodra@bigpond.net.au>
 
         PR 6943

ld/Makefile.am

@@ -758 +758 @@
 $(srcdir)/emultempl/spu_ovl.o_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S
         if ../gas/as-new --version \
                 | grep 'target.*spu' >/dev/null 2>/dev/null; then \
-          cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s
+          cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s; \
           ../gas/as-new -o spu_ovl.o spu_ovl.s; \
-          ../binutils/bin2c <spu_ovl.o >$@
+          ../binutils/bin2c <spu_ovl.o >$@; \
         fi
 eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1914 +1914 @@
 
 # Stuff that should be included in a distribution.  The diststuff
 # target is run by the taz target in ../Makefile.in.
-EXTRA_DIST = ldgram.c ldgram.h ldlex.c emultempl/spu_ovl.o_c $(man_MANS)
+EXTRA_DIST = ldgram.c ldgram.h ldlex.c emultempl/spu_ovl.o_c \
+           deffilep.c deffilep.h $(man_MANS)
 diststuff: info $(EXTRA_DIST)
 all: info ld.1
 

ld/Makefile.in

@@ -730 +730 @@
 
 # Stuff that should be included in a distribution.  The diststuff
 # target is run by the taz target in ../Makefile.in.
-EXTRA_DIST = ldgram.c ldgram.h ldlex.c emultempl/spu_ovl.o_c $(man_MANS)
+EXTRA_DIST = ldgram.c ldgram.h ldlex.c emultempl/spu_ovl.o_c \
+           deffilep.c deffilep.h $(man_MANS)
+
 DISTCLEANFILES = tdirs site.exp site.bak stringify.sed $(am__append_1)
 all: config.h
         $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1588 +1590 @@
 $(srcdir)/emultempl/spu_ovl.o_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S
         if ../gas/as-new --version \
                 | grep 'target.*spu' >/dev/null 2>/dev/null; then \
-          cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s
+          cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s; \
           ../gas/as-new -o spu_ovl.o spu_ovl.s; \
-          ../binutils/bin2c <spu_ovl.o >$@
+          ../binutils/bin2c <spu_ovl.o >$@; \
         fi
 eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}

opcodes/ChangeLog

@@ +1 @@
+2008-11-27  Alan Modra  <amodra@bigpond.net.au>
+
+        * ppc-opc.c (extract_sprg): Correct operand range check.
+
+2008-11-26  Andreas Schwab  <schwab@suse.de>
+
+        * m68k-dis.c (NEXTBYTE, NEXTWORD, NEXTLONG, NEXTULONG, NEXTSINGLE)
+        (NEXTDOUBLE, NEXTEXTEND, NEXTPACKED): Fix error handling.
+        (save_printer, save_print_address): Remove.
+        (fetch_data): Don't use them.
+        (match_insn_m68k): Always restore printing functions.
+        (print_insn_m68k): Don't save/restore printing functions.
+
+2008-11-25  Nick Clifton  <nickc@redhat.com>
+
+        * m68k-dis.c: Rewrite to remove use of setjmp/longjmp.
+
 2008-09-29  Nick Clifton  <nickc@redhat.com>
 
         * po/vi.po: Updated Vietnamese translation.

opcodes/m68k-dis.c

@@ -60 +60 @@
 #endif
 
 /* Get a 1 byte signed integer.  */
-#define NEXTBYTE(p)  (p += 2, FETCH_DATA (info, p), COERCE_SIGNED_CHAR(p[-1]))
+#define NEXTBYTE(p, val)                        \
+  do                                            \
+    {                                           \
+      p += 2;                                   \
+      if (!FETCH_DATA (info, p))                \
+        return -3;                              \
+      val = COERCE_SIGNED_CHAR (p[-1]);         \
+    }                                           \
+  while (0)
 
 /* Get a 2 byte signed integer.  */
 #define COERCE16(x) ((int) (((x) ^ 0x8000) - 0x8000))
-#define NEXTWORD(p)  \
-  (p += 2, FETCH_DATA (info, p), \
-   COERCE16 ((p[-2] << 8) + p[-1]))
+
+#define NEXTWORD(p, val, ret_val)               \
+  do                                            \
+    {                                           \
+      p += 2;                                   \
+      if (!FETCH_DATA (info, p))                \
+        return ret_val;                         \
+      val = COERCE16 ((p[-2] << 8) + p[-1]);    \
+    }                                           \
+  while (0)                                             
 
 /* Get a 4 byte signed integer.  */
 #define COERCE32(x) ((bfd_signed_vma) ((x) ^ 0x80000000) - 0x80000000)
-#define NEXTLONG(p)  \
-  (p += 4, FETCH_DATA (info, p), \
-   (COERCE32 ((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1])))
+
+#define NEXTLONG(p, val, ret_val)                                       \
+  do                                                                    \
+    {                                                                   \
+      p += 4;                                                           \
+      if (!FETCH_DATA (info, p))                                        \
+        return ret_val;                                                 \
+      val = COERCE32 ((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1]); \
+    }                                                                   \
+  while (0)
 
 /* Get a 4 byte unsigned integer.  */
-#define NEXTULONG(p)  \
-  (p += 4, FETCH_DATA (info, p), \
-   (unsigned int) ((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1]))
+#define NEXTULONG(p, val)                                               \
+  do                                                                    \
+    {                                                                   \
+      p += 4;                                                           \
+      if (!FETCH_DATA (info, p))                                        \
+        return -3;                                                      \
+      val = (unsigned int) ((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1]); \
+    }                                                                   \
+  while (0)
 
 /* Get a single precision float.  */
-#define NEXTSINGLE(val, p) \
-  (p += 4, FETCH_DATA (info, p), \
-   floatformat_to_double (&floatformat_ieee_single_big, (char *) p - 4, &val))
+#define NEXTSINGLE(val, p)                                      \
+  do                                                            \
+    {                                                           \
+      p += 4;                                                   \
+      if (!FETCH_DATA (info, p))                                \
+        return -3;                                              \
+      floatformat_to_double (& floatformat_ieee_single_big,     \
+                             (char *) p - 4, & val);            \
+    }                                                           \
+  while (0)
 
 /* Get a double precision float.  */
-#define NEXTDOUBLE(val, p) \
-  (p += 8, FETCH_DATA (info, p), \
-   floatformat_to_double (&floatformat_ieee_double_big, (char *) p - 8, &val))
+#define NEXTDOUBLE(val, p)                                      \
+  do                                                            \
+    {                                                           \
+      p += 8;                                                   \
+      if (!FETCH_DATA (info, p))                                \
+        return -3;                                              \
+      floatformat_to_double (& floatformat_ieee_double_big,     \
+                             (char *) p - 8, & val);            \
+    }                                                           \
+  while (0)
 
 /* Get an extended precision float.  */
-#define NEXTEXTEND(val, p) \
-  (p += 12, FETCH_DATA (info, p), \
-   floatformat_to_double (&floatformat_m68881_ext, (char *) p - 12, &val))
+#define NEXTEXTEND(val, p)                              \
+  do                                                    \
+    {                                                   \
+      p += 12;                                          \
+      if (!FETCH_DATA (info, p))                        \
+        return -3;                                      \
+      floatformat_to_double (& floatformat_m68881_ext,  \
+                             (char *) p - 12, & val);   \
+    }                                                   \
+  while (0)
 
 /* Need a function to convert from packed to double
    precision.   Actually, it's easier to print a
    packed number than a double anyway, so maybe
    there should be a special case to handle this... */
-#define NEXTPACKED(p) \
-  (p += 12, FETCH_DATA (info, p), 0.0)
+#define NEXTPACKED(p, val)                      \
+  do                                            \
+    {                                           \
+      p += 12;                                  \
+      if (!FETCH_DATA (info, p))                \
+        return -3;                              \
+      val = 0.0;                                \
+    }                                           \
+  while (0)
+
 
 
 /* Maximum length of an instruction.  */

opcodes/ppc-opc.c

@@ -1281 +1281 @@
 
   /* mfsprg can use 260..263 and 272..279.  mtsprg only uses spr 272..279
      If not BOOKE or 405, then both use only 272..275.  */
-  if (val <= 3
-      || (val < 0x10 && (insn & 0x100) != 0)
-      || (val - 0x10 > 3
-          && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_403)) == 0))
+  if ((val - 0x10 > 3 && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_405)) == 0)
+      || (val - 0x10 > 7 && (insn & 0x100) != 0)
+      || val <= 3
+      || (val & 8) != 0)
     *invalid = 1;
   return val & 7;
 }